CVS commit: pkgsrc/devel/ncurses

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 30 11:28:19 UTC 2016

Modified Files:
        pkgsrc/devel/ncurses: distinfo
        pkgsrc/devel/ncurses/patches: patch-ab patch-ac

Log Message:
rpath should not include DESTDIR.

Hopefully addresses PR 51689.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ncurses/patches/patch-ab
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/ncurses/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.30 pkgsrc/devel/ncurses/distinfo:1.31
--- pkgsrc/devel/ncurses/distinfo:1.30  Sun Dec 18 23:30:34 2016
+++ pkgsrc/devel/ncurses/distinfo       Fri Dec 30 11:28:19 2016
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.30 2016/12/18 23:30:34 joerg Exp $
+$NetBSD: distinfo,v 1.31 2016/12/30 11:28:19 wiz Exp $
 
 SHA1 (ncurses-6.0.tar.gz) = acd606135a5124905da770803c05f1f20dd3b21c
 RMD160 (ncurses-6.0.tar.gz) = 4d9e5938f00b400bfb0d37f3c54f2f36c4157d48
 SHA512 (ncurses-6.0.tar.gz) = 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 Size (ncurses-6.0.tar.gz) = 3131891 bytes
 SHA1 (patch-aa) = 6acf84077e84fd693bb2b52377774db3d15b4f8f
-SHA1 (patch-ab) = d5fdedbe750dab1b7e895860a563062cd850b760
-SHA1 (patch-ac) = 85738d32b84b5eda18c6acc0dd678c2616dbb8fa
+SHA1 (patch-ab) = 5a64bd1e591fa253d71bbdec1a4dc330c4c50e9e
+SHA1 (patch-ac) = b0b0eac0be624240330da852d7e5d35ff5f060c4
 SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6
 SHA1 (patch-c++_Makefile.in) = 974f89c75737a8079977fc35a924b54d32e98df2
 SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa

Index: pkgsrc/devel/ncurses/patches/patch-ab
diff -u pkgsrc/devel/ncurses/patches/patch-ab:1.19 pkgsrc/devel/ncurses/patches/patch-ab:1.20
--- pkgsrc/devel/ncurses/patches/patch-ab:1.19  Sun Dec 18 23:30:34 2016
+++ pkgsrc/devel/ncurses/patches/patch-ab       Fri Dec 30 11:28:19 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.19 2016/12/18 23:30:34 joerg Exp $
+$NetBSD: patch-ab,v 1.20 2016/12/30 11:28:19 wiz Exp $
 
 --- mk-1st.awk.orig    2014-12-20 23:54:22.000000000 +0000
 +++ mk-1st.awk
@@ -12,15 +12,17 @@ $NetBSD: patch-ab,v 1.19 2016/12/18 23:3
                return sprintf("%s%s%s", prefix, a_name, suffix)
        }
  # see imp_name
-@@ -447,7 +450,7 @@ END        {
+@@ -447,8 +450,8 @@ END        {
                                        which_list = "SHLIB_LIST";
                                }
                                printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
 -                              printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
+-                              printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
 +                              printf "\t\t-o %s $(%s_OBJS:.o=.lo) \\\n", lib_name, OBJS;
-                               printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
++                              printf "\t\t-rpath $(libdir) \\\n";
                                printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
                                print  ""
+                               print  "install \\"
 @@ -471,7 +474,7 @@ END        {
                                printf "\t$(RANLIB) $@\n"
                                if ( host == "vxworks" )

Index: pkgsrc/devel/ncurses/patches/patch-ac
diff -u pkgsrc/devel/ncurses/patches/patch-ac:1.24 pkgsrc/devel/ncurses/patches/patch-ac:1.25
--- pkgsrc/devel/ncurses/patches/patch-ac:1.24  Sun Dec 18 23:30:34 2016
+++ pkgsrc/devel/ncurses/patches/patch-ac       Fri Dec 30 11:28:19 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.24 2016/12/18 23:30:34 joerg Exp $
+$NetBSD: patch-ac,v 1.25 2016/12/30 11:28:19 wiz 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.
@@ -7,6 +7,15 @@ Include local paths before utilising fla
 
 --- configure.orig     2015-08-05 09:20:32.000000000 +0000
 +++ configure
+@@ -4930,7 +4930,7 @@ test -z "$cf_cv_libtool_version" && unse
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+       fi
+-      LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
++      LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+       LIB_OBJECT='${OBJECTS:.o=.lo}'
+       LIB_SUFFIX=.la
+       LIB_CLEAN='${LIBTOOL} --mode=clean'
 @@ -11090,12 +11090,7 @@ case ".$MANPAGE_RENAMES" in
  (.no)
        ;;
@@ -53,7 +62,7 @@ Include local paths before utilising fla
  CXX_NAME=ncurses++
  
  # workaround for g++ versus Solaris (20131116)
-@@ -23565,7 +23570,14 @@ CF_EOF
+@@ -23565,7 +23568,14 @@ CF_EOF
                cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}"
        fi