diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-09-07 09:11:52 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-09-07 09:11:52 +0000 |
| commit | 33e23e0ac78aeb4d1151e14fc814268622de3120 (patch) | |
| tree | 43fd4cba112bb4e27e5b38a283bf87cb58074fdd /lang/sun-jdk7 | |
| parent | f4a7ca33781fb5ea3eaf780d43b4bb3a49bc3c0d (diff) | |
| download | pkgsrc-33e23e0ac78aeb4d1151e14fc814268622de3120.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-jdk7')
| -rw-r--r-- | lang/sun-jdk7/Makefile | 7 | ||||
| -rw-r--r-- | lang/sun-jdk7/PLIST.linux-i386 | 4 | ||||
| -rw-r--r-- | lang/sun-jdk7/PLIST.linux-x86_64 | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile index ac4df7b674e..e280a748839 100644 --- a/lang/sun-jdk7/Makefile +++ b/lang/sun-jdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/07/04 12:25:31 obache Exp $ +# $NetBSD: Makefile,v 1.12 2013/09/07 09:11:53 ryoon Exp $ # Note: This must be kept in sync with the sun-jre7 package # Note: make sure you include sums for both the x86_64 and the x86_32 @@ -6,6 +6,7 @@ DISTNAME= jdk-7u25-${DIST_OS}-${DIST_ARCH} PKGNAME= sun-jdk7-7.0.25 +PKGREVISION= 1 MASTER_SITES= # empty LICENSE= oracle-binary-code-license @@ -33,10 +34,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-jdk7/PLIST.linux-i386 b/lang/sun-jdk7/PLIST.linux-i386 index 76589e610c2..338061921d9 100644 --- a/lang/sun-jdk7/PLIST.linux-i386 +++ b/lang/sun-jdk7/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.1 2012/12/11 14:51:33 ryoon Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.2 2013/09/07 09:11:53 ryoon Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -100,6 +100,8 @@ java/sun-7/jre java/sun-7/lib/ant-javafx.jar java/sun-7/lib/ct.sym java/sun-7/lib/dt.jar +java/sun-7/lib/${JAVA_ARCH}/libattach.so +java/sun-7/lib/${JAVA_ARCH}/libsaproc.so java/sun-7/lib/ir.idl java/sun-7/lib/javafx-doclet.jar java/sun-7/lib/javafx-mx.jar diff --git a/lang/sun-jdk7/PLIST.linux-x86_64 b/lang/sun-jdk7/PLIST.linux-x86_64 index ad85afece9c..8ebc3db2c83 100644 --- a/lang/sun-jdk7/PLIST.linux-x86_64 +++ b/lang/sun-jdk7/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-x86_64,v 1.1 2012/12/11 14:51:33 ryoon Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2013/09/07 09:11:53 ryoon Exp $ bin/sun7-appletviewer bin/sun7-apt bin/sun7-extcheck @@ -100,6 +100,8 @@ java/sun-7/jre java/sun-7/lib/ant-javafx.jar java/sun-7/lib/ct.sym java/sun-7/lib/dt.jar +java/sun-7/lib/${JAVA_ARCH}/libattach.so +java/sun-7/lib/${JAVA_ARCH}/libsaproc.so java/sun-7/lib/ir.idl java/sun-7/lib/javafx-doclet.jar java/sun-7/lib/javafx-mx.jar |