Mon Jul 11 19:19:42 2011 UTC ()
Fix build problem under Mac OS X.


(tron)
diff -r1.40 -r1.41 pkgsrc/x11/pixman/Makefile
cvs diff -r1.40 -r1.41 pkgsrc/x11/pixman/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/pixman/Makefile 2011/07/11 10:50:58 1.40
+++ pkgsrc/x11/pixman/Makefile 2011/07/11 19:19:42 1.41
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.40 2011/07/11 10:50:58 drochner Exp $ 1# $NetBSD: Makefile,v 1.41 2011/07/11 19:19:42 tron Exp $
2# 
3 2
4DISTNAME= pixman-0.22.2 3DISTNAME= pixman-0.22.2
5CATEGORIES= x11 4CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Library of low-level pixel manipulation routines 10COMMENT= Library of low-level pixel manipulation routines
 11LICENSE= mit
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config perl 17USE_TOOLS+= pkg-config perl
18### 18###
19### XXX Quiet, please! 19### XXX Quiet, please!
20### 20###
21.if empty(USE_TOOLS:Mauto*) 21.if empty(USE_TOOLS:Mauto*)
22CONFIGURE_ENV+= AUTOCONF=${TRUE:Q} 22CONFIGURE_ENV+= AUTOCONF=${TRUE:Q}
23CONFIGURE_ENV+= AUTOHEADER=${TRUE:Q} 23CONFIGURE_ENV+= AUTOHEADER=${TRUE:Q}
24CONFIGURE_ENV+= ACLOCAL=${TRUE:Q} 24CONFIGURE_ENV+= ACLOCAL=${TRUE:Q}
@@ -32,14 +32,25 @@ PKGCONFIG_OVERRIDE+= pixman-1-uninstalle @@ -32,14 +32,25 @@ PKGCONFIG_OVERRIDE+= pixman-1-uninstalle
32### for lack of -fvisibility=hidden. In keeping with the pkgsrc 32### for lack of -fvisibility=hidden. In keeping with the pkgsrc
33### tradition of portability, we'll opt to use libtool to export 33### tradition of portability, we'll opt to use libtool to export
34### the desired symbols, hiding the rest. 34### the desired symbols, hiding the rest.
35### 35###
36### Please, do not forget to ensure the currency of this file! 36### Please, do not forget to ensure the currency of this file!
37 37
38MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q} 38MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
39PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym 39PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym
40 40
41post-extract: 41post-extract:
42 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR} 42 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
43 ${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKSRC}/pixman 43 ${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKSRC}/pixman
44 44
 45.include "../../mk/bsd.prefs.mk"
 46
 47# Link the tests with the static library under Mac OS X as we cannot use
 48# the shared library out of the build area.
 49.if ${OPSYS} == "Darwin"
 50SUBST_CLASSES+= pixmantests
 51SUBST_STAGE.pixmantests= post-configure
 52SUBST_FILES.pixmantests= test/Makefile
 53SUBST_SED.pixmantests= -e 's@libpixman-1\.la@\.libs/libpixman-1\.a@'
 54.endif
 55
45.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"