Fri Jun 5 11:20:27 2009 UTC ()
Enable PKG_DESTDIR_SUPPORT for suse100_*
(abs)
diff -r1.12 -r1.13 pkgsrc/emulators/suse100_base/Makefile
diff -r1.9 -r1.10 pkgsrc/emulators/suse100_fontconfig/Makefile
diff -r1.20 -r1.21 pkgsrc/emulators/suse100_linux/Makefile.common
diff -r1.5 -r1.6 pkgsrc/emulators/suse100_slang/Makefile
--- pkgsrc/emulators/suse100_base/Makefile 2007/07/30 22:01:11 1.12
+++ pkgsrc/emulators/suse100_base/Makefile 2009/06/05 11:20:27 1.13
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/30 22:01:11 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/06/05 11:20:27 abs Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 5
@@ -24,7 +24,7 @@
LINUX_LDD= ${EMULDIR}/usr/bin/ldd
LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig
-INSTALLATION_DIRS= sbin
+INSTALLATION_DIRS+= sbin emul/linux/etc
OWN_DIRS+= ${EMULSUBDIR}
SUBST_CLASSES+= suse
@@ -35,7 +35,7 @@
# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
# the correct type.
#
-BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}}
+BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
post-extract:
${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
@@ -43,14 +43,14 @@
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
- ${PREFIX}/sbin/${LINUX_BASE}-mkpwd
- ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc
+ ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd
+ ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${DESTDIR}${EMULDIR}/etc
${BRANDELF_CMD}
${SED} -e 's:#! :#! ${EMULDIR}:' \
-e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
- ${LINUX_LDD} > ${LINUX_LDD}.new
- ${MV} ${LINUX_LDD}.new ${LINUX_LDD}
- ${CHMOD} +x ${LINUX_LDD}
+ ${DESTDIR}${LINUX_LDD} > ${DESTDIR}${LINUX_LDD}.new
+ ${MV} ${DESTDIR}${LINUX_LDD}.new ${DESTDIR}${LINUX_LDD}
+ ${CHMOD} +x ${DESTDIR}${LINUX_LDD}
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/emulators/suse100_fontconfig/Makefile 2008/11/23 17:24:55 1.9
+++ pkgsrc/emulators/suse100_fontconfig/Makefile 2009/06/05 11:20:27 1.10
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/11/23 17:24:55 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2009/06/05 11:20:27 abs Exp $
DISTNAME= suse_fontconfig-${SUSE_VERSION}
PKGREVISION= 6
@@ -21,6 +21,6 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/local.conf \
- ${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf
+ ${DESTDIR}${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/emulators/suse100_linux/Makefile.common 2008/09/04 11:53:48 1.20
+++ pkgsrc/emulators/suse100_linux/Makefile.common 2009/06/05 11:20:27 1.21
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2008/09/04 11:53:48 obache Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/06/05 11:20:27 abs Exp $
SUSE_PKG= yes
SUSE_VERSION= 10.0
@@ -19,6 +19,8 @@
ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64
.endif
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../mk/bsd.prefs.mk"
# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures.
@@ -81,7 +83,7 @@
MANCOMPRESSED?= yes
EMUL_PKG_FMT?= rpm
-RPM2PKG_PREFIX?= ${PREFIX}
+RPM2PKG_PREFIX?= ${DESTDIR}${PREFIX}
RPM2PKG_SUBPREFIX?= ${EMULSUBDIR}
RPM2PKG_STAGE?= do-install
--- pkgsrc/emulators/suse100_slang/Makefile 2007/07/29 05:18:58 1.5
+++ pkgsrc/emulators/suse100_slang/Makefile 2009/06/05 11:20:27 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/05 11:20:27 abs Exp $
DISTNAME= suse_slang-${SUSE_VERSION}
PKGREVISION= 3
@@ -14,7 +14,8 @@
CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1
post-install:
- cd ${EMULDIR}/usr/lib && ${LN} -fs libslang-utf8.so.1 libslang.so.1
+ cd ${DESTDIR}${EMULDIR}/usr/lib && \
+ ${LN} -fs libslang-utf8.so.1 libslang.so.1
.include "../../emulators/suse100_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"