diff options
author | jlam <jlam> | 2008-03-01 03:09:35 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-03-01 03:09:35 +0000 |
commit | 5374c224d8a46ebf4dea342be7ab15f844693b2d (patch) | |
tree | 5cb200153630cdd96bec09db31402d2801afe4da /devel | |
parent | 8bd363ea74fb0cfb019716625f5cc2b0bb7ecade (diff) | |
download | pkgsrc-5374c224d8a46ebf4dea342be7ab15f844693b2d.tar.gz |
Fix patch so that it refers to $(TCAPLIB) and doesn't hardcode "-ltermcap".
Now the only time that libslang.so links against libtermcap.so only when
we're using termcap. In the case where we don't, libslang.so includes
its own terminfo database parser, so we don't need to link against any
curses or other terminfo library.
Bump the PKGREVISION to 7.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libslang/Makefile | 4 | ||||
-rw-r--r-- | devel/libslang/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/libslang/distinfo | 4 | ||||
-rw-r--r-- | devel/libslang/patches/patch-aa | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 5ff8e64a152..b1ca5e4c8f7 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.63 2008/02/29 22:41:13 jlam Exp $ +# $NetBSD: Makefile,v 1.64 2008/03/01 03:09:35 jlam Exp $ # DISTNAME= slang-1.4.9 PKGNAME= lib${DISTNAME} SVR4_PKGNAME= lslan -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \ diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk index 0bfe4d014c5..0d02e0eaf42 100644 --- a/devel/libslang/buildlink3.mk +++ b/devel/libslang/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2008/02/29 22:41:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2008/03/01 03:09:35 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ @@ -19,6 +19,4 @@ BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang .endif # LIBSLANG_BUILDLINK3_MK -.include "../../mk/termcap.buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo index eb180d774d9..5e8a70eaf83 100644 --- a/devel/libslang/distinfo +++ b/devel/libslang/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2008/02/29 16:44:55 jlam Exp $ +$NetBSD: distinfo,v 1.11 2008/03/01 03:09:35 jlam Exp $ SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b Size (slang-1.4.9.tar.bz2) = 631079 bytes -SHA1 (patch-aa) = bb8ff1fb65b6e58ff65ef9779e30768faf532268 +SHA1 (patch-aa) = 619ed90efc4cb833db2695920f7772fc67df4155 SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9 SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5 SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4 diff --git a/devel/libslang/patches/patch-aa b/devel/libslang/patches/patch-aa index 1fd7c15dca0..ccf16bc4290 100644 --- a/devel/libslang/patches/patch-aa +++ b/devel/libslang/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.16 2005/05/21 14:39:44 minskim Exp $ +$NetBSD: patch-aa,v 1.17 2008/03/01 03:09:35 jlam Exp $ --- src/Makefile.in.orig Sun Feb 10 18:39:19 2002 +++ src/Makefile.in Mon Mar 25 11:59:49 2002 @@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.16 2005/05/21 14:39:44 minskim Exp $ - cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) - $(RANLIB) $(OBJDIR_NORMAL_LIB) + cd $(OBJDIR); $(LIBTOOL) --mode=link $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \ -+ -rpath $(PREFIX)/lib $(DL_LIB) -lm -ltermcap -version-info 1:4 ++ -rpath $(PREFIX)/lib $(DL_LIB) -lm $(TCAPLIB) -version-info 1:4 @echo "" @echo $(NORMAL_LIB) created in $(OBJDIR) |