diff options
| author | wiz <wiz@pkgsrc.org> | 2004-05-09 23:58:19 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-05-09 23:58:19 +0000 |
| commit | 3abcd6801fbc947becf08da003b182d4ffde24ad (patch) | |
| tree | 90292a9382c2c392976bd010690a3076878511d1 /chat | |
| parent | 197b43590b84e8b0c33f84cc04be8afa0325ac4a (diff) | |
| download | pkgsrc-3abcd6801fbc947becf08da003b182d4ffde24ad.tar.gz | |
Make mysql and expat-using modules find their shlibs.
Convert to bl3.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/ser/Makefile | 14 | ||||
| -rw-r--r-- | chat/ser/distinfo | 6 | ||||
| -rw-r--r-- | chat/ser/patches/patch-ab | 4 | ||||
| -rw-r--r-- | chat/ser/patches/patch-ac | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/chat/ser/Makefile b/chat/ser/Makefile index e989ed5c5aa..ac5742165fe 100644 --- a/chat/ser/Makefile +++ b/chat/ser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/22 07:49:21 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/09 23:58:19 wiz Exp $ # DISTNAME= ser-0.8.10_src @@ -13,12 +13,14 @@ COMMENT= SIP express router WRKSRC= ${WRKDIR}/ser-0.8.10 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make -MAKE_ENV+= BUILDLINK_PREFIX.pthread="${BUILDLINK_PREFIX.pthread}" +MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q} +MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q} +MAKE_ENV+= BUILDLINK_PREFIX.expat=${BUILDLINK_PREFIX.expat:Q} -.include "../../databases/mysql-client/buildlink2.mk" -.include "../../textproc/expat/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../databases/mysql-client/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ser/distinfo b/chat/ser/distinfo index ff312c59e13..4634f7ba0ec 100644 --- a/chat/ser/distinfo +++ b/chat/ser/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/09/16 14:51:17 agc Exp $ +$NetBSD: distinfo,v 1.4 2004/05/09 23:58:19 wiz Exp $ SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d Size (ser-0.8.10_src.tar.gz) = 931150 bytes SHA1 (patch-aa) = ebee20df3766908a6dc6b031f703f3ce60b45071 -SHA1 (patch-ab) = 38864b4c499fe838d4f8e752e0b73d8ab5bf252b -SHA1 (patch-ac) = a1869650cfd00293b1bfd71f071e06563aad8c93 +SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec +SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d diff --git a/chat/ser/patches/patch-ab b/chat/ser/patches/patch-ab index 053a446f138..eb8f40dd163 100644 --- a/chat/ser/patches/patch-ab +++ b/chat/ser/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/09 23:58:19 wiz Exp $ --- modules/jabber/Makefile- 2003-08-24 06:35:44.000000000 +0900 +++ modules/jabber/Makefile 2003-08-24 06:37:30.000000000 +0900 @@ -9,6 +9,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $ -DEFS+=-I/usr/local/include -LIBS=-L/usr/local/lib -lexpat +DEFS+=-I${BUILDLINK_PREFIX.expat}/include -+LIBS=-L${BUILDLINK_PREFIX.expat}/lib -lexpat ++LIBS=-Wl,-R${BUILDLINK_PREFIX.expat}/lib -L${BUILDLINK_PREFIX.expat}/lib -lexpat include ../../Makefile.modules diff --git a/chat/ser/patches/patch-ac b/chat/ser/patches/patch-ac index 4a32fc8c530..387aba86ef9 100644 --- a/chat/ser/patches/patch-ac +++ b/chat/ser/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $ +$NetBSD: patch-ac,v 1.2 2004/05/09 23:58:19 wiz Exp $ --- modules/mysql/Makefile- 2003-08-24 06:40:29.000000000 +0900 +++ modules/mysql/Makefile 2003-08-24 06:41:14.000000000 +0900 @@ -13,6 +13,6 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $ -LIBS=-L/usr/lib/mysql -L /usr/local/lib -L/usr/local/lib/mysql \ - -L/usr/local/mysql/lib/mysql/ \ - -lmysqlclient -lz -+LIBS=-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient -lz ++LIBS=-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient -lz include ../../Makefile.modules |