[79514] trunk/dports/www/firefox-x11-devel/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Thu Jun 16 00:05:38 PDT 2011


Revision: 79514
          http://trac.macports.org/changeset/79514
Author:   jeremyhu at macports.org
Date:     2011-06-16 00:05:37 -0700 (Thu, 16 Jun 2011)
Log Message:
-----------
firefox-x11-devel: Use internal dependencies by default.  Keep a +external_dependencies variant for the -devel port

Modified Paths:
--------------
    trunk/dports/www/firefox-x11-devel/Portfile

Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile	2011-06-16 06:50:08 UTC (rev 79513)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2011-06-16 07:05:37 UTC (rev 79514)
@@ -39,20 +39,29 @@
 	port:yasm
 
 depends_lib \
-	port:xulrunner-devel
+	port:heimdal \
+	port:gconf \
+	port:esound \
+	port:libcanberra \
+	port:findutils \
+	port:gtk2 \
+	port:mesa \
+	port:xorg-libXt \
+	port:libnotify
 
+archcheck.files \
+	libexec/heimdal/lib/libkrb5.dylib \
+	lib/libcanberra.dylib \
+	lib/libgconf-2.dylib \
+	lib/libgtk-x11-2.0.dylib \
+	lib/libnotify.dylib \
+	lib/libXt.dylib
+
 use_autoconf yes
 autoconf.cmd autoconf213
 
-# Too many problems and headaches trying to get the external deps working right
-default_variants +internal_dependencies
+set pkg_name ${name}
 
-if {[variant_isset internal_dependencies]} {
-	set pkg_name ${name}-standalone
-} else {
-	set pkg_name ${component}-x11
-}
-
 configure.args \
 	--with-xulrunner-stub-name=xulrunner-stub \
 	--disable-static \
@@ -63,18 +72,10 @@
 	--enable-default-toolkit=cairo-gtk2 \
 	--x-includes=${prefix}/include \
 	--x-libraries=${prefix}/lib \
-	--with-system-nspr \
-	--with-nspr-prefix=${prefix} \
-	--with-system-nss \
-	--with-nss-prefix=${prefix} \
-	--with-system-libxul \
-	--with-libxul-sdk=${prefix}/lib/xulrunner-devel \
-	--with-system-bzip2=${prefix} \
-	--with-system-jpeg=${prefix} \
-	--with-system-zlib=${prefix} \
-	--enable-system-lcms \
-	--enable-system-cairo \
-	--enable-system-sqlite \
+	--enable-libxul \
+	--disable-system-lcms \
+	--disable-system-cairo \
+	--disable-system-sqlite \
 	--with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \
 	--enable-oji \
 	--enable-plugins \
@@ -158,8 +159,8 @@
 	--enable-official-branding
 }
 
-variant internal_dependencies description {Use internal versions of nspr, nss, and xulrunner} {
-    configure.args-delete \
+variant external_dependencies description {Use external versions of nspr and nss} {
+    configure.args-append \
 	--with-system-nspr \
 	--with-nspr-prefix=${prefix} \
 	--with-system-nss \
@@ -173,16 +174,16 @@
 	--enable-system-cairo \
 	--enable-system-sqlite
 
-    configure.args-append \
+    configure.args-delete \
 	--enable-libxul \
 	--disable-system-lcms \
 	--disable-system-cairo \
 	--disable-system-sqlite       
 
-    depends_lib-delete \
+    depends_lib-append \
 	port:xulrunner-devel
 
-    depends_lib-append \
+    depends_lib-delete \
 	port:heimdal \
 	port:gconf \
 	port:esound \
@@ -193,7 +194,7 @@
 	port:xorg-libXt \
 	port:libnotify
 
-    archcheck.files-append \
+    archcheck.files-delete \
         libexec/heimdal/lib/libkrb5.dylib \
         lib/libcanberra.dylib \
         lib/libgconf-2.dylib \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110616/4627b61e/attachment.html>


More information about the macports-changes mailing list