* fixes DESTDIR installation

* define TEST_TARGET.

3 files changed, 37 insertions, 8 deletions

diff --git a/security/tcl-tls/Makefile b/security/tcl-tls/Makefile
index 36906d5c806..5710607264d 100644
--- a/security/tcl-tls/Makefile
+++ b/security/tcl-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/25 06:28:09 obache Exp $
 #
 
 DISTNAME=		tls1.5.0-src
@@ -7,6 +7,8 @@ PKGREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tls/}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://tls.sourceforge.net/
 COMMENT=		TLS (aka SSL) Channel for the Tcl language
@@ -18,6 +20,8 @@ CONFIGURE_ARGS+=	--with-ssl-dir=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE:Q}
 MAKE_ENV+=		TCLLIB="${BUILDLINK_PREFIX.tcl}/lib"
 
+TEST_TARGET=		test
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tcl-tls/distinfo b/security/tcl-tls/distinfo
index fbc544e5d43..3ba58e7e069 100644
--- a/security/tcl-tls/distinfo
+++ b/security/tcl-tls/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/27 17:33:44 peter Exp $
+$NetBSD: distinfo,v 1.4 2010/06/25 06:28:09 obache Exp $
 
 SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16
 RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85
 Size (tls1.5.0-src.tar.gz) = 113600 bytes
 SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15
-SHA1 (patch-ab) = 810adbf08ee865e01861bd7a9d6383d1d894f4f0
+SHA1 (patch-ab) = 6d18f2f85e41007336cb8997e8bfd0d55bb6ea69
 SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45
diff --git a/security/tcl-tls/patches/patch-ab b/security/tcl-tls/patches/patch-ab
index 7b5c2e8378f..dc0cdd5bac4 100644
--- a/security/tcl-tls/patches/patch-ab
+++ b/security/tcl-tls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/02/27 17:33:44 peter Exp $
+$NetBSD: patch-ab,v 1.3 2010/06/25 06:28:09 obache Exp $
 
---- Makefile.in.orig	2004-02-04 05:02:17.000000000 +0100
-+++ Makefile.in	2005-02-21 17:48:47.000000000 +0100
-@@ -122,6 +122,7 @@
+--- Makefile.in.orig	2004-02-04 04:02:17.000000000 +0000
++++ Makefile.in
+@@ -122,6 +122,7 @@ POST_UNINSTALL = :
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
  CC = @CC@
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2005/02/27 17:33:44 peter Exp $
  CFLAGS_DEBUG = @CFLAGS_DEBUG@
  CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
  CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
-@@ -136,7 +137,7 @@
+@@ -136,7 +137,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
  OBJEXT = @OBJEXT@
  RANLIB = @RANLIB@
  SHLIB_CFLAGS = @SHLIB_CFLAGS@
@@ -19,3 +19,28 @@ $NetBSD: patch-ab,v 1.2 2005/02/27 17:33:44 peter Exp $
  SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
  SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
  STLIB_LD = @STLIB_LD@
+@@ -208,20 +209,20 @@ install-binaries: binaries install-lib-b
+ 	sed -e "s#\@RELPATH\@#$(RELPATH)#" \
+ 	-e "s#\@tls_LIB_FILE\@#$(tls_LIB_FILE)#" \
+ 	< $(srcdir)/pkgIndex.tcl.in > pkgIndex.tcl
+-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+ 
+ #========================================================================
+ # This rule installs platform-independent files, such as header files.
+ #========================================================================
+ 
+ install-libraries: libraries
+-	$(mkinstalldirs) $(includedir)
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@echo "Installing header files in $(includedir)"
+ 	@for i in $(GENERIC_HDRS) ; do \
+ 	    echo "Installing $$i" ; \
+-	    $(INSTALL_DATA) $$i $(includedir) ; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
+ 	done;
+-	$(INSTALL_DATA) $(srcdir)/tls.tcl $(pkglibdir)
++	$(INSTALL_DATA) $(srcdir)/tls.tcl $(DESTDIR)$(pkglibdir)
+ 
+ #========================================================================
+ # Install documentation.  Unix manpages should go in the $(mandir)