Mon Aug 20 04:56:00 2012 UTC ()
Rather than assuming SunOS == libiconv, use ICONV_TYPE in the usual manner
to correctly express what variety of iconv we are using.

Fixes build on Linux systems with PREFER_PKGSRC=yes.


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

--- pkgsrc/devel/pkg-config/Makefile 2012/08/18 14:40:12 1.23
+++ pkgsrc/devel/pkg-config/Makefile 2012/08/20 04:56:00 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2012/08/18 14:40:12 tron Exp $ 1# $NetBSD: Makefile,v 1.24 2012/08/20 04:56:00 dsainty 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
@@ -29,30 +29,32 @@ CONFLICTS= pkgconfig-[0-9]* @@ -29,30 +29,32 @@ CONFLICTS= pkgconfig-[0-9]*
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" 34.if ${OPSYS} == "NetBSD"
35post-configure: 35post-configure:
36 cd ${WRKSRC}/glib; \ 36 cd ${WRKSRC}/glib; \
37 ${GREP} -v HAVE_DTRACE config.h >config.h.new; \ 37 ${GREP} -v HAVE_DTRACE config.h >config.h.new; \
38 ${MV} config.h.new config.h 38 ${MV} config.h.new config.h
39.endif 39.endif
40 40
41.if ${OPSYS} == "SunOS" 41.if ${OPSYS} == "SunOS"
42CONFIGURE_ARGS+= --with-libiconv=gnu 
43CONFIGURE_ARGS+= --disable-dtrace 42CONFIGURE_ARGS+= --disable-dtrace
44.endif 43.endif
45 44
 45CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 46CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu
 47
46PKGCONFIG_EXTRA_PATHS= # empty 48PKGCONFIG_EXTRA_PATHS= # empty
47 49
48.if ${LOCALBASE} != ${X11BASE} 50.if ${LOCALBASE} != ${X11BASE}
49PKGCONFIG_EXTRA_PATHS+= ${X11BASE}/lib/pkgconfig 51PKGCONFIG_EXTRA_PATHS+= ${X11BASE}/lib/pkgconfig
50.endif 52.endif
51 53
52.if ${LOCALBASE} != "/usr" 54.if ${LOCALBASE} != "/usr"
53PKGCONFIG_EXTRA_PATHS+= /usr/lib/pkgconfig 55PKGCONFIG_EXTRA_PATHS+= /usr/lib/pkgconfig
54.endif 56.endif
55 57
56.if !empty(PKGCONFIG_EXTRA_PATHS) 58.if !empty(PKGCONFIG_EXTRA_PATHS)
57# First part of the value is taken from configure.in 59# First part of the value is taken from configure.in
58CONFIGURE_ARGS+= --with-pc-path='$${libdir}/pkgconfig:$${datadir}/pkgconfig:${PKGCONFIG_EXTRA_PATHS:ts:}' 60CONFIGURE_ARGS+= --with-pc-path='$${libdir}/pkgconfig:$${datadir}/pkgconfig:${PKGCONFIG_EXTRA_PATHS:ts:}'