Sat Mar 1 03:09:35 2008 UTC ()
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.


(jlam)
diff -r1.63 -r1.64 pkgsrc/devel/libslang/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/libslang/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/devel/libslang/distinfo
diff -r1.16 -r1.17 pkgsrc/devel/libslang/patches/patch-aa
cvs diff -r1.63 -r1.64 pkgsrc/devel/libslang/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libslang/Makefile 2008/02/29 22:41:13 1.63
+++ pkgsrc/devel/libslang/Makefile 2008/03/01 03:09:35 1.64
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.63 2008/02/29 22:41:13 jlam Exp $ 1# $NetBSD: Makefile,v 1.64 2008/03/01 03:09:35 jlam Exp $
2# 2#
3 3
4DISTNAME= slang-1.4.9 4DISTNAME= slang-1.4.9
5PKGNAME= lib${DISTNAME} 5PKGNAME= lib${DISTNAME}
6SVR4_PKGNAME= lslan 6SVR4_PKGNAME= lslan
7PKGREVISION= 6 7PKGREVISION= 7
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ 9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \ 10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \ 11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \
12 ftp://ftp.plig.org/pub/slang/v1.4/ 12 ftp://ftp.plig.org/pub/slang/v1.4/
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.s-lang.org/ 16HOMEPAGE= http://www.s-lang.org/
17COMMENT= Routines for rapid alpha-numeric terminal applications development 17COMMENT= Routines for rapid alpha-numeric terminal applications development
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
cvs diff -r1.15 -r1.16 pkgsrc/devel/libslang/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/libslang/buildlink3.mk 2008/02/29 22:41:13 1.15
+++ pkgsrc/devel/libslang/buildlink3.mk 2008/03/01 03:09:35 1.16
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.15 2008/02/29 22:41:13 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2008/03/01 03:09:35 jlam Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ 4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8.if !empty(BUILDLINK_DEPTH:M+) 8.if !empty(BUILDLINK_DEPTH:M+)
9BUILDLINK_DEPENDS+= libslang 9BUILDLINK_DEPENDS+= libslang
10.endif 10.endif
11 11
12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang} 12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
13BUILDLINK_PACKAGES+= libslang 13BUILDLINK_PACKAGES+= libslang
14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang 14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang
15 15
16.if !empty(LIBSLANG_BUILDLINK3_MK:M+) 16.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1 17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang 19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
20.endif # LIBSLANG_BUILDLINK3_MK 20.endif # LIBSLANG_BUILDLINK3_MK
21 21
22.include "../../mk/termcap.buildlink3.mk" 
23 
24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.10 -r1.11 pkgsrc/devel/libslang/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libslang/distinfo 2008/02/29 16:44:55 1.10
+++ pkgsrc/devel/libslang/distinfo 2008/03/01 03:09:35 1.11
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.10 2008/02/29 16:44:55 jlam Exp $ 1$NetBSD: distinfo,v 1.11 2008/03/01 03:09:35 jlam Exp $
2 2
3SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa 3SHA1 (slang-1.4.9.tar.bz2) = 667709eb1bc1b0f68ce36b31204bf8a99d31eefa
4RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b 4RMD160 (slang-1.4.9.tar.bz2) = bd2c37554129134e4e874502af0ebcb6fc7e151b
5Size (slang-1.4.9.tar.bz2) = 631079 bytes 5Size (slang-1.4.9.tar.bz2) = 631079 bytes
6SHA1 (patch-aa) = bb8ff1fb65b6e58ff65ef9779e30768faf532268 6SHA1 (patch-aa) = 619ed90efc4cb833db2695920f7772fc67df4155
7SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9 7SHA1 (patch-ab) = 47f7aa6341072f113cbf138c1206d36dbbc59dc9
8SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5 8SHA1 (patch-ac) = 1ae91c0d5772d3b85c7028eca8decd8c0bc474c5
9SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4 9SHA1 (patch-ad) = 5d8f0350d473381d5bb0808db60e872b82b0dca4
cvs diff -r1.16 -r1.17 pkgsrc/devel/libslang/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/libslang/patches/patch-aa 2005/05/21 14:39:44 1.16
+++ pkgsrc/devel/libslang/patches/patch-aa 2008/03/01 03:09:35 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.16 2005/05/21 14:39:44 minskim Exp $ 1$NetBSD: patch-aa,v 1.17 2008/03/01 03:09:35 jlam Exp $
2 2
3--- src/Makefile.in.orig Sun Feb 10 18:39:19 2002 3--- src/Makefile.in.orig Sun Feb 10 18:39:19 2002
4+++ src/Makefile.in Mon Mar 25 11:59:49 2002 4+++ src/Makefile.in Mon Mar 25 11:59:49 2002
5@@ -4,7 +4,7 @@ 5@@ -4,7 +4,7 @@
6 #--------------------------------------------------------------------------- 6 #---------------------------------------------------------------------------
7 CC = @CC@ 7 CC = @CC@
8 CFLAGS = @CFLAGS@ 8 CFLAGS = @CFLAGS@
9-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@ 9-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
10+LDFLAGS = $(EXECLIBS) 10+LDFLAGS = $(EXECLIBS)
11 #----------------------------------------------------------------------------- 11 #-----------------------------------------------------------------------------
12 # System library that contains functions for dynamic linking (-ldl) 12 # System library that contains functions for dynamic linking (-ldl)
13 #----------------------------------------------------------------------------- 13 #-----------------------------------------------------------------------------
14@@ -22,7 +22,7 @@ 14@@ -22,7 +22,7 @@
@@ -55,27 +55,27 @@ $NetBSD: patch-aa,v 1.16 2005/05/21 14:3 @@ -55,27 +55,27 @@ $NetBSD: patch-aa,v 1.16 2005/05/21 14:3
55@@ -112,13 +112,12 @@ 55@@ -112,13 +112,12 @@
56 #--------------------------------------------------------------------------- 56 #---------------------------------------------------------------------------
57 # Rules 57 # Rules
58 #--------------------------------------------------------------------------- 58 #---------------------------------------------------------------------------
59-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) 59-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
60+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) 60+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
61 elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB) 61 elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
62  62
63 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) 63 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
64- -$(RM) $(OBJDIR_NORMAL_LIB) 64- -$(RM) $(OBJDIR_NORMAL_LIB)
65- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) 65- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
66- $(RANLIB) $(OBJDIR_NORMAL_LIB) 66- $(RANLIB) $(OBJDIR_NORMAL_LIB)
67+ cd $(OBJDIR); $(LIBTOOL) --mode=link $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \ 67+ cd $(OBJDIR); $(LIBTOOL) --mode=link $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
68+ -rpath $(PREFIX)/lib $(DL_LIB) -lm -ltermcap -version-info 1:4 68+ -rpath $(PREFIX)/lib $(DL_LIB) -lm $(TCAPLIB) -version-info 1:4
69 @echo "" 69 @echo ""
70 @echo $(NORMAL_LIB) created in $(OBJDIR) 70 @echo $(NORMAL_LIB) created in $(OBJDIR)
71  71
72@@ -143,8 +142,7 @@ 72@@ -143,8 +142,7 @@
73 install: install_basic_lib install_docs 73 install: install_basic_lib install_docs
74 install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB) 74 install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
75 @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR) 75 @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
76- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR) 76- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
77- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB) 77- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
78+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR) 78+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
79 @echo installing slang.h and slcurses.h in $(DEST_INCDIR) 79 @echo installing slang.h and slcurses.h in $(DEST_INCDIR)
80 $(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR) 80 $(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)
81 $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR) 81 $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)