diff options
| author | ryoon <ryoon> | 2013-09-07 09:11:52 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-09-07 09:11:52 +0000 |
| commit | a4d04ef22093373d09b44ad0c4e2336f3c5d9b79 (patch) | |
| tree | 43fd4cba112bb4e27e5b38a283bf87cb58074fdd /lang/sun-jdk6 | |
| parent | b1131e9815b8af8db2b898e6fdfb7643df118ada (diff) | |
| download | pkgsrc-a4d04ef22093373d09b44ad0c4e2336f3c5d9b79.tar.gz | |
Bump PKGREVISION.
* Attempt to fix the missing JDK native libraries to make jmap work.
Based on patches from dsainty@.
Tested on NetBSD/i386 and amd64.
Diffstat (limited to 'lang/sun-jdk6')
| -rw-r--r-- | lang/sun-jdk6/Makefile | 7 | ||||
| -rw-r--r-- | lang/sun-jdk6/PLIST.linux-i386 | 4 | ||||
| -rw-r--r-- | lang/sun-jdk6/PLIST.linux-x86_64 | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile index 4a76f93c8e5..5e3a3b9aa69 100644 --- a/lang/sun-jdk6/Makefile +++ b/lang/sun-jdk6/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2013/04/25 13:32:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.35 2013/09/07 09:11:52 ryoon Exp $ DISTNAME= jdk-6u45-${DIST_OS}-${DIST_ARCH} PKGNAME= sun-jdk6-6.0.45 +PKGREVISION= 1 MASTER_SITES= # empty LICENSE= sun-jdk6-license @@ -27,10 +28,14 @@ DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/x64/i586/} .endif PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH} +PLIST_SUBST+= JAVA_ARCH="${JAVA_ARCH}" # Remove parts that are in common with the JRE # post-extract: + ${MKDIR} ${WRKSRC}/lib/${JAVA_ARCH} + ${MV} ${WRKSRC}/jre/lib/${JAVA_ARCH}/libattach.so ${WRKSRC}/lib/${JAVA_ARCH} + ${MV} ${WRKSRC}/jre/lib/${JAVA_ARCH}/libsaproc.so ${WRKSRC}/lib/${JAVA_ARCH} common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \ cd ${WRKSRC}; for i in $$common; do \ if [ -d $$i ]; then \ diff --git a/lang/sun-jdk6/PLIST.linux-i386 b/lang/sun-jdk6/PLIST.linux-i386 index 685333c75fb..645a6b18991 100644 --- a/lang/sun-jdk6/PLIST.linux-i386 +++ b/lang/sun-jdk6/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.3 2012/05/11 13:04:17 abs Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.4 2013/09/07 09:11:52 ryoon Exp $ bin/sun6-appletviewer bin/sun6-apt bin/sun6-extcheck @@ -1667,6 +1667,8 @@ java/sun-6/jre java/sun-6/lib/ct.sym java/sun-6/lib/dt.jar java/sun-6/lib/htmlconverter.jar +java/sun-6/lib/${JAVA_ARCH}/libattach.so +java/sun-6/lib/${JAVA_ARCH}/libsaproc.so java/sun-6/lib/ir.idl java/sun-6/lib/jconsole.jar java/sun-6/lib/orb.idl diff --git a/lang/sun-jdk6/PLIST.linux-x86_64 b/lang/sun-jdk6/PLIST.linux-x86_64 index f371e08b49d..6ff002520f1 100644 --- a/lang/sun-jdk6/PLIST.linux-x86_64 +++ b/lang/sun-jdk6/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-x86_64,v 1.3 2012/05/11 13:04:17 abs Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2013/09/07 09:11:53 ryoon Exp $ bin/sun6-appletviewer bin/sun6-apt bin/sun6-extcheck @@ -1666,6 +1666,8 @@ java/sun-6/jre java/sun-6/lib/ct.sym java/sun-6/lib/dt.jar java/sun-6/lib/htmlconverter.jar +java/sun-6/lib/${JAVA_ARCH}/libattach.so +java/sun-6/lib/${JAVA_ARCH}/libsaproc.so java/sun-6/lib/ir.idl java/sun-6/lib/jconsole.jar java/sun-6/lib/orb.idl |