CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat May 23 21:32:15 UTC 2020

Modified Files:
        pkgsrc/devel/libtai: Makefile
        pkgsrc/mail/mailfront: Makefile
        pkgsrc/mail/qmail-autoresponder: Makefile
        pkgsrc/mail/qmail-conf: Makefile
        pkgsrc/sysutils/daemontools: Makefile

Log Message:
Restore missing .include of options.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libtai/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/mailfront/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/qmail-autoresponder/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/sysutils/daemontools/Makefile

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

Modified files:

Index: pkgsrc/devel/libtai/Makefile
diff -u pkgsrc/devel/libtai/Makefile:1.19 pkgsrc/devel/libtai/Makefile:1.20
--- pkgsrc/devel/libtai/Makefile:1.19   Sun Mar 22 13:24:00 2020
+++ pkgsrc/devel/libtai/Makefile        Sat May 23 21:32:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/03/22 13:24:00 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/23 21:32:14 schmonz Exp $
 #
 
 DISTNAME=              libtai-0.60
@@ -28,6 +28,8 @@ SUBST_VARS.paths=     PKG_SYSCONFDIR
 INSTALLATION_DIRS=     bin include lib ${EGDIR}
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man3
 
+.include "options.mk"
+
 post-build:
        cd ${WRKSRC} && ./leapsecs < leapsecs.txt > leapsecs.dat
 

Index: pkgsrc/mail/mailfront/Makefile
diff -u pkgsrc/mail/mailfront/Makefile:1.28 pkgsrc/mail/mailfront/Makefile:1.29
--- pkgsrc/mail/mailfront/Makefile:1.28 Fri May 22 10:56:19 2020
+++ pkgsrc/mail/mailfront/Makefile      Sat May 23 21:32:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/05/22 10:56:19 adam Exp $
+# $NetBSD: Makefile,v 1.29 2020/05/23 21:32:15 schmonz Exp $
 #
 
 DISTNAME=              mailfront-2.22
@@ -7,7 +7,7 @@ CATEGORIES=             mail
 MASTER_SITES=          ${HOMEPAGE}archive/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              https://untroubled.org/mailfront/?a=b&c=d
+HOMEPAGE=              https://untroubled.org/mailfront/
 COMMENT=               Mail server network protocol front-ends
 LICENSE=               gnu-gpl-v2
 
@@ -35,6 +35,8 @@ MAKE_JOBS_SAFE=               no # due to hacky libto
 
 PKG_SYSCONFSUBDIR=     qmail
 
+.include "options.mk"
+
 post-install:
        cd ${WRKSRC};                                                   \
        for f in ANNOUNCEMENT NEWS README *.html; do                    \

Index: pkgsrc/mail/qmail-autoresponder/Makefile
diff -u pkgsrc/mail/qmail-autoresponder/Makefile:1.5 pkgsrc/mail/qmail-autoresponder/Makefile:1.6
--- pkgsrc/mail/qmail-autoresponder/Makefile:1.5        Sat May 16 15:23:05 2020
+++ pkgsrc/mail/qmail-autoresponder/Makefile    Sat May 23 21:32:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/16 15:23:05 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/23 21:32:15 schmonz Exp $
 
 DISTNAME=              qmail-autoresponder-2.0
 CATEGORIES=            mail
@@ -21,6 +21,8 @@ BUILD_TARGET=         all
 
 LDFLAGS.SunOS+=                -lsocket
 
+.include "options.mk"
+
 pre-configure:
        ${TOUCH} ${WRKSRC}/conf-bgincs ${WRKSRC}/conf-bglibs
 

Index: pkgsrc/mail/qmail-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.34 pkgsrc/mail/qmail-conf/Makefile:1.35
--- pkgsrc/mail/qmail-conf/Makefile:1.34        Sat May 16 15:24:30 2020
+++ pkgsrc/mail/qmail-conf/Makefile     Sat May 23 21:32:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/05/16 15:24:30 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2020/05/23 21:32:15 schmonz Exp $
 #
 
 DISTNAME=              qmail-conf-0.60
@@ -21,6 +21,8 @@ DJB_CONFIG_CMDS=      ${ECHO} ${PREFIX:Q} > $
 
 SUBST_FILES.djbware+=  ../djbdns-1.05/error.h
 
+.include "options.mk"
+
 pre-build:
        cd ${WRKSRC} && ${MAKE} -f Makefile.ini djbdns="../djbdns-1.05"
 

Index: pkgsrc/sysutils/daemontools/Makefile
diff -u pkgsrc/sysutils/daemontools/Makefile:1.42 pkgsrc/sysutils/daemontools/Makefile:1.43
--- pkgsrc/sysutils/daemontools/Makefile:1.42   Sun Mar 22 10:36:39 2020
+++ pkgsrc/sysutils/daemontools/Makefile        Sat May 23 21:32:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/03/22 10:36:39 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2020/05/23 21:32:15 schmonz Exp $
 
 DISTNAME=              daemontools-0.76
 PKGREVISION=           3
@@ -38,6 +38,8 @@ SUBST_SED.paths+=     -e 's|/command/svc |${
 
 MAKE_ENV+=             PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
 
+.include "options.mk"
+
 do-install:
        (while read cmd; do \
          if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \