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

cvs diff -r1.12 -r1.13 pkgsrc/emulators/suse100_base/Makefile (expand / switch to unified diff)

--- 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,56 +1,56 @@ @@ -1,56 +1,56 @@
1# $NetBSD: Makefile,v 1.12 2007/07/30 22:01:11 jlam Exp $ 1# $NetBSD: Makefile,v 1.13 2009/06/05 11:20:27 abs Exp $
2 2
3DISTNAME= suse_base-${SUSE_VERSION} 3DISTNAME= suse_base-${SUSE_VERSION}
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= emulators 5CATEGORIES= emulators
6 6
7MAINTAINER= tonio@NetBSD.org 7MAINTAINER= tonio@NetBSD.org
8COMMENT= Linux compatibility package 8COMMENT= Linux compatibility package
9 9
10CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* 10CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
11 11
12# These files are managed by the +INSTALL/+DEINSTALL scripts. 12# These files are managed by the +INSTALL/+DEINSTALL scripts.
13CHECK_FILES_SKIP+= ${EMULDIR}/dev/.* 13CHECK_FILES_SKIP+= ${EMULDIR}/dev/.*
14CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache 14CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache
15CHECK_FILES_SKIP+= ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1 15CHECK_FILES_SKIP+= ${EMULDIR}/usr/@LINUX_LIBSUBDIR@/libz.so.1
16 16
17RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ 17RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
18 ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \ 18 ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
19 ./etc/inittab ./etc/hushlogins ./etc/java \ 19 ./etc/inittab ./etc/hushlogins ./etc/java \
20 ./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \ 20 ./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \
21 ./etc/pam.d ./etc/profile ./etc/profile.dos \ 21 ./etc/pam.d ./etc/profile ./etc/profile.dos \
22 ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype 22 ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
23 23
24LINUX_LDD= ${EMULDIR}/usr/bin/ldd 24LINUX_LDD= ${EMULDIR}/usr/bin/ldd
25LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig 25LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig
26 26
27INSTALLATION_DIRS= sbin 27INSTALLATION_DIRS+= sbin emul/linux/etc
28OWN_DIRS+= ${EMULSUBDIR} 28OWN_DIRS+= ${EMULSUBDIR}
29 29
30SUBST_CLASSES+= suse 30SUBST_CLASSES+= suse
31SUBST_STAGE.suse= do-build 31SUBST_STAGE.suse= do-build
32SUBST_FILES.suse= SuSE-release linux-mkpwd.sh 32SUBST_FILES.suse= SuSE-release linux-mkpwd.sh
33SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION 33SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION
34 34
35# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to 35# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
36# the correct type. 36# the correct type.
37# 37#
38BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${LINUX_LDCONFIG}:U${TRUE}} 38BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
39 39
40post-extract: 40post-extract:
41 ${CP} ${FILESDIR}/SuSE-release ${WRKSRC} 41 ${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
42 ${CP} ${FILESDIR}/*.sh ${WRKSRC} 42 ${CP} ${FILESDIR}/*.sh ${WRKSRC}
43 43
44do-install: 44do-install:
45 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \ 45 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
46 ${PREFIX}/sbin/${LINUX_BASE}-mkpwd 46 ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd
47 ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${EMULDIR}/etc 47 ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${DESTDIR}${EMULDIR}/etc
48 ${BRANDELF_CMD} 48 ${BRANDELF_CMD}
49 ${SED} -e 's:#! :#! ${EMULDIR}:' \ 49 ${SED} -e 's:#! :#! ${EMULDIR}:' \
50 -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \ 50 -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
51 ${LINUX_LDD} > ${LINUX_LDD}.new 51 ${DESTDIR}${LINUX_LDD} > ${DESTDIR}${LINUX_LDD}.new
52 ${MV} ${LINUX_LDD}.new ${LINUX_LDD} 52 ${MV} ${DESTDIR}${LINUX_LDD}.new ${DESTDIR}${LINUX_LDD}
53 ${CHMOD} +x ${LINUX_LDD} 53 ${CHMOD} +x ${DESTDIR}${LINUX_LDD}
54 54
55.include "../../emulators/suse100_linux/Makefile.common" 55.include "../../emulators/suse100_linux/Makefile.common"
56.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/emulators/suse100_fontconfig/Makefile (expand / switch to unified diff)

--- 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,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.9 2008/11/23 17:24:55 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.10 2009/06/05 11:20:27 abs Exp $
2 2
3DISTNAME= suse_fontconfig-${SUSE_VERSION} 3DISTNAME= suse_fontconfig-${SUSE_VERSION}
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= emulators 5CATEGORIES= emulators
6DISTFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm 6DISTFILES= fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
7 7
8MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
9COMMENT= Linux compatibility package for fontconfig 9COMMENT= Linux compatibility package for fontconfig
10 10
11EMUL_MODULES.linux= expat freetype2 11EMUL_MODULES.linux= expat freetype2
12 12
13.include "../../emulators/suse100_linux/Makefile.common" 13.include "../../emulators/suse100_linux/Makefile.common"
14 14
15PLIST_SRC= ${PKGDIR}/PLIST ${RPM2PKG_PLIST} 15PLIST_SRC= ${PKGDIR}/PLIST ${RPM2PKG_PLIST}
16 16
17do-build: 17do-build:
18 ${SETENV} LOCALBASE=${LOCALBASE:Q} X11BASE=${X11BASE:Q} \ 18 ${SETENV} LOCALBASE=${LOCALBASE:Q} X11BASE=${X11BASE:Q} \
19 ${AWK} -f ${FILESDIR}/generate.awk ${FILESDIR}/local.conf.in \ 19 ${AWK} -f ${FILESDIR}/generate.awk ${FILESDIR}/local.conf.in \
20 > ${WRKSRC}/local.conf 20 > ${WRKSRC}/local.conf
21 21
22post-install: 22post-install:
23 ${INSTALL_DATA} ${WRKSRC}/local.conf \ 23 ${INSTALL_DATA} ${WRKSRC}/local.conf \
24 ${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf 24 ${DESTDIR}${PREFIX}/${EMULSUBDIR}/etc/fonts/local.conf
25 25
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"

cvs diff -r1.20 -r1.21 pkgsrc/emulators/suse100_linux/Makefile.common (expand / switch to unified diff)

--- 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,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile.common,v 1.20 2008/09/04 11:53:48 obache Exp $ 1# $NetBSD: Makefile.common,v 1.21 2009/06/05 11:20:27 abs Exp $
2 2
3SUSE_PKG= yes 3SUSE_PKG= yes
4SUSE_VERSION= 10.0 4SUSE_VERSION= 10.0
5EMUL_REQD= suse>=${SUSE_VERSION} 5EMUL_REQD= suse>=${SUSE_VERSION}
6 6
7# The SuSE 10.x Linux packages are only usable on the following platforms. 7# The SuSE 10.x Linux packages are only usable on the following platforms.
8.if defined(SUSE_COMPAT32) 8.if defined(SUSE_COMPAT32)
9EMUL_PLATFORMS?= linux-i386 9EMUL_PLATFORMS?= linux-i386
10ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 10ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64
11ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 11ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64
12.else 12.else
13EMUL_PLATFORMS?= linux-i386 linux-powerpc linux-x86_64 13EMUL_PLATFORMS?= linux-i386 linux-powerpc linux-x86_64
14ONLY_FOR_PLATFORM+= DragonFly-*-i386 14ONLY_FOR_PLATFORM+= DragonFly-*-i386
15ONLY_FOR_PLATFORM+= FreeBSD-*-i386 15ONLY_FOR_PLATFORM+= FreeBSD-*-i386
16ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 16ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386
17ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc 17ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-powerpc
18ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 18ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64
19ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 19ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64
20.endif 20.endif
21 21
 22PKG_DESTDIR_SUPPORT= user-destdir
 23
22.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
23 25
24# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. 26# _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures.
25_SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} 27_SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH}
26_SUSE_ARCH.i386= i586 28_SUSE_ARCH.i386= i586
27_SUSE_ARCH.powerpc= ppc 29_SUSE_ARCH.powerpc= ppc
28_SUSE_ARCH= ${_SUSE_ARCH.${EMUL_ARCH}} 30_SUSE_ARCH= ${_SUSE_ARCH.${EMUL_ARCH}}
29SUSE_ARCH= ${_SUSE_ARCH} 31SUSE_ARCH= ${_SUSE_ARCH}
30 32
31_SUSE_FTP_SUBDIR= distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/ 33_SUSE_FTP_SUBDIR= distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/
32_SUSE_FTP_SUBDIR_UPD= suse/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/ 34_SUSE_FTP_SUBDIR_UPD= suse/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/
33 35
34MASTER_SITE_SUSE_${SUSE_VERSION}= \ 36MASTER_SITE_SUSE_${SUSE_VERSION}= \
@@ -71,27 +73,27 @@ MASTER_SITE_SUSE_${SUSE_VERSION}_UPD= \ @@ -71,27 +73,27 @@ MASTER_SITE_SUSE_${SUSE_VERSION}_UPD= \
71 ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \ 73 ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/${_SUSE_FTP_SUBDIR_UPD} \
72 ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD} 74 ftp://ftp.suse.com/pub/${_SUSE_FTP_SUBDIR_UPD}
73 75
74MASTER_SITES?= ${MASTER_SITE_SUSE_${SUSE_VERSION}} 76MASTER_SITES?= ${MASTER_SITE_SUSE_${SUSE_VERSION}}
75DIST_SUBDIR?= suse${SUSE_VERSION:S/.//}/${SUSE_ARCH} 77DIST_SUBDIR?= suse${SUSE_VERSION:S/.//}/${SUSE_ARCH}
76 78
77HOMEPAGE?= http://www.suse.com/ 79HOMEPAGE?= http://www.suse.com/
78 80
79WRKSRC?= ${WRKDIR} 81WRKSRC?= ${WRKDIR}
80BUILD_DIRS?= # empty 82BUILD_DIRS?= # empty
81MANCOMPRESSED?= yes 83MANCOMPRESSED?= yes
82 84
83EMUL_PKG_FMT?= rpm 85EMUL_PKG_FMT?= rpm
84RPM2PKG_PREFIX?= ${PREFIX} 86RPM2PKG_PREFIX?= ${DESTDIR}${PREFIX}
85RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} 87RPM2PKG_SUBPREFIX?= ${EMULSUBDIR}
86RPM2PKG_STAGE?= do-install 88RPM2PKG_STAGE?= do-install
87 89
88SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/} 90SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/}
89FILESDIR= ${SUSE_PKGSRCDIR}/files 91FILESDIR= ${SUSE_PKGSRCDIR}/files
90PATCHDIR= ${SUSE_PKGSRCDIR}/patches 92PATCHDIR= ${SUSE_PKGSRCDIR}/patches
91PKGDIR= ${SUSE_PKGSRCDIR} 93PKGDIR= ${SUSE_PKGSRCDIR}
92 94
93.if defined(SUSE_COMPAT32) 95.if defined(SUSE_COMPAT32)
94PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} 96PKGNAME:= ${DISTNAME:S/^suse_/suse32_/}
95COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} 97COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/}
96LINUX_BASE= linux32 98LINUX_BASE= linux32
97.else 99.else

cvs diff -r1.5 -r1.6 pkgsrc/emulators/suse100_slang/Makefile (expand / switch to unified diff)

--- 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,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.5 2007/07/29 05:18:58 jlam Exp $ 1# $NetBSD: Makefile,v 1.6 2009/06/05 11:20:27 abs Exp $
2 2
3DISTNAME= suse_slang-${SUSE_VERSION} 3DISTNAME= suse_slang-${SUSE_VERSION}
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= emulators 5CATEGORIES= emulators
6DISTFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm 6DISTFILES= slang-1.4.9-127.${SUSE_ARCH}.rpm
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Linux compatibility package for S-Lang 9COMMENT= Linux compatibility package for S-Lang
10 10
11EMUL_MODULES.linux= base 11EMUL_MODULES.linux= base
12 12
13# This symlink is managed by ldconfig(8). 13# This symlink is managed by ldconfig(8).
14CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1 14CHECK_FILES_SKIP+= ${EMULDIR}/usr/${LINUX_LIBSUBDIR}/libslang.so.1
15 15
16post-install: 16post-install:
17 cd ${EMULDIR}/usr/lib && ${LN} -fs libslang-utf8.so.1 libslang.so.1 17 cd ${DESTDIR}${EMULDIR}/usr/lib && \
 18 ${LN} -fs libslang-utf8.so.1 libslang.so.1
18 19
19.include "../../emulators/suse100_linux/Makefile.common" 20.include "../../emulators/suse100_linux/Makefile.common"
20.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"