Wed Apr 23 12:49:24 2014 UTC ()
get rid of SuSE-release from SUBST too.


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

--- pkgsrc/emulators/suse131_base/Makefile 2014/04/23 12:48:04 1.5
+++ pkgsrc/emulators/suse131_base/Makefile 2014/04/23 12:49:24 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2014/04/23 12:48:04 obache Exp $ 1# $NetBSD: Makefile,v 1.6 2014/04/23 12:49:24 obache Exp $
2 2
3DISTNAME= suse_base-${SUSE_VERSION} 3DISTNAME= suse_base-${SUSE_VERSION}
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= emulators 5CATEGORIES= emulators
6RPMPKGS+= aaa_base-${SUSE_VERSION}-16.17.1.${SUSE_ARCH} 6RPMPKGS+= aaa_base-${SUSE_VERSION}-16.17.1.${SUSE_ARCH}
7RPMPKGS+= bash-4.2-68.1.5.${SUSE_ARCH} 7RPMPKGS+= bash-4.2-68.1.5.${SUSE_ARCH}
8RPMUPDPKGS+= coreutils-8.21-7.16.1.${SUSE_ARCH} 8RPMUPDPKGS+= coreutils-8.21-7.16.1.${SUSE_ARCH}
9RPMPKGS+= findutils-4.5.12-1.1.${SUSE_ARCH} 9RPMPKGS+= findutils-4.5.12-1.1.${SUSE_ARCH}
10RPMPKGS+= libgdbm4-1.10-7.1.2.${SUSE_ARCH} 10RPMPKGS+= libgdbm4-1.10-7.1.2.${SUSE_ARCH}
11RPMUPDPKGS+= glibc-2.18-4.11.1.${SUSE_ARCH} 11RPMUPDPKGS+= glibc-2.18-4.11.1.${SUSE_ARCH}
12RPMPKGS+= keyutils-1.5.5-6.1.3.${SUSE_ARCH} 12RPMPKGS+= keyutils-1.5.5-6.1.3.${SUSE_ARCH}
13RPMPKGS+= libacl1-2.2.52-2.1.2.${SUSE_ARCH} 13RPMPKGS+= libacl1-2.2.52-2.1.2.${SUSE_ARCH}
14RPMPKGS+= libattr1-2.4.47-2.1.2.${SUSE_ARCH} 14RPMPKGS+= libattr1-2.4.47-2.1.2.${SUSE_ARCH}
@@ -41,27 +41,27 @@ RPMIGNOREPATH= ./etc/bash.bashrc ./etc/ @@ -41,27 +41,27 @@ RPMIGNOREPATH= ./etc/bash.bashrc ./etc/
41 ./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \ 41 ./etc/mailcap ./etc/mime.types ./etc/nsswitch.conf \
42 ./etc/pam.d ./etc/profile ./etc/profile.dos \ 42 ./etc/pam.d ./etc/profile ./etc/profile.dos \
43 ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype 43 ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
44 44
45LINUX_LDD= ${EMULDIR}/usr/bin/ldd 45LINUX_LDD= ${EMULDIR}/usr/bin/ldd
46LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig 46LINUX_LDCONFIG= ${EMULDIR}/usr/sbin/ldconfig
47 47
48INSTALLATION_DIRS+= ${EMULDIR}/etc ${EMULDIR}/dev/shm ${EMULDIR}/var/lock 48INSTALLATION_DIRS+= ${EMULDIR}/etc ${EMULDIR}/dev/shm ${EMULDIR}/var/lock
49INSTALLATION_DIRS+= sbin 49INSTALLATION_DIRS+= sbin
50OWN_DIRS+= ${EMULSUBDIR} 50OWN_DIRS+= ${EMULSUBDIR}
51 51
52SUBST_CLASSES+= suse 52SUBST_CLASSES+= suse
53SUBST_STAGE.suse= do-build 53SUBST_STAGE.suse= do-build
54SUBST_FILES.suse= SuSE-release linux-mkpwd.sh 54SUBST_FILES.suse= linux-mkpwd.sh
55SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION 55SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION
56 56
57# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to 57# Some platforms, e.g. FreeBSD, need to "brand" the ELF binaries to
58# the correct type. 58# the correct type.
59# 59#
60BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}} 60BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
61 61
62post-extract: 62post-extract:
63 ${CP} ${FILESDIR}/*.sh ${WRKSRC} 63 ${CP} ${FILESDIR}/*.sh ${WRKSRC}
64 64
65do-install: 65do-install:
66 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \ 66 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
67 ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd 67 ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd