Added LibXm (OpenMotif) requiered by the JDK (PR pkg/12764), also added

sandpoint in the list of supported platforms

2 files changed, 21 insertions, 15 deletions

diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 5cb4c580f4e..9390c1d6e4e 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2001/04/16 11:52:55 manu Exp $
+# $NetBSD: Makefile,v 1.11 2001/04/30 23:01:58 manu Exp $
 
-DISTNAME=		linuxppc_lib-2000.q4.4
+DISTNAME=		linuxppc_lib-2000.q4.5
 CATEGORIES=		emulators
-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 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
+MASTER_SITES+=		ftp://ftp.linuxppc.org/linuxppc-halloween/software/
+MASTER_SITES+=		http://linuxppc.org/software/java/dl/motif/
+RPMFILES=	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 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
+DISTFILES+=	${RPMFILES}
+DISTFILES+= openmotif-2.1.30-3_MLI_jdk.tar.gz
 
 MAINTAINER=		p99dreyf@criens.u-psud.fr
 HOMEPAGE=		http://www.linuxppc.org/
@@ -18,7 +21,7 @@ COMMENT=		libraries to run Linux binaries on NetBSD/powerpc (includes X11)
 BUILD_DEPENDS+=		rpm2pkg-1.2:../../pkgtools/rpm2pkg
 
 ONLY_FOR_PLATFORM=	NetBSD-*-macppc NetBSD-*-powerpc NetBSD-*-prep \
-			NetBSD-*-bebox NetBSD-*-ofppc NetBSD-*-amigappc
+			NetBSD-*-bebox NetBSD-*-ofppc NetBSD-*-amigappc NetBSD-*-sandpoint
 
 SHLIB_HANDLING=		NO
 CHECK_SHLIBS=		NO
@@ -26,7 +29,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}
 DIST_SUBDIR=		linuxppc_lib
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-RPMFILES=		${DISTFILES}
 EMUL_LINUX=		emul/linux
 LINUX_LDCONFIG=		${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
 RPM2PKG=		rpm2pkg
@@ -46,6 +48,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX}
 	${INSTALL_DATA_DIR} /${EMUL_LINUX}
 	${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
+	cd ${PREFIX}/${EMUL_LINUX}/usr/X11R6 ; ${GTAR} -x 'lib/*.so*' \
+	    -zvf ${DISTDIR}/${DIST_SUBDIR}/openmotif-2.1.30-3_MLI_jdk.tar.gz | \
+	    ${SED} -e "s|^|${EMUL_LINUX}/usr/X11R6/|" >> ${WRKDIR}/PLIST_DYNAMIC
 	${TEST} -f /emul/linux/lib/ld.so.1 || ( ${RMDIR} /${EMUL_LINUX} && \
 	    ${LN} -sf ${PREFIX}/${EMUL_LINUX} /${EMUL_LINUX} )
 	${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
@@ -54,7 +59,6 @@ do-install:
 		${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/distinfo b/emulators/linuxppc_lib/distinfo
index 2972b2ffc91..47d9a8776e0 100644
--- a/emulators/linuxppc_lib/distinfo
+++ b/emulators/linuxppc_lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:49:55 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/30 23:01:58 manu Exp $
 
 SHA1 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 8a73a18041c6b1f41556dc974752dab55f2e125c
 Size (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 9503167 bytes
@@ -28,4 +28,6 @@ SHA1 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 1d5863dfc29473472bda89d237bafd84de6
 Size (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 808456 bytes
 SHA1 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 29458422f6991affc2d88c5eba9c0f7f2c9d796b
 Size (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 145051 bytes
-SHA1 (patch-aa) = 04840c534103f659fce4c00b5a6d63f79e03bf08
+SHA1 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = b9af158b947829d0bbe2831842ff4f4b4a7313a0
+Size (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = 2631074 bytes
+MD5 (patch-aa) = 9a053c202c6fed843490faeadabe42ed