CVS commit: pkgsrc/net/ucspi-tcp

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jul 25 16:19:16 UTC 2018

Modified Files:
        pkgsrc/net/ucspi-tcp: Makefile distinfo options.mk
Removed Files:
        pkgsrc/net/ucspi-tcp/patches: patch-Makefile

Log Message:
Use external destdir patch. Add CONFLICTS with ucspi-tcp6, to be added shortly.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/ucspi-tcp/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/ucspi-tcp/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ucspi-tcp/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ucspi-tcp/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ucspi-tcp/Makefile
diff -u pkgsrc/net/ucspi-tcp/Makefile:1.42 pkgsrc/net/ucspi-tcp/Makefile:1.43
--- pkgsrc/net/ucspi-tcp/Makefile:1.42  Mon Jun 18 10:50:19 2018
+++ pkgsrc/net/ucspi-tcp/Makefile       Wed Jul 25 16:19:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/06/18 10:50:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/25 16:19:16 schmonz Exp $
 
 DISTNAME=              ucspi-tcp-0.88
 PKGREVISION=           5
@@ -14,6 +14,8 @@ LICENSE=              public-domain
 MANPAGES=              ${DISTNAME}-man-20020317.tar.gz
 SITES.${MANPAGES}=     http://smarden.org/pape/djb/manpages/
 
+CONFLICTS+=            ucspi-tcp6-[0-9]*
+
 DJB_RESTRICTED=                no
 
 SUBST_CLASSES+=                etc

Index: pkgsrc/net/ucspi-tcp/distinfo
diff -u pkgsrc/net/ucspi-tcp/distinfo:1.12 pkgsrc/net/ucspi-tcp/distinfo:1.13
--- pkgsrc/net/ucspi-tcp/distinfo:1.12  Mon Jun 18 10:54:30 2018
+++ pkgsrc/net/ucspi-tcp/distinfo       Wed Jul 25 16:19:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2018/06/18 10:54:30 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2018/07/25 16:19:16 schmonz Exp $
 
 SHA1 (rblsmtpd-nodefaultrbl.patch) = 5d6048b5928257c13ff5cbcddb40ed0eee9997c0
 RMD160 (rblsmtpd-nodefaultrbl.patch) = fa93dd4522ccc77c5b43d0a79f741ae2ab54f075
@@ -16,4 +16,7 @@ SHA1 (ucspi-tcp-0.88.tar.gz) = 793b41897
 RMD160 (ucspi-tcp-0.88.tar.gz) = eb20085ea6ffd5d137a805f7c8768e0312c1f56a
 SHA512 (ucspi-tcp-0.88.tar.gz) = 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 Size (ucspi-tcp-0.88.tar.gz) = 53019 bytes
-SHA1 (patch-Makefile) = ff965829c788c9cfe52bee4d8fd527213dc954d3
+SHA1 (ucspi-tcp-0.88-destdir-20180725.patch) = e6c3c4a93b30e78a01d84152d9ff88470ccf1ef1
+RMD160 (ucspi-tcp-0.88-destdir-20180725.patch) = 2b77b4cb8a7b96cad9a6f0171b3df2416c0b43cc
+SHA512 (ucspi-tcp-0.88-destdir-20180725.patch) = 51f12e64a11dd9442d64356985dcd1a261979b5ced4b064c3e67db166f565f3507f29c3875d382fc8ced553f1a1b67f05df2df9f492b678c6f9ba508b5e8ee07
+Size (ucspi-tcp-0.88-destdir-20180725.patch) = 1169 bytes

Index: pkgsrc/net/ucspi-tcp/options.mk
diff -u pkgsrc/net/ucspi-tcp/options.mk:1.6 pkgsrc/net/ucspi-tcp/options.mk:1.7
--- pkgsrc/net/ucspi-tcp/options.mk:1.6 Wed Jul  4 13:40:31 2018
+++ pkgsrc/net/ucspi-tcp/options.mk     Wed Jul 25 16:19:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2018/07/04 13:40:31 jperkin Exp $
+# $NetBSD: options.mk,v 1.7 2018/07/25 16:19:16 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-tcp
 PKG_SUPPORTED_OPTIONS+=        inet6 ucspi-tcp-nodefaultrbl
@@ -6,6 +6,10 @@ PKG_SUGGESTED_OPTIONS+=        inet6 ucspi-tcp-
 
 .include "../../mk/bsd.options.mk"
 
+DESTDIR_PATCH=                 ucspi-tcp-0.88-destdir-20180725.patch
+PATCHFILES+=                   ${DESTDIR_PATCH}
+SITES.${DESTDIR_PATCH}=                https://schmonz.com/qmail/ucspitcpdestdir/
+
 PLIST_VARS+=                   inet6
 .if !empty(PKG_OPTIONS:Minet6)
 IPV6_PATCH=                    ucspi-tcp-0.88-ipv6.diff20.bz2