[SVN-Commit] r1386 - in trunk/www: linux-firefox linux-seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Nov 16 05:06:44 2013
New Revision: 1386

Log:
don't replace libxul.so with linux_base-c6

Modified:
   trunk/www/linux-firefox/pkg-plist
   trunk/www/linux-seamonkey/Makefile.common

Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist	Fri Nov 15 20:25:30 2013	(r1385)
+++ trunk/www/linux-firefox/pkg-plist	Sat Nov 16 05:06:44 2013	(r1386)
@@ -37,8 +37,8 @@
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-lib/%%APP_NAME%%/libldap60.so
-lib/%%APP_NAME%%/libldif60.so
+%%REPLACE_GRE%%lib/%%APP_NAME%%/libldap60.so
+%%REPLACE_GRE%%lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/libmozalloc.so
 lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
@@ -49,7 +49,7 @@
 lib/%%APP_NAME%%/libnssutil3.so
 lib/%%APP_NAME%%/libplc4.so
 lib/%%APP_NAME%%/libplds4.so
-lib/%%APP_NAME%%/libprldap60.so
+%%REPLACE_GRE%%lib/%%APP_NAME%%/libprldap60.so
 lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common	Fri Nov 15 20:25:30 2013	(r1385)
+++ trunk/www/linux-seamonkey/Makefile.common	Sat Nov 16 05:06:44 2013	(r1386)
@@ -1,6 +1,11 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD: head/www/linux-seamonkey/Makefile.common 310165 2013-01-09 23:28:19Z flo $
 
+.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
+    ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
+.undef REPLACE_GRE
+.endif
+
 CATEGORIES+=	linux
 MASTER_SITES?=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=		linux-
@@ -28,6 +33,12 @@
 .endif
 DESKTOP_SUFFIX?=	(Linux)
 
+.if defined(REPLACE_GRE)
+PLIST_SUB+=     REPLACE_GRE=""
+.else
+PLIST_SUB+=     REPLACE_GRE="@comment "
+.endif
+
 _A=	>> ${TMPPLIST}
 _Q=	2>/dev/null || true