Ticket #12433: ncurses.diff

devel/ncurses/Portfile

@@ -4 +4 @@
 
 name            ncurses
 version         5.6
+revision                1
 categories      devel
 platforms       darwin freebsd
 maintainers     imajes@macports.org
@@ -15 +16 @@
     characters and function-key mapping, and has all the other          \
     SYSV-curses enhancements over BSD Curses.
 
-homepage        http://www.gnu.org/software/ncurses/ncurses.html
+homepage        http://www.gnu.org/software/ncurses/
 master_sites    gnu
 checksums       md5 b6593abe1089d6aab1551c105c9300e3 \
                 sha1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d \
@@ -23 +24 @@
 
 patchfiles      patch-configure
 
-# required for terminfo
-depends_run     port:ncursesw
 
 configure.args  --with-shared \
                 --disable-rpath \
@@ -32 +31 @@
                 --without-ada \
                 --enable-safe-sprintf \
                 --enable-sigwinch \
-                --without-progs \
-                --mandir=${prefix}/share/delete-me
-
-post-destroot {
-    # terminfo & manpages also do come with ncursesw
-    delete ${destroot}${prefix}/lib/terminfo ${destroot}${prefix}/share
-}
-
-platform darwin 8 {
-    configure.env-append    CC=/usr/bin/gcc-4.0 \
-                            CPP=/usr/bin/cpp-4.0 \
-                            CXX=/usr/bin/g++-4.0
-}
-
-platform freebsd {
-    depends_build-append    lib:libncursesw:ncursesw
-    destroot.env-append     LD_LIBRARY_PATH=${prefix}/lib
-}
+                --mandir=${prefix}/share/man
 
 livecheck.check regex
 livecheck.url   http://ftp.gnu.org/gnu/${name}/?M=D

devel/ncursesw/Portfile

@@ -4 +4 @@
 
 name                    ncursesw
 version                 5.6
+revision                1
 categories              devel
 platforms               darwin freebsd
 maintainers             imajes@macports.org
@@ -15 +16 @@
                                 has all the other SYSV-curses enhancements over BSD Curses. \
                                 This library offers wide-character/UTF-8 support.
 
-homepage                http://www.gnu.org/software/ncurses/ncurses.html
+homepage                http://www.gnu.org/software/ncurses/
 master_sites            gnu:ncurses
 distname                ncurses-${version}
 dist_subdir             ncurses
@@ -25 +26 @@
 
 patchfiles              patch-configure
 
+# ncursesw needs binaries provided by ncurses
+depends_run             port:ncurses
+
 configure.args  --enable-widec \
                                 --disable-rpath \
                                 --with-shared \
@@ -32 +36 @@
                                 --without-ada \
                                 --enable-safe-sprintf \
                                 --enable-sigwinch \
-                                --mandir=${prefix}/share/man
+                                --without-progs \
+                                --mandir=${prefix}/share/delete-me
+
+post-destroot {
+        # terminfo database and manpages do also come with ncurses
+        delete ${destroot}${prefix}/lib/terminfo ${destroot}${prefix}/share/delete-me
+}
 
-platform darwin 8 {
-    configure.env-append    CC=/usr/bin/gcc-4.0 \
-                            CPP=/usr/bin/cpp-4.0 \
-                            CXX=/usr/bin/g++-4.0
+platform freebsd {
+        depends_build-append    port:ncurses
+        destroot.env-append             LD_LIBRARY_PATH=${prefix}/lib
 }
 
 livecheck.check regex