Modified the package so that it uses rpm2pkg. Enabled extraction of some files

that were not extracted before, but that were requiered in order to run
Netscape.

4 files changed, 30 insertions, 96 deletions

diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 14452152682..c4b50e8b1e0 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,116 +1,59 @@
-# $NetBSD: Makefile,v 1.3 2001/02/24 02:09:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/24 18:08:35 manu Exp $
 
-DISTNAME=		linuxppc_lib-2000.q4.1
+DISTNAME=		linuxppc_lib-2000.q4.2
 CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.linuxppc.org/linuxppc-halloween/software/
+MASTER_SITES=	ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 DISTFILES=		glibc-2.1.3-15f.ppc.rpm glib-1.2.8-3.ppc.rpm \
 					libjpeg-6b-13.ppc.rpm libpng-1.0.5-3.ppc.rpm \
 					libstdc++-2.10.0-2n.ppc.rpm libtermcap-2.0.8-20.ppc.rpm \
 					libtiff-3.5.5-2.ppc.rpm XFree86-libs-3.3.6-20b.ppc.rpm \
-					zlib-1.1.3-6.ppc.rpm aalib-1.2-1.ppc.rpm \
-					gnome-libs-1.2.8-0_helix_1.ppc.rpm imlib-1.9.8-4.ppc.rpm \
-					krb5-libs-1.1.1-25.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
-					libelf-0.6.4-4.ppc.rpm libghttp-1.0.7-0_helix_1.ppc.rpm \
-					libglade-0.11-1.ppc.rpm libgtop-1.0.6-1.ppc.rpm \
-					libjpeg6a-6a-5.ppc.rpm libpcap-0.4-19.ppc.rpm \
-					librep-0.13.2-0_helix_1.ppc.rpm xpm-3.4k-1.ppc.rpm \
-					libsigc++-1.0.1-0_helix_1.ppc.rpm
+					zlib-1.1.3-6.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
+					libjpeg6a-6a-5.ppc.rpm xpm-3.4k-1.ppc.rpm \
+					ncurses-5.0-12.ppc.rpm readline-2.2.1-7a.ppc.rpm
 
 MAINTAINER=		p99dreyf@criens.u-psud.fr
 HOMEPAGE=		http://www.linuxppc.org/
-COMMENT=		libraries to run Linux binaries on NetBSD/powerpc (includes X11)
 
-BUILD_DEPENDS+=		rpm2cpio:../../misc/rpm
+BUILD_DEPENDS+=rpm2pkg:../../pkgtools/rpm2pkg
+
+COMMENT=			libraries to run Linux binaries on NetBSD/powerpc (includes X11)
 
 ONLY_FOR_PLATFORM=	NetBSD-*-macppc NetBSD-*-powerpc NetBSD-*-prep \
 							NetBSD-*-bebox NetBSD-*-ofppc NetBSD-*-amigappc
 
 SHLIB_HANDLING=NO
 CHECK_SHLIBS=	NO
-WRKSRC=			${WRKDIR}/linuxppc_lib-2000.q4.1
+WRKSRC=			${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=	linuxppc_lib
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 RPMFILES=		${DISTFILES}
-RPM2CPIO=	${PREFIX}/bin/rpm2cpio
-CPIO=			cpio
-SORT=			sort
-EMUL_LINUX=	emul/linux
+EMUL_LINUX=		emul/linux
+LINUX_LDCONFIG=${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
+RPM2PKG=			rpm2pkg
+SORT=				sort
+RPMARGS+=		-i usr/man -i usr/doc -i usr/info
+.for TEMP in ${RPMFILES}
+RPMARGS+=     ${DISTDIR}/${DIST_SUBDIR}/${TEMP}
+.endfor
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC}; for i in ${RPMFILES}; do \
-		${ECHO} -n "Extracting $$i... " ; \
-		${RPM2CPIO} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${CPIO} -u -d -i ;\
-	done ; \
 
-do-build:
-	${RM}	-f ${WRKSRC}/etc/*.orig
+do-build:	#do nothing
 
 do-install:
 	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
 	${MKDIR} ${PREFIX}/${EMUL_LINUX}
-	for d in `${FIND} ${WRKSRC}/etc -type d | ${SORT} -r`; do \
-		target=`${ECHO} $$d | ${SED} 's|${WRKSRC}|${PREFIX}/${EMUL_LINUX}|'`; \
-		files=`${LS} -l $$d | \
-				${AWK} -v d=$$d '{if ($$0~/^-/) {print d "/" $$9}}'` ; \
-		links=`${LS} -l $$d | \
-				${AWK} -v d=$$d '{if ($$0~/^l/) {print d "/" $$9}}'` ; \
-		${MKDIR} $$target ; \
-		if [ "x$$links" != "x" ] ; then \
-			${ECHO} "$$links" ; \
-			for l in $$links ; do \
-				name=`${ECHO} $$l | ${SED} 's|^.*/\([^/]*\)$$|\1|'` ; \
-				${LN} -sf `${LS} -l $$l | ${AWK} '{print $$11}'` $$target/$$name ; \
-			done ; \
-			${ECHO} $$links | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
-				${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
-		fi; \
-		if [ "x$$files" != "x" ] ; then \
-			${ECHO} "$$files" ; \
-			${INSTALL_DATA} $$files $$target/ ; \
-			${ECHO} $$files | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
-				${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
-		fi; \
-		${ECHO} $$target | ${SED} 's|${PREFIX}/|@dirrm |' >> \
-			${WRKDIR}/PLIST_DYNAMIC ; \
-	done;
-	for d in `${FIND} ${WRKSRC}/lib ${WRKSRC}/usr/lib \
-				${WRKSRC}/usr/X11R6/lib ${WRKSRC}/usr/kerberos/lib \
-				${WRKSRC}/usr/share -type d | ${SORT} -r`; do \
-		target=`${ECHO} $$d | ${SED} 's|${WRKSRC}|${PREFIX}/${EMUL_LINUX}|'`; \
-		files=`${LS} -l $$d | \
-				${AWK} -v d=$$d '{if ($$0~/^-/) {print d "/" $$9}}'` ; \
-		links=`${LS} -l $$d | \
-				${AWK} -v d=$$d '{if ($$0~/^l/) {print d "/" $$9}}'` ; \
-		${MKDIR} $$target ; \
-		if [ "x$$links" != "x" ] ; then \
-			${ECHO} "$$links" ; \
-			for l in $$links ; do \
-				name=`${ECHO} $$l | ${SED} 's|^.*/\([^/]*\)$$|\1|'` ; \
-				${LN} -sf `${LS} -l $$l | ${AWK} '{print $$11}'` $$target/$$name ; \
-			done ; \
-			${ECHO} $$links | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
-				${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
-		fi; \
-		if [ "x$$files" != "x" ] ; then \
-			${ECHO} "$$files" ; \
-			${INSTALL_SCRIPT} $$files $$target/ ; \
-			${ECHO} $$files | ${SED} 's|${WRKSRC}|${EMUL_LINUX}|g' | \
-				${TR} ' ' '\n' >> ${WRKDIR}/PLIST_DYNAMIC ; \
-		fi ; \
-		${ECHO} $$target | ${SED} 's|${PREFIX}/|@dirrm |' >> \
-			${WRKDIR}/PLIST_DYNAMIC ; \
-	done;
-	${INSTALL_SCRIPT} ${WRKSRC}/sbin/ldconfig \
-		${PREFIX}/sbin/ldconfig-linux
-	${ECHO} "sbin/ldconfig-linux" >> ${WRKDIR}/PLIST_DYNAMIC
+	${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
 	${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
-	${PREFIX}/sbin/ldconfig-linux -v | \
+	${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf
+	${LINUX_LDCONFIG} -r ${PREFIX}/${EMUL_LINUX} -v | \
 		${SED} -n '/^\/.*:$$/h; /(changed)$$/{G; \
 		s|[[:blank:]]\([^ ]\{1,\}\) =>.*\n/\(.*\):$$|${EMUL_LINUX}/\2/\1|p;}' \
 		>> ${WRKDIR}/PLIST_DYNAMIC
 	${ECHO} "${EMUL_LINUX}/etc/ld.so.cache" >> ${WRKDIR}/PLIST_DYNAMIC
+	${ECHO} "${EMUL_LINUX}/etc/ld.so.conf" >> ${WRKDIR}/PLIST_DYNAMIC
 	${SORT} -r ${WRKDIR}/PLIST_DYNAMIC > ${WRKDIR}/PLIST_DYNAMIC.sorted
 	${MV} ${WRKDIR}/PLIST_DYNAMIC.sorted ${WRKDIR}/PLIST_DYNAMIC
 
diff --git a/emulators/linuxppc_lib/files/ld.so.conf b/emulators/linuxppc_lib/files/ld.so.conf
new file mode 100644
index 00000000000..eb2ad0fd4f7
--- /dev/null
+++ b/emulators/linuxppc_lib/files/ld.so.conf
@@ -0,0 +1,3 @@
+/lib
+/usr/lib
+/usr/X11R6/lib
diff --git a/emulators/linuxppc_lib/files/md5 b/emulators/linuxppc_lib/files/md5
index f870d4dc549..4a801c60556 100644
--- a/emulators/linuxppc_lib/files/md5
+++ b/emulators/linuxppc_lib/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
+$NetBSD: md5,v 1.2 2001/02/24 18:08:35 manu Exp $
 
 MD5 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = d6987ba1c4327776b09ba3771b0ddfe9
 MD5 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = 95e9ef3aa57bf1b3096cd71c25568c8c
@@ -9,17 +9,8 @@ MD5 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 815c427badcd8c0cb1be80f713213fc
 MD5 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = bf5ca3261e0cc00205768fc77021b5e6
 MD5 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = b822ccc11675a2afd258a33050d4da15
 MD5 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 48c9234f85e7ba494e44a559498cb145
-MD5 (linuxppc_lib/aalib-1.2-1.ppc.rpm) = 5921b4d6a7f592d43be71b1cf67c7fef
-MD5 (linuxppc_lib/gnome-libs-1.2.8-0_helix_1.ppc.rpm) = 81289164c4c46421ec0a69f0a8c2dc60
-MD5 (linuxppc_lib/imlib-1.9.8-4.ppc.rpm) = aef99372932bbc8b88a4d63ec6d42c68
-MD5 (linuxppc_lib/krb5-libs-1.1.1-25.ppc.rpm) = 2694ed9272adc4749c0296472697dff8
 MD5 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 120aa77bf0306e55ffa928c97112e96f
-MD5 (linuxppc_lib/libelf-0.6.4-4.ppc.rpm) = 99d0ed6ec2b6597d432657e288894669
-MD5 (linuxppc_lib/libghttp-1.0.7-0_helix_1.ppc.rpm) = be67854c2a57c60713a533fc4d22aa55
-MD5 (linuxppc_lib/libglade-0.11-1.ppc.rpm) = 4d67459d17864f532cfc69db46cf0411
-MD5 (linuxppc_lib/libgtop-1.0.6-1.ppc.rpm) = 76395f824b2a98aea6e2949f4e032f63
 MD5 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = c11d224c80f4890f382fdfbcc4655b1d
-MD5 (linuxppc_lib/libpcap-0.4-19.ppc.rpm) = 82d113d6d78baa41c1b2551a30849113
-MD5 (linuxppc_lib/librep-0.13.2-0_helix_1.ppc.rpm) = a0ff7bf81626fb63055566a267551968
-MD5 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 1a4a7d34561732c4e8b2fcee5cc69afa
-MD5 (linuxppc_lib/libsigc++-1.0.1-0_helix_1.ppc.rpm) = 2d41e23ffc3c62345957325989361ef8
+MD5 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 257ac76594d7cf0fb3b862fee213b11d
+MD5 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 58d8d1878a465d528932992ef9885ec8
+MD5 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = aee5bab83a547628d9b498f88c648a1c
diff --git a/emulators/linuxppc_lib/files/patch-sum b/emulators/linuxppc_lib/files/patch-sum
deleted file mode 100644
index b8f167e23ed..00000000000
--- a/emulators/linuxppc_lib/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
-
-MD5 (patch-aa) = 9a053c202c6fed843490faeadabe42ed