Mon Feb 3 03:14:19 2014 UTC ()
Remove old own "SuSE-release" way, use openSUSE-release RPM instead.
It was deprecated, and new "os-release" came.

Bump PKGREVISION.


(obache)
diff -r1.1 -r1.2 pkgsrc/emulators/suse131_base/Makefile
diff -r1.2 -r1.3 pkgsrc/emulators/suse131_base/distinfo
diff -r1.1 -r0 pkgsrc/emulators/suse131_base/files/SuSE-release
cvs diff -r1.1 -r1.2 pkgsrc/emulators/suse131_base/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/suse131_base/Makefile 2013/12/05 11:42:14 1.1
+++ pkgsrc/emulators/suse131_base/Makefile 2014/02/03 03:14:18 1.2
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: Makefile,v 1.1 2013/12/05 11:42:14 obache Exp $ 1# $NetBSD: Makefile,v 1.2 2014/02/03 03:14:18 obache Exp $
2 2
3DISTNAME= suse_base-${SUSE_VERSION} 3DISTNAME= suse_base-${SUSE_VERSION}
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5RPMPKGS+= aaa_base-${SUSE_VERSION}-16.17.1.${SUSE_ARCH} 6RPMPKGS+= aaa_base-${SUSE_VERSION}-16.17.1.${SUSE_ARCH}
6RPMPKGS+= bash-4.2-68.1.5.${SUSE_ARCH} 7RPMPKGS+= bash-4.2-68.1.5.${SUSE_ARCH}
7RPMPKGS+= coreutils-8.21-7.1.3.${SUSE_ARCH} 8RPMPKGS+= coreutils-8.21-7.1.3.${SUSE_ARCH}
8RPMPKGS+= findutils-4.5.12-1.1.${SUSE_ARCH} 9RPMPKGS+= findutils-4.5.12-1.1.${SUSE_ARCH}
9RPMPKGS+= libgdbm4-1.10-7.1.2.${SUSE_ARCH} 10RPMPKGS+= libgdbm4-1.10-7.1.2.${SUSE_ARCH}
10RPMPKGS+= glibc-2.18-4.4.1.${SUSE_ARCH} 11RPMPKGS+= glibc-2.18-4.4.1.${SUSE_ARCH}
11RPMPKGS+= keyutils-1.5.5-6.1.3.${SUSE_ARCH} 12RPMPKGS+= keyutils-1.5.5-6.1.3.${SUSE_ARCH}
12RPMPKGS+= libacl1-2.2.52-2.1.2.${SUSE_ARCH} 13RPMPKGS+= libacl1-2.2.52-2.1.2.${SUSE_ARCH}
13RPMPKGS+= libattr1-2.4.47-2.1.2.${SUSE_ARCH} 14RPMPKGS+= libattr1-2.4.47-2.1.2.${SUSE_ARCH}
14RPMPKGS+= libcap2-2.22-10.1.24.${SUSE_ARCH} 15RPMPKGS+= libcap2-2.22-10.1.24.${SUSE_ARCH}
15RPMPKGS+= libgcc_s1-4.8.1_20130909-3.2.1.${SUSE_ARCH} 16RPMPKGS+= libgcc_s1-4.8.1_20130909-3.2.1.${SUSE_ARCH}
16RPMPKGS+= libgmp10-5.1.2-2.1.2.${SUSE_ARCH} 17RPMPKGS+= libgmp10-5.1.2-2.1.2.${SUSE_ARCH}
17RPMPKGS+= libncurses5-5.9-33.1.2.${SUSE_ARCH} 18RPMPKGS+= libncurses5-5.9-33.1.2.${SUSE_ARCH}
18RPMPKGS+= libpcre1-8.33-2.1.2.${SUSE_ARCH} 19RPMPKGS+= libpcre1-8.33-2.1.2.${SUSE_ARCH}
19RPMPKGS+= libreadline6-6.2-68.1.5.${SUSE_ARCH} 20RPMPKGS+= libreadline6-6.2-68.1.5.${SUSE_ARCH}
20RPMPKGS+= libselinux1-2.1.13-4.1.21.${SUSE_ARCH} 21RPMPKGS+= libselinux1-2.1.13-4.1.21.${SUSE_ARCH}
21RPMPKGS+= libstdc++6-4.8.1_20130909-3.2.1.${SUSE_ARCH} 22RPMPKGS+= libstdc++6-4.8.1_20130909-3.2.1.${SUSE_ARCH}
22RPMPKGS+= libuuid1-2.23.2-3.1.${SUSE_ARCH} 23RPMPKGS+= libuuid1-2.23.2-3.1.${SUSE_ARCH}
23RPMPKGS+= net-tools-1.60-763.1.2.${SUSE_ARCH} 24RPMPKGS+= net-tools-1.60-763.1.2.${SUSE_ARCH}
24RPMPKGS+= libz1-1.2.8-3.1.2.${SUSE_ARCH} 25RPMPKGS+= libz1-1.2.8-3.1.2.${SUSE_ARCH}
25RPMPKGS+= liblzma5-5.0.5-2.1.20.${SUSE_ARCH} 26RPMPKGS+= liblzma5-5.0.5-2.1.20.${SUSE_ARCH}
 27RPMPKGS+= openSUSE-release-${SUSE_VERSION}-1.10.${SUSE_ARCH}
26 28
27MAINTAINER= pkgsrc-users@NetBSD.org 29MAINTAINER= pkgsrc-users@NetBSD.org
28COMMENT= Linux compatibility package 30COMMENT= Linux compatibility package
29 31
30CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* 32CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
31 33
32# These files are managed by the +INSTALL/+DEINSTALL scripts. 34# These files are managed by the +INSTALL/+DEINSTALL scripts.
33CHECK_FILES_SKIP+= ${EMULDIR}/dev/.* 35CHECK_FILES_SKIP+= ${EMULDIR}/dev/.*
34CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache 36CHECK_FILES_SKIP+= ${EMULDIR}/etc/ld.so.cache
35 37
36RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \ 38RPMIGNOREPATH= ./etc/bash.bashrc ./etc/bash_completion.d \
37 ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \ 39 ./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
38 ./etc/inittab ./etc/hushlogins ./etc/java \ 40 ./etc/inittab ./etc/hushlogins ./etc/java \
@@ -48,29 +50,27 @@ INSTALLATION_DIRS+= sbin @@ -48,29 +50,27 @@ INSTALLATION_DIRS+= sbin
48OWN_DIRS+= ${EMULSUBDIR} 50OWN_DIRS+= ${EMULSUBDIR}
49 51
50SUBST_CLASSES+= suse 52SUBST_CLASSES+= suse
51SUBST_STAGE.suse= do-build 53SUBST_STAGE.suse= do-build
52SUBST_FILES.suse= SuSE-release linux-mkpwd.sh 54SUBST_FILES.suse= SuSE-release linux-mkpwd.sh
53SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION 55SUBST_VARS.suse= EMULDIR LINUX_BASE SUSE_ARCH SUSE_VERSION
54 56
55# 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
56# the correct type. 58# the correct type.
57# 59#
58BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}} 60BRANDELF_CMD= ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
59 61
60post-extract: 62post-extract:
61 ${CP} ${FILESDIR}/SuSE-release ${WRKSRC} 
62 ${CP} ${FILESDIR}/*.sh ${WRKSRC} 63 ${CP} ${FILESDIR}/*.sh ${WRKSRC}
63 64
64do-install: 65do-install:
65 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \ 66 ${INSTALL_SCRIPT} ${WRKSRC}/linux-mkpwd.sh \
66 ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd 67 ${DESTDIR}${PREFIX}/sbin/${LINUX_BASE}-mkpwd
67 ${INSTALL_DATA} ${WRKSRC}/SuSE-release ${DESTDIR}${EMULDIR}/etc 
68 ${BRANDELF_CMD} 68 ${BRANDELF_CMD}
69 ${SED} -e 's:#! :#! ${EMULDIR}:' \ 69 ${SED} -e 's:#! :#! ${EMULDIR}:' \
70 -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \ 70 -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
71 ${DESTDIR}${LINUX_LDD} > ${DESTDIR}${LINUX_LDD}.new 71 ${DESTDIR}${LINUX_LDD} > ${DESTDIR}${LINUX_LDD}.new
72 ${MV} ${DESTDIR}${LINUX_LDD}.new ${DESTDIR}${LINUX_LDD} 72 ${MV} ${DESTDIR}${LINUX_LDD}.new ${DESTDIR}${LINUX_LDD}
73 ${CHMOD} +x ${DESTDIR}${LINUX_LDD} 73 ${CHMOD} +x ${DESTDIR}${LINUX_LDD}
74 74
75.include "../../emulators/suse131_linux/Makefile.common" 75.include "../../emulators/suse131_linux/Makefile.common"
76.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/emulators/suse131_base/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/suse131_base/distinfo 2014/02/03 03:08:08 1.2
+++ pkgsrc/emulators/suse131_base/distinfo 2014/02/03 03:14:18 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.2 2014/02/03 03:08:08 obache Exp $ 1$NetBSD: distinfo,v 1.3 2014/02/03 03:14:18 obache Exp $
2 2
3SHA1 (suse131/aaa_base-13.1-16.17.1.i586.rpm) = de632d236e08da14f0591a94e7080fd22757db38 3SHA1 (suse131/aaa_base-13.1-16.17.1.i586.rpm) = de632d236e08da14f0591a94e7080fd22757db38
4RMD160 (suse131/aaa_base-13.1-16.17.1.i586.rpm) = d5ccd2229715daf2637a558cf49e29216bb06000 4RMD160 (suse131/aaa_base-13.1-16.17.1.i586.rpm) = d5ccd2229715daf2637a558cf49e29216bb06000
5Size (suse131/aaa_base-13.1-16.17.1.i586.rpm) = 125154 bytes 5Size (suse131/aaa_base-13.1-16.17.1.i586.rpm) = 125154 bytes
6SHA1 (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = b6c0fd53dbc22e45da0a4e46272f20de6f0a3b45 6SHA1 (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = b6c0fd53dbc22e45da0a4e46272f20de6f0a3b45
7RMD160 (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = cfaa3aaa165c4ec27cc39e48e1e464128beb7e39 7RMD160 (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = cfaa3aaa165c4ec27cc39e48e1e464128beb7e39
8Size (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = 125272 bytes 8Size (suse131/aaa_base-13.1-16.17.1.x86_64.rpm) = 125272 bytes
9SHA1 (suse131/bash-4.2-68.1.5.i586.rpm) = 50116c1153583179de8dd5496b5631c4dde8a80a 9SHA1 (suse131/bash-4.2-68.1.5.i586.rpm) = 50116c1153583179de8dd5496b5631c4dde8a80a
10RMD160 (suse131/bash-4.2-68.1.5.i586.rpm) = 7651e219ba60948b8cc6edfdc88a3b1d8ef03ac4 10RMD160 (suse131/bash-4.2-68.1.5.i586.rpm) = 7651e219ba60948b8cc6edfdc88a3b1d8ef03ac4
11Size (suse131/bash-4.2-68.1.5.i586.rpm) = 330313 bytes 11Size (suse131/bash-4.2-68.1.5.i586.rpm) = 330313 bytes
12SHA1 (suse131/bash-4.2-68.1.5.x86_64.rpm) = 97b84e6a6782f3a0b13dcb71e780a543598b1e2d 12SHA1 (suse131/bash-4.2-68.1.5.x86_64.rpm) = 97b84e6a6782f3a0b13dcb71e780a543598b1e2d
13RMD160 (suse131/bash-4.2-68.1.5.x86_64.rpm) = 6e5c0815c6061af43f8d9c1d7d5653cde623b32f 13RMD160 (suse131/bash-4.2-68.1.5.x86_64.rpm) = 6e5c0815c6061af43f8d9c1d7d5653cde623b32f
14Size (suse131/bash-4.2-68.1.5.x86_64.rpm) = 349290 bytes 14Size (suse131/bash-4.2-68.1.5.x86_64.rpm) = 349290 bytes
@@ -116,13 +116,19 @@ RMD160 (suse131/libuuid1-2.23.2-3.1.x86_ @@ -116,13 +116,19 @@ RMD160 (suse131/libuuid1-2.23.2-3.1.x86_
116Size (suse131/libuuid1-2.23.2-3.1.x86_64.rpm) = 33577 bytes 116Size (suse131/libuuid1-2.23.2-3.1.x86_64.rpm) = 33577 bytes
117SHA1 (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 3951f0f3592a64c6cd666766e1e55cafe0aa6984 117SHA1 (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 3951f0f3592a64c6cd666766e1e55cafe0aa6984
118RMD160 (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 36d0fd5ba6a104a379a3e9f7c89a59b74b4d63c8 118RMD160 (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 36d0fd5ba6a104a379a3e9f7c89a59b74b4d63c8
119Size (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 53192 bytes 119Size (suse131/libz1-1.2.8-3.1.2.i586.rpm) = 53192 bytes
120SHA1 (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = a22bfbf27711080dbe638006997df9eb89aeae16 120SHA1 (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = a22bfbf27711080dbe638006997df9eb89aeae16
121RMD160 (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = 6d0da44b8d855832dff3b28a2c041f1253880904 121RMD160 (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = 6d0da44b8d855832dff3b28a2c041f1253880904
122Size (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = 52647 bytes 122Size (suse131/libz1-1.2.8-3.1.2.x86_64.rpm) = 52647 bytes
123SHA1 (suse131/net-tools-1.60-763.1.2.i586.rpm) = 033ae1c63c580a87536ef7a693f39017762ea207 123SHA1 (suse131/net-tools-1.60-763.1.2.i586.rpm) = 033ae1c63c580a87536ef7a693f39017762ea207
124RMD160 (suse131/net-tools-1.60-763.1.2.i586.rpm) = f8cc7a9ddce0400ed4a36003b951433297ecae91 124RMD160 (suse131/net-tools-1.60-763.1.2.i586.rpm) = f8cc7a9ddce0400ed4a36003b951433297ecae91
125Size (suse131/net-tools-1.60-763.1.2.i586.rpm) = 223817 bytes 125Size (suse131/net-tools-1.60-763.1.2.i586.rpm) = 223817 bytes
126SHA1 (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 072966776653a3de3da29d7ddb1043f55340c153 126SHA1 (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 072966776653a3de3da29d7ddb1043f55340c153
127RMD160 (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 80d15846eabb1b030eceb178c2ebb8b53fab7ebb 127RMD160 (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 80d15846eabb1b030eceb178c2ebb8b53fab7ebb
128Size (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 227965 bytes 128Size (suse131/net-tools-1.60-763.1.2.x86_64.rpm) = 227965 bytes
 129SHA1 (suse131/openSUSE-release-13.1-1.10.i586.rpm) = 8019e299a87c72c8ed527368e0d067728cfbf80c
 130RMD160 (suse131/openSUSE-release-13.1-1.10.i586.rpm) = fd7e303c715ed51ba06fee1a8c175411919a403f
 131Size (suse131/openSUSE-release-13.1-1.10.i586.rpm) = 156048 bytes
 132SHA1 (suse131/openSUSE-release-13.1-1.10.x86_64.rpm) = 16e168b4163994b93a90aeb58076331468d21c22
 133RMD160 (suse131/openSUSE-release-13.1-1.10.x86_64.rpm) = 37240ecce96c5749b184969c32ec0820afc48cd0
 134Size (suse131/openSUSE-release-13.1-1.10.x86_64.rpm) = 156032 bytes
File Deleted: pkgsrc/emulators/suse131_base/files/Attic/SuSE-release