pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/xpkgwedge Mac OS X Leopard doesn't "InstallFl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cb22d77a0e1
branches:  trunk
changeset: 536504:8cb22d77a0e1
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Dec 16 12:29:17 2007 +0000

description:
Mac OS X Leopard doesn't "InstallFlags" in "darwin.cf". We therefore don't
need to (and cannot) apply a patch to prevent that. This package builds
under Leopard now.

diffstat:

 pkgtools/xpkgwedge/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 3a63f90921db -r 8cb22d77a0e1 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sun Dec 16 12:27:28 2007 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sun Dec 16 12:29:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2007/11/11 11:35:50 martti Exp $
+# $NetBSD: Makefile,v 1.73 2007/12/16 12:29:17 tron Exp $
 
 DISTNAME=      xpkgwedge-1.16
 CATEGORIES=    pkgtools devel x11
@@ -44,7 +44,7 @@
 FILES_SUBST+=          MAKE=${IMAKE_MAKE:Q}
 USE_TOOLS+=            ${IMAKE_TOOLS}
 
-.if ${OPSYS} == "Darwin"
+.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-i386)
 PLIST_SUBST+=          IS_DARWIN=
 USE_TOOLS+=            patch
 .else
@@ -100,8 +100,10 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf
        @case ${OPSYS} in \
        Darwin) \
-       ${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; \
+       if [ -z "$IS_DARWIN" ]; 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; \
        ;; \
        IRIX) \
        ${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${DESTDIR}${PREFIX}/lib/X11/config; \



Home | Main Index | Thread Index | Old Index