Changeset 14714 for trunk/dports

Timestamp:

Oct 19, 2005, 8:48:34 PM (19 years ago)

Author:

mww

Message:

remove - now useless - variants from emacs, create emacs-devel which fetches sources from cvs and has fancy variants (carbin, gtk)

Location:

trunk/dports/editors

Files:

• emacs-devel (added)
• emacs-devel/Portfile (added)
• emacs-devel/files (added)
• emacs-devel/files/patch-src-s-darwin.h (added)
• emacs/Portfile (modified) (4 diffs)

trunk/dports/editors/emacs/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.43 2005/10/11 07:10:07 mww Exp $
+# $Id: Portfile,v 1.44 2005/10/19 20:48:34 mww Exp $
 
 PortSystem 1.0
 name            emacs
 version         21.4a
+revision        1
 categories      editors
 maintainers     darwinports@opendarwin.org
@@ -15 +16 @@
 master_sites    gnu
 checksums       md5 8f9d97cbd126121bd5d97e5e31168a87
-configure.args  --without-x
+configure.args  --without-x --without-carbon
 destroot.args   prefix=${destroot}/${prefix}
-patchfiles      patch-src-xterm.c
 
 worksrcdir      emacs-21.4
+
+patch.pre_args  -p1
+patchfiles      patch-src-xterm.c apple-patches ange-ftp.el.diff
 
 configure.env   \
@@ -42 +45 @@
 }
 
-variant darwin {
-        patchfiles-append       apple-patches ange-ftp.el.diff
-        patch.pre_args  -p1
-}
-
 variant x11 {
         configure.args --with-x --with-x-toolkit=lucid --without-carbon \
@@ -55 +53 @@
 }
 
-variant gtk requires devel x11 {
-        configure.args-append --with-x-toolkit=gtk
-        depends_lib-append  lib:libgtk.2:gtk2 lib:libglib.2:glib2
+platform darwin 8 {
+        configure.env-append    CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
 }
 
-# Overrides darwin
-variant carbon requires devel conflicts x11 {
-        configure.args-append   --with-carbon --enable-carbon-app=${destroot}/Applications/DarwinPorts
-        patchfiles-delete       patch-src-xterm-devel.c
-        version 22.0.50.1
-}