svn commit: r408704 - in head/java/icedtea-web: . files
Jung-uk Kim
jkim at FreeBSD.org
Thu Feb 11 23:45:12 UTC 2016
Author: jkim
Date: Thu Feb 11 23:45:10 2016
New Revision: 408704
URL: https://svnweb.freebsd.org/changeset/ports/408704
Log:
Update to 1.6.2.
Added:
head/java/icedtea-web/files/patch-configure (contents, props changed)
head/java/icedtea-web/files/patch-html-gen.sh (contents, props changed)
head/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java (contents, props changed)
head/java/icedtea-web/pkg-plist (contents, props changed)
Deleted:
head/java/icedtea-web/files/AUTHORS.html
head/java/icedtea-web/files/COPYING.html
head/java/icedtea-web/files/ChangeLog.html
head/java/icedtea-web/files/NEWS.html
head/java/icedtea-web/files/extrapatch-jdk8
head/java/icedtea-web/files/patch-netx-XDesktopEntry.java
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 Feb 11 23:11:35 2016 (r408703)
+++ head/java/icedtea-web/Makefile Thu Feb 11 23:45:10 2016 (r408704)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= icedtea-web
-PORTVERSION= 1.5.2
+PORTVERSION= 1.6.2
CATEGORIES= java www
MASTER_SITES= http://icedtea.wildebeest.org/download/source/ \
http://icedtea.classpath.org/download/source/
@@ -11,9 +11,12 @@ COMMENT= Free Java plug-in and Java Web
LICENSE= GPLv2
-BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
- ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ bash:${PORTSDIR}/shells/bash \
+ gsed:${PORTSDIR}/textproc/gsed
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+TEST_DEPENDS= ${HAMCREST_JAR}:${PORTSDIR}/java/hamcrest \
+ ${JUNIT_JAR}:${PORTSDIR}/java/junit
GNU_CONFIGURE= yes
USE_JAVA= yes
@@ -22,7 +25,7 @@ JAVA_VENDOR= openjdk
USE_PERL5= build
USE_XORG= x11
USES= desktop-file-utils gmake perl5 pkgconfig shebangfix
-SHEBANG_FILES= javac.in jrunscript.in launcher/launchers.in
+SHEBANG_FILES= jrunscript.in launcher/launchers.in
WANT_GNOME= yes
@@ -30,58 +33,55 @@ EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
EXTRACT_AFTER_ARGS= | ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf -
-PLIST_FILES= bin/itweb-javaws \
- bin/itweb-policyeditor \
- bin/itweb-settings \
- man/man1/itweb-javaws.1.gz \
- man/man1/itweb-policyeditor.1.gz \
- man/man1/itweb-settings.1.gz \
- share/applications/itweb-javaws.desktop \
- share/applications/itweb-policyeditor.desktop \
- share/applications/itweb-settings.desktop \
- share/pixmaps/itweb-javaws.png
-PORTDATA= javaws_splash.png netx.jar
-PORTDOCS= netx
-
-CONFIGURE_ARGS= --with-asm=no --with-ecj=no --with-emma=no --with-jacoco=no
-CONFIGURE_ARGS+=--with-jdk-home="${JAVA_HOME}"
-CONFIGURE_ARGS+=--with-jre-home="${JAVA_HOME}/jre"
-CONFIGURE_ARGS+=--with-tagsoup=no
-CONFIGURE_ENV= BIN_BASH=${bash_CMD}
+CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
+CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
+CONFIGURE_ARGS+= --with-jre-home="${JAVA_HOME}/jre"
+CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"
+CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"
+CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"
+.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
+CONFIGURE_ARGS+= --without-${opt}
+.endfor
+CONFIGURE_ENV= BIN_BASH=${bash_CMD}
+CONFIGURE_SHELL= ${bash_CMD}
+
+TEST_TARGET= check
+
+OPTIONS_DEFINE= DOCS PLUGIN RHINO TAGSOUP
+OPTIONS_DEFAULT=DOCS PLUGIN
+OPTIONS_SUB= yes
-OPTIONS_DEFINE= PLUGIN RHINO TEST
-OPTIONS_DEFAULT=PLUGIN
PLUGIN_DESC= Enable the browser plug-in
RHINO_DESC= Add support for Proxy Auto Config files
-TEST_DESC= Add support for running regression test
+TAGSOUP_DESC= Enable cleaning up of malformed JNLP files
DOCS_CONFIGURE_ENABLE= docs
-PLUGIN_CONFIGURE_ENABLE=plugin
+DOCS_PORTDOCS= netx
+
RHINO_BUILD_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
-RHINO_RUN_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
-RHINO_CONFIGURE_OFF= --with-rhino=no
-RHINO_CONFIGURE_ON= --with-rhino=${JAVASHAREDIR}/rhino/rhino.jar
-TEST_BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-TEST_CONFIGURE_OFF= --with-junit=no
-TEST_CONFIGURE_ON= --with-junit=${JAVALIBDIR}/junit.jar
-PLUGIN_PLIST_FILES= lib/IcedTeaPlugin.so
+RHINO_RUN_DEPENDS= ${RHINO_BUILD_DEPENDS}
+RHINO_VARS= RHINO_JAR="${JAVASHAREDIR}/rhino/rhino.jar"
+RHINO_VARS_OFF= RHINO_JAR=no
+
+TAGSOUP_BUILD_DEPENDS= ${JAVALIBDIR}/tagsoup.jar:${PORTSDIR}/textproc/tagsoup
+TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS}
+TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
+TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
+
+PLUGIN_CONFIGURE_ENABLE=plugin
+PLUGIN_PORTDOCS= plugin
+PLUGIN_TEST_TARGET= plugin-tests
PLUGIN_USE= GNOME=glib20
PLUGIN_USES= gecko webplugin:native
+PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib
+PLUGIN_VARS+= WEBPLUGIN_FILES=IcedTeaPlugin.so
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPLUGIN}
-PORTDATA+= plugin.jar
-PORTDOCS+= plugin
-WEBPLUGIN_DIR= ${PREFIX}/lib
-WEBPLUGIN_FILES=IcedTeaPlugin.so
-.endif
+HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar
+JUNIT_JAR= ${JAVALIBDIR}/junit.jar
.include <bsd.port.pre.mk>
-.if ${JAVA_PORT_VERSION} == "1.8.0"
-EXTRA_PATCHES= ${PATCHDIR}/extrapatch-jdk8
-.elif ${JAVA_PORT_VERSION} == "1.6.0"
+.if ${JAVA_PORT_VERSION} == "1.6.0"
pre-extract:
@${ECHO_MSG}
@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"
@@ -91,30 +91,23 @@ pre-extract:
.endif
post-patch:
+ ${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \
+ -e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \
+ ${WRKSRC}/Makefile.in ${WRKSRC}/html-gen.sh
${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
${WRKSRC}/*.desktop.in
- ${CP} -fp ${FILESDIR}/*.html \
- ${WRKSRC}/netx/net/sourceforge/jnlp/resources
-
-.if ${PORT_OPTIONS:MTEST}
-post-build:
- @${ECHO_MSG}
- @${ECHO_MSG} "Run \"make test\" to execute regression test."
- @${ECHO_MSG}
-.endif
post-install:
${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR}
- ${INSTALL_DATA} ${WRKSRC}/javaws.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps/itweb-javaws.png
-
-.if ${PORT_OPTIONS:MTEST}
-test: build
- @(cd ${WRKSRC}; ${MAKE_CMD} check)
-.if ${PORT_OPTIONS:MPLUGIN}
- @(cd ${WRKSRC}; ${MAKE_CMD} plugin-tests)
-.endif
-.endif
+.for lang in cs de en pl
+.for man in javaws policyeditor
+ ${MV} ${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/${man}.1 \
+ ${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/itweb-${man}.1
+.endfor
+.endfor
+ @${ECHO_MSG}
+ @${ECHO_MSG} "Run \"make test\" to execute regression test."
+ @${ECHO_MSG}
.include <bsd.port.post.mk>
Modified: head/java/icedtea-web/distinfo
==============================================================================
--- head/java/icedtea-web/distinfo Thu Feb 11 23:11:35 2016 (r408703)
+++ head/java/icedtea-web/distinfo Thu Feb 11 23:45:10 2016 (r408704)
@@ -1,2 +1,2 @@
-SHA256 (icedtea-web-1.5.2.tar.gz) = b29e8ff2533cc6521a6509a002001f4c97c80a004460063156d003898da13bf3
-SIZE (icedtea-web-1.5.2.tar.gz) = 1583105
+SHA256 (icedtea-web-1.6.2.tar.gz) = ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300
+SIZE (icedtea-web-1.6.2.tar.gz) = 1824557
Modified: head/java/icedtea-web/files/patch-Makefile.in
==============================================================================
--- head/java/icedtea-web/files/patch-Makefile.in Thu Feb 11 23:11:35 2016 (r408703)
+++ head/java/icedtea-web/files/patch-Makefile.in Thu Feb 11 23:45:10 2016 (r408704)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2014-08-15 03:08:34.349127000 -0400
-+++ Makefile.in 2014-10-21 18:14:35.000000000 -0400
-@@ -309,9 +309,9 @@
+--- Makefile.in.orig 2016-02-03 13:49:10 UTC
++++ Makefile.in
+@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
#end of exported autoconf copies
# binary names
@@ -12,25 +12,22 @@
# the launcher needs to know $(bindir) and $(datadir) which can be different at
# make-time from configure-time
-@@ -852,34 +852,36 @@
+@@ -900,10 +900,10 @@ install-exec-local:
@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_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
+- ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
- ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
++ ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
+ ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
+ # all generated manpages are installed in swarm
install-data-local:
- ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
-- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
-+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1/itweb-javaws.1
- ${INSTALL_DATA} $(NETX_SRCDIR)/itweb-settings.1 $(DESTDIR)$(mandir)/man1
-- ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1
-+ ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1
- @ENABLE_DOCS_TRUE@ ${mkinstalldirs} $(DESTDIR)$(htmldir)
+@@ -913,12 +913,14 @@ install-data-local:
@ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \
@ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \
@ENABLE_DOCS_TRUE@ do \
@@ -46,42 +43,26 @@
+ at ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done)
- uninstall-local:
- rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
- rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
+ # all generated manpages must be removed one by one
+@@ -928,7 +930,7 @@ uninstall-local:
rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
-- rm -f $(DESTDIR)$(mandir)/man1/javaws.1
-+ rm -f $(DESTDIR)$(mandir)/man1/itweb-javaws.1
- rm -f $(DESTDIR)$(mandir)/man1/itweb-settings.1
-- rm -f $(DESTDIR)$(mandir)/man1/policyeditor.1
-+ rm -f $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1
- rm -f $(DESTDIR)$(bindir)/$(javaws)
- rm -f $(DESTDIR)$(bindir)/$(itweb_settings)
- rm -f $(DESTDIR)$(bindir)/$(policyeditor)
-@@ -1042,10 +1044,10 @@
- find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \
- for src in $(NETX_EXCLUDE_SRCS) ; \
- do \
-- sed -i "/$${src}/ d" $@ ; \
-+ sed -i -e "/$${src}/ d" $@ ; \
- done
-- at WITH_RHINO_FALSE@ sed -i '/RhinoBasedPacEvaluator/ d' $@
-- at HAVE_JAVA7_FALSE@ sed -i '/VariableX509TrustManagerJDK7/ d' $@
-+ at WITH_RHINO_FALSE@ sed -i -e '/RhinoBasedPacEvaluator/ d' $@
-+ at HAVE_JAVA7_FALSE@ sed -i -e '/VariableX509TrustManagerJDK7/ d' $@
-
- stamps/netx-html-gen.stamp:
- (cd $$NETX_SRCDIR/..; \
-@@ -1059,7 +1061,7 @@
- mkdir -p stamps
- touch $@
-
--stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp
-+stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
- mkdir -p $(NETX_DIR)
- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(NETX_DIR) \
-@@ -1070,7 +1072,8 @@
+ rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
+ rm -r $(ICONS_DEST_DIR)/javaws.png
+- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
++ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
+ KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
+ for file in $$KNOWN_MANS ; do \
+ for dir in $$KNOWN_DIRS ; do \
+@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
+ echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
+ for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
+ ID=`echo "$$LANG_ID" | head -c 2` ; \
+- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \
++ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
+ export LANG=$$LANG_ID; \
+ mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
+ echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
+@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
(cd $(NETX_RESOURCE_DIR); \
for files in $$(find . -type f); \
do \
@@ -91,7 +72,7 @@
$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
done)
cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
-@@ -1100,7 +1103,7 @@
+@@ -1233,7 +1236,7 @@ clean-netx:
rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
clean-desktop-files:
@@ -100,7 +81,7 @@
rm -f itweb-settings.desktop
launcher.build/$(javaws): launcher/launchers.in
-@@ -1133,7 +1136,7 @@
+@@ -1266,7 +1269,7 @@ clean-launchers:
fi
javaws.desktop: javaws.desktop.in
@@ -109,7 +90,7 @@
itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
-@@ -1141,7 +1144,7 @@
+@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
@@ -118,16 +99,16 @@
# documentation
-@@ -1252,7 +1255,7 @@
+@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
- $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
+ $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
+ tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
fi ; \
cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
if [ -f $(META_MANIFEST) ]; \
-@@ -1307,7 +1310,7 @@
+@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
path="`dirname $$slashed_dir`" ; \
file="`basename $$slashed_dir`.jar" ; \
echo "copying $$dir.jar to $$path as $$file" ; \
@@ -136,16 +117,16 @@
cp $$dir".jar" "$$path"/"$$file" ; \
fi ; \
done ; \
-@@ -1435,7 +1438,7 @@
- whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES):
+ whiteListed=$(RUN_WHITELIST_FILTER); \
cd $(TEST_EXTENSIONS_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' ` ; \
- INLCUDE="NO" ; \
-@@ -1625,7 +1628,7 @@
+ INCLUDE="NO" ; \
+@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
$(UNIT_CLASS_NAMES):
cd $(NETX_UNIT_TEST_DIR) ; \
class_names= ; \
@@ -154,7 +135,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" ; \
-@@ -1636,10 +1639,7 @@
+@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
filename=" " ; \
cd $(NETX_UNIT_TEST_SRCDIR) ; \
@@ -165,10 +146,10 @@
+ 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:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \
-@@ -2131,9 +2131,7 @@
+ CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
+@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
@ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ;
- @ENABLE_PLUGIN_TRUE@ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+ @ENABLE_PLUGIN_TRUE@ $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
- at ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
- at ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ;
Added: head/java/icedtea-web/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/icedtea-web/files/patch-configure Thu Feb 11 23:45:10 2016 (r408704)
@@ -0,0 +1,36 @@
+--- configure.orig 2016-02-03 13:49:09 UTC
++++ configure
+@@ -10114,14 +10114,10 @@ if test "${with_junit+set}" = set; then
+ JUNIT_JAR=no
+ ;;
+ *)
+- if test -f "${withval}"; then
+- JUNIT_JAR="${withval}"
+- elif test -z "${withval}"; then
++ if test -z "${withval}"; then
+ JUNIT_JAR=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+- as_fn_error $? "\"The junit jar ${withval} was not found.\"" "$LINENO" 5
++ JUNIT_JAR="${withval}"
+ fi
+ ;;
+ esac
+@@ -10186,14 +10182,10 @@ if test "${with_hamcrest+set}" = set; th
+ HAMCREST_JAR=no
+ ;;
+ *)
+- if test -f "${withval}"; then
+- HAMCREST_JAR="${withval}"
+- elif test -z "${withval}"; then
++ if test -z "${withval}"; then
+ HAMCREST_JAR=yes
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+- as_fn_error $? "\"The hamcrest jar ${withval} was not found.\"" "$LINENO" 5
++ HAMCREST_JAR="${withval}"
+ fi
+ ;;
+ esac
Added: head/java/icedtea-web/files/patch-html-gen.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/icedtea-web/files/patch-html-gen.sh Thu Feb 11 23:45:10 2016 (r408704)
@@ -0,0 +1,20 @@
+--- html-gen.sh.orig 2016-02-03 13:47:43 UTC
++++ html-gen.sh
+@@ -74,7 +74,7 @@ else
+ unset REPO_URL
+ fi
+
+-start_time="$(date +%s.%N)"
++start_time="$(date +%s)"
+
+ if [ ! -e html-gen ]; then
+ echo "No html-gen directory, exiting. See Makefile.am for usage"
+@@ -168,7 +168,7 @@ done
+
+ sed -i -r 's|(\*\ .*):|<u>\1</u>:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"
+
+-end_time="$(date +%s.%N)"
++end_time="$(date +%s)"
+
+ print_debug "HTML generation complete"
+ print_debug "Total elapsed time: $(echo "$end_time - $start_time" | bc )"
Added: head/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java Thu Feb 11 23:45:10 2016 (r408704)
@@ -0,0 +1,28 @@
+--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2016-02-03 13:47:43 UTC
++++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
+@@ -78,7 +78,7 @@ import net.sourceforge.jnlp.security.dia
+ */
+ public class XDesktopEntry {
+
+- public static final String JAVA_ICON_NAME = "javaws";
++ public static final String JAVA_ICON_NAME = "itweb-javaws";
+
+ private JNLPFile file = null;
+ private int iconSize = -1;
+@@ -202,14 +202,14 @@ public class XDesktopEntry {
+ //Shortcut executes the jnlp as it was with system preferred java. It should work fine offline
+ //absolute - works in case of self built
+ String exec = System.getProperty("icedtea-web.bin.location");
+- String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});
++ String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});
+ if (pathResult != null) {
+ return pathResult;
+ }
+ if (exec != null) {
+ return exec;
+ }
+- return "javaws";
++ return "itweb-javaws";
+ }
+
+
Added: head/java/icedtea-web/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/icedtea-web/pkg-plist Thu Feb 11 23:45:10 2016 (r408704)
@@ -0,0 +1,31 @@
+bin/itweb-javaws
+bin/itweb-policyeditor
+bin/itweb-settings
+%%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
+man/cs/man1/icedtea-web-plugin.1.gz
+man/cs/man1/icedtea-web.1.gz
+man/cs/man1/itweb-javaws.1.gz
+man/cs/man1/itweb-policyeditor.1.gz
+man/cs/man1/itweb-settings.1.gz
+man/de/man1/icedtea-web-plugin.1.gz
+man/de/man1/icedtea-web.1.gz
+man/de/man1/itweb-javaws.1.gz
+man/de/man1/itweb-policyeditor.1.gz
+man/de/man1/itweb-settings.1.gz
+man/man1/icedtea-web-plugin.1.gz
+man/man1/icedtea-web.1.gz
+man/man1/itweb-javaws.1.gz
+man/man1/itweb-policyeditor.1.gz
+man/man1/itweb-settings.1.gz
+man/pl/man1/icedtea-web-plugin.1.gz
+man/pl/man1/icedtea-web.1.gz
+man/pl/man1/itweb-javaws.1.gz
+man/pl/man1/itweb-policyeditor.1.gz
+man/pl/man1/itweb-settings.1.gz
+share/applications/itweb-javaws.desktop
+share/applications/itweb-policyeditor.desktop
+share/applications/itweb-settings.desktop
+%%DATADIR%%/javaws_splash.png
+%%DATADIR%%/netx.jar
+%%PLUGIN%%%%DATADIR%%/plugin.jar
+share/pixmaps/itweb-javaws.png
More information about the svn-ports-all
mailing list