summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2007-12-16 12:43:50 +0000
committertron <tron>2007-12-16 12:43:50 +0000
commit630776a8f4f95d2580212b1e86c7bc63e3ae0093 (patch)
tree8e00d5dd6118145996a20b12bdf43759fb4dd003
parent5a22c8709c26d71b65addd8ba3dc7aa46d2cdd2c (diff)
downloadpkgsrc-630776a8f4f95d2580212b1e86c7bc63e3ae0093.tar.gz
Fix build on pre-Leopard Mac OS X systems.
-rw-r--r--pkgtools/xpkgwedge/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index e7b78b2d0f0..22e4404abdb 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2007/12/16 12:29:17 tron Exp $
+# $NetBSD: Makefile,v 1.74 2007/12/16 12:43:50 tron Exp $
DISTNAME= xpkgwedge-1.16
CATEGORIES= pkgtools devel x11
@@ -44,10 +44,12 @@ FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q}
FILES_SUBST+= MAKE=${IMAKE_MAKE:Q}
USE_TOOLS+= ${IMAKE_TOOLS}
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-i386)
+.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+APPLY_DARWIN_PATCH= ${TRUE}
PLIST_SUBST+= IS_DARWIN=
USE_TOOLS+= patch
.else
+APPLY_DARWIN_PATCH= ${FALSE}
PLIST_SUBST+= IS_DARWIN="@comment "
.endif
@@ -100,7 +102,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf
@case ${OPSYS} in \
Darwin) \
- if [ -z "$IS_DARWIN" ]; then \
+ if ${APPLY_DARWIN_PATCH}; then \
${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
fi; \