Re: x11/gtk2+extra not happy with gmake 3.82

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Sun, Aug 22, 2010 at 03:56:08PM +0200, Erik Bertelsen wrote:
> My suspicion is that this package's Makefile violates some new
> stricter requirements of gmake 3.82.

That's correct.
When I fix that, and also manually replace @GLIB_GENMARSHALL@ (there's
no infrastructure support for that included in the package), it still
fails with 

libtool: link: cc -O2 -I/scratch/x11/gtk2+extra/work/.buildlink/include 
-I/scratch/x11/gtk2+extra/work/.x11-buildlink/include 
-I/scratch/x11/gtk2+extra/work/.x11-buildlink/include/freetype2 -Wall 
-Wl,-R/usr/pkg/lib -Wl,-R/usr/X11R7/lib -pthread -o .libs/testgtkfont 
testgtkfont.o -pthread -Wl,--export-dynamic  
-L/scratch/x11/gtk2+extra/work/.buildlink/lib 
-L/scratch/x11/gtk2+extra/work/.x11-buildlink/lib 
./.libs/libgtkextra-x11-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgtk-x11-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgdk-x11-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libatk-1.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgdk_pixbuf-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libpangocairo-1.0.so -lXext 
-lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libpangoft2-1.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgio-2.0.so -lXfixes 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libcairo.so -lpixman-1 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libglitz.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libpng14.so -lXrender -lX11 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libpango-1.0.so -lfreetype -lz 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgobject-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgmodule-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libgthread-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libglib-2.0.so 
/scratch/x11/gtk2+extra/work/.buildlink/lib/libpcre.so -lintl -lfontconfig -lm 
-pthread -Wl,-rpath -Wl,/usr/pkg/lib -Wl,-rpath 
-Wl,/scratch/x11/gtk2+extra/work/.buildlink/lib
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testrealtime] Error 1
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testgtkplotcanvas] Error 1
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testgtkfilesel] Error 1
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testgtkiconlist] Error 1
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testgtkplot3d] Error 1
./.libs/libgtkextra-x11-2.0.so: undefined reference to 
`gtkextra_VOID__INT_BOXED'
gmake[2]: *** [testgtkfont] Error 1
gmake[2]: Leaving directory 
`/scratch/x11/gtk2+extra/work/gtk+extra-2.1.2/gtkextra'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/scratch/x11/gtk2+extra/work/gtk+extra-2.1.2'

If someone wants to continue fixing the package, attached is my patch
for the first two problems.
 Thomas

$NetBSD: patch-aa,v 1.2 2010/04/13 17:44:30 drochner Exp $

gmake-3.82 is pickier about whitespace.

--- gtkextra/Makefile.in.orig   2010-03-21 00:05:56.000000000 +0000
+++ gtkextra/Makefile.in
@@ -469,7 +469,7 @@ gtkextra_extra_sources = \
        gtkextrafeatures.h.in   \
        gtkextra-marshal.list   
 
-INCLUDES = -I$(top_buildir) -I$(top_srcdir) $(GTK_CFLAGS) 
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(GTK_CFLAGS) 
 
 # target platform:
 lib_LTLIBRARIES = $(gtkextratargetlib)
@@ -1028,11 +1028,11 @@ uninstall-am: uninstall-gtkextraincludeH
 $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) 
$(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} 
${gtkextra_built_private_headers}
 
 $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > 
gtkextra-marshal.tmp \
+       ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > 
gtkextra-marshal.tmp \
         && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
         || ( rm -f gtkextra-marshal.tmp && exit 1 )
 $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > 
gtkextra-marshal.tmp \
+       ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > 
gtkextra-marshal.tmp \
         && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
         || ( rm -f gtkextra-marshal.tmp && exit 1 )