* fixes DESTDIR installation * define TEST_TARGET.diff -r1.7 -r1.8 pkgsrc/security/tcl-tls/Makefile
(obache)
@@ -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 | |||
4 | DISTNAME= tls1.5.0-src | 4 | DISTNAME= tls1.5.0-src | |
5 | PKGNAME= tcl-tls-1.5.0 | 5 | PKGNAME= tcl-tls-1.5.0 | |
6 | PKGREVISION= 2 | 6 | PKGREVISION= 2 | |
7 | CATEGORIES= security | 7 | CATEGORIES= security | |
8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/} | 8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tls/} | |
9 | 9 | |||
10 | PKG_DESTDIR_SUPPORT= user-destdir | |||
11 | ||||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://tls.sourceforge.net/ | 13 | HOMEPAGE= http://tls.sourceforge.net/ | |
12 | COMMENT= TLS (aka SSL) Channel for the Tcl language | 14 | COMMENT= TLS (aka SSL) Channel for the Tcl language | |
13 | 15 | |||
14 | WRKSRC= ${WRKDIR}/tls1.5 | 16 | WRKSRC= ${WRKDIR}/tls1.5 | |
15 | 17 | |||
16 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} | 19 | CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} | |
18 | CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} | 20 | CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} | |
19 | MAKE_ENV+= TCLLIB="${BUILDLINK_PREFIX.tcl}/lib" | 21 | MAKE_ENV+= TCLLIB="${BUILDLINK_PREFIX.tcl}/lib" | |
20 | 22 | |||
23 | TEST_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" |
@@ -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 | |||
3 | SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16 | 3 | SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16 | |
4 | RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85 | 4 | RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85 | |
5 | Size (tls1.5.0-src.tar.gz) = 113600 bytes | 5 | Size (tls1.5.0-src.tar.gz) = 113600 bytes | |
6 | SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15 | 6 | SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15 | |
7 | SHA1 (patch-ab) = 810adbf08ee865e01861bd7a9d6383d1d894f4f0 | 7 | SHA1 (patch-ab) = 6d18f2f85e41007336cb8997e8bfd0d55bb6ea69 | |
8 | SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45 | 8 | SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45 |
@@ -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) |