diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/masqmail/Makefile | 57 | ||||
-rw-r--r-- | mail/masqmail/distinfo | 4 | ||||
-rw-r--r-- | mail/masqmail/files/patch-Makefile.in | 37 | ||||
-rw-r--r-- | mail/masqmail/files/patch-local.c | 10 | ||||
-rw-r--r-- | mail/masqmail/files/patch-peopen.c | 10 | ||||
-rw-r--r-- | mail/masqmail/pkg-plist | 48 |
6 files changed, 76 insertions, 90 deletions
diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile index cb78248e710d..2bf7245a3aec 100644 --- a/mail/masqmail/Makefile +++ b/mail/masqmail/Makefile @@ -6,18 +6,17 @@ # PORTNAME= masqmail -PORTVERSION= 0.2.21 -PORTREVISION= 2 +PORTVERSION= 0.3.4 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} -DISTNAME= ${PORTNAME}_${PORTVERSION}.orig +MASTER_SITES= http://marmaro.de/prog/masqmail/files/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 5u623l20@gmail.com COMMENT= Mail server for hosts, not permanently connected to the internet .if !defined (NO_INSTALL_MANPAGES) -MAN5= masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5 -MAN8= masqmail.8 mservdetect.8 +MAN1= mservdetect.1 +MAN5= masqmail.aliases.5 masqmail.conf.5 masqmail.route.5 +MAN8= masqmail.8 rmail.8 .endif USE_GNOME= glib20 @@ -26,60 +25,34 @@ GNU_CONFIGURE= yes CFLAGS+= -Wno-trigraphs CONFIGURE_ARGS+= --with-user=mailnull --with-group=mail \ --with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.if !defined (NOPORTDOCS) -PORTDOCS= AUTHORS COPYING INSTALL NEWS README TODO -.endif - -OPTIONS += LIBCRYPTO "Use libcrypto" on -OPTIONS += POP3 "Enable POP3" on -OPTIONS += SMTP "Enable SMTP server" on -OPTIONS += Resolver "Resolver" on -OPTIONS += MAILDIR "Maildir support" on -OPTIONS += MSERVER "Enable mserver support" off +OPTIONS += RESOLVER "Resolver" on OPTIONS += AUTH "SMTP AUTH (RFC2554) support" on -OPTIONS += IDENT "Ident (RFC 1413) support" off +OPTIONS += DEBUG "Enable Debugging" off .include <bsd.port.pre.mk> -.if defined(WITH_LIBCRYPTO) -CONFIGURE_ARGS+= --with-libcrypto -.endif -.if defined(WITHOUT_POP3) -CONFIGURE_ARGS+= --disable-pop3 -.endif -.if defined(WITHOUT_SMTP) -CONFIGURE_ARGS+= --disable-smtp-server -.endif .if defined(WITHOUT_RESOLVER) CONFIGURE_ARGS+= --disable-resolver .endif -.if defined(WITH_MAILDIR) -CONFIGURE_ARGS+= --enable-maildir -.endif -.if defined(WITH_MSERVER) -CONFIGURE_ARGS+= --enable-mserver -.endif .if defined(WITH_AUTH) CONFIGURE_ARGS+= --enable-auth .endif -.if defined(WITH_IDENT) -CONFIGURE_ARGS+= --enable-ident +.if defined(WITHOUT_DEBUG) +CONFIGURE_ARGS+= --disable-debug .endif post-install: - ${MKDIR} ${PREFIX}/etc/masqmail ${CHOWN} mailnull:mail ${PREFIX}/etc/masqmail ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/masqmail.conf ${PREFIX}/etc/masqmail/masqmail.conf-dist - ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/example.get ${PREFIX}/etc/masqmail/masqmail.get-dist ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/example.route ${PREFIX}/etc/masqmail/masqmail.route-dist + ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/localnet.route ${PREFIX}/etc/masqmail/localnet.route-dist + ${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/openssl.route ${PREFIX}/etc/masqmail/openssl.route-dist .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor + ${MKDIR} ${DOCSDIR}/docs + cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${DOCSDIR} + (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/) .endif .include <bsd.port.post.mk> diff --git a/mail/masqmail/distinfo b/mail/masqmail/distinfo index 7c8f3ade9602..aaac847bffb6 100644 --- a/mail/masqmail/distinfo +++ b/mail/masqmail/distinfo @@ -1,2 +1,2 @@ -SHA256 (masqmail_0.2.21.orig.tar.gz) = 2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445 -SIZE (masqmail_0.2.21.orig.tar.gz) = 269192 +SHA256 (masqmail-0.3.4.tar.gz) = 1f0db635febc4fa8336a0645f444faf26c9db346d5056f9367206265c83cc06c +SIZE (masqmail-0.3.4.tar.gz) = 255824 diff --git a/mail/masqmail/files/patch-Makefile.in b/mail/masqmail/files/patch-Makefile.in index 696faa3794d4..b914ce4bf337 100644 --- a/mail/masqmail/files/patch-Makefile.in +++ b/mail/masqmail/files/patch-Makefile.in @@ -1,17 +1,24 @@ ---- Makefile.in.old Sun Apr 4 23:36:26 2004 -+++ Makefile.in Sun Apr 4 23:38:38 2004 -@@ -377,9 +377,12 @@ - $(DESTDIR)@datadir@/tpl: conf_dir - install -d $(DESTDIR)@datadir@/masqmail/tpl - install -m 644 tpl/failmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl -- install -m 644 tpl/failmsg.tpl.{de,fr,it} $(DESTDIR)@datadir@/masqmail/tpl -+ install -m 644 tpl/failmsg.tpl.de $(DESTDIR)@datadir@/masqmail/tpl -+ install -m 644 tpl/failmsg.tpl.fr $(DESTDIR)@datadir@/masqmail/tpl -+ install -m 644 tpl/failmsg.tpl.it $(DESTDIR)@datadir@/masqmail/tpl - install -m 644 tpl/warnmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl -- install -m 644 tpl/warnmsg.tpl.{de,fr} $(DESTDIR)@datadir@/masqmail/tpl -+ install -m 644 tpl/warnmsg.tpl.de $(DESTDIR)@datadir@/masqmail/tpl -+ install -m 644 tpl/warnmsg.tpl.fr $(DESTDIR)@datadir@/masqmail/tpl +--- Makefile.in.orig 2012-04-04 02:18:39.238237978 +0600 ++++ Makefile.in 2012-04-04 02:19:13.710250762 +0600 +@@ -689,7 +689,7 @@ + uninstall uninstall-am uninstall-local - log_dir: $(DESTDIR)@with_logdir@ +-install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail ++install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir rmail + + uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir + +@@ -707,12 +707,6 @@ + rm-tpl_dir: + rm -rf $(DESTDIR)@datadir@/masqmail/ + +-doc_dir: +- install -d $(DESTDIR)@docdir@ +- cp -r docs $(DESTDIR)@docdir@ +- cp -r examples $(DESTDIR)@docdir@ +- cp ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS $(DESTDIR)@docdir@ +- + rm-doc_dir: + cd $(DESTDIR)@docdir@ && ( \ + rm -rf docs examples ; \ diff --git a/mail/masqmail/files/patch-local.c b/mail/masqmail/files/patch-local.c deleted file mode 100644 index d5adb0eef198..000000000000 --- a/mail/masqmail/files/patch-local.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/local.c.orig Mon May 19 22:44:46 2003 -+++ src/local.c Wed Aug 4 04:15:10 2004 -@@ -19,6 +19,7 @@ - #include "masqmail.h" - #include "peopen.h" - #include <sys/wait.h> -+#include <sys/stat.h> - - static - void message_stream(FILE *out, message *msg, GList *hdr_list, guint flags) diff --git a/mail/masqmail/files/patch-peopen.c b/mail/masqmail/files/patch-peopen.c deleted file mode 100644 index fd2c94c202d7..000000000000 --- a/mail/masqmail/files/patch-peopen.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/peopen.c.old Wed Aug 4 03:51:30 2004 -+++ src/peopen.c Wed Aug 4 03:52:43 2004 -@@ -6,6 +6,7 @@ - #include <unistd.h> - #include <string.h> - #include <sys/types.h> -+#include <stdlib.h> - - #include "peopen.h" - #include "sysexits.h" diff --git a/mail/masqmail/pkg-plist b/mail/masqmail/pkg-plist index 030bf23f7ba3..ab56ca69d901 100644 --- a/mail/masqmail/pkg-plist +++ b/mail/masqmail/pkg-plist @@ -1,16 +1,42 @@ bin/mservdetect etc/masqmail/masqmail.conf-dist -etc/masqmail/masqmail.get-dist etc/masqmail/masqmail.route-dist +etc/masqmail/localnet.route-dist +etc/masqmail/openssl.route-dist sbin/masqmail -share/masqmail/tpl/failmsg.tpl -share/masqmail/tpl/failmsg.tpl.de -share/masqmail/tpl/failmsg.tpl.fr -share/masqmail/tpl/failmsg.tpl.it -share/masqmail/tpl/warnmsg.tpl -share/masqmail/tpl/warnmsg.tpl.de -share/masqmail/tpl/warnmsg.tpl.fr -@dirrm share/masqmail/tpl -@dirrm share/masqmail +sbin/rmail +%%DATADIR%%/tpl/failmsg.tpl +%%DATADIR%%/tpl/failmsg.tpl.de +%%DATADIR%%/tpl/failmsg.tpl.fr +%%DATADIR%%/tpl/failmsg.tpl.it +%%DATADIR%%/tpl/warnmsg.tpl +%%DATADIR%%/tpl/warnmsg.tpl.de +%%DATADIR%%/tpl/warnmsg.tpl.fr +%%DATADIR%%/tpl/warnmsg.tpl.it +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.ipaq +%%PORTDOCS%%%%DOCSDIR%%/docs/ppp-setup +%%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup +%%PORTDOCS%%%%DOCSDIR%%/docs/oem-option +%%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup +%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.agenda +%%PORTDOCS%%%%DOCSDIR%%/docs/howto-release +%%PORTDOCS%%%%DOCSDIR%%/docs/howto-static-linking +%%PORTDOCS%%%%DOCSDIR%%/docs/README +%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.linux +%%PORTDOCS%%%%DOCSDIR%%/docs/agenda-config.site +%%PORTDOCS%%%%DOCSDIR%%/docs/FAQ +%%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup +%%PORTDOCS%%%%DOCSDIR%%/docs/howto-report-bugs +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/tpl +@dirrm %%DATADIR%% @dirrm etc/masqmail -@dirrmtry /var/log/masqmail |