Wed Feb 18 03:10:42 2015 UTC ()
Drop the use of -no-cpp-precomp which is specific to Apple's supplied toolchain
Provide an explaination of changes in patches/patch-ac

Closes PR pkg/47949
Reviewed by wiz@


(sevan)
diff -r1.24 -r1.25 pkgsrc/devel/ncurses/distinfo
diff -r1.21 -r1.22 pkgsrc/devel/ncurses/patches/patch-ac
cvs diff -r1.24 -r1.25 pkgsrc/devel/ncurses/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/distinfo 2014/07/21 07:50:45 1.24
+++ pkgsrc/devel/ncurses/distinfo 2015/02/18 03:10:41 1.25
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.24 2014/07/21 07:50:45 richard Exp $ 1$NetBSD: distinfo,v 1.25 2015/02/18 03:10:41 sevan Exp $
2 2
3SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5 3SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5
4RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e 4RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e
5Size (ncurses-5.9.tar.gz) = 2826473 bytes 5Size (ncurses-5.9.tar.gz) = 2826473 bytes
6SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719 6SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719
7SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31 7SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31
8SHA1 (patch-ac) = aed2235f976f1893ac4c1f71f14adeb867afcf09 8SHA1 (patch-ac) = 37215c0930db9cc234c7a59a4c56cbeade6cf5f1
9SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe 9SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe
10SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20 10SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20
11SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3 11SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3
12SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df 12SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df
cvs diff -r1.21 -r1.22 pkgsrc/devel/ncurses/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/patches/Attic/patch-ac 2014/07/21 07:50:45 1.21
+++ pkgsrc/devel/ncurses/patches/Attic/patch-ac 2015/02/18 03:10:42 1.22
@@ -1,26 +1,39 @@ @@ -1,26 +1,39 @@
1$NetBSD: patch-ac,v 1.21 2014/07/21 07:50:45 richard Exp $ 1$NetBSD: patch-ac,v 1.22 2015/02/18 03:10:42 sevan Exp $
 2
 3Allow ncurses to build with compiler from pkgsrc by dropping the use of
 4-no-cpp-precomp which is specific to Apple's supplied toolchain.
 5Don't rename man pages on Debian.
 6Include local paths before utilising flags from build env
2 7
3--- configure.orig 2011-03-31 23:35:51.000000000 +0000 8--- configure.orig 2011-03-31 23:35:51.000000000 +0000
4+++ configure 9+++ configure
5@@ -9640,12 +9645,7 @@ case ".$MANPAGE_RENAMES" in #(vi 10@@ -5584,7 +5584,6 @@ CF_EOF
 11 chmod +x mk_shared_lib.sh
 12 ;;
 13 darwin*) #(vi
 14- EXTRA_CFLAGS="-no-cpp-precomp"
 15 CC_SHARED_OPTS="-dynamic"
 16 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
 17 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
 18@@ -9640,12 +9639,7 @@ case ".$MANPAGE_RENAMES" in #(vi
6 .no) #(vi 19 .no) #(vi
7 ;; 20 ;;
8 .|.yes) 21 .|.yes)
9- # Debian 'man' program? 22- # Debian 'man' program?
10- if test -f /etc/debian_version ; then 23- if test -f /etc/debian_version ; then
11- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames 24- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
12- else 25- else
13 MANPAGE_RENAMES=no 26 MANPAGE_RENAMES=no
14- fi 27- fi
15 ;; 28 ;;
16 esac 29 esac
17  30
18@@ -18592,7 +18592,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6 31@@ -18592,7 +18586,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
19  32
20 ### Construct the list of include-directories to be generated 33 ### Construct the list of include-directories to be generated
21  34
22-CPPFLAGS="$CPPFLAGS -I. -I../include" 35-CPPFLAGS="$CPPFLAGS -I. -I../include"
23+CPPFLAGS="-I. -I../include $CPPFLAGS" 36+CPPFLAGS="-I. -I../include $CPPFLAGS"
24 if test "$srcdir" != "."; then 37 if test "$srcdir" != "."; then
25 CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" 38 CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
26 fi 39 fi