CVS commit: pkgsrc/mail/qmail-conf

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov 16 23:09:13 UTC 2023

Modified Files:
        pkgsrc/mail/qmail-conf: Makefile options.mk

Log Message:
qmail-conf: bump PKGREVISION. Changes:

- Remove inet6 option; simply depend on dual-stack ucspi-tcp6 (or
  v4-only original DJB ucspi-tcp, if that's already installed)
- Set LICENSE to public-domain, as this is derived from djbdns-1.05
  which has long been public-domain.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qmail-conf/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/mail/qmail-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.38 pkgsrc/mail/qmail-conf/Makefile:1.39
--- pkgsrc/mail/qmail-conf/Makefile:1.38        Thu Nov 19 09:35:41 2020
+++ pkgsrc/mail/qmail-conf/Makefile     Thu Nov 16 23:09:13 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2020/11/19 09:35:41 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2023/11/16 23:09:13 schmonz Exp $
 
 DISTNAME=              qmail-conf-0.60
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            mail
 MASTER_SITES=          http://woodsheep.jp/qmail-conf/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
@@ -11,9 +10,11 @@ SITES.djbdns-1.05.tar.gz= http://cr.yp.t
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://woodsheep.jp/qmail-conf.html
 COMMENT=               Collection of tools for setting up qmail services
+LICENSE=               public-domain
 
 DEPENDS+=              daemontools>=0.70:../../sysutils/daemontools
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
+DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp6
 
 DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
 

Index: pkgsrc/mail/qmail-conf/options.mk
diff -u pkgsrc/mail/qmail-conf/options.mk:1.2 pkgsrc/mail/qmail-conf/options.mk:1.3
--- pkgsrc/mail/qmail-conf/options.mk:1.2       Thu Jan 10 13:23:16 2019
+++ pkgsrc/mail/qmail-conf/options.mk   Thu Nov 16 23:09:13 2023
@@ -1,16 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2019/01/10 13:23:16 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2023/11/16 23:09:13 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail-conf
-PKG_SUPPORTED_OPTIONS+=        inet6 pam
+PKG_SUPPORTED_OPTIONS+=        pam
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
-.else
-DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
-.endif
-
 .if !empty(PKG_OPTIONS:Mpam)
 DEPENDS+=              checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam
 .else