Wed Jul 25 16:19:16 2018 UTC ()
Use external destdir patch. Add CONFLICTS with ucspi-tcp6, to be added shortly.


(schmonz)
diff -r1.42 -r1.43 pkgsrc/net/ucspi-tcp/Makefile
diff -r1.12 -r1.13 pkgsrc/net/ucspi-tcp/distinfo
diff -r1.6 -r1.7 pkgsrc/net/ucspi-tcp/options.mk
diff -r1.1 -r0 pkgsrc/net/ucspi-tcp/patches/patch-Makefile
cvs diff -r1.42 -r1.43 pkgsrc/net/ucspi-tcp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp/Makefile 2018/06/18 10:50:19 1.42
+++ pkgsrc/net/ucspi-tcp/Makefile 2018/07/25 16:19:16 1.43
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.42 2018/06/18 10:50:19 schmonz Exp $ 1# $NetBSD: Makefile,v 1.43 2018/07/25 16:19:16 schmonz Exp $
2 2
3DISTNAME= ucspi-tcp-0.88 3DISTNAME= ucspi-tcp-0.88
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= sysutils net 5CATEGORIES= sysutils net
6MASTER_SITES= http://cr.yp.to/ucspi-tcp/ ftp://cr.yp.to/ucspi-tcp/ 6MASTER_SITES= http://cr.yp.to/ucspi-tcp/ ftp://cr.yp.to/ucspi-tcp/
7DISTFILES= ${DISTNAME}.tar.gz ${MANPAGES} 7DISTFILES= ${DISTNAME}.tar.gz ${MANPAGES}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://cr.yp.to/ucspi-tcp.html 10HOMEPAGE= http://cr.yp.to/ucspi-tcp.html
11COMMENT= Command-line tools for building TCP client-server applications 11COMMENT= Command-line tools for building TCP client-server applications
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14MANPAGES= ${DISTNAME}-man-20020317.tar.gz 14MANPAGES= ${DISTNAME}-man-20020317.tar.gz
15SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/ 15SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/
16 16
 17CONFLICTS+= ucspi-tcp6-[0-9]*
 18
17DJB_RESTRICTED= no 19DJB_RESTRICTED= no
18 20
19SUBST_CLASSES+= etc 21SUBST_CLASSES+= etc
20SUBST_STAGE.etc= do-configure 22SUBST_STAGE.etc= do-configure
21SUBST_FILES.etc= dns_rcrw.c 23SUBST_FILES.etc= dns_rcrw.c
22SUBST_SED.etc= -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g' 24SUBST_SED.etc= -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
23SUBST_MESSAGE.etc= Fixing prefix. 25SUBST_MESSAGE.etc= Fixing prefix.
24 26
25BUILD_DEFS+= PKG_SYSCONFBASE 27BUILD_DEFS+= PKG_SYSCONFBASE
26 28
27INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 29INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
28 30
29post-install: 31post-install:
cvs diff -r1.12 -r1.13 pkgsrc/net/ucspi-tcp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp/distinfo 2018/06/18 10:54:30 1.12
+++ pkgsrc/net/ucspi-tcp/distinfo 2018/07/25 16:19:16 1.13
@@ -1,19 +1,22 @@ @@ -1,19 +1,22 @@
1$NetBSD: distinfo,v 1.12 2018/06/18 10:54:30 schmonz Exp $ 1$NetBSD: distinfo,v 1.13 2018/07/25 16:19:16 schmonz Exp $
2 2
3SHA1 (rblsmtpd-nodefaultrbl.patch) = 5d6048b5928257c13ff5cbcddb40ed0eee9997c0 3SHA1 (rblsmtpd-nodefaultrbl.patch) = 5d6048b5928257c13ff5cbcddb40ed0eee9997c0
4RMD160 (rblsmtpd-nodefaultrbl.patch) = fa93dd4522ccc77c5b43d0a79f741ae2ab54f075 4RMD160 (rblsmtpd-nodefaultrbl.patch) = fa93dd4522ccc77c5b43d0a79f741ae2ab54f075
5SHA512 (rblsmtpd-nodefaultrbl.patch) = 911086e4de23165dccfc0390600182339defc47cb157abd0d0d86c39400e344db72a1f8fbc59673510ae820a95d2c6f29ac5e178b0108ec4bafc6940441c10d7 5SHA512 (rblsmtpd-nodefaultrbl.patch) = 911086e4de23165dccfc0390600182339defc47cb157abd0d0d86c39400e344db72a1f8fbc59673510ae820a95d2c6f29ac5e178b0108ec4bafc6940441c10d7
6Size (rblsmtpd-nodefaultrbl.patch) = 822 bytes 6Size (rblsmtpd-nodefaultrbl.patch) = 822 bytes
7SHA1 (ucspi-tcp-0.88-ipv6.diff20.bz2) = de20a86034bd616bc1c47cb4a234c16ebb5428bc 7SHA1 (ucspi-tcp-0.88-ipv6.diff20.bz2) = de20a86034bd616bc1c47cb4a234c16ebb5428bc
8RMD160 (ucspi-tcp-0.88-ipv6.diff20.bz2) = 5a77d1e585833985711270d6a228f81b30eb6151 8RMD160 (ucspi-tcp-0.88-ipv6.diff20.bz2) = 5a77d1e585833985711270d6a228f81b30eb6151
9SHA512 (ucspi-tcp-0.88-ipv6.diff20.bz2) = f8d3ae49adec2b6a643458958679b712e803b0e4609b4395ff9c4fd13b5a29b6f9fc35aee59f2928b892908d37ed83b708c67346a4a42ec21e05e7782bff215b 9SHA512 (ucspi-tcp-0.88-ipv6.diff20.bz2) = f8d3ae49adec2b6a643458958679b712e803b0e4609b4395ff9c4fd13b5a29b6f9fc35aee59f2928b892908d37ed83b708c67346a4a42ec21e05e7782bff215b
10Size (ucspi-tcp-0.88-ipv6.diff20.bz2) = 22088 bytes 10Size (ucspi-tcp-0.88-ipv6.diff20.bz2) = 22088 bytes
11SHA1 (ucspi-tcp-0.88-man-20020317.tar.gz) = 7b2507ff1b49917b44ee64af5995a94a50effd44 11SHA1 (ucspi-tcp-0.88-man-20020317.tar.gz) = 7b2507ff1b49917b44ee64af5995a94a50effd44
12RMD160 (ucspi-tcp-0.88-man-20020317.tar.gz) = 6285882adea8f3c1f700ef82bec0d34078dfa559 12RMD160 (ucspi-tcp-0.88-man-20020317.tar.gz) = 6285882adea8f3c1f700ef82bec0d34078dfa559
13SHA512 (ucspi-tcp-0.88-man-20020317.tar.gz) = e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146 13SHA512 (ucspi-tcp-0.88-man-20020317.tar.gz) = e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
14Size (ucspi-tcp-0.88-man-20020317.tar.gz) = 7562 bytes 14Size (ucspi-tcp-0.88-man-20020317.tar.gz) = 7562 bytes
15SHA1 (ucspi-tcp-0.88.tar.gz) = 793b4189795b563085602c030dd8aa0d206ddc0e 15SHA1 (ucspi-tcp-0.88.tar.gz) = 793b4189795b563085602c030dd8aa0d206ddc0e
16RMD160 (ucspi-tcp-0.88.tar.gz) = eb20085ea6ffd5d137a805f7c8768e0312c1f56a 16RMD160 (ucspi-tcp-0.88.tar.gz) = eb20085ea6ffd5d137a805f7c8768e0312c1f56a
17SHA512 (ucspi-tcp-0.88.tar.gz) = 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7 17SHA512 (ucspi-tcp-0.88.tar.gz) = 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
18Size (ucspi-tcp-0.88.tar.gz) = 53019 bytes 18Size (ucspi-tcp-0.88.tar.gz) = 53019 bytes
19SHA1 (patch-Makefile) = ff965829c788c9cfe52bee4d8fd527213dc954d3 19SHA1 (ucspi-tcp-0.88-destdir-20180725.patch) = e6c3c4a93b30e78a01d84152d9ff88470ccf1ef1
 20RMD160 (ucspi-tcp-0.88-destdir-20180725.patch) = 2b77b4cb8a7b96cad9a6f0171b3df2416c0b43cc
 21SHA512 (ucspi-tcp-0.88-destdir-20180725.patch) = 51f12e64a11dd9442d64356985dcd1a261979b5ced4b064c3e67db166f565f3507f29c3875d382fc8ced553f1a1b67f05df2df9f492b678c6f9ba508b5e8ee07
 22Size (ucspi-tcp-0.88-destdir-20180725.patch) = 1169 bytes
cvs diff -r1.6 -r1.7 pkgsrc/net/ucspi-tcp/options.mk (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp/options.mk 2018/07/04 13:40:31 1.6
+++ pkgsrc/net/ucspi-tcp/options.mk 2018/07/25 16:19:16 1.7
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1# $NetBSD: options.mk,v 1.6 2018/07/04 13:40:31 jperkin Exp $ 1# $NetBSD: options.mk,v 1.7 2018/07/25 16:19:16 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-tcp 3PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-tcp
4PKG_SUPPORTED_OPTIONS+= inet6 ucspi-tcp-nodefaultrbl 4PKG_SUPPORTED_OPTIONS+= inet6 ucspi-tcp-nodefaultrbl
5PKG_SUGGESTED_OPTIONS+= inet6 ucspi-tcp-nodefaultrbl 5PKG_SUGGESTED_OPTIONS+= inet6 ucspi-tcp-nodefaultrbl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
 9DESTDIR_PATCH= ucspi-tcp-0.88-destdir-20180725.patch
 10PATCHFILES+= ${DESTDIR_PATCH}
 11SITES.${DESTDIR_PATCH}= https://schmonz.com/qmail/ucspitcpdestdir/
 12
9PLIST_VARS+= inet6 13PLIST_VARS+= inet6
10.if !empty(PKG_OPTIONS:Minet6) 14.if !empty(PKG_OPTIONS:Minet6)
11IPV6_PATCH= ucspi-tcp-0.88-ipv6.diff20.bz2 15IPV6_PATCH= ucspi-tcp-0.88-ipv6.diff20.bz2
12PATCHFILES+= ${IPV6_PATCH} 16PATCHFILES+= ${IPV6_PATCH}
13SITES.${IPV6_PATCH}= http://www.fefe.de/ucspi/ 17SITES.${IPV6_PATCH}= http://www.fefe.de/ucspi/
14PATCH_DIST_STRIP.${IPV6_PATCH}= -p1 18PATCH_DIST_STRIP.${IPV6_PATCH}= -p1
15PLIST.inet6= yes 19PLIST.inet6= yes
16 20
17SUBST_CLASSES+= hier 21SUBST_CLASSES+= hier
18SUBST_STAGE.hier= pre-configure 22SUBST_STAGE.hier= pre-configure
19SUBST_MESSAGE.hier= Fixing manpage path. 23SUBST_MESSAGE.hier= Fixing manpage path.
20SUBST_FILES.hier= hier.c 24SUBST_FILES.hier= hier.c
21SUBST_SED.hier= -e 's,man,${PKGMANDIR},' 25SUBST_SED.hier= -e 's,man,${PKGMANDIR},'
File Deleted: pkgsrc/net/ucspi-tcp/patches/Attic/patch-Makefile