[SVN-Commit] r774 - in branches/experimental: Mk www/libxul www/libxul19

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jun 18 20:32:10 2012
New Revision: 774

Log:
libxul19: connect and conflict

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/libxul19/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Mon Jun 18 14:17:27 2012	(r773)
+++ branches/experimental/Mk/bsd.gecko.mk	Mon Jun 18 20:32:10 2012	(r774)
@@ -14,7 +14,7 @@
 # WITH_GECKO=	libxul
 #
 # The valid backends are:
-# libxul
+# libxul libxul19
 #
 # See below for more details.
 # ======================= /USERS ================================
@@ -80,9 +80,10 @@
 #		${MOZSRC}/configure
 #  .endif
 
-_GECKO_ALL=	libxul
+_GECKO_ALL=	libxul libxul19
 
 libxul_PLIST=		${LOCALBASE}/lib/libxul/libxul.so
+libxul19_PLIST=		${LOCALBASE}/lib/libxul/libxul.so
 
 .for gecko in ${_GECKO_ALL}
 ${gecko}_PORTSDIR?=	www

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Mon Jun 18 14:17:27 2012	(r773)
+++ branches/experimental/www/libxul/Makefile	Mon Jun 18 20:32:10 2012	(r774)
@@ -21,7 +21,7 @@
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 WRKSRC=		${WRKDIR}/mozilla-release
-CONFLICTS=	mozilla-[0-9]*
+CONFLICTS=	mozilla-[0-9]* libxul-1.9.*
 
 USE_AUTOTOOLS=	autoconf213:env
 WANT_GNOME=	yes

Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile	Mon Jun 18 14:17:27 2012	(r773)
+++ branches/experimental/www/libxul19/Makefile	Mon Jun 18 20:32:10 2012	(r774)
@@ -16,7 +16,7 @@
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
 WRKSRC=		${WRKDIR}/mozilla-1.9.2
-CONFLICTS=	mozilla-[0-9]*
+CONFLICTS=	mozilla-[0-9]* libxul-[0-9][0-9].*
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib