svn commit: r320984 - in head: . Mk audio/tuxguitar deskutils/chmsee deskutils/google-gadgets editors/morla java/icedtea-web misc/xiphos multimedia/gxine net/libproxy-mozjs science/gchemutils www w...

Florian Smeets flo at FreeBSD.org
Sat Jun 15 11:10:39 UTC 2013 

Author: flo
Date: Sat Jun 15 11:10:34 2013
New Revision: 320984
URL: http://svnweb.freebsd.org/changeset/ports/320984

Log:
  - Remove www/libxul19, is has been vulnerable and unsupported upstream for
    quite some time.
  - Switch all remaining consumers to depend on www/libxul
  - Mark ports that don't work with the new libxul BROKEN
  - Mark some old ports DEPRECATED with a reasonable timeout
  
  Approved by:	portmgr (miwi)

Deleted:
  head/www/libxul19/
Modified:
  head/MOVED
  head/Mk/bsd.gecko.mk
  head/audio/tuxguitar/Makefile   (contents, props changed)
  head/deskutils/chmsee/Makefile
  head/deskutils/google-gadgets/Makefile   (contents, props changed)
  head/editors/morla/Makefile
  head/java/icedtea-web/Makefile
  head/misc/xiphos/Makefile
  head/multimedia/gxine/Makefile   (contents, props changed)
  head/net/libproxy-mozjs/Makefile   (contents, props changed)
  head/science/gchemutils/Makefile
  head/www/Makefile
  head/www/gecko-mediaplayer/Makefile
  head/www/gecko-sharp20/Makefile   (contents, props changed)
  head/www/helixplugin/Makefile   (contents, props changed)
  head/www/moonshine/Makefile   (contents, props changed)
  head/www/openvrml/Makefile
  head/www/xpi-conkeror/Makefile   (contents, props changed)
  head/www/xpi-gwt-dev-plugin/Makefile   (contents, props changed)
  head/x11-toolkits/swt-devel/Makefile   (contents, props changed)
  head/x11-toolkits/swt/Makefile   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/MOVED	Sat Jun 15 11:10:34 2013	(r320984)
@@ -4387,3 +4387,4 @@ devel/linuxthreads||2013-06-10|Has expir
 mail/claws-mail-gtkhtml2_viewer|mail/claws-mail-fancy|2013-06-11|Has expired: No longer maintained, please use mail/claws-mail-fancy instead
 mail/claws-mail-cachesaver||2013-06-11|Has expired: No longer maintained by Claws Mail team
 deskutils/contacts||2013-06-13|Has expired: upstream project discontinued for years, upstream sources are gone
+www/libxul19|www/libxul|2013-06-15|Has bee vulnerable for a long time, unsupported upstream

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/Mk/bsd.gecko.mk	Sat Jun 15 11:10:34 2013	(r320984)
@@ -14,7 +14,7 @@
 # WITH_GECKO=	libxul
 #
 # The valid backends are:
-# libxul libxul19
+# libxul
 #
 # See below for more details.
 # ======================= /USERS ================================
@@ -36,8 +36,8 @@ Gecko_Pre_Include=			bsd.gecko.mk
 
 # Users should use the following syntax:
 #
-# WITH_GECKO= libxul libxul19
-#  Use libxul whenever a port supports it, falling back on libxul19.
+# WITH_GECKO= libxul
+#  Use libxul whenever a port supports it
 # WITH_GECKO= libxul
 #  Sets your preferred backend. With this example, libxul will always
 #  be chosen, unless the port doesn't support a libxul backend. In that
@@ -47,19 +47,17 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #
 # Ports should use the following:
 #
-# USE_GECKO= libxul libxul19
+# USE_GECKO= libxul
 #  The list of gecko backends that the port supports. Unless the user
 #  overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
-#  will be the default. In the above example, www/libxul will be used
-#  as a gecko backend unless WITH_GECKO=libxul19 is defined by the
-#  user.
+#  will be the default.
 #
 # USE_GECKO= libxul19<->libxul
 #  This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure
 #  if ${GECKO}=="libxul19"
 #
 #  Example:
-#  USE_GECKO= libxul libxul19
+#  USE_GECKO= libxul
 #
 #  post-patch:
 #	@${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \
@@ -69,7 +67,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #  has been chosen.
 #
 #  Example:
-#  USE_GECKO= libxul libxul19
+#  USE_GECKO= libxul
 #
 #  post-patch:
 #  .if ${GECKO}=="libxul19"
@@ -77,10 +75,9 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #		${MOZSRC}/configure
 #  .endif
 
-_GECKO_ALL=	libxul libxul19
+_GECKO_ALL=	libxul
 
-libxul_PLIST=		libxul>=10
-libxul19_PLIST=		libxul<2
+libxul_PLIST=		libxul>=17
 
 .for gecko in ${_GECKO_ALL}
 ${gecko}_PORTSDIR?=	www

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/audio/tuxguitar/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -29,7 +29,7 @@ MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_
 USES=		pkgconfig
 USE_JAVA=	yes
 USE_ANT=	yes
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.6+

Modified: head/deskutils/chmsee/Makefile
==============================================================================
--- head/deskutils/chmsee/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/deskutils/chmsee/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -10,13 +10,18 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	A viewer for Microsoft Help "CHM" files
 
+BROKEN=		Does not work with newer libxul
+
+DEPRECATED=	Does not work with newer libxul
+EXPIRATION_DATE=	2013-09-01
+
 LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 LICENSE=	GPLv2
 
 USE_GNOME=	gnomehier libglade2
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 USES=		cmake gettext
 CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
 INSTALLS_ICONS=	yes

Modified: head/deskutils/google-gadgets/Makefile
==============================================================================
--- head/deskutils/google-gadgets/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/deskutils/google-gadgets/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -65,7 +65,7 @@ LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR
 .endif
 
 .if ${PORT_OPTIONS:MMOZILLA}
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 .endif
 
 .if ${PORT_OPTIONS:MGTKWEBKIT} && ! ${PORT_OPTIONS:MGTK}

Modified: head/editors/morla/Makefile
==============================================================================
--- head/editors/morla/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/editors/morla/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -45,7 +45,7 @@ post-patch:
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MXULRUNNER}
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 CONFIGURE_ARGS+=	--with-javascript=xulrunner
 .else
 CONFIGURE_ARGS+=	--with-javascript=none

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/java/icedtea-web/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=--disable-docs
 .endif
 
 .if ${PORT_OPTIONS:MPLUGIN}
-USE_GECKO=	libxul libxul19
+USE_GECKO=	libxul
 USE_GNOME=	glib20
 USE_WEBPLUGINS=	native
 WEBPLUGINS_DIR=	${PREFIX}/lib

Modified: head/misc/xiphos/Makefile
==============================================================================
--- head/misc/xiphos/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/misc/xiphos/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -25,9 +25,8 @@ INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgsf
 
 OPTIONS_SINGLE=		BACKEND
-OPTIONS_SINGLE_BACKEND=	GTKHTML LIBXUL WEBKIT
+OPTIONS_SINGLE_BACKEND=	GTKHTML WEBKIT
 GTKHTML_DESC=		Use gtkhtml for rendering
-LIBXUL_DESC=		Use xulrunner for rendering
 WEBKIT_DESC=		Use webkit for rendering (preferred)
 
 OPTIONS_DEFAULT=	WEBKIT
@@ -39,11 +38,6 @@ WAF_CONFIGURE_ARGS=	--backend=webkit
 LIB_DEPENDS=		webkitgtk:${PORTSDIR}/www/webkit-gtk2
 .endif
 
-.if ${PORT_OPTIONS:MLIBXUL}
-WAF_CONFIGURE_ARGS=	--backend=xulrunner
-USE_GECKO=		libxul19
-.endif
-
 .if ${PORT_OPTIONS:MGTKHTML}
 WAF_CONFIGURE_ARGS=	--backend=gtkhtml
 .endif

Modified: head/multimedia/gxine/Makefile
==============================================================================
--- head/multimedia/gxine/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/multimedia/gxine/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -21,7 +21,7 @@ MOZILLA_PLUGIN_DESC=	Mozilla plugin
 USE_XZ=		yes
 USES=        pathfix
 USE_GNOME=	gtk20
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}"

Modified: head/net/libproxy-mozjs/Makefile
==============================================================================
--- head/net/libproxy-mozjs/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/net/libproxy-mozjs/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -12,12 +12,18 @@ PKGNAMESUFFIX=	-mozjs
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Mozilla JavaScript plug-in for libproxy
 
+BROKEN=		Does not work with newer libxul
+
+DEPRECATED=	Does not work with newer libxul
+EXPIRATION_DATE=	2013-09-01
+
+
 LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 
 LIBPROXY_SLAVE=	mozjs
 

Modified: head/science/gchemutils/Makefile
==============================================================================
--- head/science/gchemutils/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/science/gchemutils/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -55,7 +55,8 @@ XUL_DESC=	Build browser plugin (requires
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MXUL}
-USE_GECKO=	libxul19
+BROKEN=		Does not work with newer libxul
+USE_GECKO=	libxul
 CONFIGURE_ARGS+=--enable-mozilla-plugin
 PLIST_SUB+=	XUL=""
 .else

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -398,7 +398,6 @@
     SUBDIR += libmicrohttpd
     SUBDIR += libwww
     SUBDIR += libxul
-    SUBDIR += libxul19
     SUBDIR += lifetype
     SUBDIR += lightsquid
     SUBDIR += lighttpd

Modified: head/www/gecko-mediaplayer/Makefile
==============================================================================
--- head/www/gecko-mediaplayer/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/gecko-mediaplayer/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -25,7 +25,7 @@ CACHE_DESC=	Enable caching of remote med
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 USE_GNOME=	glib20
-USE_GECKO=	libxul libxul19
+USE_GECKO=	libxul
 USE_WEBPLUGINS=	native
 
 WEBPLUGINS_FILES=	${PORTNAME}.so

Modified: head/www/gecko-sharp20/Makefile
==============================================================================
--- head/www/gecko-sharp20/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/gecko-sharp20/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 MAINTAINER=	mono at FreeBSD.org
 COMMENT=	Mono bindings to embed Mozilla
 
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 USE_GNOME=	gtksharp20
 LATEST_LINK=	gecko-sharp20
 GNU_CONFIGURE=	yes

Modified: head/www/helixplugin/Makefile
==============================================================================
--- head/www/helixplugin/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/helixplugin/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -14,11 +14,17 @@ MASTER_SITES=	http://virtual-estates.net
 MAINTAINER=	mi at aldan.algebra.com
 COMMENT=	Browser plugin for Real or Helix Players
 
+BROKEN=		Does not work with newer libxul
+
+DEPRECATED=	Does not work with newer libxul
+EXPIRATION_DATE=	2013-09-01
+
+
 USE_BZIP2	 =	yes
 USE_DOS2UNIX	 =	yes
 MAKEFILE	 =	${FILESDIR}/BSDmakefile
-USE_GECKO	 =	libxul19
-MAKE_ENV	+=	TOP="${WRKSRC}" GECKO=${GECKO:S/19//}
+USE_GECKO	 =	libxul
+MAKE_ENV	+=	TOP="${WRKSRC}" GECKO=${GECKO}
 MAKE_JOBS_UNSAFE =	yes
 
 USE_WEBPLUGINS=	native

Modified: head/www/moonshine/Makefile
==============================================================================
--- head/www/moonshine/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/moonshine/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	moonshine
-# Date created:				May 14 2009
-# Whom:					Florent Thoumie <flz at FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	moonshine
 PORTVERSION=	0.7
@@ -15,11 +11,14 @@ DISTNAME=	abock-${PORTNAME}-${GITCOMMIT}
 MAINTAINER=	mono at FreeBSD.org
 COMMENT=	Windows Media playback through Moonlight and Firefox
 
+DEPRECATED=	Does not work with newer libxul
+EXPIRATION_DATE=	2013-09-01
+
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 GITCOMMIT=	35085a4
 
 USE_GMAKE=	yes
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 USE_AUTOTOOLS=	libtool libtoolize aclocal autoconf autoheader automake
 LIBTOOLIZE_ARGS=	--force --copy --automake
 AUTOMAKE_ARGS=	--gnu --add-missing --force --copy -Wno-portability

Modified: head/www/openvrml/Makefile
==============================================================================
--- head/www/openvrml/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/openvrml/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -36,7 +36,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${JA
 LDFLAGS+=	-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client -pthread
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 
 USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=openvrml.so

Modified: head/www/xpi-conkeror/Makefile
==============================================================================
--- head/www/xpi-conkeror/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/xpi-conkeror/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -18,7 +18,7 @@ MAINTAINER=	ashish at FreeBSD.org
 COMMENT=	A completely keyboard driven browser based on firefox
 
 WRKSRC=	${WRKDIR}/conkeror
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
 
 BUILD_ID=echo -n `whoami`@`hostname`_`date +%s`
 

Modified: head/www/xpi-gwt-dev-plugin/Makefile
==============================================================================
--- head/www/xpi-gwt-dev-plugin/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/www/xpi-gwt-dev-plugin/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -15,7 +15,12 @@ DISTNAME=	gwt-dev-plugin-${PORTVERSION}-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Google Web Toolkit Developer Plugin for Firefox
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul19
+BROKEN=		Does not build
+
+DEPRECATED=	Requires an ancient version of Firefox to build
+EXPIRATION_DATE=	2013-07-15
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
 
 ONLY_FOR_ARCHS=	amd64 i386
 

Modified: head/x11-toolkits/swt-devel/Makefile
==============================================================================
--- head/x11-toolkits/swt-devel/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/x11-toolkits/swt-devel/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -60,7 +60,8 @@ MAKE_GNOME=	make_gnome
 .endif
 
 .if ${PORT_OPTIONS:MMOZILLA}
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
+BROKEN=		Does now work with newer libxul
 PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
 MAKE_MOZILLA=	make_xulrunner
 .endif

Modified: head/x11-toolkits/swt/Makefile
==============================================================================
--- head/x11-toolkits/swt/Makefile	Sat Jun 15 10:45:43 2013	(r320983)
+++ head/x11-toolkits/swt/Makefile	Sat Jun 15 11:10:34 2013	(r320984)
@@ -43,7 +43,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${OUTPUT_JAR
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	CAIRO GNOMEVFS BROWSER
-OPTIONS_DEFAULT=	CAIRO GNOMEVFS BROWSER
+OPTIONS_DEFAULT=	CAIRO GNOMEVFS
 GNOMEVFS_DESC=	Gnome VFS Support
 BROWSER_DESC=	Gecko Browser Support
 
@@ -62,7 +62,8 @@ MAKE_GNOME=	make_gnome
 .endif
 
 .if ${PORT_OPTIONS:MBROWSER}
-USE_GECKO=	libxul19
+USE_GECKO=	libxul
+BROKEN=		Does not build with newer libxul
 PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
 MAKE_MOZILLA=	make_xulrunner
 .endif

More information about the svn-ports-head mailing list