[76622] trunk/dports/devel
jmr at macports.org
jmr at macports.org
Wed Mar 2 14:14:45 PST 2011
Revision: 76622
http://trac.macports.org/changeset/76622
Author: jmr at macports.org
Date: 2011-03-02 14:14:45 -0800 (Wed, 02 Mar 2011)
Log Message:
-----------
ncurses: update to 5.8, stop using separate ncursesw, install with standard names and locations (#12605)
Modified Paths:
--------------
trunk/dports/devel/ncurses/Portfile
trunk/dports/devel/ncurses/files/ungetch_guard.diff
trunk/dports/devel/ncursesw/Portfile
Added Paths:
-----------
trunk/dports/devel/ncurses/files/hex.diff
Removed Paths:
-------------
trunk/dports/devel/ncursesw/files/
Modified: trunk/dports/devel/ncurses/Portfile
===================================================================
--- trunk/dports/devel/ncurses/Portfile 2011-03-02 21:48:51 UTC (rev 76621)
+++ trunk/dports/devel/ncurses/Portfile 2011-03-02 22:14:45 UTC (rev 76622)
@@ -3,8 +3,7 @@
PortSystem 1.0
name ncurses
-version 5.7
-revision 1
+version 5.8
categories devel
platforms darwin freebsd
license MIT
@@ -20,45 +19,30 @@
homepage http://www.gnu.org/software/ncurses/ncurses.html
master_sites gnu
-checksums md5 cce05daf61a64501ef6cd8da1f727ec6 \
- sha1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 \
- rmd160 a19ca026d32255f5a4d22eb006d65182041e0234
+checksums md5 20ed3fa7599937f0ca268d9088837a64 \
+ sha1 8e38c591667be8d39840dc2c4e1e897da230f155 \
+ rmd160 d0fbbafae56b9df4540cfe12359935b703508295
-# required for terminfo
-depends_run port:ncursesw
+# needs to be upgraded first to avoid conflicting files
+depends_build port:ncursesw
# from http://www.opensource.apple.com/source/ncurses/ncurses-27/patches/
-patchfiles ungetch_guard.diff
+patchfiles hex.diff ungetch_guard.diff
configure.cppflags
configure.ldflags
-configure.args --with-shared \
- --disable-rpath \
+configure.args --enable-widec \
+ --enable-overwrite \
+ --with-shared \
--without-debug \
--without-ada \
- --enable-safe-sprintf \
--enable-sigwinch \
- --without-progs \
- --mandir=${prefix}/share/delete-me \
- --with-manpage-format=normal
+ --mandir=${prefix}/share/man \
+ --with-manpage-format=normal \
+ --enable-pc-files \
+ --enable-symlinks
+# using symlinks because of ticket #13601
-platform darwin 10 {
- configure.args-delete --enable-safe-sprintf
-}
-platform darwin 11 {
- configure.args-delete --enable-safe-sprintf
-}
-
-post-destroot {
- # terminfo & manpages also do come with ncursesw
- delete ${destroot}${prefix}/lib/terminfo ${destroot}${prefix}/share
-}
-
-platform freebsd {
- depends_build-append lib:libncursesw:ncursesw
- destroot.env-append LD_LIBRARY_PATH=${prefix}/lib
-}
-
if {[variant_isset universal]} {
configure.args-append --with-chtype=int
@@ -70,3 +54,18 @@
}
use_parallel_build yes
+
+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 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
+}
Copied: trunk/dports/devel/ncurses/files/hex.diff (from rev 76616, trunk/dports/devel/ncursesw/files/hex.diff)
===================================================================
--- trunk/dports/devel/ncurses/files/hex.diff (rev 0)
+++ trunk/dports/devel/ncurses/files/hex.diff 2011-03-02 22:14:45 UTC (rev 76622)
@@ -0,0 +1,21 @@
+diff -Nru ./misc/terminfo.src ../ncurses-5.4+hex/misc/terminfo.src
+--- ./misc/terminfo.src 2004-01-17 17:37:18.000000000 -0800
++++ ../ncurses-5.4+hex/misc/terminfo.src 2004-11-27 15:10:30.000000000 -0800
+@@ -5754,7 +5754,7 @@
+ # hp2621 with function labels. Most of the time they are off,
+ # but inside vi, the function key labels appear. You have to
+ # hold down shift to get them to xmit.
+-hp2621|hp2621a|hp2621A|2621|2621a|2621A|hp2621-wl|2621-wl|hp 2621 w/labels,
++hp2621|hp2621a|2621|2621a|hp2621-wl|2621-wl|hp 2621 w/labels,
+ is2=\E&jA\r, rmkx=\E&jA, use=hp2621-fl,
+ hp2621-fl|hp 2621,
+ xhp@, xon,
+@@ -6247,7 +6247,7 @@
+ ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
+ sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
+ smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
+-hp70092|hp70092a|hp70092A|HP 700/92,
++hp70092|hp70092a|HP 700/92,
+ am, da, db, xhp,
+ cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
+ acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
Modified: trunk/dports/devel/ncurses/files/ungetch_guard.diff
===================================================================
--- trunk/dports/devel/ncurses/files/ungetch_guard.diff 2011-03-02 21:48:51 UTC (rev 76621)
+++ trunk/dports/devel/ncurses/files/ungetch_guard.diff 2011-03-02 22:14:45 UTC (rev 76622)
@@ -1,9 +1,9 @@
---- ncurses/base/lib_ungetch.c 2002-08-24 15:08:48.000000000 -0700
-+++ ncurses/base/lib_ungetch.c 2008-03-25 13:49:35.000000000 -0700
-@@ -61,6 +61,10 @@
- {
- int rc = ERR;
+--- ncurses/base/lib_ungetch.c.orig 2009-10-25 09:12:21.000000000 +1100
++++ ncurses/base/lib_ungetch.c 2011-03-03 08:00:06.000000000 +1100
+@@ -64,6 +64,10 @@ safe_ungetch(SCREEN *sp, int ch)
+ T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+
+ if (!sp) {
+ returnCode(ERR);
+ }
Modified: trunk/dports/devel/ncursesw/Portfile
===================================================================
--- trunk/dports/devel/ncursesw/Portfile 2011-03-02 21:48:51 UTC (rev 76621)
+++ trunk/dports/devel/ncursesw/Portfile 2011-03-02 22:14:45 UTC (rev 76622)
@@ -3,59 +3,23 @@
PortSystem 1.0
name ncursesw
-version 5.7
-revision 1
+version 5.8
categories devel
platforms darwin freebsd
license MIT
-maintainers jmr openmaintainer
-description emulation of curses in System V Release 4.0
-long_description The Ncurses (new curses) library is a free software \
- emulation of curses in System V Release 4.0, and more. It uses \
- Terminfo format, supports pads and color and multiple \
- highlights and forms characters and function-key mapping, and \
- has all the other SYSV-curses enhancements over BSD Curses. \
- This library offers wide-character/UTF-8 support.
+maintainers nomaintainer
+description stub port, use ncurses instead
+long_description $name is a stub port. Its functionality has been \
+ incorporated into ncurses.
homepage http://www.gnu.org/software/ncurses/ncurses.html
-master_sites gnu:ncurses
-distname ncurses-${version}
-dist_subdir ncurses
+distfiles
-checksums md5 cce05daf61a64501ef6cd8da1f727ec6 \
- sha1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 \
- rmd160 a19ca026d32255f5a4d22eb006d65182041e0234
-
-# from http://www.opensource.apple.com/source/ncurses/ncurses-27/patches/
-patchfiles hex.diff ungetch_guard.diff
-
-configure.cppflags
-configure.ldflags
-configure.args --enable-widec \
- --disable-rpath \
- --with-shared \
- --without-debug \
- --without-ada \
- --enable-safe-sprintf \
- --enable-sigwinch \
- --mandir=${prefix}/share/man \
- --with-manpage-format=normal
-
-platform darwin 10 {
- configure.args-delete --enable-safe-sprintf
+supported_archs noarch
+use_configure no
+build {}
+destroot {
+ xinstall -d ${destroot}${prefix}/share/doc/${name}
+ system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
}
-platform darwin 11 {
- configure.args-delete --enable-safe-sprintf
-}
-
-if {[variant_isset universal]} {
- configure.args-append --with-chtype=int
-
- # check that this doesn't start breaking anything with new versions
- post-configure {
- reinplace s/1UL/1U/g "${worksrcpath}/include/curses.head"
- system "cd ${worksrcpath} && ed - include/curses.head < ${filespath}/include_curses.head.ed"
- }
-}
-
-use_parallel_build yes
+livecheck.type none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110302/a5846700/attachment-0001.html>
More information about the macports-changes
mailing list