[41010] trunk/dports/x11/xterm

[blb at macports.org]

Revision: 41010
          http://trac.macports.org/changeset/41010
Author:   blb at macports.org
Date:     2008-10-20 14:58:19 -0700 (Mon, 20 Oct 2008)
Log Message:
-----------
x11/xterm - version bump to 237, fix build problem concerning fd_mask (ticket
#14016), and correct dependencies (patching configure so it sees MacPorts'
before stuff in /usr/X11)

Modified Paths:
--------------
    trunk/dports/x11/xterm/Portfile

Added Paths:
-----------
    trunk/dports/x11/xterm/files/
    trunk/dports/x11/xterm/files/patch-configure.diff
    trunk/dports/x11/xterm/files/patch-xterm.h.diff

Modified: trunk/dports/x11/xterm/Portfile
===================================================================
--- trunk/dports/x11/xterm/Portfile	2008-10-20 21:55:22 UTC (rev 41009)
+++ trunk/dports/x11/xterm/Portfile	2008-10-20 21:58:19 UTC (rev 41010)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                xterm
-version             236
+version             237
 categories          x11
 platforms           darwin
 maintainers         nomaintainer
@@ -14,14 +14,17 @@
 
 homepage            http://invisible-island.net/xterm/
 master_sites        ftp://invisible-island.net/xterm/
-checksums           md5     204288c9de867679fc8201f4fb153772 \
-                    sha1    5219f67149d223b214c4e2353fb970ed95e58c76 \
-                    rmd160  fd5738cf4ec979d92e843c9d6f3a02279a02ade3
+checksums           md5     6d5f9e124fd3e09487f47c66da8c7345 \
+                    sha1    50ecf5b2c2ed3abd3d1bcdcfe476e9c485723084 \
+                    rmd160  3e64296f5526dc00024f68695078f90ea9b6550c
 extract.suffix      .tgz
 
-depends_lib         lib:libX11.6:XFree86 \
-                    port:ncurses
+depends_lib         lib:libX11.6:XFree86 port:ncurses port:Xft2 \
+                    port:xrender port:fontconfig port:expat port:freetype \
+                    port:zlib
 
+patchfiles          patch-configure.diff patch-xterm.h.diff
+
 configure.args      --mandir=${prefix}/share/man
 
 # If -ltermcap stays in the LDFLAGS, xterm is linked against both
@@ -33,3 +36,4 @@
 livecheck.check     regex
 livecheck.url       ${master_sites}
 livecheck.regex     "${name}\\.tar\\.gz -> ${name}-(\\d+)\\.tgz"
+

Added: trunk/dports/x11/xterm/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/xterm/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/x11/xterm/files/patch-configure.diff	2008-10-20 21:58:19 UTC (rev 41010)
@@ -0,0 +1,11 @@
+--- configure.orig	2008-07-27 09:26:49.000000000 -0600
++++ configure	2008-10-20 15:52:07.000000000 -0600
+@@ -7994,7 +7994,7 @@
+ 
+ cf_have_X_LIBS=no
+ 
+-LDFLAGS="$X_LIBS $LDFLAGS"
++LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 

Added: trunk/dports/x11/xterm/files/patch-xterm.h.diff
===================================================================
--- trunk/dports/x11/xterm/files/patch-xterm.h.diff	                        (rev 0)
+++ trunk/dports/x11/xterm/files/patch-xterm.h.diff	2008-10-20 21:58:19 UTC (rev 41010)
@@ -0,0 +1,11 @@
+--- xterm.h.orig	2007-07-22 22:14:48.000000000 +0200
++++ xterm.h	2008-01-21 12:10:49.000000000 +0100
+@@ -280,7 +280,7 @@
+ #include <proto.h>
+ #include <ptyx.h>
+ 
+-#if (XtSpecificationRelease >= 6) && !defined(NO_XPOLL_H) && !defined(sun)
++#if (XtSpecificationRelease >= 6) && !defined(NO_XPOLL_H) && !defined(sun) && !defined(__APPLE__)
+ #include <X11/Xpoll.h>
+ #define USE_XPOLL_H 1
+ #else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081020/9bc520f1/attachment.html