Attachment 216744 Details for Bug 244976 – Makefile and pkg-plist patch

[patch] Makefile and pkg-plist patch

java_icedtea-web.diff (text/plain), 2.31 KB, created by Lars Herschke on 2020-07-24 13:49:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Herschke

Created: 2020-07-24 13:49:04 UTC

Size: 2.31 KB

patch

obsolete

>Index: java/icedtea-web/Makefile
>===================================================================
>--- java/icedtea-web/Makefile	(Revision 543245)
>+++ java/icedtea-web/Makefile	(Arbeitskopie)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	icedtea-web
> PORTVERSION=	1.8.4
>+PORTREVISION=   1
> CATEGORIES=	java www
> MASTER_SITES=	https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -13,6 +14,7 @@
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	zip:archivers/zip \
>+		rustc:lang/rust \
> 		bash:shells/bash \
> 		gsed:textproc/gsed \
> 		${HAMCREST_JAR}:java/hamcrest \
>@@ -23,6 +25,7 @@
> 
> GNU_CONFIGURE=	yes
> USE_JAVA=	yes
>+JAVA_VERSION=	1.7 1.8
> JAVA_OS=	native
> JAVA_VENDOR=	openjdk
> USE_PERL5=	build
>@@ -32,7 +35,6 @@
> 
> 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}"
>@@ -67,7 +69,7 @@
> TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
> TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no
> 
>-PLUGIN_CONFIGURE_ENABLE=native-plugin
>+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
>Index: java/icedtea-web/pkg-plist
>===================================================================
>--- java/icedtea-web/pkg-plist	(Revision 543245)
>+++ java/icedtea-web/pkg-plist	(Arbeitskopie)
>@@ -1,5 +1,9 @@
>+bin/itw-modularjdk.args
>+bin/itweb-javaws
> bin/itweb-javaws.sh
>+bin/itweb-policyeditor
> bin/itweb-policyeditor.sh
>+bin/itweb-settings
> bin/itweb-settings.sh
> %%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
> man/cs/man1/icedtea-web-plugin.1.gz
>@@ -25,7 +29,11 @@
> share/applications/itweb-javaws.desktop
> share/applications/itweb-policyeditor.desktop
> share/applications/itweb-settings.desktop
>+share/bash-completion/completions/itweb-settings.bash
>+share/bash-completion/completions/javaws.bash
>+share/bash-completion/completions/policyeditor.bash
>+%%DATADIR%%/javaws.jar
> %%DATADIR%%/javaws_splash.png
>-%%DATADIR%%/javaws.jar
>+%%PLUGIN%%%%DATADIR%%/jsobject.jar
> %%PLUGIN%%%%DATADIR%%/plugin.jar
> share/pixmaps/itweb-javaws.png

Actions: View | Diff

Attachments on bug 244976: 212611 | 215350 | 215574 | 216383 | 216446 | 216744 | 216757 | 216865 | 216912