diff options
author | seb <seb@pkgsrc.org> | 2002-09-02 23:12:22 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-09-02 23:12:22 +0000 |
commit | 4b3653ff1ea7c06ec538e50f811163a93d4846ee (patch) | |
tree | 989f4bde7d32401879ad6bcc74460ecc59e7145a | |
parent | 08bc9810802e05265d59d7f74827ac2b6cd58324 (diff) | |
download | pkgsrc-4b3653ff1ea7c06ec538e50f811163a93d4846ee.tar.gz |
Update to version 1.0rc8nb1.
Fix my own mistakes: use libtool to install libtool-linked executables!
Signaled in PR pkg/18152 by Martin Weber <Ephaeton@gmx.net>.
-rw-r--r-- | lang/tcl-otcl/Makefile | 3 | ||||
-rw-r--r-- | lang/tcl-otcl/buildlink2.mk | 4 | ||||
-rw-r--r-- | lang/tcl-otcl/distinfo | 4 | ||||
-rw-r--r-- | lang/tcl-otcl/patches/patch-aa | 26 |
4 files changed, 20 insertions, 17 deletions
diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile index 3e12203055e..6fb9c27f8db 100644 --- a/lang/tcl-otcl/Makefile +++ b/lang/tcl-otcl/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/02 23:12:22 seb Exp $ DISTNAME= otcl-1.0a8 PKGNAME= tcl-${DISTNAME:S/a/rc/} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/} diff --git a/lang/tcl-otcl/buildlink2.mk b/lang/tcl-otcl/buildlink2.mk index 5ddd2dc3e0c..029aa0f0eb4 100644 --- a/lang/tcl-otcl/buildlink2.mk +++ b/lang/tcl-otcl/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/08/28 09:57:34 seb Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2002/09/02 23:12:23 seb Exp $ .if !defined(TCL_OTCL_BUILDLINK2_MK) TCL_OTCL_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= tcl-otcl -BUILDLINK_DEPENDS.tcl-otcl?= tcl-otcl>=1.0rc8 +BUILDLINK_DEPENDS.tcl-otcl?= tcl-otcl>=1.0rc8nb1 BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl EVAL_PREFIX+= BUILDLINK_PREFIX.tcl-otcl=tcl-otcl diff --git a/lang/tcl-otcl/distinfo b/lang/tcl-otcl/distinfo index 0c676ca4e6e..f74dc83626b 100644 --- a/lang/tcl-otcl/distinfo +++ b/lang/tcl-otcl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/28 09:57:34 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/09/02 23:12:23 seb Exp $ SHA1 (otcl-1.0a8.tar.gz) = 84cf8ec97a79230f5de6ae65ccee3ff788c7c20c Size (otcl-1.0a8.tar.gz) = 300607 bytes -SHA1 (patch-aa) = aa5e68245897764a12c098a73f8e2f06f5672474 +SHA1 (patch-aa) = 87f242437f8c22c9e6260d9343fa3ef3eabf2c8f diff --git a/lang/tcl-otcl/patches/patch-aa b/lang/tcl-otcl/patches/patch-aa index 4111c77ea0a..b43d83621ea 100644 --- a/lang/tcl-otcl/patches/patch-aa +++ b/lang/tcl-otcl/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/02 23:12:24 seb Exp $ ---- Makefile.in.orig Thu Nov 2 02:45:59 2000 +--- Makefile.in.orig Thu Nov 2 01:45:59 2000 +++ Makefile.in @@ -5,6 +5,7 @@ # @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ CFLAGS= @CFLAGS@ RANLIB= @RANLIB@ INSTALL= @INSTALL@ -@@ -28,7 +29,7 @@ +@@ -28,7 +29,7 @@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ INST_OTCLSH= @prefix@/bin INST_OWISH= @prefix@/bin INST_OLIB= @prefix@/lib @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ INST_OINC= @prefix@/include -@@ -40,7 +41,6 @@ +@@ -40,7 +41,6 @@ INCLUDES = \ -I. \ @V_INCLUDES@ \ @V_INCLUDE_X11@ \ @@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ @V_INCLUDE@ DEFINES = \ -@@ -58,9 +58,9 @@ +@@ -58,9 +58,9 @@ MV= mv -f CFILES = otcl.c otclAppInit.c otkAppInit.c .c.o: @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ # # compile an appinit with tcl and otcl and link against -@@ -69,8 +69,8 @@ +@@ -69,8 +69,8 @@ all: libotcl.a libotcl$(SHLIB_SUFFIX) ot otclsh: otclAppInit.c libotcl.a rm -f libotcl$(SHLIB_SUFFIX) @@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ # # compile an appinit with tcl/tk and otcl and link against -@@ -79,8 +79,8 @@ +@@ -79,8 +79,8 @@ otclsh: otclAppInit.c libotcl.a owish: otkAppInit.c libotcl.a rm -f libotcl$(SHLIB_SUFFIX) @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ # # compile otcl.c and link it into a library archive -@@ -89,36 +89,25 @@ +@@ -89,36 +89,25 @@ owish: otkAppInit.c libotcl.a libotcl.a: otcl.c rm -f libotcl.a otcl.o @@ -86,12 +86,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ ./owish lib/test.tcl -install: owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) otcl.h -+install: owish otclsh libotcl.a otcl.h - $(INSTALL) owish $(INST_OWISH) - $(INSTALL) otclsh $(INST_OTCLSH) +- $(INSTALL) owish $(INST_OWISH) +- $(INSTALL) otclsh $(INST_OTCLSH) - $(INSTALL) libotcl.a $(INST_OLIB) - $(INSTALL) libotcl$(SHLIB_SUFFIX) $(INST_OLIBSH) ++install: owish otclsh libotcl.a otcl.h + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libotcl.la ${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} owish $(INST_OWISH) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} otclsh $(INST_OTCLSH) $(INSTALL) otcl.h $(INST_OINC) clean: @@ -104,7 +106,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $ # To be compatible with ns/nam distclean: clean -@@ -146,7 +135,7 @@ +@@ -146,7 +135,7 @@ srctar: depend: $(CFILES) @echo Making dependencies for $(srcdir){$(CFILES)} |