Date: Thu, 6 Sep 2012 21:15:59 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303791 - in head/java/icedtea-web: . files Message-ID: <201209062115.q86LFxPI085825@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Sep 6 21:15:59 2012 New Revision: 303791 URL: http://svn.freebsd.org/changeset/ports/303791 Log: Update to 1.3. Deleted: head/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc Modified: head/java/icedtea-web/Makefile head/java/icedtea-web/distinfo head/java/icedtea-web/files/patch-Makefile.in Modified: head/java/icedtea-web/Makefile ============================================================================== --- head/java/icedtea-web/Makefile Thu Sep 6 21:07:32 2012 (r303790) +++ head/java/icedtea-web/Makefile Thu Sep 6 21:15:59 2012 (r303791) @@ -6,8 +6,7 @@ # PORTNAME= icedtea-web -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= java www MASTER_SITES= http://icedtea.classpath.org/download/source/ @@ -46,6 +45,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PO USE_PKGCONFIG= yes CONFIGURE_ARGS+=--with-ecj=no --with-jdk-home="${JAVA_HOME}" +CONFIGURE_ENV+= SHELL=${LOCALBASE}/bin/bash .include <bsd.port.pre.mk> @@ -66,6 +66,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkg ${LOCALBASE}/libdata/pkgconfig/gtk+-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20 \ ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul +CONFIGURE_ARGS+=--with-gtk=2 .include "${PORTSDIR}/www/firefox/Makefile.webplugins" .else CONFIGURE_ARGS+=--disable-plugin @@ -81,7 +82,8 @@ CONFIGURE_ARGS+=--with-rhino=no .if ${PORT_OPTIONS:MTEST} CONFIGURE_ARGS+=--with-junit=${JAVALIBDIR}/junit.jar -BUILD_DEPENDS+= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit +BUILD_DEPENDS+= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ + ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash .else CONFIGURE_ARGS+=--with-junit=no .endif @@ -118,9 +120,11 @@ post-install: .if ${PORT_OPTIONS:MTEST} test: build - @(cd ${WRKSRC}; ${GMAKE} check) + @${SED} -e 's|^SHELL = /bin/sh|SHELL = ${LOCALBASE}/bin/bash|' \ + ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.test + @(cd ${WRKSRC}; ${GMAKE} -f Makefile.test check) .if ${PORT_OPTIONS:MPLUGIN} - @(cd ${WRKSRC}; ${GMAKE} plugin-tests) + @(cd ${WRKSRC}; ${GMAKE} -f Makefile.test plugin-tests) .endif .endif Modified: head/java/icedtea-web/distinfo ============================================================================== --- head/java/icedtea-web/distinfo Thu Sep 6 21:07:32 2012 (r303790) +++ head/java/icedtea-web/distinfo Thu Sep 6 21:15:59 2012 (r303791) @@ -1,2 +1,2 @@ -SHA256 (icedtea-web-1.2.1.tar.gz) = 134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6 -SIZE (icedtea-web-1.2.1.tar.gz) = 879692 +SHA256 (icedtea-web-1.3.tar.gz) = d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f +SIZE (icedtea-web-1.3.tar.gz) = 987785 Modified: head/java/icedtea-web/files/patch-Makefile.in ============================================================================== --- head/java/icedtea-web/files/patch-Makefile.in Thu Sep 6 21:07:32 2012 (r303790) +++ head/java/icedtea-web/files/patch-Makefile.in Thu Sep 6 21:15:59 2012 (r303791) @@ -1,7 +1,7 @@ ---- Makefile.in.orig 2012-03-05 12:06:46.333970000 -0500 -+++ Makefile.in 2012-03-05 18:07:03.000000000 -0500 -@@ -292,14 +292,14 @@ - +--- Makefile.in.orig 2012-08-27 15:36:58.431461000 -0400 ++++ Makefile.in 2012-09-06 17:00:58.000000000 -0400 +@@ -235,14 +235,14 @@ + #end of exported autoconf copies # binary names -javaws := $(shell echo javaws | sed '@program_transform_name@') @@ -17,7 +17,7 @@ -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \ -e 's|[@]JAVA[@]|$(JAVA)|g' \ -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g' -@@ -638,8 +638,8 @@ +@@ -724,8 +724,8 @@ # Top-Level Targets # ================= @@ -28,8 +28,8 @@ check-local: $(RHINO_TESTS) $(JUNIT_TESTS) -@@ -659,24 +659,26 @@ - @ENABLE_PLUGIN_TRUE@ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir) +@@ -745,24 +745,26 @@ + @ENABLE_PLUGIN_TRUE@ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir) @ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar - ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) @@ -60,7 +60,7 @@ @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done) uninstall-local: -@@ -685,8 +687,8 @@ +@@ -771,8 +773,8 @@ rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar @@ -71,7 +71,7 @@ rm -f $(DESTDIR)$(bindir)/$(itweb_settings) rm -rf $(DESTDIR)$(htmldir) -@@ -776,7 +778,7 @@ +@@ -862,7 +864,7 @@ netx-source-files.txt: find $(NETX_SRCDIR) -name '*.java' | sort > $@ @@ -80,7 +80,7 @@ stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp mkdir -p $(NETX_DIR) -@@ -788,7 +790,8 @@ +@@ -874,7 +876,8 @@ (cd $(NETX_RESOURCE_DIR); \ for files in $$(find . -type f); \ do \ @@ -90,7 +90,7 @@ $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \ done) cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \ -@@ -816,10 +819,10 @@ +@@ -902,10 +905,10 @@ rm -f stamps/netx.stamp clean-desktop-files: @@ -103,7 +103,7 @@ extra-source-files.txt: find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ -@@ -831,7 +834,8 @@ +@@ -917,7 +920,8 @@ (cd $(NETX_EXTRA_DIR); \ for files in $$(find . -type f); \ do \ @@ -113,7 +113,7 @@ $(NETX_EXTRA_DIST_DIR)/$${files}; \ done) mkdir -p stamps -@@ -845,7 +849,7 @@ +@@ -931,7 +935,7 @@ extra-lib/about.jar: stamps/extra-class-files.stamp $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; @@ -122,7 +122,7 @@ mkdir -p launcher.build $(edit_launcher_script) < $< > $@ -@@ -854,14 +858,14 @@ +@@ -940,14 +944,14 @@ $(edit_launcher_script) < $< > $@ clean-launchers: @@ -140,36 +140,34 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \ -@@ -915,8 +919,8 @@ +@@ -1001,7 +1005,7 @@ fi - check-pac-functions: stamps/bootstrap-directory.stamp + stamps/check-pac-functions.stamp: stamps/bootstrap-directory.stamp - ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \ -- $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) -+ $(SHELL) jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \ -+ $$(realpath $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) - - junit-runner-source-files.txt: - find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@ -@@ -958,7 +962,7 @@ - notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \ - $(BOOT_DIR)/bin/javac -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \ - if [ -n "$$notSrcFiles" ] ; then \ -- cp -R --parents "$$notSrcFiles" "$(JNLP_TESTS_DIR)/$$dir/" ; \ -+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(JNLP_TESTS_DIR)/$$dir/" ; \ - fi ; \ - cd "$(JNLP_TESTS_DIR)/$$dir/" ; \ - $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \ -@@ -1015,7 +1019,7 @@ - $(REPRODUCERS_CLASS_NAMES): - cd $(JNLP_TESTS_ENGINE_DIR) ; \ ++ $(SHELL) ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \ + $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) ; \ + mkdir -p stamps && \ + touch $@ +@@ -1056,7 +1060,7 @@ + notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \ + $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \ + if [ -n "$$notSrcFiles" ] ; then \ +- cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \ ++ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(JNLP_TESTS_DIR)/$$dir/" ; \ + fi ; \ + cd "$(JNLP_TESTS_DIR)/$$dir/" ; \ + if [ -f $(META_MANIFEST) ]; \ +@@ -1209,7 +1213,7 @@ + whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \ + cd $(JNLP_TESTS_ENGINE_TESTS_DIR) ; \ class_names= ; \ - for test in `find -type f` ; do \ + for test in `find . -type f` ; do \ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ - class_names="$$class_names $$class_name" ; \ -@@ -1059,7 +1063,7 @@ + INLCUDE="NO" ; \ +@@ -1393,7 +1397,7 @@ $(UNIT_CLASS_NAMES): cd $(NETX_UNIT_TEST_DIR) ; \ class_names= ; \ @@ -178,7 +176,7 @@ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ class_names="$$class_names $$class_name" ; \ -@@ -1070,10 +1074,7 @@ +@@ -1404,10 +1408,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES) filename=" " ; \ cd $(NETX_UNIT_TEST_SRCDIR) ; \ @@ -189,8 +187,8 @@ + tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ -@@ -1302,9 +1303,7 @@ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(JNLP_TESTS_ENGINE_DIR):. \ +@@ -1663,9 +1664,7 @@ @ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ; @ENABLE_PLUGIN_TRUE@ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ @ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209062115.q86LFxPI085825>