[76839] trunk/dports/devel/ncurses

jmr at macports.org jmr at macports.org
Wed Mar 9 23:11:46 PST 2011


Revision: 76839
          http://trac.macports.org/changeset/76839
Author:   jmr at macports.org
Date:     2011-03-09 23:11:45 -0800 (Wed, 09 Mar 2011)
Log Message:
-----------
ncurses: build wide libs as 'ncurses' like apple does and link to ncursesw instead of vice versa, and add missing link to ncurses5-config (#28725)

Modified Paths:
--------------
    trunk/dports/devel/ncurses/Portfile

Added Paths:
-----------
    trunk/dports/devel/ncurses/files/configure.diff

Modified: trunk/dports/devel/ncurses/Portfile
===================================================================
--- trunk/dports/devel/ncurses/Portfile	2011-03-10 06:00:13 UTC (rev 76838)
+++ trunk/dports/devel/ncurses/Portfile	2011-03-10 07:11:45 UTC (rev 76839)
@@ -4,6 +4,7 @@
 
 name            ncurses
 version         5.8
+revision        1
 categories      devel
 platforms       darwin freebsd
 license         MIT
@@ -27,7 +28,7 @@
 depends_build   port:ncursesw
 
 # from http://www.opensource.apple.com/source/ncurses/ncurses-27/patches/
-patchfiles      hex.diff ungetch_guard.diff
+patchfiles      hex.diff ungetch_guard.diff configure.diff
 
 configure.cppflags
 configure.ldflags
@@ -58,14 +59,13 @@
 post-destroot {
     set major [lindex [split $version .] 0]
     foreach f {form menu ncurses panel} {
-        ln -s lib${f}w.${major}.dylib ${destroot}${prefix}/lib/lib${f}.dylib
-        ln -s lib${f}w.${major}.dylib ${destroot}${prefix}/lib/lib${f}.${major}.dylib
-        ln -s lib${f}w.a ${destroot}${prefix}/lib/lib${f}.a
-        ln -s ${f}w.pc ${destroot}${prefix}/lib/pkgconfig/${f}.pc
+        ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.dylib
+        ln -s lib${f}.${major}.dylib ${destroot}${prefix}/lib/lib${f}w.${major}.dylib
+        ln -s lib${f}.a ${destroot}${prefix}/lib/lib${f}w.a
+        ln -s ${f}.pc ${destroot}${prefix}/lib/pkgconfig/${f}w.pc
     }
-    ln -s libncurses++w.a ${destroot}${prefix}/lib/libncurses++.a
-    ln -s ncurses++w.pc ${destroot}${prefix}/lib/pkgconfig/ncurses++.pc
-    ln -s libncursesw.${major}.dylib ${destroot}${prefix}/lib/libcurses.dylib
-    ln -s libncursesw.a ${destroot}${prefix}/lib/libcurses.a
-    ln -s libncursesw.${major}.dylib ${destroot}${prefix}/lib/libtermcap.dylib
+    ln -s libncurses++.a ${destroot}${prefix}/lib/libncurses++w.a
+    ln -s ncurses++.pc ${destroot}${prefix}/lib/pkgconfig/ncurses++w.pc
+    ln -s libncurses.${major}.dylib ${destroot}${prefix}/lib/libtermcap.dylib
+    ln -s ncurses5-config ${destroot}${prefix}/bin/ncursesw5-config
 }

Added: trunk/dports/devel/ncurses/files/configure.diff
===================================================================
--- trunk/dports/devel/ncurses/files/configure.diff	                        (rev 0)
+++ trunk/dports/devel/ncurses/files/configure.diff	2011-03-10 07:11:45 UTC (rev 76839)
@@ -0,0 +1,10 @@
+--- configure.orig	2011-02-21 12:40:36.000000000 +1100
++++ configure	2011-03-10 17:38:29.000000000 +1100
+@@ -7813,7 +7813,6 @@
+ echo "$as_me:7813: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+-	LIB_SUFFIX="w${LIB_SUFFIX}"
+ 	cat >>confdefs.h <<\EOF
+ #define USE_WIDEC_SUPPORT 1
+ EOF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110309/e22ed1f4/attachment.html>


More information about the macports-changes mailing list