[Midnightbsd-cvs] mports [24346] trunk/mail/courier/Makefile: update make file
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 17 22:39:36 EDT 2018
Revision: 24346
http://svnweb.midnightbsd.org/mports/?rev=24346
Author: laffer1
Date: 2018-09-17 22:39:36 -0400 (Mon, 17 Sep 2018)
Log Message:
-----------
update make file
Modified Paths:
--------------
trunk/mail/courier/Makefile
Modified: trunk/mail/courier/Makefile
===================================================================
--- trunk/mail/courier/Makefile 2018-09-18 02:38:15 UTC (rev 24345)
+++ trunk/mail/courier/Makefile 2018-09-18 02:39:36 UTC (rev 24346)
@@ -2,7 +2,7 @@
PORTNAME= courier
PORTVERSION= 0.65.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF
@@ -10,14 +10,16 @@
COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite
LICENSE= gpl3
+LICENSE_FILE= ${WRKSRC}/COPYING.GPL
-BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
- ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
- ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
- ${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
- ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base
+LIB_DEPENDS= libidn.so:dns/libidn \
+ libpcre.so:devel/pcre
+RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \
+ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool \
+ ${LOCALBASE}/etc/mime.types:misc/mime-support \
+ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+ ca_root_nss>=3.*:security/ca_root_nss
CONFLICTS= courier-imap-2.* couriermlm-0.* \
exim-4.* maildrop-1.* \
@@ -27,10 +29,6 @@
smail-3.* sqwebmail-3.* \
zmailer-2.*
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE= yes
-.endif
-
#
# User-serviceable variables
#
@@ -41,10 +39,13 @@
# set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
# recomended values are: /var/mail, ./Mailbox or ./Maildir
#
+
IMAGEURL?= /webmail
CACHEOWN?= pop
MAILDROPDEFAULT?=./Maildir
+
# End of user-serviceable variables
+
MAILOWN= courier
MAILGRP= courier
MAILUID= 465
@@ -58,17 +59,11 @@
MIMETYPES= ${LOCALBASE}/etc/mime.types
WITH_TRANSPORT= local esmtp dsn
-USES= fam gettext gmake libtool perl5 pkgconfig ssl tar:bzip2
-USE_PERL5= yes
+USES= fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl
USE_SUBMAKE= yes
-
USE_RC_SUBR= courier
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV:= ${CONFIGURE_ENV}
-
CONFIGURE_ARGS= --disable-root-check \
--with-db=db \
--enable-syslog=1 --enable-use-flock \
@@ -93,8 +88,9 @@
--with-transport='${WITH_TRANSPORT}' \
--with-default-maildrop=${MAILDROPDEFAULT} \
--with-paranoid-smtpext \
- --enable-workarounds-for-imap-client-bugs \
- --cache-file=${WRKDIR}/courier.cache
+ --enable-workarounds-for-imap-client-bugs
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip install-perms
@@ -104,16 +100,17 @@
CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \
CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}"
SUB_LIST:= ${PLIST_SUB}
-SUB_FILES+= pkg-install pkg-message crontab sharedindexupdate
+SUB_FILES+= pkg-message crontab sharedindexupdate
+#SUB_FILES+= pkg-install pkg-message crontab sharedindexupdate
-OPTIONS_DEFINE= LDAP GNUPG PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS \
- WEBMAILFLAGS WEBMAILRSENT
-OPTIONS_GROUP= EXPERIMENTAL
-OPTIONS_GROUP_EXPERIMENTAL= WEBMAILXFACE
+OPTIONS_DEFINE= LDAP PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS DOCS
+OPTIONS_GROUP= WEBMAIL
+#OPTIONS_GROUP= SYSTEM WEBMAIL
+#OPTIONS_GROUP_SYSTEM= RCCONF MAILCONF PERIODIC
+OPTIONS_GROUP_WEBMAIL= GNUPG WEBMAILRSENT WEBMAILFLAGS WEBMAILXFACE
OPTIONS_RADIO= ALIASES SPELL
OPTIONS_RADIO_ALIASES= SYSTEMALIASES EMPTYALIASES
OPTIONS_RADIO_SPELL= ASPELL ISPELL
-
OPTIONS_DEFAULT=WEBMAILRSENT SYSTEMALIASES
LDAP_DESC= LDAP-based mail aliasing support
@@ -124,13 +121,17 @@
SENDFAX_DESC= mgetty+sendfax support
UUCP_DESC= UUCP support
MAILDROPFLAGS_DESC= maildrop set flags patch
+WEBMAILRSENT_DESC= enable Autorename Sent folder
WEBMAILFLAGS_DESC= webmail show flags patch
WEBMAILXFACE_DESC= experimental webmail X-Face patch
-WEBMAILRSENT_DESC= enable Autorename Sent folder
SYSTEMALIASES_DESC= symlink system /etc/aliases
EMPTYALIASES_DESC= create empty aliases file
+RCCONF_DESC= modify rc.conf to enable courier/disable sendmail
+MAILCONF_DESC= modify mailer.conf to use courier instead of sendmail
+PERIODIC_DESC= modify/create periodic.conf
.include <bsd.mport.options.mk>
+
.include "${.CURDIR}/Makefile.doc"
.include "${.CURDIR}/Makefile.own"
@@ -137,7 +138,7 @@
.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes
WITH_AUTH_LDAP= yes
-RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:${PORTSDIR}/net/courier-authlib-ldap
+RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
CONFIGURE_ARGS+=--with-ldapaliasd
PLIST_SUB+= WITHLDAP=""
SUB_LIST+= WITHLDAP=""
@@ -168,17 +169,17 @@
.endif
.if ${PORT_OPTIONS:MGNUPG}
-BUILD_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS+= gpg:security/gnupg
+RUN_DEPENDS+= gpg:security/gnupg
.endif
.if ${PORT_OPTIONS:MASPELL}
-BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS+= aspell:textproc/aspell
+RUN_DEPENDS+= aspell:textproc/aspell
CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell
.elif ${PORT_OPTIONS:MISPELL}
-BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS+= ispell:textproc/aspell-ispell
+RUN_DEPENDS+= ispell:textproc/aspell-ispell
CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
.else
CONFIGURE_ARGS+=--without-ispell
@@ -185,14 +186,14 @@
.endif
.if ${PORT_OPTIONS:MPROCMAIL}
-BUILD_DEPENDS+= procmail:${PORTSDIR}/mail/procmail
-RUN_DEPENDS+= procmail:${PORTSDIR}/mail/procmail
+BUILD_DEPENDS+= procmail:mail/procmail
+RUN_DEPENDS+= procmail:mail/procmail
.endif
.if ${PORT_OPTIONS:MSENDFAX}
-USE_GHOSTSCRIPT=yes
-SENDFAX_DEPENDS=sendfax:${PORTSDIR}/comms/mgetty+sendfax \
- pnmscale:${PORTSDIR}/graphics/netpbm
+USES+= ghostscript
+SENDFAX_DEPENDS=sendfax:comms/mgetty+sendfax \
+ pnmscale:graphics/netpbm
BUILD_DEPENDS+= ${SENDFAX_DEPENDS}
RUN_DEPENDS+= ${SENDFAX_DEPENDS}
WITH_TRANSPORT+=fax
@@ -205,8 +206,8 @@
.if ${PORT_OPTIONS:MUUCP}
.if !exists(/usr/bin/uux)
-BUILD_DEPENDS+= uux:${PORTSDIR}/net/freebsd-uucp
-RUN_DEPENDS+= uux:${PORTSDIR}/net/freebsd-uucp
+BUILD_DEPENDS+= uux:net/freebsd-uucp
+RUN_DEPENDS+= uux:net/freebsd-uucp
.endif
WITH_TRANSPORT+=uucp
PLIST_SUB+= WITHUUCP=""
@@ -239,6 +240,24 @@
CONFIGURE_ARGS+=--disable-autorenamesent
.endif
+.if ${PORT_OPTIONS:MMAILCONF}
+SUB_LIST+= MAILCONF="y"
+.else
+SUB_LIST+= MAILCONF="n"
+.endif
+
+.if ${PORT_OPTIONS:MRCCONF}
+SUB_LIST+= RCCONF="y"
+.else
+SUB_LIST+= RCCONF="n"
+.endif
+
+.if ${PORT_OPTIONS:MPERIODIC}
+SUB_LIST+= PERIODIC="y"
+.else
+SUB_LIST+= PERIODIC="n"
+.endif
+
pre-everything::
@${ECHO_MSG} "===> --------------------------------------------------------"
@${ECHO_MSG} "===> Run 'make config' to (re)configure ${PKGNAME}"
@@ -248,6 +267,11 @@
@${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
post-patch:
+ @${REINPLACE_CMD} -i '' -e 's|#! perl|#!${PERL}|g' \
+ ${WRKSRC}/webadmin/*.pl \
+ ${WRKSRC}/webadmin/*.pl.in \
+ ${WRKSRC}/courier/webadmin/*.pl \
+ ${WRKSRC}/courier/webadmin/*.pl.in
@${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
${WRKSRC}/courier/module.*/courier.config
@${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
@@ -272,16 +296,9 @@
${WRKSRC}/*/*/*/configure
@${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root wheel/g' \
${WRKSRC}/courier/perms.sh.in
+ @${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \
+ ${WRKSRC}/courier/module.esmtp/Makefile.in
-pre-configure:
- @if [ -f "${WRKDIR}/courier.cache" -a -s "${WRKDIR}/courier.cache" ]; then \
- ${RM} -f "${WRKDIR}/courier.cache"; \
- fi
- @cp ${LOCALBASE}/share/gettext/po/Makefile.in.in ${WRKSRC}/pcp/po
-.for oldlt in . bdbobj cgi courier courier/libs courier/filters courier/filters/perlfilter courier/module.dsn courier/module.esmtp courier/module.local courier/module.uucp gdbmobj gpglib http11 imap ldapaddressbook libhmac liblock maildir maildrop makedat md5 numlib pcp random128 rfc822 rfc1035 rfc2045 sha1 tcpd unicode webmail
- @cd ${WRKSRC}/${oldlt} && ${SETENV} ${SCRIPTS_ENV} ${SH} /usr/local/bin/aclocal
-.endfor
-
post-build:
@${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
-e 's|^(account)\s+(required).*|$$1 \t$$2\tpam_unix.so|g;' \
@@ -301,41 +318,28 @@
@${LN} -f ${WRKSRC}/webmail/SECURITY.html ${WRKSRC}/webmail/SECURITY.webmail.html
post-install:
- @${LN} -f ${SYSCONFDIR}/maildrop ${SYSCONFDIR}/maildropfilter
- @${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
- @${INSTALL_DATA} ${WRKDIR}/crontab ${SYSCONFDIR}/
- @${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${DATADIR}/
+ @${LN} -f ${STAGEDIR}${SYSCONFDIR}/maildrop ${STAGEDIR}${SYSCONFDIR}/maildropfilter
+ @${INSTALL_DATA} /dev/null ${STAGEDIR}${SYSCONFDIR}/locallowercase
+ @${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${SYSCONFDIR}/
+ @${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate ${STAGEDIR}${DATADIR}/
.for file in ${OWNER0}
- @-${CHOWN} -Rh ${BINOWN}:${BINGRP} ${PREFIX}/${file}
+ @-${CHOWN} -Rh ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/${file}
.endfor
- @${GREP} '^@exec ' ${TMPPLIST} \
- | ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
- > ${WRKDIR}/.PLIST.exec \
- && ${SH} ${WRKDIR}/.PLIST.exec
.if ${PORT_OPTIONS:MDOCS}
- @${INSTALL} ${_DOCOWNGRP} -d ${DOCSDIR}/html
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/html
.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
.for f in ${HTMLDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/html
+ @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/html
.endfor
- @${INSTALL_DATA} ${DATADIR}/htmldoc/* ${DOCSDIR}/html
+ @${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
.endif
- @${RM} -rf ${DATADIR}/htmldoc
- @-${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${DATADIR}
- @${CHMOD} -R a+r ${DATADIR}/courierwebadmin
- @${CHMOD} -R a-w ${DATADIR} ${LIBEXECDIR}/courier
- @${CHMOD} 550 ${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
- @${ECHO_MSG} " To activate Courier in /etc/mail/mailer.conf or to"
- @${ECHO_MSG} " replace {sendmail,mailq,newaliases} with Courier"
- @${ECHO_MSG} " versions execute the following as root user:"
- @${ECHO_MSG}
- @${ECHO_MSG} "PKG_PREFIX=\"${PREFIX}\" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL"
- @${ECHO_MSG}
-.else
- @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+ @${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
+ @-${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
+ @${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
+ @${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
+ @${CHMOD} 550 ${STAGEDIR}${LIBEXECDIR}/courier/modules/esmtp/courieresmtp*
.include <bsd.port.mk>
More information about the Midnightbsd-cvs
mailing list