Wed Jun 17 17:57:55 2009 UTC ()
Work around build problems on Solaris 10.
Patch from Joern Clausen per PR 41608.
Other platforms are not affected.


(asau)
diff -r1.177 -r1.178 pkgsrc/x11/gtk2/Makefile
cvs diff -r1.177 -r1.178 pkgsrc/x11/gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2009/06/17 17:08:29 1.177
+++ pkgsrc/x11/gtk2/Makefile 2009/06/17 17:57:55 1.178
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.177 2009/06/17 17:08:29 drochner Exp $ 1# $NetBSD: Makefile,v 1.178 2009/06/17 17:57:55 asau Exp $
2 2
3DISTNAME= gtk+-2.16.2 3DISTNAME= gtk+-2.16.2
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.16/ \ 6MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.16/ \
7 ${MASTER_SITE_GNOME:=sources/gtk+/2.16/} 7 ${MASTER_SITE_GNOME:=sources/gtk+/2.16/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gtk.org/ 11HOMEPAGE= http://www.gtk.org/
12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -53,26 +53,31 @@ CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" @@ -53,26 +53,31 @@ CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
53SUBST_CLASSES+= pthread 53SUBST_CLASSES+= pthread
54SUBST_STAGE.pthread= pre-configure 54SUBST_STAGE.pthread= pre-configure
55SUBST_MESSAGE.pthread= Fixing pthread flags. 55SUBST_MESSAGE.pthread= Fixing pthread flags.
56SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' 56SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
57SUBST_FILES.pthread= gdk-pixbuf/Makefile.in 57SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
58 58
59PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert 59PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert
60# gtk-builder-convert uses minidom from xml.dom, which needs expat 60# gtk-builder-convert uses minidom from xml.dom, which needs expat
61.include "../../lang/python/pyversion.mk" 61.include "../../lang/python/pyversion.mk"
62.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" 62.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
63DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 63DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
64.endif 64.endif
65 65
 66# Work around build problems, disable unstable PAPI, PR #41608:
 67.if ${OPSYS} == "SunOS"
 68CONFIGURE_ARGS+= --disable-papi
 69.endif
 70
66.include "options.mk" 71.include "options.mk"
67 72
68# We remove the module databases during post-install since we create them 73# We remove the module databases during post-install since we create them
69# anew in the +INSTALL script as part of the POST-INSTALL action. 74# anew in the +INSTALL script as part of the POST-INSTALL action.
70# 75#
71post-install: 76post-install:
72 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} 77 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
73 ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB} 78 ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
74 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/immodules 79 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/immodules
75 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/modules 80 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/modules
76 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/2.10.0/filesystems 81 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/2.10.0/filesystems
77 82
78EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme 83EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme