From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 18:22:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97C386A1; Tue, 12 Nov 2013 18:22:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6CD902AE5; Tue, 12 Nov 2013 18:22:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACIM6i5051715; Tue, 12 Nov 2013 18:22:06 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACIM6Jv051714; Tue, 12 Nov 2013 18:22:06 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201311121822.rACIM6Jv051714@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 12 Nov 2013 18:22:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333597 - head/java/icedtea-web X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 18:22:06 -0000 Author: jkim Date: Tue Nov 12 18:22:05 2013 New Revision: 333597 URL: http://svnweb.freebsd.org/changeset/ports/333597 Log: - Support staging. - Convert to use USES=webplugin:native. - Remove an article from comment. Modified: head/java/icedtea-web/Makefile Modified: head/java/icedtea-web/Makefile ============================================================================== --- head/java/icedtea-web/Makefile Tue Nov 12 18:18:38 2013 (r333596) +++ head/java/icedtea-web/Makefile Tue Nov 12 18:22:05 2013 (r333597) @@ -2,13 +2,13 @@ PORTNAME= icedtea-web PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= http://icedtea.wildebeest.org/download/source/ \ http://icedtea.classpath.org/download/source/ MAINTAINER= java@FreeBSD.org -COMMENT= A free Java plug-in and Java Web Start for OpenJDK +COMMENT= Free Java plug-in and Java Web Start for OpenJDK LICENSE= GPLv2 @@ -23,7 +23,7 @@ JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= x11 -USES= gmake pkgconfig shebangfix perl5 +USES= gmake perl5 pkgconfig shebangfix SHEBANG_FILES= javac.in jrunscript.in WANT_GNOME= yes @@ -32,8 +32,8 @@ EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= | ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} -xf - -MAN1= itweb-javaws.1 PLIST_FILES= bin/itweb-javaws bin/itweb-settings \ + man/man1/itweb-javaws.1.gz \ share/applications/itweb-javaws.desktop \ share/applications/itweb-settings.desktop \ share/pixmaps/itweb-javaws.png @@ -50,7 +50,6 @@ PLUGIN_DESC= Enable the browser plug-in RHINO_DESC= Add support for Proxy Auto Config files TEST_DESC= Add support for running regression test -NO_STAGE= yes .include .if empty(PORT_OPTIONS:MDOCS) @@ -60,15 +59,13 @@ CONFIGURE_ARGS+=--disable-docs .if ${PORT_OPTIONS:MPLUGIN} USE_GECKO= libxul USE_GNOME= glib20 -USE_WEBPLUGINS= native -WEBPLUGINS_DIR= ${PREFIX}/lib -WEBPLUGINS_FILES=IcedTeaPlugin.so +USES+= webplugin:native +WEBPLUGIN_DIR= ${PREFIX}/lib +WEBPLUGIN_FILES=IcedTeaPlugin.so PLIST_FILES+= lib/IcedTeaPlugin.so PORTDATA+= plugin.jar PORTDOCS+= plugin - -.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .else CONFIGURE_ARGS+=--disable-plugin .endif @@ -117,10 +114,10 @@ post-build: .endif post-install: - ${MKDIR} ${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/*.desktop ${DESKTOPDIR} + ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/javaws.png \ - ${PREFIX}/share/pixmaps/itweb-javaws.png + ${STAGEDIR}${PREFIX}/share/pixmaps/itweb-javaws.png .if ${PORT_OPTIONS:MTEST} test: build