pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vmailmgr: use PKG_SYSCONFSUBDIR, fix other paths.



Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Pushed By:	schmonz
Date:		Thu Feb 22 11:37:07 2024 -0500
Changeset:	0dd5f1caccb4d1ef60ef9ff866428a9972978204

Modified Files:
	vmailmgr/Makefile.common
	vmailmgr/TODO.md

Log Message:
vmailmgr: use PKG_SYSCONFSUBDIR, fix other paths.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0dd5f1caccb4d1ef60ef9ff866428a9972978204

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

diffstat:
 vmailmgr/Makefile.common | 39 +++++++++++++++++++++++++++++++++++++++
 vmailmgr/TODO.md         |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diffs:
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
index 8f8cafdc73..be4a93c7fe 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -25,15 +25,54 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf automake gmake perl sh
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+PKG_SYSCONFSUBDIR=	vmailmgr
 
 PATCHDIR=		${.CURDIR}/../../wip/vmailmgr-base/patches
 DISTINFO_FILE=		${.CURDIR}/../../wip/vmailmgr-base/distinfo
 
+REPLACE_PERL=		lib/cli++/*.pl doc/*.pl
+
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	pre-configure
 SUBST_FILES.version=	configure.ac
 SUBST_VARS.version=	PKGVERSION
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_FILES.prefix=	authenticate/checkvpw.pod doc/HOWTO.texi
+SUBST_SED.prefix=	-e 's|/usr/bin|${PREFIX}/bin|g'
+
+SUBST_CLASSES+=		sysconf
+SUBST_STAGE.sysconf=	pre-configure
+SUBST_FILES.sysconf=	php/vmail.inc scripts/vmailmgrd.run
+SUBST_FILES.sysconf+=	lib/config/configrc.h.in lib/config/configrc.h
+SUBST_FILES.sysconf+=	doc/FAQ.texi doc/HOWTO.texi doc/configuration.texi
+SUBST_SED.sysconf=	-e 's|/etc/vmailmgr|${PKG_SYSCONFDIR}|g'
+
+BUILD_DEFS+=		PKG_SYSCONFBASE
+SUBST_CLASSES+=		courier
+SUBST_STAGE.courier=	pre-configure
+SUBST_FILES.courier=	doc/FAQ.texi doc/HOWTO.texi
+SUBST_SED.courier=	-e 's|/usr/lib/courier-imap/etc/imapd\.config|${PKG_SYSCONFBASE}/courier/imapd.cnf|g'
+SUBST_SED.courier+=	-e 's|/usr/lib/courier-imap/libexec/authlib|${PREFIX}/libexec/courier-authlib|g'
+
+BUILD_DEFS+=		QMAILDIR
+SUBST_CLASSES+=		qmaildir
+SUBST_STAGE.qmaildir=	pre-configure
+SUBST_FILES.qmaildir=	lib/config/configrc.in lib/config/_qmail_root.cc
+SUBST_FILES.qmaildir+=	doc/FAQ.texi doc/HOWTO.texi doc/configuration.texi
+SUBST_FILES.qmaildir+=	authenticate/checkvpw.pod
+SUBST_SED.qmaildir=	-e 's|/var/qmail|${QMAILDIR}|g'
+SUBST_SED.qmaildir+=	-e 's|/etc/qmail|${QMAILDIR}|g'
+
+BUILD_DEFS+=		VARBASE
+SUBST_CLASSES+=		varbase
+SUBST_STAGE.varbase=	pre-configure
+SUBST_FILES.varbase=	lib/config/_error_maildir.cc lib/config/_global_bulletin_dir.cc
+SUBST_FILES.varbase+=	lib/config/configrc.in doc/configuration.texi
+SUBST_SED.varbase=	-e 's|/var/lib/vmailmgr|${VARBASE}/vmailmgr|g'
+SUBST_SED.varbase+=	-e 's|/var/spool|${VARBASE}/spool|g'
+
 post-extract:
 	cd ${WRKSRC}/lib/config && ${SH} build-config.sh
 
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index 1fab0dfa64..8f779cfa77 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -1,6 +1,6 @@
 # TODO
 
+- Give each package its own DESCR and COMMENT
 - Fix build warnings
-- PKG_SYSCONFSUBDIR
 - Add separate package for daemon?
 - [FreeBSD's vmailmgr port just before deletion](https://github.com/freebsd/freebsd-ports/tree/635ccfbf59522ddd44cd9283b321e2d9b3bc9876/mail/vmailmgr)


Home | Main Index | Thread Index | Old Index