Attachment #216712 for bug #248197





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}"

TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no

PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar
PLUGIN_CONFIGURE_ENV=	MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
			MOZILLA_LIBS=" " # needs to be set and non-empty!
PLUGIN_DISTFILES=	libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi

HAMCREST_JAR=	${JAVALIBDIR}/hamcrest.jar
JUNIT_JAR=	${JAVALIBDIR}/junit.jar

.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPLUGIN}
JAVA_VERSION=	1.7 1.8
.endif

.include <bsd.port.pre.mk>

.if ${JAVA_PORT_VERSION:M*6*}




--- configure.ac.orig	2020-06-04 13:08:14.000000000 +0200
+++ configure.ac	2020-07-23 17:57:21.000000000 +0200
@@ -71,7 +71,7 @@
 build_linux=no
 build_windows=no

         build_linux=yes
         ;;
     cygwin*)
@@ -178,7 +178,9 @@
 fi
 IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING])
 IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE])
-IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
+if test "$enable_native_plugin" = yes -a  "$enable_pluginjar" = yes ; then
+  IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
+fi
 
 IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY
 IT_CHECK_GLIB_VERSION

Return to bug 248197

Lines 32-38 Link Here

(-)java/icedtea-web/Makefile (-2 / +6 lines)
32		32
33	CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"	33	CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
34	CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"	34	CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
35	CONFIGURE_ARGS+= --with-jre-home="${JAVA_HOME}/jre"
36	CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"	35	CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"
37	CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"	36	CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"
38	CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"	37	CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"
Lines 67-73 Link Here
67	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"	66	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
68	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no	67	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
69		68
70	PLUGIN_CONFIGURE_ENABLE=native-plugin	69	PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar
71	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \	70	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
72	MOZILLA_LIBS=" " # needs to be set and non-empty!	71	MOZILLA_LIBS=" " # needs to be set and non-empty!
73	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi	72	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi
Lines 82-87 Link Here
82	HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar	81	HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar
83	JUNIT_JAR= ${JAVALIBDIR}/junit.jar	82	JUNIT_JAR= ${JAVALIBDIR}/junit.jar
84		83
		84	.include <bsd.port.options.mk>
		85	.if ${PORT_OPTIONS:MPLUGIN}
		86	JAVA_VERSION= 1.7 1.8
		87	.endif
		88
85	.include <bsd.port.pre.mk>	89	.include <bsd.port.pre.mk>
86		90
87	.if ${JAVA_PORT_VERSION:M6}	91	.if ${JAVA_PORT_VERSION:M6}

Lines 1-5 Link Here

(-)java/icedtea-web/files/patch-configure.ac (-2 / +13 lines)
1	--- configure.ac.orig 2019-08-02 14:08:17.000000000 +0200	1	--- configure.ac.orig 2020-06-04 13:08:14.000000000 +0200
2	+++ configure.ac 2020-01-14 16:32:04.000000000 +0100	2	+++ configure.ac 2020-07-23 17:57:21.000000000 +0200
3	@@ -71,7 +71,7 @@	3	@@ -71,7 +71,7 @@
4	build_linux=no	4	build_linux=no
5	build_windows=no	5	build_windows=no
Lines 9-11 Link Here
9	build_linux=yes	9	build_linux=yes
10	;;	10	;;
11	cygwin*)	11	cygwin*)
		12	@@ -178,7 +178,9 @@
		13	fi
		14	IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING])
		15	IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE])
		16	-IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
		17	+if test "$enable_native_plugin" = yes -a "$enable_pluginjar" = yes ; then
		18	+ IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
		19	+fi
		20
		21	IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY
		22	IT_CHECK_GLIB_VERSION