pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: schmonz
Date: Thu Nov 19 08:11:18 UTC 2020
Modified Files:
pkgsrc/mail/qmailanalog: Makefile
pkgsrc/mail/serialmail: Makefile
pkgsrc/mk: djbware.mk
pkgsrc/net/publicfile: Makefile
pkgsrc/sysutils/service-config: Makefile
Log Message:
Only a few djb-nonlicense packages remain. Retire DJB_RESTRICTED,
instead setting LICENSE directly in those packages. Remove outdated
djbware.mk TODO items.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/qmailanalog/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/serialmail/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/djbware.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/publicfile/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/service-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/qmailanalog/Makefile
diff -u pkgsrc/mail/qmailanalog/Makefile:1.18 pkgsrc/mail/qmailanalog/Makefile:1.19
--- pkgsrc/mail/qmailanalog/Makefile:1.18 Thu Jun 25 05:42:38 2020
+++ pkgsrc/mail/qmailanalog/Makefile Thu Nov 19 08:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:38 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2020/11/19 08:11:18 schmonz Exp $
#
DISTNAME= qmailanalog-0.70
@@ -9,8 +9,8 @@ MASTER_SITES= http://cr.yp.to/software/
MAINTAINER= schmonz%NetBSD.org@localhost
HOMEPAGE= https://cr.yp.to/qmailanalog.html
COMMENT= Collection of tools to help analyze qmail's activity
+LICENSE= djb-nonlicense
-DJB_RESTRICTED= YES
DJB_CONFIG_PREFIX= ${PREFIX}/qmailanalog
SUBST_CLASSES+= djberrno
Index: pkgsrc/mail/serialmail/Makefile
diff -u pkgsrc/mail/serialmail/Makefile:1.13 pkgsrc/mail/serialmail/Makefile:1.14
--- pkgsrc/mail/serialmail/Makefile:1.13 Thu Jun 25 05:42:38 2020
+++ pkgsrc/mail/serialmail/Makefile Thu Nov 19 08:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:38 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/19 08:11:18 schmonz Exp $
#
DISTNAME= serialmail-0.75
@@ -9,15 +9,12 @@ MASTER_SITES= http://cr.yp.to/software/
MAINTAINER= schmonz%NetBSD.org@localhost
HOMEPAGE= https://cr.yp.to/serialmail.html
COMMENT= Tools for passing mail across serial links
+LICENSE= djb-nonlicense
DEPENDS+= qmail>=1.03nb7:../../mail/qmail
INSTALLATION_DIRS= share/doc/${PKGBASE}
-# We change conf-home from the default "/usr/local" and don't
-# provide compatibility symlinks. We also apply patches.
-DJB_RESTRICTED= YES
-
SUBST_CLASSES+= djberrno
SUBST_CLASSES+= paths
Index: pkgsrc/mk/djbware.mk
diff -u pkgsrc/mk/djbware.mk:1.30 pkgsrc/mk/djbware.mk:1.31
--- pkgsrc/mk/djbware.mk:1.30 Thu Jun 25 05:42:36 2020
+++ pkgsrc/mk/djbware.mk Thu Nov 19 08:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.30 2020/06/25 05:42:36 schmonz Exp $
+# $NetBSD: djbware.mk,v 1.31 2020/11/19 08:11:18 schmonz Exp $
#
# Makefile fragment for packages with djb-style build machinery
#
@@ -8,24 +8,10 @@
# * typical values for conf-* files
# * replace inline definitions of errno with "#include <errno.h>"
#
-# TODO:
-# * centralize handling of third-party manpages
-# * centralize MASTER_SITES and SITES_foo
-# * centralize compiler hack for arm{,32}
-# * common install script for compatibility with default conf-home pathnames
-# * PKG_OPTIONS (default):
-# djbware-errno-hack (off)
-# djbware-pathname-compat (on)
-# inet6 (off)
-# pam (off)
-# * set RESTRICTED automatically iff patches or other mods are applied
-# * be unrestricted by default for bulk builds
-#
.if !defined(DJBWARE_MK)
DJBWARE_MK= # defined
-DJB_RESTRICTED?= YES
DJB_MAKE_TARGETS?= YES
DJB_BUILD_TARGETS?= # empty
DJB_INSTALL_TARGETS?= # empty
@@ -40,12 +26,11 @@ DJB_CONFIG_PREFIX?= ${PREFIX}
DJB_CONFIG_HOME?= conf-home
DJB_CONFIG_CMDS?= ${DO_NADA}
-.if !empty(DJB_RESTRICTED:M[yY][eE][sS])
-LICENSE= djb-nonlicense
-
-RESTRICTED= modified source and binaries may not be distributed
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+.if ${LICENSE} == "djb-nonlicense"
+# So-licensed packages that install totally unmodified may want to opt out
+RESTRICTED?= modified source and binaries may not be distributed
+NO_BIN_ON_CDROM?= ${RESTRICTED}
+NO_BIN_ON_FTP?= ${RESTRICTED}
.endif
.if !empty(DJB_MAKE_TARGETS:M[yY][eE][sS])
Index: pkgsrc/net/publicfile/Makefile
diff -u pkgsrc/net/publicfile/Makefile:1.18 pkgsrc/net/publicfile/Makefile:1.19
--- pkgsrc/net/publicfile/Makefile:1.18 Thu Jun 25 05:42:36 2020
+++ pkgsrc/net/publicfile/Makefile Thu Nov 19 08:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2020/11/19 08:11:18 schmonz Exp $
#
DISTNAME= publicfile-0.52
@@ -9,10 +9,10 @@ MASTER_SITES= http://cr.yp.to/publicfil
MAINTAINER= schmonz%NetBSD.org@localhost
HOMEPAGE= https://cr.yp.to/publicfile.html
COMMENT= Secure read-only HTTP and FTP servers
+LICENSE= djb-nonlicense
DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
-DJB_RESTRICTED= YES
DJB_CONFIG_PREFIX= ${PREFIX}/publicfile
SUBST_CLASSES+= djberrno
Index: pkgsrc/sysutils/service-config/Makefile
diff -u pkgsrc/sysutils/service-config/Makefile:1.14 pkgsrc/sysutils/service-config/Makefile:1.15
--- pkgsrc/sysutils/service-config/Makefile:1.14 Thu Jun 25 05:42:39 2020
+++ pkgsrc/sysutils/service-config/Makefile Thu Nov 19 08:11:18 2020
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2020/06/25 05:42:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/19 08:11:18 schmonz Exp $
#
DISTNAME= service-config-0.51
CATEGORIES= sysutils
-MASTER_SITES= http://www.superscript.com/service-config/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://www.superscript.com/service-config/intro.html
+HOMEPAGE= https://web.archive.org/web/20090302170825/http://www.superscript.com/service-config/intro.html
COMMENT= Utility to create and configure svscan service directories
+LICENSE= djb-nonlicense
DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
-# Possibly inherited DJB-style distribution terms
-DJB_RESTRICTED= YES
-
SUBST_CLASSES+= djberrno
INSTALLATION_DIRS= bin
Home |
Main Index |
Thread Index |
Old Index