svn commit: r353965 - in head/mail/masqmail: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Tue May 13 15:38:52 UTC 2014
Author: sunpoet
Date: Tue May 13 15:38:51 2014
New Revision: 353965
URL: http://svnweb.freebsd.org/changeset/ports/353965
QAT: https://qat.redports.org/buildarchive/r353965/
Log:
- Add DOCS to OPTIONS_DEFINE
- Use ETCDIR
- Support STAGEDIR
- While I'm here:
- Fix STAGEDIR prefix in PREFIX/sbin/rmail
- Convert to new options helper
- Simplify Makefile
- Sort PLIST
PR: ports/189661
Submitted by: Muhammad Moinur Rahman <5u623l20 at gmail.com> (maintainer)
Modified:
head/mail/masqmail/Makefile
head/mail/masqmail/files/patch-Makefile.in
head/mail/masqmail/pkg-plist
Modified: head/mail/masqmail/Makefile
==============================================================================
--- head/mail/masqmail/Makefile Tue May 13 15:22:06 2014 (r353964)
+++ head/mail/masqmail/Makefile Tue May 13 15:38:51 2014 (r353965)
@@ -3,55 +3,43 @@
PORTNAME= masqmail
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://marmaro.de/prog/masqmail/files/
MAINTAINER= 5u623l20 at gmail.com
COMMENT= Mail server for hosts, not permanently connected to the internet
-.if !defined (NO_INSTALL_MANPAGES)
-MAN1= mservdetect.1
-MAN5= masqmail.aliases.5 masqmail.conf.5 masqmail.route.5
-MAN8= masqmail.8 rmail.8
-.endif
+LICENSE= GPLv2
USE_GNOME= glib20
USES= pkgconfig
USE_RC_SUBR= masqmail
GNU_CONFIGURE= yes
CFLAGS+= -Wno-trigraphs
-CONFIGURE_ARGS+= --with-user=mailnull --with-group=mail \
- --with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
+CONFIGURE_ARGS= --with-user=mailnull --with-group=mail \
+ --with-confdir=${ETCDIR} --with-logdir=/var/log/masqmail
-OPTIONS_DEFINE= RESOLVER AUTH DEBUG
+OPTIONS_DEFINE= RESOLVER AUTH DEBUG DOCS
OPTIONS_DEFAULT= RESOLVER AUTH
RESOLVER_DESC= Resolver
AUTH_DESC= SMTP AUTH (RFC2554) support
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
+AUTH_CONFIGURE_ENABLE= auth
+DEBUG_CONFIGURE_ENABLE= debug
+RESOLVER_CONFIGURE_ENABLE= resolver
-.if ! ${PORT_OPTIONS:MRESOLVER}
-CONFIGURE_ARGS+= --disable-resolver
-.endif
-.if ${PORT_OPTIONS:MAUTH}
-CONFIGURE_ARGS+= --enable-auth
-.endif
-.if ! ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+= --disable-debug
-.endif
+post-patch:
+ @${REINPLACE_CMD} -e '/sed.*SENDMAIL/ s|$$(DESTDIR)||' ${WRKSRC}/Makefile.in
post-install:
- ${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.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 ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}/docs
- cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${DOCSDIR}
- (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/)
-.endif
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/masqmail.conf ${STAGEDIR}${ETCDIR}/masqmail.conf-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/example.route ${STAGEDIR}${ETCDIR}/masqmail.route-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/localnet.route ${STAGEDIR}${ETCDIR}/localnet.route-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/openssl.route ${STAGEDIR}${ETCDIR}/openssl.route-dist
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
+ cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/docs/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/mail/masqmail/files/patch-Makefile.in
==============================================================================
--- head/mail/masqmail/files/patch-Makefile.in Tue May 13 15:22:06 2014 (r353964)
+++ head/mail/masqmail/files/patch-Makefile.in Tue May 13 15:38:51 2014 (r353965)
@@ -5,7 +5,7 @@
-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
++install-data-local: uid_bit conf_dir tpl_dir rmail
uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
Modified: head/mail/masqmail/pkg-plist
==============================================================================
--- head/mail/masqmail/pkg-plist Tue May 13 15:22:06 2014 (r353964)
+++ head/mail/masqmail/pkg-plist Tue May 13 15:38:51 2014 (r353965)
@@ -1,8 +1,18 @@
bin/mservdetect
-etc/masqmail/masqmail.conf-dist
-etc/masqmail/masqmail.route-dist
-etc/masqmail/localnet.route-dist
-etc/masqmail/openssl.route-dist
+ at owner mailnull
+ at group mail
+%%ETCDIR%%/localnet.route-dist
+%%ETCDIR%%/masqmail.conf-dist
+%%ETCDIR%%/masqmail.route-dist
+%%ETCDIR%%/openssl.route-dist
+ at owner
+ at group
+man/man1/mservdetect.1.gz
+man/man5/masqmail.aliases.5.gz
+man/man5/masqmail.conf.5.gz
+man/man5/masqmail.route.5.gz
+man/man8/masqmail.8.gz
+man/man8/rmail.8.gz
sbin/masqmail
sbin/rmail
%%DATADIR%%/tpl/failmsg.tpl
@@ -13,30 +23,30 @@ sbin/rmail
%%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%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.agenda
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.ipaq
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.linux
+%%PORTDOCS%%%%DOCSDIR%%/docs/README
+%%PORTDOCS%%%%DOCSDIR%%/docs/agenda-config.site
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-release
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-report-bugs
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-static-linking
+%%PORTDOCS%%%%DOCSDIR%%/docs/oem-option
+%%PORTDOCS%%%%DOCSDIR%%/docs/ppp-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/tpl
@dirrm %%DATADIR%%
- at dirrm etc/masqmail
+ at dirrm %%ETCDIR%%
More information about the svn-ports-head
mailing list