pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/darwin_lib * Strip out unnecessary path comp...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c276450cd0e7
branches: trunk
changeset: 515065:c276450cd0e7
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jun 23 15:52:34 2006 +0000
description:
* Strip out unnecessary path components in the PLIST so that check-files
isn't confused by the "pkg_info -qL" output.
* Add a MESSAGE file noting what should be added to the kernel config
file in order to use darwin_lib.
* Add an INSTALL script that creates the /emul/darwin symlink needed by
NetBSD to use darwin_lib.
Bump the PKGREVISION to 2. This fixes the error noted in the bulk build
results:
http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html
diffstat:
emulators/darwin_lib/INSTALL | 30 ++++++++++++++++++++++++++++++
emulators/darwin_lib/MESSAGE | 7 +++++++
emulators/darwin_lib/Makefile | 27 ++++++++++++---------------
3 files changed, 49 insertions(+), 15 deletions(-)
diffs (97 lines):
diff -r f40d8ef5cfca -r c276450cd0e7 emulators/darwin_lib/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/darwin_lib/INSTALL Fri Jun 23 15:52:34 2006 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: INSTALL,v 1.1 2006/06/23 15:52:34 jlam Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+ emulsubdir=darwin
+
+ emuldir="/emul/$emulsubdir"
+ pkgemuldir="${PKG_PREFIX}/emul/$emulsubdir"
+
+ emuldir_pwd=`cd $emuldir 2>/dev/null && ${PWD_CMD}`
+ pkgemuldir_pwd=`cd $pkgemuldir 2>/dev/null && ${PWD_CMD}`
+
+ if ${TEST} "$emuldir_pwd" != "$pkgemuldir_pwd"; then
+ if ${TEST} -e $emuldir -o -L $emuldir; then
+ ${CAT} << EOF
+==============================================================================
+You must create a symbolic link for ${PKGNAME} to work properly:
+
+ $pkgemuldir -> $emuldir
+
+It seems there is something else located at $emuldir.
+==============================================================================
+EOF
+ else
+ ${MKDIR} -p `${DIRNAME} $emuldir` &&
+ ${LN} -fs $pkgemuldir $emuldir
+ fi
+ fi
+ ;;
+esac
diff -r f40d8ef5cfca -r c276450cd0e7 emulators/darwin_lib/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/darwin_lib/MESSAGE Fri Jun 23 15:52:34 2006 +0000
@@ -0,0 +1,7 @@
+==============================================================================
+$NetBSD: MESSAGE,v 1.1 2006/06/23 15:52:34 jlam Exp $
+
+Do not forget to include EXEC_MACHO, COMPAT_MACH, and COMPAT_DARWIN
+in your kernel configuration file. Darwin binaries require these
+options in order to work.
+==============================================================================
diff -r f40d8ef5cfca -r c276450cd0e7 emulators/darwin_lib/Makefile
--- a/emulators/darwin_lib/Makefile Fri Jun 23 15:48:50 2006 +0000
+++ b/emulators/darwin_lib/Makefile Fri Jun 23 15:52:34 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/06/23 15:52:34 jlam Exp $
DISTNAME= darwin_lib-6.6.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://www.opendarwin.org/downloads/6.6.2/RPMS/ \
http://www.opendarwin.org/downloads/6.6.2/RPMS/${DARWIN_ARCH}/
@@ -21,28 +21,25 @@
ONLY_FOR_PLATFORM= NetBSD-1.6Z*-powerpc NetBSD-1.6Z*-i386 \
NetBSD-[2-9]*-powerpc NetBSD-[2-9]*-i386
-PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
+PLIST_SRC= ${WRKDIR}/.PLIST_SRC
DARWIN_ARCH= ${MACHINE_ARCH:C/powerpc/ppc/}
RPM2PKG= rpm2pkg
-RPMARGS= -d ${PREFIX} -f ${PLIST_SRC} -p emul/darwin -i ./Developer \
- -i ./usr/X11R6/lib/X11/doc/html -i ./usr/share/man \
- -i ./usr/include -i ./usr/X11R6/man -i ./usr/X11R6/include \
- -i ./usr/local/include -i ./usr/local/man
-.for TEMP in ${DISTFILES}
-RPMARGS+= ${DISTDIR}/${TEMP}
-.endfor
+RPMARGS= -d ${PREFIX} -f ${WRKDIR}/PLIST_RPM2PKG -p emul/darwin \
+ -i ./Developer -i ./usr/X11R6/lib/X11/doc/html \
+ -i ./usr/share/man -i ./usr/include -i ./usr/X11R6/man \
+ -i ./usr/X11R6/include -i ./usr/local/include \
+ -i ./usr/local/man \
+ ${DISTFILES:S/^/${DISTDIR}\//}
EXTRACT_ONLY= # empty
NO_BUILD= yes
do-install:
- ${RM} -f ${WRKDIR}/PLIST_DYNAMIC
+ ${RM} -f ${WRKDIR}/PLIST_RPM2PKG
${RPM2PKG} ${RPMARGS}
- ${MKDIR} /emul
- # Avoid a symlink left from a previous installation
- ${TEST} -L /emul/darwin && ${RM} /emul/darwin || ${TRUE}
- ${LN} -sf ${PREFIX}/emul/darwin /emul/darwin
+ ${SED} -e "s|^\./||" -e "s|/\./|/|g" -e "s|/+|/|g" \
+ ${WRKDIR}/PLIST_RPM2PKG > ${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index