Changeset 79514

Timestamp:

06/16/11 00:05:37 (4 years ago)

Author:

jeremyhu@…

Message:

firefox-x11-devel: Use internal dependencies by default. Keep a +external_dependencies variant for the -devel port

File:

• trunk/dports/www/firefox-x11-devel/Portfile (modified) (6 diffs)

trunk/dports/www/firefox-x11-devel/Portfile

@@ -40 +40 @@
 
 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
-
-if {[variant_isset internal_dependencies]} {
-        set pkg_name ${name}-standalone
-} else {
-        set pkg_name ${component}-x11
-}
+set pkg_name ${name}
 
 configure.args \
@@ -64 +73 @@
         --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 \
@@ -159 +160 @@
 }
 
-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} \
@@ -174 +175 @@
         --enable-system-sqlite
 
-    configure.args-append \
+    configure.args-delete \
         --enable-libxul \
         --disable-system-lcms \
@@ -180 +181 @@
         --disable-system-sqlite       
 
+    depends_lib-append \
+        port:xulrunner-devel
+
     depends_lib-delete \
-        port:xulrunner-devel
-
-    depends_lib-append \
         port:heimdal \
         port:gconf \
@@ -194 +195 @@
         port:libnotify
 
-    archcheck.files-append \
+    archcheck.files-delete \
         libexec/heimdal/lib/libkrb5.dylib \
         lib/libcanberra.dylib \