git: bca4e5c306ae - main - mail/qmail-contrib: convert to meta-port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 30 Sep 2024 23:37:11 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bca4e5c306ae7c49548c4687acec5cf654a77735

commit bca4e5c306ae7c49548c4687acec5cf654a77735
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-09-30 23:26:04 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-09-30 23:36:57 +0000

    mail/qmail-contrib: convert to meta-port
    
    This port went through complex gyrations to build the same software
    built by mail/dot-forward and mail/fastforward so just depend on them
    instead.
    
    There was on small patch to fastforward, which I've dropped as the logs
    make no attempt to explain its presence. It could easily be restored if
    someone finds it useful.
---
 mail/qmail-contrib/Makefile                     | 83 +++----------------------
 mail/qmail-contrib/distinfo                     |  4 --
 mail/qmail-contrib/files/extra-patch-newaliases | 75 ----------------------
 mail/qmail-contrib/pkg-plist                    | 16 -----
 4 files changed, 10 insertions(+), 168 deletions(-)

diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index b8450fc0d3ae..7aac4591e120 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -1,83 +1,20 @@
 PORTNAME=	qmail-contrib
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
-MASTER_SITES=	http://cr.yp.to/software/ \
-		GENTOO
-DISTFILES=	dot-forward-${DF_VER}.tar.gz \
-		fastforward-${FF_VER}.tar.gz
+MASTER_SITES=	# not applicable
+DISTFILES=	# not applicable
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Contributed programs for qmail
+COMMENT=	Meta-port of contributed programs for qmail
 
-OPTIONS_DEFINE=	DOCS
+LICENSE=	NONE	# purely a meta-port
 
-USES=		groff qmail:run
+RUN_DEPENDS=	dot-forward:mail/dot-forward \
+		fastforward:mail/fastforward
 
-ALL_TARGET=	prog
-INSTALL_TARGET=	setup
-
-PREFIX?=	${QMAIL_PREFIX}
-NO_PREFIX_RMDIR=yes
-
-FF_VER=		0.51
-DF_VER=		0.71
-QCK_VER=	0.1
-
-# XXX: This port should be split into sub-packages/ports
-WRKFF=		${WRKDIR}/fastforward-${FF_VER}
-WRKDF=		${WRKDIR}/dot-forward-${DF_VER}
-
-NO_MTREE=	yes
-
-PORTDOCS=	ALIASES
-DOCSDIR=	doc/${PORTNAME}
-
-pre-patch:
-	@${PATCH} -d ${WRKFF} -s <${PATCHDIR}/extra-patch-newaliases
-
-post-patch:
-	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail
-	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail
-	@${REINPLACE_CMD} -e '/cat/d; s|doc/fastforward|${DOCSDIR}|g' \
-		-e 's|\"man|\"share/man|g' \
-		${WRKFF}/hier.c \
-		${WRKDF}/hier.c
-	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKFF}/conf-cc
-	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKFF}/conf-ld
-	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKDF}/conf-cc
-	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKDF}/conf-ld
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man
-
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -E 's|^(.*${DOCSDIR})|// \1|g' \
-		${WRKFF}/hier.c
-
-do-build:
-	${MAKE_CMD} -C ${WRKDIR}/dot-forward-${DF_VER} ${ALL_TARGET}
-	${MAKE_CMD} -C ${WRKDIR}/fastforward-${FF_VER} ${ALL_TARGET}
-
-# Do a dance to stage and keep out of resulting binaries (see r346769
-# and r349241)
-post-build:
-	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
-	${MV} -f ${WRKFF}/conf-qmail ${WRKFF}/conf-qmail.sav
-	${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail
-	cd ${WRKFF} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
-	cd ${WRKFF} ; ${DO_MAKE_BUILD} install instcheck
-	${TOUCH} ${WRKFF}/newaliases ${WRKFF}/fastforward ${WRKFF}/newinclude
-	${MV} -f ${WRKFF}/conf-qmail.sav ${WRKFF}/conf-qmail
-
-	${MV} -f ${WRKDF}/conf-qmail ${WRKDF}/conf-qmail.sav
-	${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail
-	cd ${WRKDF} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
-	cd ${WRKDF} ; ${DO_MAKE_BUILD} install instcheck
-	${TOUCH} ${WRKDF}/dot-forward
-	${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR}
-	${MAKE_CMD} -C ${WRKDIR}/dot-forward-${DF_VER} ${INSTALL_TARGET}
-	${MAKE_CMD} -C ${WRKDIR}/fastforward-${FF_VER} ${INSTALL_TARGET}
+NO_ARCH=	yes
+NO_BUILD=	yes
+NO_INSTALL=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-contrib/distinfo b/mail/qmail-contrib/distinfo
deleted file mode 100644
index 575e77bc361a..000000000000
--- a/mail/qmail-contrib/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (dot-forward-0.71.tar.gz) = 18086b59edf113aaeb02a770afb5429c3200e8637d06ce15094247416fc6e258
-SIZE (dot-forward-0.71.tar.gz) = 26352
-SHA256 (fastforward-0.51.tar.gz) = 45a1a071d54701bf973fed7582b5ff76cb6ed3e43089da6da87caabbb4b4fd7e
-SIZE (fastforward-0.51.tar.gz) = 40659
diff --git a/mail/qmail-contrib/files/extra-patch-newaliases b/mail/qmail-contrib/files/extra-patch-newaliases
deleted file mode 100644
index 4098f42cd45c..000000000000
--- a/mail/qmail-contrib/files/extra-patch-newaliases
+++ /dev/null
@@ -1,75 +0,0 @@
---- newaliases.c.orig	Tue May 19 13:25:42 1998
-+++ newaliases.c	Mon Feb 13 09:53:58 2006
-@@ -12,6 +12,10 @@
- 
- #define FATAL "newaliases: fatal: "
- 
-+stralloc fnsrc = {0};
-+stralloc fncdb = {0};
-+stralloc fntmp = {0};
-+
- void nomem()
- {
-   strerr_die2x(111,FATAL,"out of memory");
-@@ -26,11 +30,11 @@
- }
- void writeerr()
- {
--  strerr_die2sys(111,FATAL,"unable to write to /etc/aliases.tmp: ");
-+  strerr_die4sys(111,FATAL,"unable to write to ",fntmp.s,": ");
- }
- void readerr()
- {
--  strerr_die2sys(111,FATAL,"unable to read /etc/aliases: ");
-+  strerr_die4sys(111,FATAL,"unable to read ",fnsrc.s,": ");
- }
- void die_control()
- {
-@@ -270,19 +274,32 @@
-   if (cdbmss_add(&cdbmss,key.s,key.len,instr.s,instr.len) == -1) writeerr();
- }
- 
--void main()
-+void main(argc,argv)
-+int argc;
-+char **argv;
- {
-   int fd;
- 
-   umask(033);
-   readcontrols();
- 
--  fd = open_read("/etc/aliases");
-+  if (!stralloc_copys(&fnsrc,argv[1] ? argv[1] : "/etc/aliases")) nomem();
-+  if (!stralloc_0(&fnsrc)) nomem();
-+
-+  if (!stralloc_copys(&fncdb,fnsrc.s)) nomem();
-+  if (!stralloc_cats(&fncdb,".cdb")) nomem();
-+  if (!stralloc_0(&fncdb)) nomem();
-+
-+  if (!stralloc_copys(&fntmp,fnsrc.s)) nomem();
-+  if (!stralloc_cats(&fntmp,".tmp")) nomem();
-+  if (!stralloc_0(&fntmp)) nomem();
-+  
-+  fd = open_read(fnsrc.s);
-   if (fd == -1) readerr();
-   substdio_fdbuf(&ssin,read,fd,inbuf,sizeof inbuf);
- 
--  fd = open_trunc("/etc/aliases.tmp");
--  if (fd == -1) strerr_die2sys(111,FATAL,"unable to create /etc/aliases.tmp: ");
-+  fd = open_trunc(fntmp.s);
-+  if (fd == -1) strerr_die4sys(111,FATAL,"unable to create ",fntmp.s,": ");
-   if (cdbmss_start(&cdbmss,fd) == -1) writeerr();
- 
-   if (!stralloc_copys(&line,"")) nomem();
-@@ -314,8 +331,8 @@
-   if (fsync(fd) == -1) writeerr();
-   if (close(fd) == -1) writeerr(); /* NFS stupidity */
- 
--  if (rename("/etc/aliases.tmp","/etc/aliases.cdb") == -1)
--    strerr_die2sys(111,FATAL,"unable to move /etc/aliases.tmp to /etc/aliases.cdb: ");
-+  if (rename(fntmp.s,fncdb.s) == -1)
-+    strerr_die6sys(111,FATAL,"unable to move ",fntmp.s," to ",fncdb.s,": ");
-   
-   _exit(0);
- }
diff --git a/mail/qmail-contrib/pkg-plist b/mail/qmail-contrib/pkg-plist
deleted file mode 100644
index 8f39c6a2de2d..000000000000
--- a/mail/qmail-contrib/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/dot-forward
-bin/fastforward
-bin/newaliases
-bin/newinclude
-bin/printforward
-bin/printmaillist
-bin/setforward
-bin/setmaillist
-share/man/man1/dot-forward.1.gz
-share/man/man1/fastforward.1.gz
-share/man/man1/newaliases.1.gz
-share/man/man1/newinclude.1.gz
-share/man/man1/printforward.1.gz
-share/man/man1/printmaillist.1.gz
-share/man/man1/setforward.1.gz
-share/man/man1/setmaillist.1.gz