pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/xpkgwedge Fix build on pre-Leopard Mac OS X s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd8aaabb89b0
branches:  trunk
changeset: 536506:bd8aaabb89b0
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Dec 16 12:43:50 2007 +0000

description:
Fix build on pre-Leopard Mac OS X systems.

diffstat:

 pkgtools/xpkgwedge/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 58dc89f32458 -r bd8aaabb89b0 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sun Dec 16 12:36:28 2007 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sun Dec 16 12:43:50 2007 +0000
@@ -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+=          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 @@
        ${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; \



Home | Main Index | Thread Index | Old Index