Sun May 10 07:10:39 2020 UTC ()
mail/mailfront: fix PKG_SUGGESTED_OPTIONS

The package-specific options.mk is included by djbware.mk and must
therefore not be included by the package Makefile itself.  This fixes the
PKG_SUPPORTED_OPTIONS displayed by show-options.

Found by making the package-settable variables in mk/bsd.options.mk
read-only.


(rillig)
diff -r1.25 -r1.26 pkgsrc/mail/mailfront/Makefile
cvs diff -r1.25 -r1.26 pkgsrc/mail/mailfront/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mailfront/Makefile 2020/03/08 16:50:23 1.25
+++ pkgsrc/mail/mailfront/Makefile 2020/05/10 07:10:39 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2020/03/08 16:50:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2020/05/10 07:10:39 rillig Exp $
2# 2#
3 3
4DISTNAME= mailfront-2.22 4DISTNAME= mailfront-2.22
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${HOMEPAGE}archive/ 7MASTER_SITES= ${HOMEPAGE}archive/
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://untroubled.org/mailfront/ 10HOMEPAGE= https://untroubled.org/mailfront/
11COMMENT= Mail server network protocol front-ends 11COMMENT= Mail server network protocol front-ends
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools 14DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
@@ -24,28 +24,26 @@ FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL @@ -24,28 +24,26 @@ FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL
24FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q} 24FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
25RCD_SCRIPTS= smtpfront 25RCD_SCRIPTS= smtpfront
26INSTALLATION_DIRS= share/doc/mailfront 26INSTALLATION_DIRS= share/doc/mailfront
27INSTALL_ENV+= install_prefix=${DESTDIR:Q} 27INSTALL_ENV+= install_prefix=${DESTDIR:Q}
28 28
29BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER 29BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER
30 30
31USE_LIBTOOL= yes 31USE_LIBTOOL= yes
32 32
33MAKE_JOBS_SAFE= no # due to hacky libtoolization 33MAKE_JOBS_SAFE= no # due to hacky libtoolization
34 34
35PKG_SYSCONFSUBDIR= qmail 35PKG_SYSCONFSUBDIR= qmail
36 36
37.include "options.mk" 
38 
39post-install: 37post-install:
40 cd ${WRKSRC}; \ 38 cd ${WRKSRC}; \
41 for f in ANNOUNCEMENT NEWS README *.html; do \ 39 for f in ANNOUNCEMENT NEWS README *.html; do \
42 ${INSTALL_DATA} $${f} \ 40 ${INSTALL_DATA} $${f} \
43 ${DESTDIR}${PREFIX}/share/doc/mailfront; \ 41 ${DESTDIR}${PREFIX}/share/doc/mailfront; \
44 done 42 done
45 43
46BUILDLINK_API_DEPENDS.bglibs+= bglibs>=2.01 44BUILDLINK_API_DEPENDS.bglibs+= bglibs>=2.01
47.include "../../devel/bglibs/buildlink3.mk" 45.include "../../devel/bglibs/buildlink3.mk"
48BUILDLINK_API_DEPENDS.cvm+= cvm>=0.97 46BUILDLINK_API_DEPENDS.cvm+= cvm>=0.97
49.include "../../security/cvm/buildlink3.mk" 47.include "../../security/cvm/buildlink3.mk"
50.include "../../mk/djbware.mk" 48.include "../../mk/djbware.mk"
51.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"