Attachment #116815 for bug #158826

View | Details | Raw Unified | Return to bug 158826
Collapse All | Expand All




# Date created:		July 11, 2011
# Whom:			Jung-uk Kim <jkim@FreeBSD.org>
#
# $FreeBSD: ports/java/icedtea-web/Makefile,v 1.1 2011/07/11 20:50:42 jkim Exp $
#

PORTNAME=	icedtea-web


MAINTAINER=	java@FreeBSD.org
COMMENT=	A free Java plug-in and Java Web Start for OpenJDK
LICENSE=	GPLv2

GNU_CONFIGURE=	yes
USE_GMAKE=	yes

USE_XORG=	x11

OPTIONS=	PLUGIN "Enable the browser plug-in" on \
		RHINO "Enable support for Proxy Auto Config files" off \
		TEST "Add support for running regression test" off

MAN1=		javaws.1


.if defined(WITH_RHINO)
CONFIGURE_ARGS+=--with-rhino=${JAVASHAREDIR}/rhino/rhino.jar
BUILD_DEPENDS+=	${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
RUN_DEPENDS+=	${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
.else
CONFIGURE_ARGS+=--with-rhino=no




--- Makefile.in.orig	2011-06-08 23:59:15.371244000 +0200
+++ Makefile.in	2011-07-12 12:43:03.500532970 +0200
@@ -642,9 +642,9 @@
 @ENABLE_PLUGIN_TRUE@	${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(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)
+	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
 	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
-	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+	${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
 
 install-data-local:
 	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
@@ -758,7 +758,7 @@
 
 netx-source-files.txt:

Return to bug 158826

Lines 2-8 Link Here

(-)icedtea-web/Makefile (-4 / +2 lines)
2	# Date created: July 11, 2011	2	# Date created: July 11, 2011
3	# Whom: Jung-uk Kim <jkim@FreeBSD.org>	3	# Whom: Jung-uk Kim <jkim@FreeBSD.org>
4	#	4	#
5	# $FreeBSD: ports/java/icedtea-web/Makefile,v 1.3 2011/07/11 23:13:16 jkim Exp $	5	# $FreeBSD: ports/java/icedtea-web/Makefile,v 1.1 2011/07/11 20:50:42 jkim Exp $
6	#	6	#
7		7
8	PORTNAME= icedtea-web	8	PORTNAME= icedtea-web
Lines 12-18 Link Here
12		12
13	MAINTAINER= java@FreeBSD.org	13	MAINTAINER= java@FreeBSD.org
14	COMMENT= A free Java plug-in and Java Web Start for OpenJDK	14	COMMENT= A free Java plug-in and Java Web Start for OpenJDK
15	LICENSE= GPLv2
16		15
17	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
18	USE_GMAKE= yes	17	USE_GMAKE= yes
Lines 21-27 Link Here
21	USE_XORG= x11	20	USE_XORG= x11
22		21
23	OPTIONS= PLUGIN "Enable the browser plug-in" on \	22	OPTIONS= PLUGIN "Enable the browser plug-in" on \
24	RHINO "Add support for Proxy Auto Config files" off \	23	RHINO "Enable support for Proxy Auto Config files" off \
25	TEST "Add support for running regression test" off	24	TEST "Add support for running regression test" off
26		25
27	MAN1= javaws.1	26	MAN1= javaws.1
Lines 65-71 Link Here
65		64
66	.if defined(WITH_RHINO)	65	.if defined(WITH_RHINO)
67	CONFIGURE_ARGS+=--with-rhino=${JAVASHAREDIR}/rhino/rhino.jar	66	CONFIGURE_ARGS+=--with-rhino=${JAVASHAREDIR}/rhino/rhino.jar
68	BUILD_DEPENDS+= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
69	RUN_DEPENDS+= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino	67	RUN_DEPENDS+= ${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino
70	.else	68	.else
71	CONFIGURE_ARGS+=--with-rhino=no	69	CONFIGURE_ARGS+=--with-rhino=no

Lines 1-5 Link Here

(-)icedtea-web/files/patch-Makefile.in (-2 / +14 lines)
1	--- Makefile.in.orig 2011-06-08 17:59:15.371244000 -0400	1	--- Makefile.in.orig 2011-06-08 23:59:15.371244000 +0200
2	+++ Makefile.in 2011-07-11 16:37:49.000000000 -0400	2	+++ Makefile.in 2011-07-12 12:43:03.500532970 +0200
		3	@@ -642,9 +642,9 @@
		4	@ENABLE_PLUGIN_TRUE@ ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir)
		5	@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
		6	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
		7	- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
		8	+ ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
		9	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
		10	- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
		11	+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
		12
		13	install-data-local:
		14	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
3	@@ -758,7 +758,7 @@	15	@@ -758,7 +758,7 @@
4		16
5	netx-source-files.txt:	17	netx-source-files.txt: