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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.58 2015/12/26 11:58:19 joerg Exp $
2 2
3DISTNAME= mercury-srcdist-14.01.1 3DISTNAME= mercury-srcdist-14.01.1
4PKGNAME= mercury-14.01.1 4PKGNAME= mercury-14.01.1
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://dl.mercurylang.org/release/ \ 7MASTER_SITES= http://dl.mercurylang.org/release/ \
8 ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \ 8 ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \
9 http://www.mercury.cs.mu.oz.au/download/files/ \ 9 http://www.mercury.cs.mu.oz.au/download/files/ \
10 ${MASTER_SITE_SUNSITE:=devel/lang/mercury/} 10 ${MASTER_SITE_SUNSITE:=devel/lang/mercury/}
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.mercurylang.org/ 13HOMEPAGE= http://www.mercurylang.org/
14COMMENT= Modern logic/functional programming language 14COMMENT= Modern logic/functional programming language
@@ -21,27 +21,27 @@ BUILD_DEPENDS+= tex-latex-fonts>=0:../. @@ -21,27 +21,27 @@ BUILD_DEPENDS+= tex-latex-fonts>=0:../.
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23USE_TOOLS+= gmake pax bison flex makeinfo 23USE_TOOLS+= gmake pax bison flex makeinfo
24USE_TOOLS+= perl # ? 24USE_TOOLS+= perl # ?
25USE_TOOLS+= makeinfo 25USE_TOOLS+= makeinfo
26INFO_FILES= yes 26INFO_FILES= yes
27 27
28# Some of the scripts test CC and use special settings for gcc. 28# Some of the scripts test CC and use special settings for gcc.
29CONFIGURE_ENV+= CC=gcc 29CONFIGURE_ENV+= CC=gcc
30 30
31CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q} 31CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q}
32USE_TOOLS+= hostname 32USE_TOOLS+= hostname
33 33
34MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} 34ALL_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline}
35 35
36INSTALL_PREFIX= ${WRKSRC}/tmp 36INSTALL_PREFIX= ${WRKSRC}/tmp
37BUILD_MAKE_FLAGS= ${MAKE_FLAGS} 37BUILD_MAKE_FLAGS= ${MAKE_FLAGS}
38BUILD_MAKE_FLAGS+= INSTALL_PREFIX=${INSTALL_PREFIX:Q} 38BUILD_MAKE_FLAGS+= INSTALL_PREFIX=${INSTALL_PREFIX:Q}
39BUILD_MAKE_FLAGS+= INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q} 39BUILD_MAKE_FLAGS+= INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q}
40BUILD_MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q} 40BUILD_MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q}
41BUILD_MAKE_FLAGS+= MERCURY_COMPILER=${INSTALL_PREFIX:Q}/bin/mercury_compile 41BUILD_MAKE_FLAGS+= MERCURY_COMPILER=${INSTALL_PREFIX:Q}/bin/mercury_compile
42BUILD_MAKE_FLAGS+= PARALLEL=$(MAKE_JOBS:D-j$(MAKE_JOBS)) 42BUILD_MAKE_FLAGS+= PARALLEL=$(MAKE_JOBS:D-j$(MAKE_JOBS))
43 43
44CHECK_PORTABILITY_SKIP+= boehm_gc/configure 44CHECK_PORTABILITY_SKIP+= boehm_gc/configure
45CHECK_INTERPRETER_SKIP+= lib/mercury/reconf/scripts/mtags.in 45CHECK_INTERPRETER_SKIP+= lib/mercury/reconf/scripts/mtags.in
46 46
47post-patch: 47post-patch:
cvs diff -r1.15 -r1.16 pkgsrc/lang/mercury/distinfo (expand / switch to unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.15 2015/11/03 22:50:38 agc Exp $ 1$NetBSD: distinfo,v 1.16 2015/12/26 11:58:19 joerg Exp $
2 2
3SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf 3SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf
4RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac 4RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac
5SHA512 (mercury-srcdist-14.01.1.tar.gz) = a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c 5SHA512 (mercury-srcdist-14.01.1.tar.gz) = a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
6Size (mercury-srcdist-14.01.1.tar.gz) = 52658945 bytes 6Size (mercury-srcdist-14.01.1.tar.gz) = 52658945 bytes
7SHA1 (patch-ab) = ac76d414cd5d6ed0b429c706d982dfbb9a643508 7SHA1 (patch-ab) = ac76d414cd5d6ed0b429c706d982dfbb9a643508
8SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681 8SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681
9SHA1 (patch-ad) = 94d5029000b8d2e2f424aff957d8c72d2c7aa1fe 9SHA1 (patch-ad) = 94d5029000b8d2e2f424aff957d8c72d2c7aa1fe
10SHA1 (patch-an) = 65bfb05147fe2f3663b35e494b8e8bf7fc6906e2 10SHA1 (patch-an) = 65bfb05147fe2f3663b35e494b8e8bf7fc6906e2
11SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e 11SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e
12SHA1 (patch-ap) = 1779d182c543322c0083a6cca354a73fda4f7cb5 12SHA1 (patch-ap) = 1779d182c543322c0083a6cca354a73fda4f7cb5
13SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845 13SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845
14SHA1 (patch-at) = 41173e0ea5bffe06f8bcffb85cd8447831c3c044 14SHA1 (patch-at) = fc77b1e0059a7eb98e5d9c9fb30b69434fcf475c
cvs diff -r1.4 -r1.5 pkgsrc/lang/mercury/patches/patch-at (expand / switch to unified 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,25 +1,34 @@ @@ -1,25 +1,34 @@
1$NetBSD: patch-at,v 1.4 2015/07/30 19:34:40 asau Exp $ 1$NetBSD: patch-at,v 1.5 2015/12/26 11:58:19 joerg Exp $
2 2
3Support shared libraries. 3Support shared libraries.
4Don't capture value of HOME. 4Don't capture value of HOME.
5 5
6--- configure.orig 2014-09-08 08:56:03.000000000 +0400 6--- configure.orig 2014-09-08 04:56:03.000000000 +0000
7+++ configure 2015-07-30 22:18:33.000000000 +0300 7+++ configure
8@@ -1514,7 +1514,7 @@ 8@@ -1514,7 +1514,7 @@ Installation directories:
9 By default, \`make install' will install all the files in 9 By default, \`make install' will install all the files in
10 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify 10 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
11 an installation prefix other than \`$ac_default_prefix' using \`--prefix', 11 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
12-for instance \`--prefix=\$HOME'. 12-for instance \`--prefix=\$HOME'.
13+for instance \`--prefix=\\\$HOME'. 13+for instance \`--prefix=\\\$HOME'.
14  14
15 For better control, use the options below. 15 For better control, use the options below.
16  16
17@@ -11481,7 +11481,7 @@ 17@@ -11481,7 +11481,7 @@ $as_echo "yes" >&6; }
18 EXT_FOR_SHARED_LIB=so 18 EXT_FOR_SHARED_LIB=so
19 EXT_FOR_LINK_WITH_PIC_OBJECTS=o 19 EXT_FOR_LINK_WITH_PIC_OBJECTS=o
20 ;; 20 ;;
21- i*86-*-freebsd*) 21- i*86-*-freebsd*)
22+ i*86-*-freebsd*|*-netbsd*) 22+ i*86-*-freebsd*|*-netbsd*)
23 # From Cornelis van der Laan <nils@ims.uni-stuttgart.de> 23 # From Cornelis van der Laan <nils@ims.uni-stuttgart.de>
24 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 24 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
25 $as_echo "yes" >&6; } 25 $as_echo "yes" >&6; }
 26@@ -13143,7 +13143,7 @@ if test $mercury_cv_have_readline = no;
 27
 28 else
 29 TERMCAP_LIBRARY="$mercury_cv_termcap_lib"
 30- READLINE_LIBRARIES="-lreadline $TERMCAP_LIBRARY"
 31+ READLINE_LIBRARIES="-L${READLINE_PREFIX}/lib ${LINKER_RPATH_FLAG}${READLINE_PREFIX}/lib -lreadline $TERMCAP_LIBRARY"
 32 fi
 33
 34