Wed Jun 15 15:48:50 2011 UTC ()
comment out two non-portable shell variable substitutions and revert
the "bash" requirement for "configure", works around build problems
due to unresolved problems with bash on Dragonfly
(PR pkg/45059 by Matthias Rampke)


(drochner)
diff -r1.216 -r1.217 pkgsrc/x11/gtk2/Makefile
diff -r1.134 -r1.135 pkgsrc/x11/gtk2/distinfo
diff -r1.19 -r1.20 pkgsrc/x11/gtk2/patches/patch-af
cvs diff -r1.216 -r1.217 pkgsrc/x11/gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2011/04/28 01:57:38 1.216
+++ pkgsrc/x11/gtk2/Makefile 2011/06/15 15:48:50 1.217
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.216 2011/04/28 01:57:38 obache Exp $ 1# $NetBSD: Makefile,v 1.217 2011/06/15 15:48:50 drochner Exp $
2 2
3DISTNAME= gtk+-2.24.4 3DISTNAME= gtk+-2.24.4
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.24/ \ 7MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.24/ \
8 ${MASTER_SITE_GNOME:=sources/gtk+/2.24/} 8 ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gtk.org/ 12HOMEPAGE= http://www.gtk.org/
13COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 13COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
@@ -20,28 +20,28 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -20,28 +20,28 @@ PKG_DESTDIR_SUPPORT= user-destdir
20 20
21CONFLICTS= gtk2-engines<2.6.0 21CONFLICTS= gtk2-engines<2.6.0
22CONFLICTS+= gail-[0-9]* 22CONFLICTS+= gail-[0-9]*
23 23
24SUPERSEDES= gail-[0-9]* 24SUPERSEDES= gail-[0-9]*
25 25
26USE_PKGLOCALEDIR= yes 26USE_PKGLOCALEDIR= yes
27USE_TOOLS+= gmake msgfmt perl pkg-config bash 27USE_TOOLS+= gmake msgfmt perl pkg-config bash
28USE_LANGUAGES= c c++ 28USE_LANGUAGES= c c++
29USE_LIBTOOL= yes 29USE_LIBTOOL= yes
30PTHREAD_AUTO_VARS= yes 30PTHREAD_AUTO_VARS= yes
31 31
32GNU_CONFIGURE= yes 32GNU_CONFIGURE= yes
33# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh 33# bashism in "configure" (illegal variable substitution), patched
34CONFIG_SHELL= bash 34#CONFIG_SHELL= bash
35CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 35CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
36# Work around build problems, disable unstable PAPI, PR #41608: 36# Work around build problems, disable unstable PAPI, PR #41608:
37CONFIGURE_ARGS+= --disable-papi 37CONFIGURE_ARGS+= --disable-papi
38# Not to unwanted pick up of db2html, PR#44908 38# Not to unwanted pick up of db2html, PR#44908
39CONFIGURE_ENV+= ac_cv_prog_DB2HTML=false 39CONFIGURE_ENV+= ac_cv_prog_DB2HTML=false
40MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 40MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
41TEST_TARGET= check 41TEST_TARGET= check
42 42
43PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in 43PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in
44PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in 44PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in
45PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in 45PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in
46PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in 46PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in
47PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in 47PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in
cvs diff -r1.134 -r1.135 pkgsrc/x11/gtk2/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/distinfo 2011/04/05 17:50:06 1.134
+++ pkgsrc/x11/gtk2/distinfo 2011/06/15 15:48:50 1.135
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.134 2011/04/05 17:50:06 drochner Exp $ 1$NetBSD: distinfo,v 1.135 2011/06/15 15:48:50 drochner Exp $
2 2
3SHA1 (gtk+-2.24.4.tar.bz2) = c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf 3SHA1 (gtk+-2.24.4.tar.bz2) = c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf
4RMD160 (gtk+-2.24.4.tar.bz2) = 56a6f731cfdc47686c71f8f6b4253484e08dd230 4RMD160 (gtk+-2.24.4.tar.bz2) = 56a6f731cfdc47686c71f8f6b4253484e08dd230
5Size (gtk+-2.24.4.tar.bz2) = 17607752 bytes 5Size (gtk+-2.24.4.tar.bz2) = 17607752 bytes
6SHA1 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11 6SHA1 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11
7SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 7SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
8SHA1 (patch-af) = 9e3009396f2377ece4dba1f79d6f65c3478ec81f 8SHA1 (patch-af) = 169430dd9a0c8ddfd30022f0ba46dabc0093ff1f
9SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 9SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
cvs diff -r1.19 -r1.20 pkgsrc/x11/gtk2/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/patches/patch-af 2010/11/15 18:28:45 1.19
+++ pkgsrc/x11/gtk2/patches/patch-af 2011/06/15 15:48:50 1.20
@@ -1,13 +1,28 @@ @@ -1,13 +1,28 @@
1$NetBSD: patch-af,v 1.19 2010/11/15 18:28:45 drochner Exp $ 1$NetBSD: patch-af,v 1.20 2011/06/15 15:48:50 drochner Exp $
2 2
3--- configure.orig 2010-09-23 14:27:27.000000000 +0000 3--- configure.orig 2011-04-01 21:41:11.000000000 +0000
4+++ configure 4+++ configure
5@@ -21936,7 +21936,7 @@ _ACEOF 5@@ -22773,7 +22773,7 @@ _ACEOF
6 if ac_fn_c_try_link "$LINENO"; then : 6 if ac_fn_c_try_link "$LINENO"; then :
7 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8 $as_echo "no" >&6; } 8 $as_echo "no" >&6; }
9- X_LIBS="$X_LIBS -R$x_libraries" 9- X_LIBS="$X_LIBS -R$x_libraries"
10+ X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries" 10+ X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
11 else 11 else
12 LIBS="$ac_xsave_LIBS -R $x_libraries" 12 LIBS="$ac_xsave_LIBS -R $x_libraries"
13 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 14@@ -24724,10 +24724,10 @@ $as_echo "$found_introspection" >&6; }
 15 INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
 16 INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
 17 INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
 18- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 19- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
 20- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 21- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
 22+# INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 23+# INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
 24+# INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 25+# INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
 26 INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
 27 INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
 28 INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection