summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2011-11-29 06:19:43 +0000
committersbd <sbd@pkgsrc.org>2011-11-29 06:19:43 +0000
commit49f591232ad5c4cf0741753a2c01c5e8600bb4e6 (patch)
tree87c14e8a843c965a8f5de5b39d45bc7d54be39b7
parent5f58b9ee8d5148cada337ed4a6259abad183a3a6 (diff)
downloadpkgsrc-49f591232ad5c4cf0741753a2c01c5e8600bb4e6.tar.gz
Use CPPFLAGS and LDFLAGS to locate headers and librarys.
Bump PKGREVISION
-rw-r--r--mail/policyd/Makefile3
-rw-r--r--mail/policyd/distinfo4
-rw-r--r--mail/policyd/patches/patch-ab14
3 files changed, 10 insertions, 11 deletions
diff --git a/mail/policyd/Makefile b/mail/policyd/Makefile
index f7ba241e6aa..7cc9ebe842d 100644
--- a/mail/policyd/Makefile
+++ b/mail/policyd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/09/30 10:49:12 obache Exp $
+# $NetBSD: Makefile,v 1.5 2011/11/29 06:19:43 sbd Exp $
DISTNAME= policyd-1.82
PKGREVISION= 1
@@ -15,7 +15,6 @@ USE_TOOLS+= gmake
USE_LANGUAGES= c c++
BUILD_TARGET= build
-MAKE_ENV+= MYSQL_PREFIX=${BUILDLINK_PREFIX.mysql-client}
BUILD_DEFS+= VARBASE
diff --git a/mail/policyd/distinfo b/mail/policyd/distinfo
index 1c15e14ee97..59c6c104622 100644
--- a/mail/policyd/distinfo
+++ b/mail/policyd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2008/03/03 11:45:17 sketch Exp $
+$NetBSD: distinfo,v 1.4 2011/11/29 06:19:43 sbd Exp $
SHA1 (policyd-1.82.tar.gz) = 4a9bf4bcf63eb3792794d87682e67b15e4a04707
RMD160 (policyd-1.82.tar.gz) = 0258ee9abaa00cde9a139bdeafed36df1ec37537
Size (policyd-1.82.tar.gz) = 68372 bytes
SHA1 (patch-aa) = f1be4bf5f101e15d8f73b05a73fdd1ca324b72eb
-SHA1 (patch-ab) = 3bc5c7270a4c96b694c03bbb30722e1146a21170
+SHA1 (patch-ab) = 21183b12a60446f15116d7709df3f2cf93202619
SHA1 (patch-ac) = b8e254e0c05a5e5ea599a068b9b63a2fd030b5b1
SHA1 (patch-ad) = b0db714c2379deb225774ed4c237ea8ad0e52916
SHA1 (patch-ae) = 8a9db8b9e050f2692c4a9201a1319248a9f30db6
diff --git a/mail/policyd/patches/patch-ab b/mail/policyd/patches/patch-ab
index 48180b97ed0..90662bb64fb 100644
--- a/mail/policyd/patches/patch-ab
+++ b/mail/policyd/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2008/03/03 11:45:17 sketch Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/29 06:19:44 sbd Exp $
---- Makefile.orig 2007-08-20 07:42:05.000000000 +0100
-+++ Makefile 2008-03-03 11:05:32.976857000 +0000
-@@ -14,6 +14,8 @@
+--- Makefile.orig 2007-08-20 06:42:05.000000000 +0000
++++ Makefile
+@@ -14,6 +14,8 @@ lib += -L/usr/pkg/lib/mysql
# os x
lib += -L/usr/local/mysql
-+inc = -I${MYSQL_PREFIX}/include/mysql
-+lib = -L${MYSQL_PREFIX}/lib/mysql -Wl,-R${MYSQL_PREFIX}/lib/mysql
++inc = ${CPPFLAGS}
++lib = ${LDFLAGS}
CC := gcc
CPPFLAGS := -O $(inc)
-@@ -23,6 +25,7 @@
+@@ -23,6 +25,7 @@ LDLIBS = $(lib) -lmysqlclient -lz
ifeq "${OS_NAME}" "sunos"
LDLIBS += -lsocket -lnsl -lm