[pkgsrc/trunk]: pkgsrc Find correct zlib.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b947100597c1
branches:  trunk
changeset: 643380:b947100597c1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Dec 15 12:31:09 2014 +0000

description:
Find correct zlib.

diffstat:

 cross/atasm/Makefile         |   3 ++-
 cross/atasm/distinfo         |   4 ++--
 cross/atasm/patches/patch-aa |  14 ++++++++++----
 math/minisat/Makefile        |   3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diffs (71 lines):

diff -r d467c01c8296 -r b947100597c1 cross/atasm/Makefile
--- a/cross/atasm/Makefile      Mon Dec 15 11:55:04 2014 +0000
+++ b/cross/atasm/Makefile      Mon Dec 15 12:31:09 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/12/09 15:10:47 mef Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/15 12:37:01 jperkin Exp $
 #
 
 DISTNAME=      atasm106
@@ -15,6 +15,7 @@
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=  YES
 BUILD_DIRS=    src
+MAKE_ENV=      ZLIB="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz"
 
 DOCDIR=                ${PREFIX}/share/doc/atasm
 EXAMPLE_DIR=   ${PREFIX}/share/examples/atasm
diff -r d467c01c8296 -r b947100597c1 cross/atasm/distinfo
--- a/cross/atasm/distinfo      Mon Dec 15 11:55:04 2014 +0000
+++ b/cross/atasm/distinfo      Mon Dec 15 12:31:09 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2014/12/09 15:10:47 mef Exp $
+$NetBSD: distinfo,v 1.6 2014/12/15 12:37:01 jperkin Exp $
 
 SHA1 (atasm106.zip) = c016c2f6ee611e001dbd026923c29ce509979f1c
 RMD160 (atasm106.zip) = e9935d0e202bc668114af9d11fdbf396399cb6d3
 Size (atasm106.zip) = 368360 bytes
-SHA1 (patch-aa) = d87376db3b9babe3578b8cc614a418066c3488f3
+SHA1 (patch-aa) = e040580b87e68fc7ec2230fb22bc45b5d168ca83
 SHA1 (patch-ab) = 18c516a98ae5cbae3f8df7f38ca87bd1f47b9664
diff -r d467c01c8296 -r b947100597c1 cross/atasm/patches/patch-aa
--- a/cross/atasm/patches/patch-aa      Mon Dec 15 11:55:04 2014 +0000
+++ b/cross/atasm/patches/patch-aa      Mon Dec 15 12:31:09 2014 +0000
@@ -1,10 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2014/12/09 15:10:47 mef Exp $
+$NetBSD: patch-aa,v 1.4 2014/12/15 12:37:01 jperkin Exp $
 
 Honor CC, CFLAGS and LDFLAGS from pkgsrc.
 
---- Makefile.orig      2009-03-18 05:39:26.000000000 +0900
-+++ src/Makefile       2014-12-09 23:26:41.000000000 +0900
-@@ -17,10 +17,10 @@ UNIX    = -DUNIX
+--- src/Makefile.orig  2009-03-17 20:39:26.000000000 +0000
++++ src/Makefile
+@@ -12,15 +12,15 @@
+ # if you are compiling under UNIX, change the above lines to 
+ # reflect the location of zlib.  I use:
+ USEZ    = -DZLIB_CAPABLE 
+-ZLIB    = -lz
++#ZLIB    = -lz
+ UNIX    = -DUNIX
  
  # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
  #CFLAGS  = -g -Wall $(USEZ) $(DOS) $(UNIX) 
diff -r d467c01c8296 -r b947100597c1 math/minisat/Makefile
--- a/math/minisat/Makefile     Mon Dec 15 11:55:04 2014 +0000
+++ b/math/minisat/Makefile     Mon Dec 15 12:31:09 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/09 14:38:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/15 12:31:09 jperkin Exp $
 
 DISTNAME=      minisat-2.2.0
 CATEGORIES=    math
@@ -15,6 +15,7 @@
 #BUILD_DIRS=   core simp
 BUILD_DIRS=    simp
 MAKE_ENV=      MROOT=$(WRKSRC)
+MAKE_ENV+=     LFLAGS="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib"
 BUILD_TARGET=  # empty
 
 INSTALLATION_DIRS+=    bin