Attachment 116815 Details for Bug 158826 – ice.diff

[patch] ice.diff

ice.diff (text/x-diff; charset=us-ascii), 2.45 KB, created by Guido Falsi on 2011-07-12 11:53:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2011-07-12 11:53:26 UTC

Size: 2.45 KB

patch

obsolete

>diff -ruN icedtea-web.old/Makefile icedtea-web/Makefile
>--- icedtea-web.old/Makefile	2011-07-12 12:49:34.017275844 +0200
>+++ icedtea-web/Makefile	2011-07-12 12:49:54.507304408 +0200
>@@ -2,7 +2,7 @@
> # Date created:		July 11, 2011
> # Whom:			Jung-uk Kim <jkim@FreeBSD.org>
> #
>-# $FreeBSD: ports/java/icedtea-web/Makefile,v 1.3 2011/07/11 23:13:16 jkim Exp $
>+# $FreeBSD: ports/java/icedtea-web/Makefile,v 1.1 2011/07/11 20:50:42 jkim Exp $
> #
> 
> PORTNAME=	icedtea-web
>@@ -12,7 +12,6 @@
> 
> MAINTAINER=	java@FreeBSD.org
> COMMENT=	A free Java plug-in and Java Web Start for OpenJDK
>-LICENSE=	GPLv2
> 
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
>@@ -21,7 +20,7 @@
> USE_XORG=	x11
> 
> OPTIONS=	PLUGIN "Enable the browser plug-in" on \
>-		RHINO "Add support for Proxy Auto Config files" off \
>+		RHINO "Enable support for Proxy Auto Config files" off \
> 		TEST "Add support for running regression test" off
> 
> MAN1=		javaws.1
>@@ -65,7 +64,6 @@
> 
> .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
>diff -ruN icedtea-web.old/files/patch-Makefile.in icedtea-web/files/patch-Makefile.in
>--- icedtea-web.old/files/patch-Makefile.in	2011-07-12 12:49:34.016285206 +0200
>+++ icedtea-web/files/patch-Makefile.in	2011-07-12 12:49:54.506304551 +0200
>@@ -1,5 +1,17 @@
>---- Makefile.in.orig	2011-06-08 17:59:15.371244000 -0400
>-+++ Makefile.in	2011-07-11 16:37:49.000000000 -0400
>+--- 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:

Actions: View | Diff

Attachments on bug 158826: 116815