Date: Sat, 22 Sep 2012 10:47:03 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1027 - in trunk: Mk www/libxul www/libxul-esr Message-ID: <201209221047.q8MAl3xI045024@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep 22 10:47:03 2012
New Revision: 1027
Log:
backout r1010, it was part of a failed idea to unify patches
Replaced:
trunk/www/libxul/
- copied from r1026, trunk/www/libxul-esr/
Deleted:
trunk/www/libxul-esr/
Modified:
trunk/Mk/bsd.gecko.mk
trunk/www/libxul/Makefile
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sat Sep 22 09:45:26 2012 (r1026)
+++ trunk/Mk/bsd.gecko.mk Sat Sep 22 10:47:03 2012 (r1027)
@@ -14,7 +14,7 @@
# WITH_GECKO= libxul
#
# The valid backends are:
-# libxul libxul-esr libxul19
+# libxul libxul19
#
# See below for more details.
# ======================= /USERS ================================
@@ -36,7 +36,7 @@
# Users should use the following syntax:
#
-# WITH_GECKO= libxul libxul-esr libxul19
+# WITH_GECKO= libxul libxul19
# Use libxul whenever a port supports it, falling back on libxul19.
# WITH_GECKO= libxul
# Sets your preferred backend. With this example, libxul will always
@@ -47,7 +47,7 @@
#
# Ports should use the following:
#
-# USE_GECKO= libxul libxul-esr libxul19
+# USE_GECKO= libxul libxul19
# 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
@@ -59,7 +59,7 @@
# if ${GECKO}=="libxul19"
#
# Example:
-# USE_GECKO= libxul libxul-esr libxul19
+# USE_GECKO= libxul libxul19
#
# post-patch:
# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
@@ -69,7 +69,7 @@
# has been chosen.
#
# Example:
-# USE_GECKO= libxul libxul-esr libxul19
+# USE_GECKO= libxul libxul19
#
# post-patch:
# .if ${GECKO}=="libxul19"
@@ -77,10 +77,9 @@
# ${MOZSRC}/configure
# .endif
-_GECKO_ALL= libxul libxul-esr libxul19
+_GECKO_ALL= libxul libxul19
libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so
-libxul-esr_PLIST= ${LOCALBASE}/lib/libxul/libxul.so
libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so
.for gecko in ${_GECKO_ALL}
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul-esr/Makefile Sat Sep 22 09:45:26 2012 (r1026)
+++ trunk/www/libxul/Makefile Sat Sep 22 10:47:03 2012 (r1027)
@@ -22,8 +22,7 @@
unzip:${PORTSDIR}/archivers/unzip
WRKSRC= ${WRKDIR}/mozilla-esr10
-LATEST_LINK= libxul-esr
-CONFLICTS= mozilla-[0-9]* libxul-1.9.* libxul-16.*
+CONFLICTS= mozilla-[0-9]* libxul-1.9.*
USE_AUTOTOOLS= autoconf213:env
WANT_GNOME= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209221047.q8MAl3xI045024>