Sat Aug 18 14:40:12 2012 UTC ()
Disable DTrace support under NetBSD which breaks the build if DTrace is
actually installed.


(tron)
diff -r1.22 -r1.23 pkgsrc/devel/pkg-config/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/devel/pkg-config/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pkg-config/Makefile 2012/08/15 10:12:54 1.22
+++ pkgsrc/devel/pkg-config/Makefile 2012/08/18 14:40:12 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2012/08/15 10:12:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.23 2012/08/18 14:40:12 tron Exp $
2 2
3DISTNAME= pkg-config-0.27 3DISTNAME= pkg-config-0.27
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ 6MASTER_SITES= http://pkgconfig.freedesktop.org/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://pkgconfig.freedesktop.org/ 9HOMEPAGE= http://pkgconfig.freedesktop.org/
10COMMENT= System for managing library compile/link flags 10COMMENT= System for managing library compile/link flags
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,26 +21,33 @@ CONFIGURE_ARGS+= --with-internal-glib @@ -21,26 +21,33 @@ CONFIGURE_ARGS+= --with-internal-glib
21#CONFIGURE_ARGS+= GLIB_CFLAGS="-I${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0 -I${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include" 21#CONFIGURE_ARGS+= GLIB_CFLAGS="-I${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0 -I${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include"
22#CONFIGURE_ARGS+= GLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.glib2}/lib -L${BUILDLINK_PREFIX.glib2}/lib -lglib-2.0 -lintl" 22#CONFIGURE_ARGS+= GLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.glib2}/lib -L${BUILDLINK_PREFIX.glib2}/lib -lglib-2.0 -lintl"
23 23
24# old name of the package 24# old name of the package
25CONFLICTS= pkgconfig-[0-9]* 25CONFLICTS= pkgconfig-[0-9]*
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29.if ${OPSYS} == "IRIX" 29.if ${OPSYS} == "IRIX"
30# configure bails out in subdir after re-parsing the cache 30# configure bails out in subdir after re-parsing the cache
31CONFIGURE_ARGS+= --cache-file=/dev/null 31CONFIGURE_ARGS+= --cache-file=/dev/null
32.endif 32.endif
33 33
 34.if ${OPSYS} == "NetBSD"
 35post-configure:
 36 cd ${WRKSRC}/glib; \
 37 ${GREP} -v HAVE_DTRACE config.h >config.h.new; \
 38 ${MV} config.h.new config.h
 39.endif
 40
34.if ${OPSYS} == "SunOS" 41.if ${OPSYS} == "SunOS"
35CONFIGURE_ARGS+= --with-libiconv=gnu 42CONFIGURE_ARGS+= --with-libiconv=gnu
36CONFIGURE_ARGS+= --disable-dtrace 43CONFIGURE_ARGS+= --disable-dtrace
37.endif 44.endif
38 45
39PKGCONFIG_EXTRA_PATHS= # empty 46PKGCONFIG_EXTRA_PATHS= # empty
40 47
41.if ${LOCALBASE} != ${X11BASE} 48.if ${LOCALBASE} != ${X11BASE}
42PKGCONFIG_EXTRA_PATHS+= ${X11BASE}/lib/pkgconfig 49PKGCONFIG_EXTRA_PATHS+= ${X11BASE}/lib/pkgconfig
43.endif 50.endif
44 51
45.if ${LOCALBASE} != "/usr" 52.if ${LOCALBASE} != "/usr"
46PKGCONFIG_EXTRA_PATHS+= /usr/lib/pkgconfig 53PKGCONFIG_EXTRA_PATHS+= /usr/lib/pkgconfig