[73351] trunk/dports/editors/emacs/Portfile

[dports at macports.org]

Revision: 73351
          http://trac.macports.org/changeset/73351
Author:   dports at macports.org
Date:     2010-11-10 14:30:01 -0800 (Wed, 10 Nov 2010)
Log Message:
-----------
emacs: fix up dependencies
 * add missing dependencies
 * explicitly disable some libraries so they are not autodetected if
   they happen to be installed
 * enable dbus by default; enable gconf for +gtk variant only
 * remove --without-carbon conf flag (does not exist in emacs 23)
 * switch to port: instead of lib: dependencies

Modified Paths:
--------------
    trunk/dports/editors/emacs/Portfile

Modified: trunk/dports/editors/emacs/Portfile
===================================================================
--- trunk/dports/editors/emacs/Portfile	2010-11-10 21:31:31 UTC (rev 73350)
+++ trunk/dports/editors/emacs/Portfile	2010-11-10 22:30:01 UTC (rev 73351)
@@ -6,7 +6,7 @@
 
 name            emacs
 version         23.2
-revision        2
+revision        3
 
 categories      editors
 maintainers     dports openmaintainer
@@ -28,15 +28,17 @@
                 rmd160  6d25f8d12cfa23e413ea353933ed871a3d3aa08e
 
 configure.args  --without-x \
-                --without-carbon \
+                --with-dbus \
+                --without-gconf \
+                --without-libotf \
+                --without-m17n-flt \
+                --without-gpm \
                 --infodir ${prefix}/share/info/${name}
 
-configure.args-append \
-    --without-dbus \
-    --without-gconf
+depends_lib     port:ncurses \
+                port:dbus \
+                port:texinfo
 
-depends_lib     port:ncurses
-
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/emacs/${version}/leim
     delete ${destroot}${prefix}/bin/ctags
@@ -51,21 +53,22 @@
     configure.args-delete   --without-x
     configure.args-append   --with-x-toolkit=lucid \
                             --without-xaw3d \
-                            --without-carbon \
                             --with-xpm \
                             --with-jpeg \
                             --with-tiff \
                             --with-gif \
                             --with-png \
-                            --with-rsvg
+                            --with-rsvg \
+                            --with-xft 
     depends_lib-append      port:xorg-libXmu \
                             port:xorg-libXaw \
                             port:xpm \
-                            lib:libjpeg:jpeg \
-                            lib:libtiff:tiff \
-                            path:include/gif_lib.h:giflib \
-                            lib:libpng:libpng \
-                            lib:librsvg:librsvg
+                            port:jpeg \
+                            port:tiff \
+                            port:giflib \
+                            port:libpng \
+                            port:librsvg \
+                            port:Xft2            
 }
 
 variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
@@ -76,7 +79,10 @@
 
 variant gtk requires x11 description {Builds emacs as an X11 program with GTK+2 widgets} {
     configure.args-delete   --with-x-toolkit=lucid
+    configure.args-delete   --without-gconf
     configure.args-append   --with-x-toolkit=gtk
-    depends_lib-append      lib:libgtk.2:gtk2 \
-                            lib:libglib.2:glib2
+    configure.args-append   --with-gconf
+    depends_lib-append      port:gtk2 \
+                            port:glib2 \
+                            port:gconf
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101110/1b36f002/attachment.html>