CVS commit: pkgsrc/mail/opensmtpd

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Mar  2 17:01:12 UTC 2024

Modified Files:
        pkgsrc/mail/opensmtpd: Makefile options.mk
        pkgsrc/mail/opensmtpd/files: opensmtpd.sh

Log Message:
mail/opensmtpd: fix SUBST routines after SYSCONFSUBDIR introduction.

Also, since we're here, remove pam policy file from CONF files and
better sort Makefile.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/opensmtpd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/opensmtpd/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/opensmtpd/files/opensmtpd.sh

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

Modified files:

Index: pkgsrc/mail/opensmtpd/Makefile
diff -u pkgsrc/mail/opensmtpd/Makefile:1.24 pkgsrc/mail/opensmtpd/Makefile:1.25
--- pkgsrc/mail/opensmtpd/Makefile:1.24 Fri Mar  1 20:50:05 2024
+++ pkgsrc/mail/opensmtpd/Makefile      Sat Mar  2 17:01:12 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2024/03/01 20:50:05 vins Exp $
+# $NetBSD: Makefile,v 1.25 2024/03/02 17:01:12 vins Exp $
 
 VERSION=       7.4.0p1
 DISTNAME=      opensmtpd-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  https://www.opensmtpd.org/archives/
 
@@ -13,6 +14,8 @@ LICENSE=      isc AND modified-bsd AND 2-clau
 BUILD_DEFS+=   VARBASE
 SMTPD_HOME=    ${VARBASE}/chroot/smtpd
 
+GNU_CONFIGURE= yes
+USE_DB185=     yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    awk pkg-config yacc
 USE_TOOLS+=    automake aclocal autoheader autoconf
@@ -32,10 +35,10 @@ PKG_HOME._smtpq=    ${SMTPD_HOME}
 
 .include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=         yes
-USE_DB185=             yes
+PKG_SYSCONFSUBDIR=     smtpd
+
 CONFIGURE_ENV+=                MANTYPE=man
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}/smtpd
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-libssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=       --with-path-CAfile=${SSLCERTS}/ca-certificates.crt
 CONFIGURE_ARGS+=       --with-path-empty=${VARBASE}/empty
@@ -50,7 +53,6 @@ CONFIGURE_ARGS+=      --with-pie
 
 .include "options.mk"
 
-PKG_SYSCONFSUBDIR=     smtpd
 EGDIR=                 ${PREFIX}/share/examples/opensmtpd
 DOCDIR=                        ${PREFIX}/share/doc/opensmtpd
 CONF_FILES+=           ${EGDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd.conf
@@ -76,12 +78,14 @@ SUBST_MESSAGE.pkgsrc=       Replacing pkgsrc p
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_MESSAGE.paths=   Fixing hard-coded paths.
-SUBST_FILES.paths+=    mk/smtpd/Makefile.am usr.sbin/smtpd/smtpd.conf  \
-                       usr.sbin/smtpd/smtpd.8 usr.sbin/smtpd/smtpd.conf.5 \
-                       usr.sbin/smtpd/aliases.5 usr.sbin/smtpd/makemap.8 \
-                       usr.sbin/smtpd/newaliases.8
-SUBST_SED.paths+=      -e "s:/etc/mail:${PKG_SYSCONFDIR}/smtpd:g"
-SUBST_SED.paths+=      -e "s:/usr/local/etc:${PKG_SYSCONFDIR}/smtpd:g"
+SUBST_FILES.paths+=    configure mk/smtpd/Makefile.am usr.sbin/smtpd/smtpd.conf \
+                       usr.sbin/smtpd/smtpd.h usr.sbin/smtpd/smtpd.8 \
+                       usr.sbin/smtpd/smtpd.conf.5 usr.sbin/smtpd/aliases.5 \
+                       usr.sbin/smtpd/makemap.8 usr.sbin/smtpd/newaliases.8
+SUBST_SED.paths+=      -e "s:/etc/mail:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/etc:${PKG_SYSCONFDIR}:g"
+SUBST_SED.paths+=      -e "s:/usr/local/lib:${PREFIX}/lib:g"
+SUBST_SED.paths+=      -e "s:/usr/local/libexec:${PREFIX}/libexec:g"
 SUBST_SED.paths+=      -e "s:@EXAMPLE_DIR@:${EGDIR}:g"
 SUBST_SED.paths+=      -e "s:/etc/ssl:${SSLDIR}:g"
 

Index: pkgsrc/mail/opensmtpd/options.mk
diff -u pkgsrc/mail/opensmtpd/options.mk:1.3 pkgsrc/mail/opensmtpd/options.mk:1.4
--- pkgsrc/mail/opensmtpd/options.mk:1.3        Fri Mar  1 20:50:05 2024
+++ pkgsrc/mail/opensmtpd/options.mk    Sat Mar  2 17:01:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/03/01 20:50:05 vins Exp $
+# $NetBSD: options.mk,v 1.4 2024/03/02 17:01:12 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opensmtpd
 
@@ -28,10 +28,6 @@ CONFIGURE_ARGS+=     --with-auth-pam=smtp
 
 PAMDIR=                share/examples/pam.d
 MAKE_DIRS+=    ${PAMDIR}
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/pam.d
-
-CONF_FILES+=           ${PREFIX}/${PAMDIR}/smtp \
-                       ${PKG_SYSCONFDIR}/pam.d/smtp
 
 INSTALLATION_DIRS+=    ${PAMDIR}
 

Index: pkgsrc/mail/opensmtpd/files/opensmtpd.sh
diff -u pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.3 pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.4
--- pkgsrc/mail/opensmtpd/files/opensmtpd.sh:1.3        Thu Aug 24 15:26:40 2023
+++ pkgsrc/mail/opensmtpd/files/opensmtpd.sh    Sat Mar  2 17:01:12 2024
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: opensmtpd.sh,v 1.3 2023/08/24 15:26:40 vins Exp $
+# $NetBSD: opensmtpd.sh,v 1.4 2024/03/02 17:01:12 vins Exp $
 #
 
 # PROVIDE: smtpd mail