Tue Mar 26 11:41:02 2013 UTC ()
Fix generation of libexpect545.a.  Ok'd by wiz@ during freeze.

Bump PKGREVISION.


(jperkin)
diff -r1.27 -r1.28 pkgsrc/lang/tcl-expect/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/tcl-expect/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in
cvs diff -r1.27 -r1.28 pkgsrc/lang/tcl-expect/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/Makefile 2012/10/02 20:11:55 1.27
+++ pkgsrc/lang/tcl-expect/Makefile 2013/03/26 11:41:01 1.28
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.27 2012/10/02 20:11:55 asau Exp $ 1# $NetBSD: Makefile,v 1.28 2013/03/26 11:41:01 jperkin 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
6CATEGORIES= lang 7CATEGORIES= lang
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Extensions to Tcl to support scripting of interactive programs 10COMMENT= Extensions to Tcl to support scripting of interactive programs
10LICENSE= public-domain 11LICENSE= public-domain
11 12
12CONFIGURE_ARGS+= --enable-shared 13CONFIGURE_ARGS+= --enable-shared
13CONFIGURE_ARGS+= --without-x 14CONFIGURE_ARGS+= --without-x
14 15
15INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q} 16INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q}
16 17
17.include "../../lang/tcl/buildlink3.mk" 18.include "../../lang/tcl/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/lang/tcl-expect/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/distinfo 2012/08/21 21:33:58 1.16
+++ pkgsrc/lang/tcl-expect/distinfo 2013/03/26 11:41:01 1.17
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.16 2012/08/21 21:33:58 marino Exp $ 1$NetBSD: distinfo,v 1.17 2013/03/26 11:41:01 jperkin 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) = f1fdd2e3284b9b71ba231d8f8eff16729e1ef72f 6SHA1 (patch-Makefile.in) = eb44dad343e841fe825dd18ed7027f575bdd2e33
7SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34 7SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34
cvs diff -r1.1 -r1.2 pkgsrc/lang/tcl-expect/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/tcl-expect/patches/patch-Makefile.in 2012/08/21 21:33:58 1.1
+++ pkgsrc/lang/tcl-expect/patches/patch-Makefile.in 2013/03/26 11:41:01 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile.in,v 1.1 2012/08/21 21:33:58 marino Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2013/03/26 11:41:01 jperkin 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@
@@ -26,29 +26,29 @@ New Makefile.in patch, no libtool @@ -26,29 +26,29 @@ New Makefile.in patch, no libtool
26+pkgincludedir = $(includedir) 26+pkgincludedir = $(includedir)
27  27
28 top_builddir = . 28 top_builddir = .
29  29
30@@ -214,10 +216,15 @@ all: binaries libraries doc 30@@ -214,10 +216,15 @@ all: binaries libraries doc
31 # of the Makefile, in the "BINARIES" variable. 31 # of the Makefile, in the "BINARIES" variable.
32 #======================================================================== 32 #========================================================================
33  33
34-binaries: $(BINARIES) pkgIndex.tcl-hand 34-binaries: $(BINARIES) pkgIndex.tcl-hand
35+binaries: $(BINARIES) pkgIndex.tcl-hand ${PKG_LIB_A_FILE} 35+binaries: $(BINARIES) pkgIndex.tcl-hand ${PKG_LIB_A_FILE}
36  36
37 libraries: 37 libraries:
38  38
39+${PKG_LIB_A_FILE}: ${OBJS} 39+${PKG_LIB_A_FILE}: $(PKG_OBJECTS)
40+ rm -rf $@ 40+ rm -rf $@
41+ ar cr $@ ${OBJS} 41+ ar cr $@ $(PKG_OBJECTS)
42+ $(RANLIB) $@ 42+ $(RANLIB) $@
43+ 43+
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 \