>Number:         30582
>Category:       pkg
>Synopsis:       emulators/suse91_base support for NetBSD/amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 23 13:25:00 +0000 2005
>Originator:     Nicolas Joly
>Release:        NetBSD 3.99.6
>Organization:
Institut Pasteur, Paris.
>Environment:
System: NetBSD lanfeust.sis.pasteur.fr 3.99.6 NetBSD 3.99.6 (LANFEUST) #0: Thu Jun 23 10:33:39 CEST 2005 njoly@lanfeust.sis.pasteur.fr:/local/src/NetBSD/src/sys/arch/amd64/compile/LANFEUST amd64
Architecture: x86_64
Machine: amd64
>Description:
With recent COMPAT_LINUX option on -current NetBSD/amd64, i wanted to test
Linux/x86_64 on my workstation. The simplest way to install the needed files
was to adjust the `emulators/suse91_base' package.

The provided patch do the following :
* Move RPM list definition from Makefile to Makefile.${MACHINE_ARCH}
* Likewise, move distinfo file to distinfo.${MACHINE_ARCH}
* Use `lib64' directory for x86_64 libs instead of `lib' on i386

>How-To-Repeat:
n/a
>Fix:
Remove existsing distinfo file, and use the following patches:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_base/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	16 Jun 2005 06:57:51 -0000	1.9
+++ Makefile	23 Jun 2005 12:58:02 -0000
@@ -11,23 +11,16 @@
 COMMENT=		Linux compatibility package
 
 CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 FreeBSD-*-i386
+ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-[3-9]*-x86_64 \
+			FreeBSD-*-i386
+
+DISTINFO_FILE=		${.CURDIR}/distinfo.${MACHINE_ARCH}
 
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		aaa_base-9.1-0.${SUSE_ARCH}.rpm \
-			bash-2.05b-305.${SUSE_ARCH}.rpm \
-			coreutils-5.2.1-23.${SUSE_ARCH}.rpm \
-			glibc-2.3.3-98.${SUSE_ARCH}.rpm \
-			libgcc-3.3.3-41.${SUSE_ARCH}.rpm \
-			libacl-2.2.21-54.${SUSE_ARCH}.rpm \
-			libattr-2.4.12-56.${SUSE_ARCH}.rpm \
-			libselinux-1.8-16.${SUSE_ARCH}.rpm \
-			libstdc++-3.3.3-41.${SUSE_ARCH}.rpm \
-			ncurses-5.4-59.${SUSE_ARCH}.rpm \
-			readline-4.3-306.${SUSE_ARCH}.rpm \
-			zlib-1.2.1-70.${SUSE_ARCH}.rpm
+.include "Makefile.${MACHINE_ARCH}"
+
 RPMIGNOREPATH=		./etc/bash.bashrc ./etc/bash_completion.d \
 			./etc/cron.daily ./etc/csh.cshrc ./etc/csh.login \
 			./etc/inittab ./etc/hushlogins ./etc/java \
@@ -36,6 +29,11 @@
 			./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
 LINUX_LDD=		${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
+.if ${MACHINE_ARCH} == "x86_64"
+LINUX_LIB=		lib64
+.else
+LINUX_LIB=		lib
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,6 +43,7 @@
 	@for FILE in ${PKGDIR}/PLIST ${FILESDIR}/*.sh; do \
 	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
 	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
+	         -e 's#@@LINUX_LIB@@#${LINUX_LIB}#g' \
 	    <$$FILE >${WRKDIR}/`basename $$FILE`; \
 	done
 	${SED} -e 's#@@VERSION@@#${SUSE_VERSION}#g' \
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse91_base/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	5 Nov 2004 14:23:53 -0000	1.3
+++ PLIST	23 Jun 2005 12:58:02 -0000
@@ -3,7 +3,7 @@
 @unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
 @@EMULSUBDIR@@/etc/SuSE-release
 @@EMULSUBDIR@@/etc/mtab
-@@EMULSUBDIR@@/usr/lib/libz.so.1
+@@EMULSUBDIR@@/usr/@@LINUX_LIB@@/libz.so.1
 @exec ${MKDIR} %D/@@EMULSUBDIR@@/proc
 @dirrm @@EMULSUBDIR@@/proc
 @unexec cd %D/@@EMULSUBDIR@@/etc && ${RM} -f group gshadow passwd shadow
--- /dev/null	2005-06-23 14:40:07.000000000 +0200
+++ Makefile.i386	2005-06-15 18:03:52.000000000 +0200
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+RPMFILES=		aaa_base-9.1-0.${SUSE_ARCH}.rpm \
+			bash-2.05b-305.${SUSE_ARCH}.rpm \
+			coreutils-5.2.1-23.${SUSE_ARCH}.rpm \
+			glibc-2.3.3-98.${SUSE_ARCH}.rpm \
+			libgcc-3.3.3-41.${SUSE_ARCH}.rpm \
+			libacl-2.2.21-54.${SUSE_ARCH}.rpm \
+			libattr-2.4.12-56.${SUSE_ARCH}.rpm \
+			libselinux-1.8-16.${SUSE_ARCH}.rpm \
+			libstdc++-3.3.3-41.${SUSE_ARCH}.rpm \
+			ncurses-5.4-59.${SUSE_ARCH}.rpm \
+			readline-4.3-306.${SUSE_ARCH}.rpm \
+			zlib-1.2.1-70.${SUSE_ARCH}.rpm
--- /dev/null	2005-06-23 14:40:07.000000000 +0200
+++ Makefile.x86_64	2005-06-15 18:03:58.000000000 +0200
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+RPMFILES=               aaa_base-9.1-0.${SUSE_ARCH}.rpm \
+                        bash-2.05b-301.${SUSE_ARCH}.rpm \
+                        coreutils-5.2.1-21.${SUSE_ARCH}.rpm \
+                        glibc-2.3.3-63.${SUSE_ARCH}.rpm \
+                        libgcc-3.3.3-33.${SUSE_ARCH}.rpm \
+                        libacl-2.2.21-45.${SUSE_ARCH}.rpm \
+                        libattr-2.4.12-44.${SUSE_ARCH}.rpm \
+                        libselinux-1.8-15.${SUSE_ARCH}.rpm \
+                        libstdc++-3.3.3-33.${SUSE_ARCH}.rpm \
+                        ncurses-5.4-48.${SUSE_ARCH}.rpm \
+                        readline-4.3-301.${SUSE_ARCH}.rpm \
+                        zlib-1.2.1-60.${SUSE_ARCH}.rpm
--- /dev/null	2005-06-23 14:40:07.000000000 +0200
+++ distinfo.i386	2005-06-23 14:17:30.000000000 +0200
@@ -0,0 +1,38 @@
+$NetBSD$
+
+SHA1 (suse91/i586/aaa_base-9.1-0.i586.rpm) = c15fcdc81a93c7d3056292d56b1376a0fdf20554
+RMD160 (suse91/i586/aaa_base-9.1-0.i586.rpm) = 62c26c035f73418f2db88685b16282cbf691da66
+Size (suse91/i586/aaa_base-9.1-0.i586.rpm) = 289379 bytes
+SHA1 (suse91/i586/bash-2.05b-305.i586.rpm) = 51c41a86a19628af1e43c4b65ece8aa159bc9da7
+RMD160 (suse91/i586/bash-2.05b-305.i586.rpm) = 464a25a22ae5e7b68ed31a66ae8bf0e5da345e64
+Size (suse91/i586/bash-2.05b-305.i586.rpm) = 636675 bytes
+SHA1 (suse91/i586/coreutils-5.2.1-23.i586.rpm) = 801f63e5e347b19323d01e6a4460aaea60ddc14f
+RMD160 (suse91/i586/coreutils-5.2.1-23.i586.rpm) = dfa09f0e495db289741d7ae7466118428a122dcb
+Size (suse91/i586/coreutils-5.2.1-23.i586.rpm) = 1982252 bytes
+SHA1 (suse91/i586/glibc-2.3.3-98.i586.rpm) = bd12daad569a071dd8989d92b5e278aa168b0ab3
+RMD160 (suse91/i586/glibc-2.3.3-98.i586.rpm) = 4633ccc71cd5bb8dfa3bd7338d39406d702fda14
+Size (suse91/i586/glibc-2.3.3-98.i586.rpm) = 1455673 bytes
+SHA1 (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 1fc7169f9e2730ffd8e7dc28d00f0f9b90dbd0eb
+RMD160 (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 95ed4e7c50be207a3c5bdb563e569c78c9f9acb1
+Size (suse91/i586/libgcc-3.3.3-41.i586.rpm) = 51314 bytes
+SHA1 (suse91/i586/libacl-2.2.21-54.i586.rpm) = 03ad392c7762b22430559c0ab8e2671069dddc5d
+RMD160 (suse91/i586/libacl-2.2.21-54.i586.rpm) = aff03ec829987897ab0d812658eab23b6b81ffae
+Size (suse91/i586/libacl-2.2.21-54.i586.rpm) = 18239 bytes
+SHA1 (suse91/i586/libattr-2.4.12-56.i586.rpm) = 82d248de4b15ffed49a758eef1701b94b1d57415
+RMD160 (suse91/i586/libattr-2.4.12-56.i586.rpm) = d082ec704e5537ff133c29a14dfe63268f3a492b
+Size (suse91/i586/libattr-2.4.12-56.i586.rpm) = 11086 bytes
+SHA1 (suse91/i586/libselinux-1.8-16.i586.rpm) = 302a59b8ac41ffb6d61add6deac3aa0c10990ef5
+RMD160 (suse91/i586/libselinux-1.8-16.i586.rpm) = 887e03f24a29d30e6842790bd499708aaa6307b9
+Size (suse91/i586/libselinux-1.8-16.i586.rpm) = 47298 bytes
+SHA1 (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = 77341589e297e66fc793961d96a7b24df5893101
+RMD160 (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = c038490eb1126db93f08e057448f8ffc0614304c
+Size (suse91/i586/libstdc++-3.3.3-41.i586.rpm) = 301785 bytes
+SHA1 (suse91/i586/ncurses-5.4-59.i586.rpm) = 83fc26e2c55e75f347530ad19b01d23883a60738
+RMD160 (suse91/i586/ncurses-5.4-59.i586.rpm) = 17616a49eeaf0d385ef4049d95183f66aa958752
+Size (suse91/i586/ncurses-5.4-59.i586.rpm) = 790419 bytes
+SHA1 (suse91/i586/readline-4.3-306.i586.rpm) = 500c6665e66d0052a5d922d7db3f88f029c91853
+RMD160 (suse91/i586/readline-4.3-306.i586.rpm) = 740f13777dbfaf579fc4be2c1df735c29695ac0f
+Size (suse91/i586/readline-4.3-306.i586.rpm) = 151357 bytes
+SHA1 (suse91/i586/zlib-1.2.1-70.i586.rpm) = 7592cc5629f8c3c480bb943089c0e09481ac3f46
+RMD160 (suse91/i586/zlib-1.2.1-70.i586.rpm) = 8e9f69c1250be1c194dc3798b7a2b4372e69a5e8
+Size (suse91/i586/zlib-1.2.1-70.i586.rpm) = 63453 bytes
--- /dev/null	2005-06-23 14:40:07.000000000 +0200
+++ distinfo.x86_64	2005-06-23 14:17:42.000000000 +0200
@@ -0,0 +1,38 @@
+$NetBSD$
+
+SHA1 (suse91/x86_64/aaa_base-9.1-0.x86_64.rpm) = f2fe65f6c41ab216456ceff453456eb3673b9b65
+RMD160 (suse91/x86_64/aaa_base-9.1-0.x86_64.rpm) = d7a4ca9f87975edb19fe5f0b3a215e09778d2f6e
+Size (suse91/x86_64/aaa_base-9.1-0.x86_64.rpm) = 289773 bytes
+SHA1 (suse91/x86_64/bash-2.05b-301.x86_64.rpm) = 93f665912afd2908abda5aeff6f1e1cedfa728a7
+RMD160 (suse91/x86_64/bash-2.05b-301.x86_64.rpm) = b850a95ca7e6f7cc0d999a79af585a2b81d30a0f
+Size (suse91/x86_64/bash-2.05b-301.x86_64.rpm) = 660645 bytes
+SHA1 (suse91/x86_64/coreutils-5.2.1-21.x86_64.rpm) = c4778943129d8d49aea5f32377b027da6555f6c7
+RMD160 (suse91/x86_64/coreutils-5.2.1-21.x86_64.rpm) = 76839f5b067e81b5b17bd081cfd774588fa6e493
+Size (suse91/x86_64/coreutils-5.2.1-21.x86_64.rpm) = 2047535 bytes
+SHA1 (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 76333c7308334c49ad3cc4479282138d604373a9
+RMD160 (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 5153fdfa1b373a921ff175cd220b42887ff57a61
+Size (suse91/x86_64/glibc-2.3.3-63.x86_64.rpm) = 2422978 bytes
+SHA1 (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = bdf7233e869b50f89c0066648a7f8cee221a6ec1
+RMD160 (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = 993edf19958968cc2708c61656f84b2c4dafde5b
+Size (suse91/x86_64/libgcc-3.3.3-33.x86_64.rpm) = 71138 bytes
+SHA1 (suse91/x86_64/libacl-2.2.21-45.x86_64.rpm) = 2105334a6b101c8bd562e521f0cc40793584933f
+RMD160 (suse91/x86_64/libacl-2.2.21-45.x86_64.rpm) = 9f5f089c230a7e1ebaa3d3cdb1bf8fdf309ac7d0
+Size (suse91/x86_64/libacl-2.2.21-45.x86_64.rpm) = 19799 bytes
+SHA1 (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = f83b27f98d53c2ca1350e3d304b9f67fb2c93653
+RMD160 (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = 63efd2968f54a8c574c830d6d68721dc0c64274c
+Size (suse91/x86_64/libattr-2.4.12-44.x86_64.rpm) = 12014 bytes
+SHA1 (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = f898349c259c98e4f3e2ce6e166c5cc542cb5517
+RMD160 (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = f1ec0e456bdb2ec3dc7074652e7a0b9303ed06d9
+Size (suse91/x86_64/libselinux-1.8-15.x86_64.rpm) = 50409 bytes
+SHA1 (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = f72a13be6a00ea7c2799411628d3aec020e89cb7
+RMD160 (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = a715a11e16633f739350ba360656a65e77e22643
+Size (suse91/x86_64/libstdc++-3.3.3-33.x86_64.rpm) = 562762 bytes
+SHA1 (suse91/x86_64/ncurses-5.4-48.x86_64.rpm) = 6c0f8c1e08a79f2f215ece0f8a11f4178f3eb7f8
+RMD160 (suse91/x86_64/ncurses-5.4-48.x86_64.rpm) = b9a6dfa1f233872ec0f49d77e949a32f53be603f
+Size (suse91/x86_64/ncurses-5.4-48.x86_64.rpm) = 865784 bytes
+SHA1 (suse91/x86_64/readline-4.3-301.x86_64.rpm) = 55b4750bf47d3432882454c054d08b40ad7fc44e
+RMD160 (suse91/x86_64/readline-4.3-301.x86_64.rpm) = ace2cacf4ce4ea28ab74f68f2a763f22a137aaa4
+Size (suse91/x86_64/readline-4.3-301.x86_64.rpm) = 163217 bytes
+SHA1 (suse91/x86_64/zlib-1.2.1-60.x86_64.rpm) = cde7a4c9c9c3e08c4b215240c26006c8c351f5f6
+RMD160 (suse91/x86_64/zlib-1.2.1-60.x86_64.rpm) = c2583ff4fd9938409735765b5278f4a0d21c64e2
+Size (suse91/x86_64/zlib-1.2.1-60.x86_64.rpm) = 65851 bytes