diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/openjdk7-icedtea-plugin/Makefile | 8 | ||||
-rw-r--r-- | www/openjdk7-icedtea-plugin/distinfo | 19 | ||||
-rw-r--r-- | www/openjdk7-icedtea-plugin/patches/patch-aa | 22 | ||||
-rw-r--r-- | www/openjdk7-icedtea-plugin/patches/patch-ab | 18 | ||||
-rw-r--r-- | www/openjdk7-icedtea-plugin/patches/patch-ad | 24 |
5 files changed, 45 insertions, 46 deletions
diff --git a/www/openjdk7-icedtea-plugin/Makefile b/www/openjdk7-icedtea-plugin/Makefile index 8beda7cf03b..ce8d56ae554 100644 --- a/www/openjdk7-icedtea-plugin/Makefile +++ b/www/openjdk7-icedtea-plugin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2010/01/15 19:18:42 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2010/05/23 10:50:42 tnn Exp $ # DISTNAME= # from icedtea-extras.mk -PKGNAME= openjdk7-icedtea-plugin-1.11.0.20100111 +PKGNAME= openjdk7-icedtea-plugin-1.12.0.20100521 CATEGORIES= www MASTER_SITES= # from icedtea-extras.mk @@ -29,12 +29,12 @@ SUBST_FILES.fix-paths= plugin/icedteanp/IcedTeaNPPlugin.cc SUBST_SED.fix-paths+= -e 's,%s/../../bin/java,${PREFIX}/java/openjdk7/bin/java,g' do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} IcedTeaNPPlugin.so + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${WRKSRC}/plugin.build/icedteanp/IcedTeaNPPlugin.so INSTALLATION_DIRS+= lib/netscape/plugins do-install: - ${INSTALL_LIB} ${WRKSRC}/plugin/icedteanp/IcedTeaNPPlugin.so ${DESTDIR}${PREFIX}/lib/netscape/plugins + ${INSTALL_LIB} ${WRKSRC}/plugin.build/icedteanp/IcedTeaNPPlugin.so ${DESTDIR}${PREFIX}/lib/netscape/plugins BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=1.9.1.3nb6 .include "../../lang/openjdk7/icedtea-extras.mk" diff --git a/www/openjdk7-icedtea-plugin/distinfo b/www/openjdk7-icedtea-plugin/distinfo index dc5f7a108cc..4881364e175 100644 --- a/www/openjdk7-icedtea-plugin/distinfo +++ b/www/openjdk7-icedtea-plugin/distinfo @@ -1,17 +1,16 @@ -$NetBSD: distinfo,v 1.4 2010/01/15 19:18:42 tnn Exp $ +$NetBSD: distinfo,v 1.5 2010/05/23 10:50:42 tnn Exp $ -SHA1 (openjdk7/aaf3cf416fb4.tar.bz2) = 0699222ac14be906c2dbdc2db3aff3eeffcd7ac5 -RMD160 (openjdk7/aaf3cf416fb4.tar.bz2) = a88ae483d665163cf3dd302bd4f02c3ce551ab1c -Size (openjdk7/aaf3cf416fb4.tar.bz2) = 4589271 bytes -SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483 -RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d -Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes +SHA1 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 280e3a66c737c928facdeeb2533215e084513088 +RMD160 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 50d96c6c81deff07016649498e6efd7f950108cf +Size (openjdk7/8dc6e1ff8ccf.tar.bz2) = 4581125 bytes +SHA1 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1 +RMD160 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5 +Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes SHA1 (openjdk7/rhino1_7R2.zip) = 3bb380cfb7f6febb87a64b2dee7fa308042f37e4 RMD160 (openjdk7/rhino1_7R2.zip) = 58ae321829ac701e442bfbfed3d6f87b2bb6ba4c Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes SHA1 (openjdk7/xalan-j_2_7_1-bin.zip) = 681f04e180de88264bd3df68946001efb0bc2ff1 RMD160 (openjdk7/xalan-j_2_7_1-bin.zip) = d7174fcc9dd8b3876b5a9c8cde021953475b57f8 Size (openjdk7/xalan-j_2_7_1-bin.zip) = 17336979 bytes -SHA1 (patch-aa) = f7720f1730611a8331856da0a9593d8456b6c104 -SHA1 (patch-ab) = 2084c98cefb4875717ddf1617edcdb40b1726b78 -SHA1 (patch-ad) = 19a423e2a6414ddb16866fe24f628ecd573ee4ab +SHA1 (patch-aa) = 799f3b8ed3376bde6e200beb1de0a07d8b04f4dc +SHA1 (patch-ad) = 7bd1c85839426fd57815286a6e698af265837896 diff --git a/www/openjdk7-icedtea-plugin/patches/patch-aa b/www/openjdk7-icedtea-plugin/patches/patch-aa index ab75d6f5961..b3b80f76503 100644 --- a/www/openjdk7-icedtea-plugin/patches/patch-aa +++ b/www/openjdk7-icedtea-plugin/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $ +$NetBSD: patch-aa,v 1.2 2010/05/23 10:50:42 tnn Exp $ ---- Makefile.am.orig 2009-10-08 16:31:21.000000000 +0200 -+++ Makefile.am -@@ -1704,7 +1704,7 @@ IcedTeaNPPlugin.so: IcedTeaNPPlugin_obje - $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(MOZILLA_LIBS)\ -- -shared -o $@ \ -+ -shared -o $@; \ - cd ../ +--- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-05-20 13:37:32.000000000 +0000 ++++ plugin/icedteanp/IcedTeaPluginRequestProcessor.cc +@@ -512,8 +512,6 @@ PluginRequestProcessor::sendMember(std:: - clean-IcedTeaNPPlugin: + NPIdentifier member_identifier; + +- NPIdentifier member_identifier; +- + int method_id; + int instance_id; + long reference; diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ab b/www/openjdk7-icedtea-plugin/patches/patch-ab deleted file mode 100644 index 1bd111962b6..00000000000 --- a/www/openjdk7-icedtea-plugin/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2010/01/15 19:18:42 tnn Exp $ - ---- configure.ac.orig 2010-01-09 00:01:09.000000000 +0000 -+++ configure.ac -@@ -400,11 +400,11 @@ then - fi - - dnl Check for plugin support headers and libraries. --dnl FIXME: use unstable -+dnl FIXME: use nstable - if test "x${enable_plugin}" = "xyes" - then - PKG_CHECK_MODULES(XULRUNNER, \ -- nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) -+ mozilla-nspr mozilla-js mozilla-plugin libxul >= 1.9) - PKG_CHECK_MODULES(GTK, gtk+-2.0) - IT_XULRUNNER_VERSION - fi diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ad b/www/openjdk7-icedtea-plugin/patches/patch-ad index 837e708ec8c..722df01079f 100644 --- a/www/openjdk7-icedtea-plugin/patches/patch-ad +++ b/www/openjdk7-icedtea-plugin/patches/patch-ad @@ -1,8 +1,26 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $ +$NetBSD: patch-ad,v 1.2 2010/05/23 10:50:42 tnn Exp $ ---- acinclude.m4.orig 2009-10-07 10:48:00.000000000 +0200 +--- acinclude.m4.orig 2010-05-20 13:37:32.000000000 +0000 +++ acinclude.m4 -@@ -873,7 +873,7 @@ AC_DEFUN([ENABLE_HG], +@@ -287,7 +287,7 @@ AC_DEFUN([FIND_JAVAH], + JAVAH=no + ]) + AC_MSG_RESULT(${JAVAH}) +- if test "x${JAVAH}" == "xno"; then ++ if test "x${JAVAH}" = "xno"; then + JAVAH=${JAVAH_DEFAULT} + fi + AC_PATH_PROG(JAVAH, "${JAVAH}") +@@ -320,7 +320,7 @@ AC_DEFUN([FIND_JAR], + JAR=no + ]) + AC_MSG_RESULT(${JAR}) +- if test "x${JAR}" == "xno"; then ++ if test "x${JAR}" = "xno"; then + JAR=${JAR_DEFAULT} + fi + AC_PATH_PROG(JAR, "${JAR}") +@@ -854,7 +854,7 @@ AC_DEFUN([ENABLE_HG], [ AC_MSG_CHECKING(whether to retrieve the source code from Mercurial) AC_ARG_ENABLE([hg], |