Fri Jun 25 06:28:09 2010 UTC ()
* fixes DESTDIR installation
* define TEST_TARGET.


(obache)
diff -r1.7 -r1.8 pkgsrc/security/tcl-tls/Makefile
diff -r1.3 -r1.4 pkgsrc/security/tcl-tls/distinfo
diff -r1.2 -r1.3 pkgsrc/security/tcl-tls/patches/patch-ab

cvs diff -r1.7 -r1.8 pkgsrc/security/tcl-tls/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tcl-tls/Makefile 2010/01/17 12:02:44 1.7
+++ pkgsrc/security/tcl-tls/Makefile 2010/06/25 06:28:09 1.8
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2010/06/25 06:28:09 obache Exp $
2# 2#
3 3
4DISTNAME= tls1.5.0-src 4DISTNAME= tls1.5.0-src
5PKGNAME= tcl-tls-1.5.0 5PKGNAME= tcl-tls-1.5.0
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/}
9 9
 10PKG_DESTDIR_SUPPORT= user-destdir
 11
10MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://tls.sourceforge.net/ 13HOMEPAGE= http://tls.sourceforge.net/
12COMMENT= TLS (aka SSL) Channel for the Tcl language 14COMMENT= TLS (aka SSL) Channel for the Tcl language
13 15
14WRKSRC= ${WRKDIR}/tls1.5 16WRKSRC= ${WRKDIR}/tls1.5
15 17
16GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 19CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
18CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} 20CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
19MAKE_ENV+= TCLLIB="${BUILDLINK_PREFIX.tcl}/lib" 21MAKE_ENV+= TCLLIB="${BUILDLINK_PREFIX.tcl}/lib"
20 22
 23TEST_TARGET= test
 24
21.include "../../lang/tcl/buildlink3.mk" 25.include "../../lang/tcl/buildlink3.mk"
22.include "../../security/openssl/buildlink3.mk" 26.include "../../security/openssl/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/security/tcl-tls/distinfo (expand / switch to unified diff)

--- pkgsrc/security/tcl-tls/distinfo 2005/02/27 17:33:44 1.3
+++ pkgsrc/security/tcl-tls/distinfo 2010/06/25 06:28:09 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2005/02/27 17:33:44 peter Exp $ 1$NetBSD: distinfo,v 1.4 2010/06/25 06:28:09 obache Exp $
2 2
3SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16 3SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16
4RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85 4RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85
5Size (tls1.5.0-src.tar.gz) = 113600 bytes 5Size (tls1.5.0-src.tar.gz) = 113600 bytes
6SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15 6SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15
7SHA1 (patch-ab) = 810adbf08ee865e01861bd7a9d6383d1d894f4f0 7SHA1 (patch-ab) = 6d18f2f85e41007336cb8997e8bfd0d55bb6ea69
8SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45 8SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45

cvs diff -r1.2 -r1.3 pkgsrc/security/tcl-tls/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/tcl-tls/patches/Attic/patch-ab 2005/02/27 17:33:44 1.2
+++ pkgsrc/security/tcl-tls/patches/Attic/patch-ab 2010/06/25 06:28:09 1.3
@@ -1,21 +1,46 @@ @@ -1,21 +1,46 @@
1$NetBSD: patch-ab,v 1.2 2005/02/27 17:33:44 peter Exp $ 1$NetBSD: patch-ab,v 1.3 2010/06/25 06:28:09 obache Exp $
2 2
3--- Makefile.in.orig 2004-02-04 05:02:17.000000000 +0100 3--- Makefile.in.orig 2004-02-04 04:02:17.000000000 +0000
4+++ Makefile.in 2005-02-21 17:48:47.000000000 +0100 4+++ Makefile.in
5@@ -122,6 +122,7 @@ 5@@ -122,6 +122,7 @@ POST_UNINSTALL = :
6 PACKAGE = @PACKAGE@ 6 PACKAGE = @PACKAGE@
7 VERSION = @VERSION@ 7 VERSION = @VERSION@
8 CC = @CC@ 8 CC = @CC@
9+TCL_CC = @TCL_CC@ 9+TCL_CC = @TCL_CC@
10 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 10 CFLAGS_DEBUG = @CFLAGS_DEBUG@
11 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 11 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
12 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 12 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
13@@ -136,7 +137,7 @@ 13@@ -136,7 +137,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
14 OBJEXT = @OBJEXT@ 14 OBJEXT = @OBJEXT@
15 RANLIB = @RANLIB@ 15 RANLIB = @RANLIB@
16 SHLIB_CFLAGS = @SHLIB_CFLAGS@ 16 SHLIB_CFLAGS = @SHLIB_CFLAGS@
17-SHLIB_LD = @SHLIB_LD@ 17-SHLIB_LD = @SHLIB_LD@
18+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) ${TCLLIB} 18+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) ${TCLLIB}
19 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ 19 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
20 SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ 20 SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
21 STLIB_LD = @STLIB_LD@ 21 STLIB_LD = @STLIB_LD@
 22@@ -208,20 +209,20 @@ install-binaries: binaries install-lib-b
 23 sed -e "s#\@RELPATH\@#$(RELPATH)#" \
 24 -e "s#\@tls_LIB_FILE\@#$(tls_LIB_FILE)#" \
 25 < $(srcdir)/pkgIndex.tcl.in > pkgIndex.tcl
 26- $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
 27+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
 28
 29 #========================================================================
 30 # This rule installs platform-independent files, such as header files.
 31 #========================================================================
 32
 33 install-libraries: libraries
 34- $(mkinstalldirs) $(includedir)
 35+ $(mkinstalldirs) $(DESTDIR)$(includedir)
 36 @echo "Installing header files in $(includedir)"
 37 @for i in $(GENERIC_HDRS) ; do \
 38 echo "Installing $$i" ; \
 39- $(INSTALL_DATA) $$i $(includedir) ; \
 40+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 41 done;
 42- $(INSTALL_DATA) $(srcdir)/tls.tcl $(pkglibdir)
 43+ $(INSTALL_DATA) $(srcdir)/tls.tcl $(DESTDIR)$(pkglibdir)
 44
 45 #========================================================================
 46 # Install documentation. Unix manpages should go in the $(mandir)