From 4aa257f54ddaaa9c94be466cbbee45aad3bda89f Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 9 Apr 2009 02:25:37 +0000 Subject: Update enma to 1.1.0. * support DKIM (verification only) and DKIM ADSP * support exclusion address list to avoid authentication --- mail/enma/Makefile | 14 +++++++++----- mail/enma/PLIST | 7 ++++--- mail/enma/distinfo | 11 +++++------ mail/enma/files/enma.sh | 4 ++-- mail/enma/patches/patch-aa | 12 ------------ mail/enma/patches/patch-ab | 15 --------------- mail/enma/patches/patch-ac | 15 +++++++++++++++ 7 files changed, 35 insertions(+), 43 deletions(-) delete mode 100644 mail/enma/patches/patch-aa delete mode 100644 mail/enma/patches/patch-ab create mode 100644 mail/enma/patches/patch-ac (limited to 'mail/enma') diff --git a/mail/enma/Makefile b/mail/enma/Makefile index 911a1718ade..e00ab74af67 100644 --- a/mail/enma/Makefile +++ b/mail/enma/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ +# $NetBSD: Makefile,v 1.2 2009/04/09 02:25:37 obache Exp $ # -DISTNAME= enma-1.0.0 +DISTNAME= enma-1.1.0 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enma/} @@ -50,12 +50,16 @@ SUBST_SED.daemon= -e 's;daemon;${ENMA_USER};g' OWN_DIRS_PERMS+= ${VARBASE}/run/enma ${ENMA_USER} ${ENMA_GROUP} 0700 -INSTALLATION_DIRS+= ${PKGMANDIR}/ja_JP.EUC/man1 +INSTALLATION_DIRS+= share/examples/enma post-install: - ${INSTALL_MAN} ${WRKSRC}/enma/man/enma.ja.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/enma.1 + ${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample \ + ${DESTDIR}${PREFIX}/share/examples/enma/enma.conf.sample .include "../../mail/libmilter/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.if ${OPSYS} == "DragonFly" +USE_BUILTIN.resolv= no +.endif .include "../../mk/resolv.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/enma/PLIST b/mail/enma/PLIST index d46a5440336..3e6c8ce182f 100644 --- a/mail/enma/PLIST +++ b/mail/enma/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ -bin/enma +@comment $NetBSD: PLIST,v 1.2 2009/04/09 02:25:37 obache Exp $ bin/sidfquery -man/ja_JP.EUC/man1/enma.1 +libexec/enma +man/ja_JP.UTF-8/man1/enma.1 man/man1/enma.1 share/examples/enma/enma.conf.sample share/examples/rc.d/enma +@dirrm share/examples/enma diff --git a/mail/enma/distinfo b/mail/enma/distinfo index 1f9594999b5..fdccce6dfa8 100644 --- a/mail/enma/distinfo +++ b/mail/enma/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ +$NetBSD: distinfo,v 1.2 2009/04/09 02:25:37 obache Exp $ -SHA1 (enma-1.0.0.tar.gz) = a792ea302df81aec7940dae8665584086145ec15 -RMD160 (enma-1.0.0.tar.gz) = 35a9ff9ad0594561d9597788ddaca2b7d1ef8721 -Size (enma-1.0.0.tar.gz) = 161566 bytes -SHA1 (patch-aa) = 0ab42bca38fbc52a1fffe00f9809da67ffb76eda -SHA1 (patch-ab) = 2f6413b6c167198de118741c41f29c6bf76b1f06 +SHA1 (enma-1.1.0.tar.gz) = 4fe05c3a5f3cc7c1758958123c6ef6e56cdc803d +RMD160 (enma-1.1.0.tar.gz) = e30a301298a05aed0d347a37a2dfcd1a7ee9d863 +Size (enma-1.1.0.tar.gz) = 238176 bytes +SHA1 (patch-ac) = 5ca90712fb1b2178b9dc77231f1772bac7e1fa85 diff --git a/mail/enma/files/enma.sh b/mail/enma/files/enma.sh index c3235b5aa4d..68b83c82a32 100644 --- a/mail/enma/files/enma.sh +++ b/mail/enma/files/enma.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: enma.sh,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ +# $NetBSD: enma.sh,v 1.2 2009/04/09 02:25:37 obache Exp $ # # PROVIDE: enma # REQUIRE: NETWORK @@ -10,7 +10,7 @@ name="enma" rcvar=${name} -command="@PREFIX@/bin/enma" +command="@PREFIX@/libexec/enma" pidfile="@VARBASE@/run/enma/${name}.pid" required_files="@PKG_SYSCONFDIR@/enma.conf" command_args="-c @PKG_SYSCONFDIR@/enma.conf" diff --git a/mail/enma/patches/patch-aa b/mail/enma/patches/patch-aa deleted file mode 100644 index fa2a3b723a0..00000000000 --- a/mail/enma/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ - ---- libsidf/src/sidfrequest.c.orig 2008-08-13 15:44:32.000000000 +0000 -+++ libsidf/src/sidfrequest.c -@@ -18,6 +18,7 @@ RCSID("$Id: sidfrequest.c 348 2008-08-13 - #include - #include - #include -+#include - #include - #include - // #include diff --git a/mail/enma/patches/patch-ab b/mail/enma/patches/patch-ab deleted file mode 100644 index 4357ad80dc4..00000000000 --- a/mail/enma/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/09/05 07:23:44 obache Exp $ - ---- enma/etc/Makefile.in.orig 2008-08-21 14:22:29.000000000 +0000 -+++ enma/etc/Makefile.in -@@ -29,8 +29,8 @@ OBJS := $(patsubst %.c,%.o,$(SRCS)) - all: - - install: -- $(INSTALL) -d $(sysconfdir) -- $(INSTALL_DATA) -c enma.conf.sample $(sysconfdir) -+ $(INSTALL) -d $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) -c enma.conf.sample $(DESTDIR)$(sysconfdir) - - clean: - rm -rf *~ diff --git a/mail/enma/patches/patch-ac b/mail/enma/patches/patch-ac new file mode 100644 index 00000000000..b624fbcc75f --- /dev/null +++ b/mail/enma/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2009/04/09 02:25:38 obache Exp $ + +--- configure.orig 2009-03-02 05:01:02.000000000 +0000 ++++ configure +@@ -4170,8 +4170,8 @@ fi + + + CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra" +-CPPFLAGS="$CPPFLAGS -I$includedir -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" +-LDFLAGS="$LDFLAGS -L$libdir -lpthread" ++CPPFLAGS="$CPPFLAGS -I$includedir $PTHREAD_CFLAGS" ++LDFLAGS="$LDFLAGS -L$libdir $PTHREAD_LDFLAGS $PTHREAD_LIBS" + + { echo "$as_me:$LINENO: checking for __res_ndestroy in -lbind" >&5 + echo $ECHO_N "checking for __res_ndestroy in -lbind... $ECHO_C" >&6; } -- cgit v1.2.3