Mon Jun 10 21:49:21 2013 UTC ()
Add symbolic link to shared library in location that tclsh scripts (such
as unbuffer) expect to find it.  Bump PKGREVISION.


(markd)
diff -r1.28 -r1.29 pkgsrc/lang/tcl-expect/Makefile
diff -r1.13 -r1.14 pkgsrc/lang/tcl-expect/PLIST
diff -r1.17 -r1.18 pkgsrc/lang/tcl-expect/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
cvs diff -r1.28 -r1.29 pkgsrc/lang/tcl-expect/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/Makefile 2013/03/26 11:41:01 1.28
+++ pkgsrc/lang/tcl-expect/Makefile 2013/06/10 21:49:21 1.29
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.28 2013/03/26 11:41:01 jperkin Exp $ 1# $NetBSD: Makefile,v 1.29 2013/06/10 21:49:21 markd Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= tcl-expect-${EXPECT_VERSION} 5PKGNAME= tcl-expect-${EXPECT_VERSION}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Extensions to Tcl to support scripting of interactive programs 10COMMENT= Extensions to Tcl to support scripting of interactive programs
11LICENSE= public-domain 11LICENSE= public-domain
12 12
13CONFIGURE_ARGS+= --enable-shared 13CONFIGURE_ARGS+= --enable-shared
14CONFIGURE_ARGS+= --without-x 14CONFIGURE_ARGS+= --without-x
15 15
16INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q} 16INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q}
17 17
18.include "../../lang/tcl/buildlink3.mk" 18.include "../../lang/tcl/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/lang/tcl-expect/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/PLIST 2012/08/21 21:33:58 1.13
+++ pkgsrc/lang/tcl-expect/PLIST 2013/06/10 21:49:21 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2012/08/21 21:33:58 marino Exp $ 1@comment $NetBSD: PLIST,v 1.14 2013/06/10 21:49:21 markd Exp $
2bin/autoexpect 2bin/autoexpect
3bin/autopasswd 3bin/autopasswd
4bin/cryptdir 4bin/cryptdir
5bin/decryptdir 5bin/decryptdir
6bin/dislocate 6bin/dislocate
7bin/expect 7bin/expect
8bin/ftp-rfc 8bin/ftp-rfc
9bin/kibitz 9bin/kibitz
10bin/lpunlock 10bin/lpunlock
11bin/mkpasswd 11bin/mkpasswd
12bin/multixterm 12bin/multixterm
13bin/passmass 13bin/passmass
14bin/rftp 14bin/rftp
@@ -18,26 +18,27 @@ bin/timed-run @@ -18,26 +18,27 @@ bin/timed-run
18bin/tknewsbiff 18bin/tknewsbiff
19bin/tkpasswd 19bin/tkpasswd
20bin/unbuffer 20bin/unbuffer
21bin/weather 21bin/weather
22bin/xkibitz 22bin/xkibitz
23bin/xpstat 23bin/xpstat
24include/expect.h 24include/expect.h
25include/expect_comm.h 25include/expect_comm.h
26include/expect_tcl.h 26include/expect_tcl.h
27include/tcldbg.h 27include/tcldbg.h
28lib/libexpect${SONUM}.a 28lib/libexpect${SONUM}.a
29lib/libexpect${SONUM}.so 29lib/libexpect${SONUM}.so
30lib/libexpect${SONUM}.so.1.0 30lib/libexpect${SONUM}.so.1.0
 31lib/tcl/expect${BASEVER}/libexpect${SONUM}.so
31lib/tcl/expect${BASEVER}/pkgIndex.tcl 32lib/tcl/expect${BASEVER}/pkgIndex.tcl
32man/man1/autoexpect.1 33man/man1/autoexpect.1
33man/man1/cryptdir.1 34man/man1/cryptdir.1
34man/man1/decryptdir.1 35man/man1/decryptdir.1
35man/man1/dislocate.1 36man/man1/dislocate.1
36man/man1/expect.1 37man/man1/expect.1
37man/man1/kibitz.1 38man/man1/kibitz.1
38man/man1/mkpasswd.1 39man/man1/mkpasswd.1
39man/man1/multixterm.1 40man/man1/multixterm.1
40man/man1/passmass.1 41man/man1/passmass.1
41man/man1/tknewsbiff.1 42man/man1/tknewsbiff.1
42man/man1/unbuffer.1 43man/man1/unbuffer.1
43man/man1/xkibitz.1 44man/man1/xkibitz.1
cvs diff -r1.17 -r1.18 pkgsrc/lang/tcl-expect/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/distinfo 2013/03/26 11:41:01 1.17
+++ pkgsrc/lang/tcl-expect/distinfo 2013/06/10 21:49:21 1.18
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.17 2013/03/26 11:41:01 jperkin Exp $ 1$NetBSD: distinfo,v 1.18 2013/06/10 21:49:21 markd Exp $
2 2
3SHA1 (expect5.45.tar.gz) = e634992cab35b7c6931e1f21fbb8f74d464bd496 3SHA1 (expect5.45.tar.gz) = e634992cab35b7c6931e1f21fbb8f74d464bd496
4RMD160 (expect5.45.tar.gz) = edffe881ee45abe6e9aa150ea5958a04d0ffeab0 4RMD160 (expect5.45.tar.gz) = edffe881ee45abe6e9aa150ea5958a04d0ffeab0
5Size (expect5.45.tar.gz) = 628808 bytes 5Size (expect5.45.tar.gz) = 628808 bytes
6SHA1 (patch-Makefile.in) = eb44dad343e841fe825dd18ed7027f575bdd2e33 6SHA1 (patch-Makefile.in) = 6f38c1d356ab206c0d00a8b465434994bc787bcf
7SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34 7SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34
cvs diff -r1.2 -r1.3 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/patches/patch-Makefile.in 2013/03/26 11:41:01 1.2
+++ pkgsrc/lang/tcl-expect/patches/patch-Makefile.in 2013/06/10 21:49:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile.in,v 1.2 2013/03/26 11:41:01 jperkin Exp $ 1$NetBSD: patch-Makefile.in,v 1.3 2013/06/10 21:49:21 markd Exp $
2 2
3New Makefile.in patch, no libtool 3New Makefile.in patch, no libtool
4 4
5--- Makefile.in.orig 2010-09-30 17:14:07.000000000 +0000 5--- Makefile.in.orig 2010-09-30 17:14:07.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -99,7 +99,9 @@ PKG_HEADERS = @PKG_HEADERS@ 7@@ -99,7 +99,9 @@ PKG_HEADERS = @PKG_HEADERS@
8 # configuration options) composed of the named objects. 8 # configuration options) composed of the named objects.
9 #======================================================================== 9 #========================================================================
10  10
11+SHLIB_VERSION = .@SHLIB_VERSION@ 11+SHLIB_VERSION = .@SHLIB_VERSION@
12 PKG_LIB_FILE = @PKG_LIB_FILE@ 12 PKG_LIB_FILE = @PKG_LIB_FILE@
13+PKG_LIB_A_FILE = ${PKG_LIB_FILE:.so=.a} 13+PKG_LIB_A_FILE = ${PKG_LIB_FILE:.so=.a}
14 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ 14 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
@@ -44,25 +44,26 @@ New Makefile.in patch, no libtool @@ -44,25 +44,26 @@ New Makefile.in patch, no libtool
44 doc: 44 doc:
45  45
46 install: all install-binaries install-libraries install-doc 46 install: all install-binaries install-libraries install-doc
47@@ -547,6 +554,9 @@ install-lib-binaries: 47@@ -547,6 +554,9 @@ install-lib-binaries:
48 fi; \ 48 fi; \
49 fi; \ 49 fi; \
50 done 50 done
51+ mv $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE)$(SHLIB_VERSION) 51+ mv $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE)$(SHLIB_VERSION)
52+ cd $(DESTDIR)$(pkglibdir) && ln -fs $(PKG_LIB_FILE)$(SHLIB_VERSION) $(PKG_LIB_FILE) 52+ cd $(DESTDIR)$(pkglibdir) && ln -fs $(PKG_LIB_FILE)$(SHLIB_VERSION) $(PKG_LIB_FILE)
53+ $(INSTALL_DATA) $(PKG_LIB_A_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_A_FILE) 53+ $(INSTALL_DATA) $(PKG_LIB_A_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_A_FILE)
54 @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ 54 @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
55 if test -f $(srcdir)/$$p; then \ 55 if test -f $(srcdir)/$$p; then \
56 destp=`basename $$p`; \ 56 destp=`basename $$p`; \
57@@ -554,9 +564,10 @@ install-lib-binaries: 57@@ -554,9 +564,11 @@ install-lib-binaries:
58 $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ 58 $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
59 fi; \ 59 fi; \
60 done 60 done
61+ mkdir -p $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION) 61+ mkdir -p $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION)
 62+ ln -fs ../../$(PKG_LIB_FILE) $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION)/
62 @if test "x$(SHARED_BUILD)" = "x1"; then \ 63 @if test "x$(SHARED_BUILD)" = "x1"; then \
63 echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ 64 echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
64- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ 65- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
65+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION); \ 66+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION); \
66 fi 67 fi
67  68
68 #======================================================================== 69 #========================================================================