Sat Dec 26 11:58:19 2015 UTC ()
Fix readline detection.


(joerg)
diff -r1.57 -r1.58 pkgsrc/lang/mercury/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/mercury/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/mercury/patches/patch-at
cvs diff -r1.57 -r1.58 pkgsrc/lang/mercury/Makefile (expand / switch to context diff)
--- pkgsrc/lang/mercury/Makefile 2015/08/18 07:31:10 1.57
+++ pkgsrc/lang/mercury/Makefile 2015/12/26 11:58:19 1.58
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:10 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2015/12/26 11:58:19 joerg Exp $
 
 DISTNAME=		mercury-srcdist-14.01.1
 PKGNAME=		mercury-14.01.1
@@ -31,7 +31,7 @@
 CONFIGURE_ENV+=		HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q}
 USE_TOOLS+=		hostname
 
-MAKE_ENV+=		READLINE_PREFIX=${BUILDLINK_PREFIX.readline}
+ALL_ENV+=		READLINE_PREFIX=${BUILDLINK_PREFIX.readline}
 
 INSTALL_PREFIX=		${WRKSRC}/tmp
 BUILD_MAKE_FLAGS=	${MAKE_FLAGS}
cvs diff -r1.15 -r1.16 pkgsrc/lang/mercury/distinfo (expand / switch to context diff)
--- pkgsrc/lang/mercury/distinfo 2015/11/03 22:50:38 1.15
+++ pkgsrc/lang/mercury/distinfo 2015/12/26 11:58:19 1.16
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 22:50:38 agc Exp $
+$NetBSD: distinfo,v 1.16 2015/12/26 11:58:19 joerg Exp $
 
 SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf
 RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac
@@ -11,4 +11,4 @@
 SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e
 SHA1 (patch-ap) = 1779d182c543322c0083a6cca354a73fda4f7cb5
 SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845
-SHA1 (patch-at) = 41173e0ea5bffe06f8bcffb85cd8447831c3c044
+SHA1 (patch-at) = fc77b1e0059a7eb98e5d9c9fb30b69434fcf475c
cvs diff -r1.4 -r1.5 pkgsrc/lang/mercury/patches/patch-at (expand / switch to context diff)
--- pkgsrc/lang/mercury/patches/patch-at 2015/07/30 19:34:40 1.4
+++ pkgsrc/lang/mercury/patches/patch-at 2015/12/26 11:58:19 1.5
@@ -1,11 +1,11 @@
-$NetBSD: patch-at,v 1.4 2015/07/30 19:34:40 asau Exp $
+$NetBSD: patch-at,v 1.5 2015/12/26 11:58:19 joerg Exp $
 
 Support shared libraries.
 Don't capture value of HOME.
 
---- configure.orig	2014-09-08 08:56:03.000000000 +0400
-+++ configure	2015-07-30 22:18:33.000000000 +0300
-@@ -1514,7 +1514,7 @@
+--- configure.orig	2014-09-08 04:56:03.000000000 +0000
++++ configure
+@@ -1514,7 +1514,7 @@ Installation directories:
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
  an installation prefix other than \`$ac_default_prefix' using \`--prefix',
@@ -14,7 +14,7 @@
  
  For better control, use the options below.
  
-@@ -11481,7 +11481,7 @@
+@@ -11481,7 +11481,7 @@ $as_echo "yes" >&6; }
          EXT_FOR_SHARED_LIB=so
          EXT_FOR_LINK_WITH_PIC_OBJECTS=o
          ;;
@@ -23,3 +23,12 @@
          # From Cornelis van der Laan <nils@ims.uni-stuttgart.de>
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
+@@ -13143,7 +13143,7 @@ if test $mercury_cv_have_readline = no; 
+ 
+ else
+ 	TERMCAP_LIBRARY="$mercury_cv_termcap_lib"
+-	READLINE_LIBRARIES="-lreadline $TERMCAP_LIBRARY"
++	READLINE_LIBRARIES="-L${READLINE_PREFIX}/lib ${LINKER_RPATH_FLAG}${READLINE_PREFIX}/lib -lreadline $TERMCAP_LIBRARY"
+ fi
+ 
+