svn commit: r408860 - in head/mail/dma: . files
Guido Falsi
madpilot at FreeBSD.org
Sun Feb 14 14:55:13 UTC 2016
Author: madpilot
Date: Sun Feb 14 14:55:10 2016
New Revision: 408860
URL: https://svnweb.freebsd.org/changeset/ports/408860
Log:
- Update to 0.11
- Update GITHUB usage
- Use software own install target
- Removed support for unsupported FreeBSD releases
Added:
head/mail/dma/files/patch-bsd_dma-mbox-create_Makefile (contents, props changed)
head/mail/dma/files/patch-bsd_dma_Makefile (contents, props changed)
Deleted:
head/mail/dma/files/patch-BSDMakefile
head/mail/dma/files/patch-Makefile
head/mail/dma/files/patch-alias_scan.l
head/mail/dma/files/patch-dma-Makefile
head/mail/dma/files/patch-dma-mbox-create-Makefile
head/mail/dma/files/patch-dma.conf
Modified:
head/mail/dma/Makefile
head/mail/dma/distinfo
head/mail/dma/files/patch-conf.c
head/mail/dma/files/patch-dma.c
head/mail/dma/files/patch-get-version.sh
head/mail/dma/files/patch-mail.c
head/mail/dma/files/patch-spool.c
head/mail/dma/pkg-plist
Modified: head/mail/dma/Makefile
==============================================================================
--- head/mail/dma/Makefile Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/Makefile Sun Feb 14 14:55:10 2016 (r408860)
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= dma
-PORTVERSION= v0.9
-PORTREVISION= 1
+PORTVERSION= 0.11
+DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= mail ipv6
-EXTRACT_SUFX=
MAINTAINER= ports at FreeBSD.org
COMMENT= DragonFly Mail Agent, a small MTA for local/outbound mail
@@ -17,15 +16,17 @@ USE_OPENSSL= yes
USE_GITHUB= yes
GH_ACCOUNT= corecode
-GH_TAGNAME= 2bb8bcb
+BUILD_WRKSRC= ${WRKSRC}/bsd
+INSTALL_WRKSRC= ${WRKSRC}/bsd
CFLAGS+= -I${OPENSSLINC} \
-DCONF_PATH='\"${PREFIX}/etc/dma\"' \
-DDMA_ROOT_USER='\"mailnull\"' \
-DDMA_GROUP='\"mail\"'
LDFLAGS+= -L${OPENSSLLIB}
-MAKE_ENV= __MAKE_CONF=/dev/null SRCCONF=/dev/null NO_WERROR=defined
+MAKE_ENV= __MAKE_CONF=/dev/null SRCCONF=/dev/null NO_WERROR=defined \
+ MANDIR=${MANDIRS}/man
USE_RC_SUBR= dma_flushq
SUB_FILES= pkg-message
@@ -42,28 +43,21 @@ PLIST_SUB+= VARDIR=""
PLIST_SUB+= VARDIR="@comment "
.endif
-pre-patch:
- @${MKDIR} ${WRKSRC}/dma ${WRKSRC}/dma-mbox-create
- @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
-
post-patch:
@${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \
${WRKSRC}/dma.8
@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
${WRKSRC}/dma.conf
+ @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN/NO_MAN/' \
+ ${WRKSRC}/bsd/dma-mbox-create/Makefile
.if ${OSVERSION} < 1000013
- @${REINPLACE_CMD} -e 's,^YFLAGS.*,,' ${WRKSRC}/dma/Makefile
+ @${REINPLACE_CMD} -e 's,^YFLAGS.*,,' ${WRKSRC}/bsd/dma/Makefile
.endif
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
- ${INSTALL_PROGRAM} \
- ${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
- ${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
- ${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
-.for i in ${CONFFILES}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
-.endfor
+post-install:
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
${MKDIR} ${STAGEDIR}/var/spool/dma
+ ${INSTALL_DATA} ${WRKSRC}/dma.conf ${STAGEDIR}${ETCDIR}/dma.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf.sample
.include <bsd.port.post.mk>
Modified: head/mail/dma/distinfo
==============================================================================
--- head/mail/dma/distinfo Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/distinfo Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,2 +1,2 @@
-SHA256 (corecode-dma-v0.9-2bb8bcb_GH0) = 4c829de90cfb77ea5471108b724281b87a657e6a92f954436b49e6c25aa9eb12
-SIZE (corecode-dma-v0.9-2bb8bcb_GH0) = 45609
+SHA256 (corecode-dma-v0.11_GH0.tar.gz) = 288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8
+SIZE (corecode-dma-v0.11_GH0.tar.gz) = 34529
Added: head/mail/dma/files/patch-bsd_dma-mbox-create_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dma/files/patch-bsd_dma-mbox-create_Makefile Sun Feb 14 14:55:10 2016 (r408860)
@@ -0,0 +1,15 @@
+--- bsd/dma-mbox-create/Makefile.orig 2016-02-07 12:41:49 UTC
++++ bsd/dma-mbox-create/Makefile
+@@ -17,8 +17,9 @@ PREFIX?= /usr/local
+ LIBEXEC?= ${PREFIX}/libexec
+ CONFDIR?= ${PREFIX}/etc/dma
+
+-BINOWN= root
+-BINGRP= mail
+-BINMODE=4554
++BINDIR= ${LIBEXEC}
++#BINOWN= root
++#BINGRP= mail
++#BINMODE=4554
+
+ .include <bsd.prog.mk>
Added: head/mail/dma/files/patch-bsd_dma_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dma/files/patch-bsd_dma_Makefile Sun Feb 14 14:55:10 2016 (r408860)
@@ -0,0 +1,25 @@
+--- bsd/dma/Makefile.orig 2016-02-07 12:41:49 UTC
++++ bsd/dma/Makefile
+@@ -11,6 +11,8 @@ CFLAGS+= -DCONF_PATH='"${CONFDIR}"'
+ DPADD= ${LIBSSL} ${LIBCRYPTO}
+ LDADD= -lssl -lcrypto
+
++YFLAGS+= -i
++
+ PROG= dma
+ .PATH: ${.CURDIR}/../..
+ SRCS= aliases_parse.y aliases_scan.l base64.c conf.c crypto.c
+@@ -21,9 +23,10 @@ PREFIX?= /usr/local
+ LIBEXEC?= ${PREFIX}/libexec
+ CONFDIR?= ${PREFIX}/etc/dma
+
+-BINOWN= root
+-BINGRP= mail
+-BINMODE=2555
++BINDIR= ${LIBEXEC}
++#BINOWN= root
++#BINGRP= mail
++#BINMODE=2555
+ WARNS?= 5
+
+ .include <bsd.prog.mk>
Modified: head/mail/dma/files/patch-conf.c
==============================================================================
--- head/mail/dma/files/patch-conf.c Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/files/patch-conf.c Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,11 +1,11 @@
---- ./conf.c.orig 2012-01-03 13:54:05.000000000 +0000
-+++ ./conf.c 2012-01-24 22:57:41.000000000 +0000
-@@ -121,7 +121,7 @@
+--- conf.c.orig 2016-02-07 12:41:49 UTC
++++ conf.c
+@@ -121,7 +121,7 @@ parse_authfile(const char *path)
au = calloc(1, sizeof(*au));
if (au == NULL)
-- errlog(1, NULL);
-+ errlog(1, "calloc failed");
+- errlog(EX_OSERR, NULL);
++ errlog(EX_OSERR, "calloc failed");
data = strdup(line);
au->login = strsep(&data, "|");
Modified: head/mail/dma/files/patch-dma.c
==============================================================================
--- head/mail/dma/files/patch-dma.c Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/files/patch-dma.c Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,7 +1,7 @@
---- dma.c.orig 2013-08-22 10:56:28.000000000 +0000
-+++ dma.c 2013-08-22 11:03:59.000000000 +0000
-@@ -343,7 +343,7 @@ retry:
- exit(1);
+--- dma.c.orig 2016-02-07 12:41:49 UTC
++++ dma.c
+@@ -340,7 +340,7 @@ retry:
+ exit(EX_SOFTWARE);
}
if (gettimeofday(&now, NULL) == 0 &&
- (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
@@ -9,7 +9,7 @@
snprintf(errmsg, sizeof(errmsg),
"Could not deliver for the last %d seconds. Giving up.",
MAX_TIMEOUT);
-@@ -560,7 +560,7 @@ main(int argc, char **argv)
+@@ -564,7 +564,7 @@ main(int argc, char **argv)
skipopts:
if (logident_base == NULL)
logident_base = "dma";
@@ -18,12 +18,12 @@
act.sa_handler = sighup_handler;
act.sa_flags = 0;
-@@ -598,7 +598,7 @@ skipopts:
- errlog(1, "can not read aliases file `%s'", config.aliases);
+@@ -596,7 +596,7 @@ skipopts:
+ errlog(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases);
if ((sender = set_from(&queue, sender)) == NULL)
-- errlog(1, NULL);
-+ errlog(1, "set_from failed");
+- errlog(EX_SOFTWARE, NULL);
++ errlog(EX_SOFTWARE, "set_from failed");
if (newspoolf(&queue) != 0)
- errlog(1, "can not create temp file in `%s'", config.spooldir);
+ errlog(EX_CANTCREAT, "can not create temp file in `%s'", config.spooldir);
Modified: head/mail/dma/files/patch-get-version.sh
==============================================================================
--- head/mail/dma/files/patch-get-version.sh Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/files/patch-get-version.sh Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,10 +1,11 @@
---- get-version.sh.orig 2012-03-08 17:37:54.000000000 +0000
-+++ get-version.sh 2012-03-08 17:38:41.000000000 +0000
-@@ -1,9 +1,7 @@
- #!/bin/sh
+--- get-version.sh.orig 2016-02-07 12:41:49 UTC
++++ get-version.sh
+@@ -2,10 +2,8 @@
+ tmp=$1
+ file=${tmp:=VERSION}
-gitver=$(git describe 2>/dev/null | tr - .)
- filever=$(cat VERSION)
+ filever=$(cat ${file} 2>/dev/null)
-version=${gitver}
: ${version:=$filever}
Modified: head/mail/dma/files/patch-mail.c
==============================================================================
--- head/mail/dma/files/patch-mail.c Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/files/patch-mail.c Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,11 +1,11 @@
---- ./mail.c.orig 2012-01-03 13:54:05.000000000 +0000
-+++ ./mail.c 2012-01-24 22:57:41.000000000 +0000
-@@ -332,7 +332,7 @@
+--- mail.c.orig 2016-02-07 12:41:49 UTC
++++ mail.c
+@@ -333,7 +333,7 @@ newaddr:
ps->pos = 0;
addr = strdup(ps->addr);
if (addr == NULL)
-- errlog(1, NULL);
-+ errlog(1, "strdup failed");
+- errlog(EX_SOFTWARE, NULL);
++ errlog(EX_SOFTWARE, "strdup failed");
if (add_recp(queue, addr, EXPAND_WILDCARD) != 0)
- errlogx(1, "invalid recipient `%s'", addr);
+ errlogx(EX_DATAERR, "invalid recipient `%s'", addr);
Modified: head/mail/dma/files/patch-spool.c
==============================================================================
--- head/mail/dma/files/patch-spool.c Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/files/patch-spool.c Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,6 +1,6 @@
---- spool.c.orig 2013-06-03 14:03:15.000000000 +0000
-+++ spool.c 2013-08-22 11:07:47.000000000 +0000
-@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
+--- spool.c.orig 2016-02-07 12:41:49 UTC
++++ spool.c
+@@ -416,7 +416,7 @@ flushqueue_since(unsigned int period)
return (0);
/* Did the flush file get touched within the last period seconds? */
Modified: head/mail/dma/pkg-plist
==============================================================================
--- head/mail/dma/pkg-plist Sun Feb 14 14:46:06 2016 (r408859)
+++ head/mail/dma/pkg-plist Sun Feb 14 14:55:10 2016 (r408860)
@@ -1,5 +1,5 @@
-@(,mail,2555) libexec/dma
-@(root,mail,4555) libexec/dma-mbox-create
+@(root,mail,2555) libexec/dma
+@(root,mail,4554) libexec/dma-mbox-create
@sample(root,mail,0644) etc/dma/dma.conf.sample
@sample(root,mail,0640) etc/dma/auth.conf.sample
man/man8/dma.8.gz
More information about the svn-ports-all
mailing list