diff options
| -rw-r--r-- | devel/tcl-tclcl/Makefile | 3 | ||||
| -rw-r--r-- | devel/tcl-tclcl/distinfo | 4 | ||||
| -rw-r--r-- | devel/tcl-tclcl/patches/patch-aa | 10 | ||||
| -rw-r--r-- | lang/tcl-otcl/Makefile | 10 | ||||
| -rw-r--r-- | lang/tcl-otcl/distinfo | 4 | ||||
| -rw-r--r-- | lang/tcl-otcl/patches/patch-aa | 16 |
6 files changed, 25 insertions, 22 deletions
diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile index 62b081f5cce..aca2c57ba42 100644 --- a/devel/tcl-tclcl/Makefile +++ b/devel/tcl-tclcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/04/26 15:32:24 minskim Exp $ +# $NetBSD: Makefile,v 1.19 2009/02/17 19:53:02 joerg Exp $ DISTNAME= tclcl-src-1.19 PKGNAME= tcl-${DISTNAME:S/-src//} @@ -10,6 +10,7 @@ HOMEPAGE= http://otcl-tclcl.sourceforge.net/tclcl/ COMMENT= Tcl/C++ interface used by ns and nam PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c c++ diff --git a/devel/tcl-tclcl/distinfo b/devel/tcl-tclcl/distinfo index 25bddde797e..bde8a5b8573 100644 --- a/devel/tcl-tclcl/distinfo +++ b/devel/tcl-tclcl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2007/04/26 15:32:24 minskim Exp $ +$NetBSD: distinfo,v 1.11 2009/02/17 19:53:02 joerg Exp $ SHA1 (tclcl-src-1.19.tar.gz) = 4ecb4b45f439f9bf10539936a138d70dd32aa6d4 RMD160 (tclcl-src-1.19.tar.gz) = a7bc0088e20fd91fd6a3ff1f8ff4d99649db7047 Size (tclcl-src-1.19.tar.gz) = 174080 bytes -SHA1 (patch-aa) = ad3327a2176745c103d55610015aa4d165ae78f6 +SHA1 (patch-aa) = df5fde2f7bc352a5b108472cdc88e728d0ca3fe7 SHA1 (patch-ab) = 8df79a3911c55aa21eaa9d4a2cbb7f82dc9870a1 SHA1 (patch-ac) = dbbd4529799e015ffaafff449fb6140aa8f9d663 diff --git a/devel/tcl-tclcl/patches/patch-aa b/devel/tcl-tclcl/patches/patch-aa index 3d69fcec62d..11a9e283fe0 100644 --- a/devel/tcl-tclcl/patches/patch-aa +++ b/devel/tcl-tclcl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2006/01/30 00:09:10 minskim Exp $ +$NetBSD: patch-aa,v 1.7 2009/02/17 19:53:02 joerg Exp $ --- Makefile.in.orig 2005-10-02 14:26:19.000000000 -0700 +++ Makefile.in @@ -62,11 +62,11 @@ $NetBSD: patch-aa,v 1.6 2006/01/30 00:09:10 minskim Exp $ - $(INSTALL) $(LIB_TCLCL) @prefix@/lib - $(RANLIB) @prefix@/lib/$(LIB_TCLCL) + for f in idlecallback.h iohandler.h rate-variable.h tclcl-config.h tclcl-mappings.h tclcl.h timer.h tracedvar.h; do \ -+ ${INSTALL_DATA} $$f ${PREFIX}/include; \ ++ ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include; \ + done -+ ${INSTALL_PROGRAM} tcl2c++ ${PREFIX}/bin -+ ${INSTALL_SCRIPT} otcldoc ${PREFIX}/bin -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtclcl.la ${PREFIX}/lib ++ ${INSTALL_PROGRAM} tcl2c++ ${DESTDIR}${PREFIX}/bin ++ ${INSTALL_SCRIPT} otcldoc ${DESTDIR}${PREFIX}/bin ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtclcl.la ${DESTDIR}${PREFIX}/lib # libTcl is no longer installed as of 13-Nov-99 # -test -f @prefix@/lib/libTcl.a && rm -f @prefix@/lib/libTcl.a || true diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile index 9195372fe60..e70a05ca4d9 100644 --- a/lang/tcl-otcl/Makefile +++ b/lang/tcl-otcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/04/26 15:28:42 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2009/02/17 19:49:57 joerg Exp $ DISTNAME= otcl-src-1.13 PKGNAME= tcl-${DISTNAME:S/-src//} @@ -10,6 +10,7 @@ HOMEPAGE= http://otcl-tclcl.sourceforge.net/otcl/ COMMENT= MIT Object Tcl PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -25,7 +26,7 @@ DOCS= autoload.html capi.html class.html object.html \ tutorial.html otcl-paper.ps.gz DOCDIR= ${PREFIX}/share/doc/tcl/otcl -INSTALLATION_DIRS= bin include lib +INSTALLATION_DIRS= bin include lib ${DOCDIR} BUILDLINK_DEPMETHOD.libXt?= build @@ -34,10 +35,9 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DESTDIR}${DOCDIR} .for _file_ in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DESTDIR}${DOCDIR} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl-otcl/distinfo b/lang/tcl-otcl/distinfo index 6725f2414fb..a17020c80d5 100644 --- a/lang/tcl-otcl/distinfo +++ b/lang/tcl-otcl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2007/04/26 15:28:42 minskim Exp $ +$NetBSD: distinfo,v 1.9 2009/02/17 19:49:57 joerg Exp $ SHA1 (otcl-src-1.13.tar.gz) = e3310044628f0a59217abaa5ff8ac8234700dd83 RMD160 (otcl-src-1.13.tar.gz) = 7c0def77993ec6e48e4085d6a953b55c2fe2bc59 Size (otcl-src-1.13.tar.gz) = 317440 bytes -SHA1 (patch-aa) = 499fc336891fb96392614b85bac4373d7f63be65 +SHA1 (patch-aa) = b3308c72cc4f9260608578ff78926f77df343527 SHA1 (patch-ab) = 0f735f21dd2204fe37990f201ec121af4eb7b470 SHA1 (patch-ac) = c7b11d85eecc954424993f2410cb69da1d3dff1f diff --git a/lang/tcl-otcl/patches/patch-aa b/lang/tcl-otcl/patches/patch-aa index 4c700ea8053..71fd00d8864 100644 --- a/lang/tcl-otcl/patches/patch-aa +++ b/lang/tcl-otcl/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2006/09/29 16:28:55 minskim Exp $ +$NetBSD: patch-aa,v 1.5 2009/02/17 19:49:57 joerg Exp $ ---- Makefile.in.orig 2006-09-25 05:02:37.000000000 +0000 +--- Makefile.in.orig 2007-03-11 00:11:11.000000000 +0100 +++ Makefile.in @@ -5,6 +5,7 @@ # @@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.4 2006/09/29 16:28:55 minskim Exp $ test: otclsh owish ./otclsh lib/test.tcl -@@ -114,12 +103,10 @@ dirs: +@@ -114,13 +103,11 @@ dirs: fi;\ done @@ -93,13 +93,15 @@ $NetBSD: patch-aa,v 1.4 2006/09/29 16:28:55 minskim Exp $ - $(INSTALL) libotcl.a $(INST_OLIB) - $(RANLIB) $(INST_OLIB)/libotcl.a - $(INSTALL) libotcl$(SHLIB_SUFFIX) $(INST_OLIBSH) +- $(INSTALL) -m 644 otcl.h $(INST_OINC) +install: owish otclsh libotcl.a otcl.h dirs -+ ${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) -m 644 otcl.h $(INST_OINC) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libotcl.la ${DESTDIR}${PREFIX}/lib ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} owish ${DESTDIR}$(INST_OWISH) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} otclsh ${DESTDIR}$(INST_OTCLSH) ++ $(INSTALL) -m 644 otcl.h ${DESTDIR}$(INST_OINC) clean: + rm -f owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) \ @@ -154,7 +141,7 @@ srctar: depend: $(CFILES) |