pkg/31357: graphics/gnome-icon-theme is broken by intltool invocation problem, too

[carton%Ivy.NET@localhost]

>Number:         31357
>Category:       pkg
>Synopsis:       graphics/gnome-icon-theme is broken by intltool invocation 
>problem, too
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 20 04:36:00 +0000 2005
>Originator:     Miles Nordin
>Release:        pkgsrc 2005-08-24
>Organization:
Ivy Ministries
>Environment:
System: NetBSD castrovalva 3.0_BETA NetBSD 3.0_BETA (CASTROVALVA-$Revision: 
1.10 $) #0: Sun Sep 11 15:08:04 EDT 2005 
carton@castrovalva:/export/src/sys/arch/alpha/compile/CASTROVALVA alpha
Architecture: alpha
Machine: alpha
>Description:
>How-To-Repeat:
Making all in emblems                                                           
                                                                              
gmake[2]: Entering directory 
`/usr/pkgobj/graphics/gnome-icon-theme/work/gnome-icon-theme-2.10.1/48x48/emblems'
                                               
../../intltool-merge ../../po emblem-art.icon.in emblem-art.icon -d -u -c 
../../po/.intltool-merge-cache                                                  
    
Usage: intltool-merge [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE             
                                                                              
Generates an output file that includes some localized attributes from an        
                                                                              
untranslated source file.                                                       
                                                                              
                                                                                
                                                                              
Mandatory options: (exactly one must be specified)                              
                                                                              
  -b, --ba-style         includes translations in the bonobo-activation style   
                                                                              
  -d, --desktop-style    includes translations in the desktop style             
                                                                              
  -k, --keys-style       includes translations in the keys style                
                                                                              
  -s, --schemas-style    includes translations in the schemas style             
                                                                              
  -r, --rfc822deb-style  includes translations in the RFC822 style              
                                                                              
[...more usage message...]

>Fix:
proper fix would be to pull aclocal.m4 through automake into all these 
Makefile.in's, but I cant get autoreconf to run on this package.  It 
complains about AM_GLIB_GNU_GETTEXT not being defined, and that symbol 
isn't in the texinfo documentation for automake or autoconf, so I guess 
it is just more of GNOME using undocumented secret APIs just like they 
accuse Microsoft of doing with Office.  I wish they would not keep 
rototilling their secret APIs.

Index: distinfo
===================================================================
RCS file: /scratch/cvsroot/netbsd/pkgsrc/graphics/gnome-icon-theme/distinfo,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -r1.1.1.6 -r1.2
--- distinfo    18 Jul 2005 13:00:54 -0000      1.1.1.6
+++ distinfo    20 Sep 2005 04:31:26 -0000      1.2
@@ -3,3 +3,6 @@
 SHA1 (gnome-icon-theme-2.10.1.tar.bz2) = 
f419c8b5161e086e369248f56611a9e732d6283a
 RMD160 (gnome-icon-theme-2.10.1.tar.bz2) = 
8c7df4ed6212861945c3db43cecc55d2db846121
 Size (gnome-icon-theme-2.10.1.tar.bz2) = 2989029 bytes
+SHA1 (patch-aa) = 1f2358738df60a8cbe3b9d4dccdbe4c5d530a78a
+SHA1 (patch-ab) = 33806e693f9eea4e58e27326e9003ef50e7596fc
+SHA1 (patch-ac) = 0326d16092ed7321bb7c922d8629b908cbd4aae1
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-aa    20 Sep 2005 04:31:26 -0000      1.1
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.in.orig   2005-03-23 06:46:50.000000000 +0800
++++ Makefile.in
+@@ -673,7 +673,7 @@
+       uninstall-iconDATA uninstall-info-am uninstall-pkgconfigDATA
+ 
+ 
+-%.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c 
$(top_builddir)/po/.intltool-merge-cache
++%.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@
+ 
+ # we don't want to install mo files, all translations are already stored
+ # in theme files
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab    20 Sep 2005 04:31:27 -0000      1.1
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 48x48/emblems/Makefile.in.orig     2005-03-23 06:46:47.000000000 +0800
++++ 48x48/emblems/Makefile.in
+@@ -453,7 +453,7 @@
+       uninstall-info-am uninstall-pngDATA
+ 
+ 
+-%.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c 
$(top_builddir)/po/.intltool-merge-cache
++%.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac    20 Sep 2005 04:31:27 -0000      1.1
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- scalable/emblems/Makefile.in.orig  2005-03-23 06:46:50.000000000 +0800
++++ scalable/emblems/Makefile.in
+@@ -374,7 +374,7 @@
+ 
+       $(NULL)
+ 
+-%.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c 
$(top_builddir)/po/.intltool-merge-cache
++%.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; 
$(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: