CVS commit: pkgsrc/net/ucspi-tcp

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov 15 13:46:07 UTC 2018

Modified Files:
        pkgsrc/net/ucspi-tcp: Makefile PLIST options.mk

Log Message:
Remove 'inet6' option (fefe's patch). For IPv6 support, see net/ucspi-tcp6.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/ucspi-tcp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ucspi-tcp/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ucspi-tcp/options.mk

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.43 pkgsrc/net/ucspi-tcp/Makefile:1.44
--- pkgsrc/net/ucspi-tcp/Makefile:1.43  Wed Jul 25 16:19:16 2018
+++ pkgsrc/net/ucspi-tcp/Makefile       Thu Nov 15 13:46:07 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2018/07/25 16:19:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.44 2018/11/15 13:46:07 schmonz Exp $
 
 DISTNAME=              ucspi-tcp-0.88
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            sysutils net
 MASTER_SITES=          http://cr.yp.to/ucspi-tcp/ ftp://cr.yp.to/ucspi-tcp/
 DISTFILES=             ${DISTNAME}.tar.gz ${MANPAGES}
@@ -11,6 +11,10 @@ HOMEPAGE=            http://cr.yp.to/ucspi-tcp.htm
 COMMENT=               Command-line tools for building TCP client-server applications
 LICENSE=               public-domain
 
+DESTDIR_PATCH=         ucspi-tcp-0.88-destdir-20180725.patch
+PATCHFILES+=           ${DESTDIR_PATCH}
+SITES.${DESTDIR_PATCH}=        https://schmonz.com/qmail/ucspitcpdestdir/
+
 MANPAGES=              ${DISTNAME}-man-20020317.tar.gz
 SITES.${MANPAGES}=     http://smarden.org/pape/djb/manpages/
 

Index: pkgsrc/net/ucspi-tcp/PLIST
diff -u pkgsrc/net/ucspi-tcp/PLIST:1.3 pkgsrc/net/ucspi-tcp/PLIST:1.4
--- pkgsrc/net/ucspi-tcp/PLIST:1.3      Thu Jun  9 01:47:13 2011
+++ pkgsrc/net/ucspi-tcp/PLIST  Thu Nov 15 13:46:07 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/06/09 01:47:13 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/11/15 13:46:07 schmonz Exp $
 bin/addcr
 bin/argv0
 bin/date@
@@ -21,7 +21,6 @@ man/man1/argv0.1
 man/man1/date@.1
 man/man1/delcr.1
 man/man1/finger@.1
-${PLIST.inet6}man/man1/fixcr.1
 man/man1/fixcrio.1
 man/man1/http@.1
 man/man1/mconnect.1
@@ -33,4 +32,3 @@ man/man1/tcprules.1
 man/man1/tcprulescheck.1
 man/man1/tcpserver.1
 man/man1/who@.1
-${PLIST.inet6}man/man5/tcp-environ.5

Index: pkgsrc/net/ucspi-tcp/options.mk
diff -u pkgsrc/net/ucspi-tcp/options.mk:1.7 pkgsrc/net/ucspi-tcp/options.mk:1.8
--- pkgsrc/net/ucspi-tcp/options.mk:1.7 Wed Jul 25 16:19:16 2018
+++ pkgsrc/net/ucspi-tcp/options.mk     Thu Nov 15 13:46:07 2018
@@ -1,30 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2018/07/25 16:19:16 schmonz Exp $
+# $NetBSD: options.mk,v 1.8 2018/11/15 13:46:07 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-tcp
-PKG_SUPPORTED_OPTIONS+=        inet6 ucspi-tcp-nodefaultrbl
-PKG_SUGGESTED_OPTIONS+=        inet6 ucspi-tcp-nodefaultrbl
+PKG_SUPPORTED_OPTIONS+=        ucspi-tcp-nodefaultrbl
+PKG_SUGGESTED_OPTIONS+=        ucspi-tcp-nodefaultrbl
 
 .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
-PATCHFILES+=                   ${IPV6_PATCH}
-SITES.${IPV6_PATCH}=           http://www.fefe.de/ucspi/
-PATCH_DIST_STRIP.${IPV6_PATCH}=        -p1
-PLIST.inet6=                   yes
-
-SUBST_CLASSES+=                hier
-SUBST_STAGE.hier=      pre-configure
-SUBST_MESSAGE.hier=    Fixing manpage path.
-SUBST_FILES.hier=      hier.c
-SUBST_SED.hier=                -e 's,man,${PKGMANDIR},'
-.endif
-
 .if !empty(PKG_OPTIONS:Mucspi-tcp-nodefaultrbl)
 NODEFAULTRBL_PATCH=            rblsmtpd-nodefaultrbl.patch
 PATCHFILES+=                   ${NODEFAULTRBL_PATCH}