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 context 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,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2014/07/21 07:50:45 richard Exp $
+$NetBSD: distinfo,v 1.25 2015/02/18 03:10:41 sevan Exp $
 
 SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5
 RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e
 Size (ncurses-5.9.tar.gz) = 2826473 bytes
 SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719
 SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31
-SHA1 (patch-ac) = aed2235f976f1893ac4c1f71f14adeb867afcf09
+SHA1 (patch-ac) = 37215c0930db9cc234c7a59a4c56cbeade6cf5f1
 SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe
 SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20
 SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3

cvs diff -r1.21 -r1.22 pkgsrc/devel/ncurses/patches/Attic/patch-ac (expand / switch to context 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,8 +1,21 @@
-$NetBSD: patch-ac,v 1.21 2014/07/21 07:50:45 richard Exp $
+$NetBSD: patch-ac,v 1.22 2015/02/18 03:10:42 sevan Exp $
 
+Allow ncurses to build with compiler from pkgsrc by dropping the use of
+-no-cpp-precomp which is specific to Apple's supplied toolchain.
+Don't rename man pages on Debian.
+Include local paths before utilising flags from build env
+
 --- configure.orig	2011-03-31 23:35:51.000000000 +0000
 +++ configure
-@@ -9640,12 +9645,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+@@ -5584,7 +5584,6 @@ CF_EOF
+ 		chmod +x mk_shared_lib.sh
+ 		;;
+ 	darwin*) #(vi
+-		EXTRA_CFLAGS="-no-cpp-precomp"
+ 		CC_SHARED_OPTS="-dynamic"
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+@@ -9640,12 +9639,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)
@@ -15,7 +28,7 @@
    ;;
  esac
  
-@@ -18592,7 +18592,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
+@@ -18592,7 +18586,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
  
  ### Construct the list of include-directories to be generated