Index: head/mail/courier/Makefile =================================================================== --- head/mail/courier/Makefile (revision 200759) +++ head/mail/courier/Makefile (revision 200760) @@ -1,364 +1,358 @@ # New ports collection makefile for: Courier MTA # Date created: 17 Oct 2001 # Whom: Yarema # # $FreeBSD$ # PORTNAME= courier PORTVERSION= 0.54.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier MAINTAINER= bsd@dino.sk COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base LIB_DEPENDS= pcre:${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 CONFLICTS= exim-4.* courier-imap-2.* maildrop-1.* \ postfix-1.* postfix-2.* \ qmail-1.* qmail-*-1.* \ sendmail-8.* sendmail-*-8.* \ smail-3.* sqwebmail-3.* zmailer-2.* .if !defined(BATCH) && !defined(PACKAGE_BUILDING) IS_INTERACTIVE= yes .endif # # User-serviceable variables # # [ There's no need to add trailing ``/''s ] # # set IMAGEURL to where on the web server URL the images are found # set CACHEOWN to who you'd like to own the cache files # 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 MAILGID= 465 ETCDIR= ${PREFIX}/etc SYSCONFDIR= ${ETCDIR}/courier USERDB?= ${ETCDIR}/userdb LIBEXECDIR= ${PREFIX}/libexec LOCALSTATEDIR= /var/spool/courier CACHEDIR= /var/spool/webmail CALENDIR= /var/spool/calendar MIMETYPES= ${LOCALBASE}/etc/mime.types WITH_TRANSPORT= local esmtp dsn USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_FAM= yes USE_GETTEXT= yes USE_GMAKE= yes USE_OPENSSL= yes USE_PERL5= yes USE_SUBMAKE= yes USE_RC_SUBR= courier.sh CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \ CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE_ENV:= ${CONFIGURE_ENV} CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-root-check --with-db=db \ --enable-syslog=1 --enable-use-flock \ --program-transform-name=s,^,, \ --enable-utf7-folder-encoding \ --enable-unicode \ --with-mailuser=${MAILOWN} \ --with-mailgroup=${MAILGRP} \ --with-mailuid=${MAILUID} \ --with-mailgid=${MAILGID} \ --with-etcdir=${ETCDIR} \ --sysconfdir=${SYSCONFDIR} \ --with-userdb=${USERDB} \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --localstatedir=${LOCALSTATEDIR} \ --enable-mimetypes=${MIMETYPES} \ --enable-imageurl=${IMAGEURL} \ --with-cachedir=${CACHEDIR} \ --with-cacheowner=${CACHEOWN} \ --with-calendardir=${CALENDIR} \ --with-transport='${WITH_TRANSPORT}' \ --with-default-maildrop=${MAILDROPDEFAULT} \ --with-paranoid-smtpext \ --enable-workarounds-for-imap-client-bugs \ --cache-file=${WRKDIR}/courier.cache INSTALL_TARGET= install-strip install-perms PLIST_SUB+= BINOWN="${BINOWN}" BINGRP="${BINGRP}" \ MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \ MAILUID="${MAILUID}" MAILGID="${MAILGID}" \ CACHEOWN="${CACHEOWN}" CACHEDIR="${CACHEDIR}" \ CALENDIR="${CALENDIR}" LOCALSTATEDIR="${LOCALSTATEDIR}" SUB_LIST:= ${PLIST_SUB} SUB_FILES+= pkg-install pkg-message crontab sharedindexupdate OPTIONS+=LDAP "LDAP-based mail aliasing support" .if (exists(${LOCALBASE}/lib/libldap.a) && exists(${LOCALBASE}/lib/liblber.a)) || defined(WITH_LDAP) OPTIONS+=on .else OPTIONS+=off .endif .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif OPTIONS+=GNUPG "GNU Privacy Guard support for WebMail" .if exists(${LOCALBASE}/bin/gpg) || defined(WITH_GNUPG) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=ASPELL "ASpell support for WebMail / mutually" .if exists(${LOCALBASE}/bin/aspell) || defined(WITH_ASPELL) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=ISPELL "ISpell support for WebMail \ exclusive" .if exists(${LOCALBASE}/bin/ispell) || defined(WITH_ISPELL) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=PROCMAIL "Procmail local delivery support" .if exists(${LOCALBASE}/bin/procmail) || defined(WITH_PROCMAIL) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=SENDFAX "mgetty+sendfax support" .if exists(${LOCALBASE}/sbin/sendfax) && exists(${LOCALBASE}/bin/pnmscale) && exists(${LOCALBASE}/bin/gs) || defined(WITH_SENDFAX) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=UUCP "UUCP support" .if exists(/usr/bin/uux) || exists(${LOCALBASE}/bin/uux) || defined(WITH_UUCP) OPTIONS+=on .else OPTIONS+=off .endif OPTIONS+=IPV6 "IPv6 support" .if defined(WITH_IPV6) OPTIONS+=on .else OPTIONS+=off .endif .include .include "${.CURDIR}/Makefile.doc" .include "${.CURDIR}/Makefile.man" .include "${.CURDIR}/Makefile.own" .if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) USE_OPENLDAP= yes WITH_AUTH_LDAP= yes RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:${PORTSDIR}/net/courier-authlib-ldap CONFIGURE_ARGS+=--with-ldapaliasd PLIST_SUB+= WITHLDAP="" SUB_LIST+= WITHLDAP="" .else CONFIGURE_ARGS+=--without-ldapaliasd PLIST_SUB+= WITHLDAP="@comment " SUB_LIST+= WITHLDAP="@comment " .endif .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if defined(WITH_GNUPG) && !defined(WITHOUT_GNUPG) BUILD_DEPENDS+= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg .endif .if defined(WITH_ASPELL) && !defined(WITHOUT_ASPELL) && !defined(WITH_ISPELL) BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell .endif .if defined(WITH_ISPELL) && !defined(WITHOUT_ISPELL) && !defined(WITH_ASPELL) BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell .endif .if defined(WITH_ASPELL) && defined(WITH_ISPELL) BROKEN= ASpell and ISpell are mutually exclusive. Run 'make config' to (re)configure ${PKGNAME} .endif .if !defined(WITH_ASPELL) && !defined(WITH_ISPELL) CONFIGURE_ARGS+=--without-ispell .endif .if defined(WITH_PROCMAIL) && !defined(WITHOUT_PROCMAIL) BUILD_DEPENDS+= procmail:${PORTSDIR}/mail/procmail RUN_DEPENDS+= procmail:${PORTSDIR}/mail/procmail .endif .if defined(WITH_SENDFAX) && !defined(WITHOUT_SENDFAX) USE_GHOSTSCRIPT=yes SENDFAX_DEPENDS=sendfax:${PORTSDIR}/comms/mgetty+sendfax \ pnmscale:${PORTSDIR}/graphics/netpbm BUILD_DEPENDS+= ${SENDFAX_DEPENDS} RUN_DEPENDS+= ${SENDFAX_DEPENDS} WITH_TRANSPORT+=fax PLIST_SUB+= WITHFAX="" SUB_LIST+= WITHFAX="" .else PLIST_SUB+= WITHFAX="@comment " SUB_LIST+= WITHFAX="@comment " .endif .if defined(WITH_UUCP) && !defined(WITHOUT_UUCP) .if !exists(/usr/bin/uux) BUILD_DEPENDS+= uux:${PORTSDIR}/net/freebsd-uucp RUN_DEPENDS+= uux:${PORTSDIR}/net/freebsd-uucp .endif WITH_TRANSPORT+=uucp PLIST_SUB+= WITHUUCP="" .else PLIST_SUB+= WITHUUCP="@comment " .endif .if defined(WITH_IPV6) || !defined(WITHOUT_IPV6) CONFIGURE_ARGS+=--with-ipv6 .else CONFIGURE_ARGS+=--without-ipv6 .endif -.if ${OSVERSION} < 500000 -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-maildir__maildirfilter.c \ - ${FILESDIR}/extrapatch-webmail__folder.c \ - ${FILESDIR}/extrapatch-webmail__newmsg.c -.endif - pre-everything:: @${ECHO_MSG} "===> --------------------------------------------------------" @${ECHO_MSG} "===> Run 'make config' to (re)configure ${PKGNAME}" @${ECHO_MSG} "===> --------------------------------------------------------" pre-patch: @${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC} post-patch: @${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \ ${WRKSRC}/courier/module.*/courier.config @${REINPLACE_CMD} -e 's|@datadir@|@sysconfdir@|g' \ ${WRKSRC}/*/mk*cert.* \ ${WRKSRC}/*/*/mk*cert.* @${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@datadir@|\1@sysconfdir@|g' \ ${WRKSRC}/*/*.dist.in \ ${WRKSRC}/*/*/*.dist.in @${REINPLACE_CMD} -e 's|^\(RANDFILE = \)@datadir@[^[:space:]]*|\1@sysconfdir@/random.tmp|g' \ ${WRKSRC}/*/*.cnf.in \ ${WRKSRC}/*/*/*.cnf.in @${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/*/Makefile.in \ ${WRKSRC}/*/*/Makefile.in \ ${WRKSRC}/*/*/*/Makefile.in @${REINPLACE_CMD} -e 's|^\(INSTALL_STRIP_PROGRAM=\).*$$|\1"${INSTALL_PROGRAM} -s"|' \ -e 's|; ldapaliasd="yes"||' \ ${WRKSRC}/configure \ ${WRKSRC}/*/configure \ ${WRKSRC}/*/*/configure \ ${WRKSRC}/*/*/*/configure @${REINPLACE_CMD} -E -e 's/(root|bin)[[:space:]]*bin/root wheel/g' \ ${WRKSRC}/courier/perms.sh.in pre-configure: @if [ -f "${WRKDIR}/courier.cache" -a -s "${WRKDIR}/courier.cache" ]; then \ ${RM} -f "${WRKDIR}/courier.cache"; \ fi 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;' \ -e 's|^(session)\s+(required).*|$$1 \t$$2\tpam_permit.so|g;' \ ${WRKSRC}/*/*.authpam* \ ${WRKSRC}/*/*/*.authpam* @${LN} -f ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html @${LN} -f ${WRKSRC}/imap/BUGS ${WRKSRC}/imap/BUGS.imap @${LN} -f ${WRKSRC}/imap/BUGS.html ${WRKSRC}/imap/BUGS.imap.html @${LN} -f ${WRKSRC}/imap/README ${WRKSRC}/imap/README.imap @${LN} -f ${WRKSRC}/imap/README.html ${WRKSRC}/imap/README.imap.html @${LN} -f ${WRKSRC}/maildrop/README.html ${WRKSRC}/maildrop/README.maildrop.html @${LN} -f ${WRKSRC}/pcp/README.html ${WRKSRC}/pcp/README.pcp.html @${LN} -f ${WRKSRC}/webmail/BUGS ${WRKSRC}/webmail/BUGS.webmail @${LN} -f ${WRKSRC}/webmail/BUGS.html ${WRKSRC}/webmail/BUGS.webmail.html @${LN} -f ${WRKSRC}/webmail/SECURITY ${WRKSRC}/webmail/SECURITY.webmail @${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}/ .for file in ${OWNER0} @-${CHOWN} -Rh ${BINOWN}:${BINGRP} ${PREFIX}/${file} .endfor @${GREP} '^@exec ' ${TMPPLIST} \ | ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \ > ${WRKDIR}/.PLIST.exec \ && ${SH} ${WRKDIR}/.PLIST.exec .if !defined(NOPORTDOCS) @${INSTALL} ${_DOCOWNGRP} -d ${DOCSDIR}/html .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .for f in ${HTMLDOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/html .endfor @${INSTALL_DATA} ${DATADIR}/htmldoc/* ${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* @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .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 .include Property changes on: head/mail/courier/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 200759) +++ head/mail/dovecot/Makefile (revision 200760) @@ -1,162 +1,162 @@ # ex:ts=8 # New ports collection makefile for: dovecot # Date created: 12/08/2002 # Whom: Dominic Marks # # $FreeBSD$ # PORTNAME= dovecot DISTVERSION= 1.0.5 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/1.0/ MAINTAINER= robin@isometry.net COMMENT= Secure and compact IMAP and POP3 servers USE_ICONV= yes USE_RC_SUBR= dovecot.sh GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-shadow --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= ${PREFIX}/lib/dovecot \ ${PREFIX}/lib/dovecot/imap \ ${PREFIX}/lib/dovecot/pop3 \ ${PREFIX}/lib/dovecot/lda .if !defined(NOPORTDOCS) PORTDOCS= *.txt wiki .else CONFIGURE_ARGS+= --without-docs .endif DOVECOT_UID?= 143 DOVECOT_GID?= 143 SCRIPT_ENV+= DOVECOT_UID=${DOVECOT_UID} \ DOVECOT_GID=${DOVECOT_GID} OPTIONS= KQUEUE "kqueue(2) support" on \ SSL "SSL support" on \ IPV6 "IPv6 support" on \ POP3 "POP3 support" on \ LDA "LDA support" on \ GSSAPI "GSSAPI support" off \ VPOPMAIL "VPopMail support" off \ LDAP "OpenLDAP support" off \ PGSQL "PostgreSQL support" off \ MYSQL "MySQL support" off \ SQLITE "SQLite support" off .include ## kqueue(2) support # .if !defined(WITHOUT_KQUEUE) CONFIGURE_ARGS+= --with-ioloop=kqueue .endif ## SSL support # .if defined(WITHOUT_SSL) CONFIGURE_ARGS+= --without-ssl .endif ## IPv6 support # -.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014 +.if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif ## POP3 support # .if defined(WITHOUT_POP3) CONFIGURE_ARGS+= --without-pop3d PROTOCOLS= imap PLIST_SUB+= POP3="@comment " .else PROTOCOLS= imap pop3 PLIST_SUB+= POP3="" .endif ## LDA support # .if defined(WITHOUT_LDA) CONFIGURE_ARGS+= --without-deliver PLIST_SUB+= LDA="@comment " .else PLIST_SUB+= LDA="" .endif ## GSSAPI support # .if defined(WITH_GSSAPI) CONFIGURE_ARGS+= --with-gssapi .else CONFIGURE_ARGS+= --without-gssapi .endif ## VPopMail Support # .if defined(WITH_VPOPMAIL) VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail CONFIGURE_ARGS+= --with-vpopmail .else CONFIGURE_ARGS+= --without-vpopmail .endif ## OpenLDAP Support # .if defined(WITH_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap .endif ## PostgreSQL Support # .if defined(WITH_PGSQL) USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql .endif ## MySQL Support # .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .endif ## SQLite Support # .if defined(WITH_SQLITE) USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite .endif post-patch: .if defined(WITH_GSSAPI) @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/src/auth/mech-gssapi.c \ ${WRKSRC}/configure .endif post-build: @${REINPLACE_CMD} \ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%PROTOCOLS%%,${PROTOCOLS},g' \ ${WRKSRC}/dovecot-example.conf pre-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @${MKDIR} ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DATADIR} @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/dovecot/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.74 \ No newline at end of property +1.75 \ No newline at end of property Index: head/mail/dovecot-devel/Makefile =================================================================== --- head/mail/dovecot-devel/Makefile (revision 200759) +++ head/mail/dovecot-devel/Makefile (revision 200760) @@ -1,162 +1,162 @@ # ex:ts=8 # New ports collection makefile for: dovecot # Date created: 12/08/2002 # Whom: Dominic Marks # # $FreeBSD$ # PORTNAME= dovecot DISTVERSION= 1.0.5 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/1.0/ MAINTAINER= robin@isometry.net COMMENT= Secure and compact IMAP and POP3 servers USE_ICONV= yes USE_RC_SUBR= dovecot.sh GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-shadow --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= ${PREFIX}/lib/dovecot \ ${PREFIX}/lib/dovecot/imap \ ${PREFIX}/lib/dovecot/pop3 \ ${PREFIX}/lib/dovecot/lda .if !defined(NOPORTDOCS) PORTDOCS= *.txt wiki .else CONFIGURE_ARGS+= --without-docs .endif DOVECOT_UID?= 143 DOVECOT_GID?= 143 SCRIPT_ENV+= DOVECOT_UID=${DOVECOT_UID} \ DOVECOT_GID=${DOVECOT_GID} OPTIONS= KQUEUE "kqueue(2) support" on \ SSL "SSL support" on \ IPV6 "IPv6 support" on \ POP3 "POP3 support" on \ LDA "LDA support" on \ GSSAPI "GSSAPI support" off \ VPOPMAIL "VPopMail support" off \ LDAP "OpenLDAP support" off \ PGSQL "PostgreSQL support" off \ MYSQL "MySQL support" off \ SQLITE "SQLite support" off .include ## kqueue(2) support # .if !defined(WITHOUT_KQUEUE) CONFIGURE_ARGS+= --with-ioloop=kqueue .endif ## SSL support # .if defined(WITHOUT_SSL) CONFIGURE_ARGS+= --without-ssl .endif ## IPv6 support # -.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014 +.if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif ## POP3 support # .if defined(WITHOUT_POP3) CONFIGURE_ARGS+= --without-pop3d PROTOCOLS= imap PLIST_SUB+= POP3="@comment " .else PROTOCOLS= imap pop3 PLIST_SUB+= POP3="" .endif ## LDA support # .if defined(WITHOUT_LDA) CONFIGURE_ARGS+= --without-deliver PLIST_SUB+= LDA="@comment " .else PLIST_SUB+= LDA="" .endif ## GSSAPI support # .if defined(WITH_GSSAPI) CONFIGURE_ARGS+= --with-gssapi .else CONFIGURE_ARGS+= --without-gssapi .endif ## VPopMail Support # .if defined(WITH_VPOPMAIL) VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail CONFIGURE_ARGS+= --with-vpopmail .else CONFIGURE_ARGS+= --without-vpopmail .endif ## OpenLDAP Support # .if defined(WITH_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap .endif ## PostgreSQL Support # .if defined(WITH_PGSQL) USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql .endif ## MySQL Support # .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .endif ## SQLite Support # .if defined(WITH_SQLITE) USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite .endif post-patch: .if defined(WITH_GSSAPI) @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/src/auth/mech-gssapi.c \ ${WRKSRC}/configure .endif post-build: @${REINPLACE_CMD} \ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%PROTOCOLS%%,${PROTOCOLS},g' \ ${WRKSRC}/dovecot-example.conf pre-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @${MKDIR} ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DATADIR} @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/dovecot-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.74 \ No newline at end of property +1.75 \ No newline at end of property Index: head/mail/exim/Makefile =================================================================== --- head/mail/exim/Makefile (revision 200759) +++ head/mail/exim/Makefile (revision 200760) @@ -1,670 +1,666 @@ # New ports collection makefile for: exim # Date created: 23 June 1996 # Whom: markm@FreeBSD.org # # $FreeBSD$ # PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim DIST_SUBDIR= exim EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= krion@FreeBSD.org COMMENT?= High performance MTA for Unix systems on the Internet .include "options" .if defined(WITH_SA_EXIM) MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ ${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sa_exim/} MASTER_SITE_SUBDIR+= sa-exim/:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif EXIM_VERSION= 4.68 SA_EXIM_VERSION=4.2 .if !defined(EXIMON_ONLY) .if defined(PKGNAMESUFFIX) CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.* .endif .for suffix in -ldap2 -mysql -postgresql -sa-exim -sqlite .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != ${suffix} CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.* .endif .endfor .if defined(WITH_EXIMON) CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-monitor-4.* .endif .else WITH_EXIMON= yes .endif .if defined(WITH_EXIMON) USE_XLIB= yes .endif USE_BZIP2= yes .if !defined(EXIMON_ONLY) MAN8= exim.8 .else NO_INSTALL_MANPAGES= yes .endif PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING PORTDOC_FILES= ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \ OptionLists.txt README README.SIEVE dbm.discuss.txt \ experimental-spec.txt filter.txt pcrepattern.txt \ pcretest.txt spec.txt PORT_EXAMPLES= convert4r3 convert4r4 pcretest transport-filter.pl DAILY_SCRIPTS= 150.exim-tidydb 460.exim-mail-rejects PKGINSTALL= ${WRKDIR}/pkg-install .if defined(NOPORTDOCS) && !defined(EXIMON_ONLY) PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES .else PKGMESSAGE= ${WRKDIR}/pkg-message .endif MAKE_ENV+= OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}" .if defined(EXIMON_ONLY) MAKE_ENV+= INSTALL_ARG="eximon eximon.bin" .elif defined(WITHOUT_SUID) MAKE_ENV+= INSTALL_ARG="-no_chown" .endif EXIM_USER?= mailnull EXIM_GROUP?= mail LOGDIR?= /var/log/exim LOG_FILE_PATH?= ${LOGDIR}/%slog SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ -e 's,%%EXIM_USER%%,${EXIM_USER},g' \ -e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \ -e 's,%%LOGDIR%%,${LOGDIR},g' PLIST_SUB= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \ EXIM_USER=${EXIM_USER} \ EXIM_GROUP=${EXIM_GROUP} \ LOGDIR="${LOGDIR}" # Define it to enabale malware and spam scanning in the DATA ACL, # and the MIME ACL. #WITH_CONTENT_SCAN= yes # Enable old, deprecated "demime" ACL condition, in addition # to all the other content-scanning features. #WITHOUT_OLD_DEMIME= yes # If WITH_EXIMON is defined, the eximon monitor, which requires X, # will be made a dependency. Note that using WITH_EXIMON will cause # XFree86 to be installed if it is not present. #WITH_EXIMON= yes # If WITH_SA_EXIM is defined, exim will be built with the SA-Exim # local_scan function () #WITH_SA_EXIM= yes # Exim refuses to run local deliveries as root by default. You can # add other users to this colon-separated list that cannot be # overridden at runtime below, but are advised not to remove "root". #WITH_FIXED_NEVER_USERS= root:daemon:bin # Define WITH_TCP_WRAPPERS, WITH_MYSQL, WITH_SQLITE and WITH_PGSQL # to link against libwrap, libmysqlclient, sqlite and libpq # respectively. Define WITH_SASLAUTHD to enable use of the Cyrus # SASL authentication daemon. Define WITH_SQLITE to enable use of # the SQLite support. Define WITH_MYSQL_VER to specify a particular # version of MySQL to use. Valid values are currently 323, 40 and # 41. Defining WITH_MYSQL_VER implies WITH_MYSQL. #WITH_TCP_WRAPPERS= yes #WITH_MYSQL= yes #WITH_MYSQL_VER= 40 #WITH_PGSQL= yes #WITH_SQLITE= yes #WITH_SASLAUTHD= yes # As an alternative to WITH_SASLAUTHD, you can define WITH_PWCHECK to # link against libsasl for SMTP AUTH authentication via the Cyrus SASL # pwcheck daemon. ################################ # THIS MECHANISM IS DEPRECATED # ################################ #WITH_PWCHECK= yes # Define WITHOUT_IPV6 to exclude IPv6 support from the compiled exim # binary. Exim compiled with IPv6 support will still operate on # systems that do not have IPv6 kernel support, so this should not # be necessary. #WITHOUT_IPV6= yes # Define WITH_OPENLDAP or WITH_OPENLDAP_VER to link against libldap. # Define WITH_OPENLDAP_VER to specify a particular version of # OpenLDAP to use. Valid values are currently 21, 22 and 23. # Defining WITH_OPENLDAP_VER implies WITH_OPENLDAP. # Exim also supports NETSCAPE and SOLARIS7 lookup types, but no # client libraries exist for these in the ports tree. #WITH_OPENLDAP= yes #WITH_OPENLDAP_VER= 23 # Define WITH_BDB or WITH_BDB_VER to link against the Berkeley DB library. # Define WITH_BDB_VER to specify a particular version of Berkeley DB to use. # Values may be 1, which corresponds to version 1.85 in the base system, 4, # 41, 42, 43, ... which depends on the databases/db4* ports. #WITH_BDB= yes #WITH_BDB_VER?= 1 # When Exim is decoding MIME "words" in header lines it converts any foreign # character sets to the one that is set in the headers_charset option. # The default setting is defined by this setting: WITH_DEFAULT_CHARSET?= ISO-8859-1 # The following options may be defined to turn off support for various # features that this port enables by default. # # Do not link against OpenSSL; disables STARTTLS. #WITHOUT_TLS= yes # # Disable the embedded Perl interpreter, which allows Perl subroutines to # be called during string expansion. #WITHOUT_PERL= yes # # Disable built-in Exim support for the PAM, RFC 2195, RFC 2595 and # Microsoft "Secure Password Authentication" authentication mechanisms, # used for SMTP AUTH. #WITHOUT_PAM= yes #WITHOUT_AUTH_CRAM_MD5= yes #WITHOUT_AUTH_PLAINTEXT= yes #WITHOUT_AUTH_DOVECOT= yes #WITHOUT_AUTH_SPA= yes # # Enable support for authenticating via the Cyrus SASL library #WITH_AUTH_SASL= yes # # Enable built-in Exim support for radius (RFC 2865) authentication # RADIUS_TYPE can either be RADLIB (to use the radius library supplied # with FreeBSD) or RADIUSCLIENT (to use port net/radiusclient) #WITH_AUTH_RADIUS= yes #WITH_RADIUS_TYPE= RADLIB # # Disable built-in Exim support for additional mailbox formats. #WITHOUT_MAILDIR= yes #WITHOUT_MAILSTORE= yes #WITHOUT_MBX= yes # # Define WITHOUT_CDB, WITHOUT_DNSDB, WITHOUT_DSEARCH, WITHOUT_LSEARCH, # WITHOUT_NIS and WITHOUT_PASSWD to disable support for CDB-style, DNS-style, # directory-list, wildcarded-file, NIS and /etc/passwd lookups respectively. #WITHOUT_CDB= yes #WITHOUT_DNSDB= yes #WITHOUT_DSEARCH= yes #WITHOUT_LSEARCH= yes #WITHOUT_NIS= yes #WITHOUT_PASSWD= yes # # Disable support for the LMTP (RFC 2033 "SMTP over command pipe") # transport. #WITHOUT_LMTP= yes # # Allow alternate configuration files not only in ${PREFIX}/etc/exim #WITHOUT_ALT_CONFIG_PREFIX= yes # # Include the unsupported patches in ${PATCHDIR}/wishlist-*.patch #WITH_WISHLIST= yes # # Enable Sender Policy Framework (SPF) checking in exiscan-acl #WITH_SPF= yes # # Enable DomainKeys support #WITH_DOMAINKEYS= yes # # Enable Sender Rewriting Scheme (SRS) #WITH_SRS= yes # # Enable Sender Rewriting Scheme alternative library (SRS_ALT) #WITH_SRS_ALT= yes # # Use the readline(3) library for the test expansion option #WITH_READLINE= yes # # Don't install the exim binary suid root #WITHOUT_SUID= yes # # Don't install scripts to run exim as a daemon # (for example when using option mua_wrapper) #WITHOUT_DAEMON= yes # You should not need to fiddle with anything below this point. .if defined(WITH_WISHLIST) EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` .endif SEDLIST+= -e 's,XX_CFLAGS_XX,${CFLAGS},' \ -e 's,XX_PREFIX_XX,${PREFIX},' \ -e 's,XX_LOCALBASE_XX,${LOCALBASE},' \ -e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH},' \ -e 's,XX_EXIM_USER_XX,${EXIM_USER},' \ -e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP},' \ -e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET},' .if defined(WITH_FIXED_NEVER_USERS) SEDLIST+= -e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS},' .endif .if defined(WITH_EXIMON) SEDLIST+= -e 's,^\# (EXIM_MONITOR=),\1,' PLIST_SUB+= EXIMON="" .else PLIST_SUB+= EXIMON="@comment " .endif .if !defined(WITHOUT_TLS) USE_OPENSSL= yes SEDLIST+= -e 's,^\# (SUPPORT_TLS=),\1,' .else SEDLIST+= -e 's,^(TLS_LIBS=),\# \1,' .endif .if !defined(WITHOUT_PERL) USE_PERL5= yes SEDLIST+= -e 's,^\# (EXIM_PERL=),\1,' .endif .if defined(WITH_TCP_WRAPPERS) SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \ -e 's,^\# (USE_TCP_WRAPPERS=),\1,' .else SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,' .endif .if !defined(WITHOUT_ICONV) USE_ICONV= yes SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE}/lib -liconv,' \ -e 's,^\# (HAVE_ICONV=),\1,' .else SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' .endif .if defined(WITH_LDAP) || defined(LDAP_LIB_TYPE) \ || defined(WITH_OPENLDAP1) || defined(WITH_OPENLDAP2) \ || defined(WITH_OPENLDAP20) || defined(WITH_OPENLDAP21) BROKEN= deprecated LDAP option defined, use WITH_OPENLDAP or WITH_OPENLDAP_VER .endif .if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER:L} != "auto" WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif .if defined(WITH_OPENLDAP) USE_OPENLDAP= yes LDAP_LIB_TYPE= OPENLDAP2 SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE}/lib -llber -lldap,' \ -e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE}/include,' \ -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},' \ -e 's,^\# (LOOKUP_LDAP=),\1,' .else SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ -e 's,^(LDAP_LIB_TYPE=),\# \1,' .endif .if defined(DB_LIB_VERSION) BROKEN= deprecated option DB_LIB_VERSION used, use WITH_BDB_VER .endif .if defined(WITH_BDB_VER) .if ${WITH_BDB_VER} > 1 WITH_BDB= yes .endif .endif .if defined(WITH_BDB) USE_BDB= yes INVALID_BDB_VER= 2 3 DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} DB_INCLUDES= -I${BDB_INCLUDE_DIR} .else DB_LIBS= DB_INCLUDES= SEDLIST+= -e 's,^(DBMLIB=),\# \1,' .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},' .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER:L} != "auto" WANT_MYSQL_VER= ${WITH_MYSQL_VER} .else .undef WITH_MYSQL_VER .endif .if defined(WITH_MYSQL) USE_MYSQL= yes SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE}/lib/mysql -lmysqlclient,' \ -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE}/include/mysql,' \ -e 's,^\# (LOOKUP_MYSQL=),\1,' .else SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' .endif .if defined(WITH_SASLAUTHD) RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd SASLAUTHD_SOCKET?= /var/run/saslauthd/mux SEDLIST+= -e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET},' .endif .if defined(WITH_PWCHECK) RUN_DEPENDS+= ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl SEDLIST+= -e 's,^\# (SUPPORT_CYRUS_PWCHECK=),\1,' \ -e 's,^\# (CYRUS_PWCHECK_SOCKET=),\1,' .endif .if !defined(WITHOUT_PAM) SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' \ -e 's,^\# (SUPPORT_PAM=),\1,' .else SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' .endif .if !defined(WITHOUT_AUTH_CRAM_MD5) SEDLIST+= -e 's,^\# (AUTH_CRAM_MD5=),\1,' .endif .if !defined(WITHOUT_AUTH_PLAINTEXT) SEDLIST+= -e 's,^\# (AUTH_PLAINTEXT=),\1,' .endif .if !defined(WITHOUT_AUTH_DOVECOT) SEDLIST+= -e 's,^\# (AUTH_DOVECOT=),\1,' .endif .if !defined(WITHOUT_AUTH_SPA) SEDLIST+= -e 's,^\# (AUTH_SPA=),\1,' .endif .if defined(WITH_AUTH_SASL) LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 SEDLIST+= -e 's,^\# (AUTH_CYRUS_SASL=),\1,' \ -e 's,^\# (AUTH_LIBS=),\1,' .endif .if defined(WITH_AUTH_RADIUS) WITH_RADIUS_TYPE?= RADLIB .if ${WITH_RADIUS_TYPE:L} == radlib SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-lradius,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,' .elif ${WITH_RADIUS_TYPE:L} == radiusclient LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient-ng,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/etc/radiusclient-ng/radiusclient.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,' .else IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT .endif .else SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' .endif .if defined(WITH_PGSQL) USE_PGSQL= yes SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \ -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \ -e 's,^\# (LOOKUP_PGSQL=),\1,' .else SEDLIST+= -e 's,XX_PGSQL_[^ ]*_XX,,' .endif .if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(LDAP_LIB_TYPE) && \ !defined(WITH_BDB) SEDLIST+= -e 's,^(LOOKUP_LIBS=),\# \1,' \ -e 's,^(LOOKUP_INCLUDE=),\# \1,' .endif .if !defined(WITHOUT_DNSDB) SEDLIST+= -e 's,^\# (LOOKUP_DNSDB=),\1,' .endif .if !defined(WITHOUT_MAILDIR) SEDLIST+= -e 's,^\# (SUPPORT_MAILDIR=),\1,' .endif .if !defined(WITHOUT_MAILSTORE) SEDLIST+= -e 's,^\# (SUPPORT_MAILSTORE=),\1,' .endif .if !defined(WITHOUT_MBX) SEDLIST+= -e 's,^\# (SUPPORT_MBX=),\1,' .endif .if !defined(WITHOUT_CDB) SEDLIST+= -e 's,^\# (LOOKUP_CDB=),\1,' .endif .if !defined(WITHOUT_DSEARCH) SEDLIST+= -e 's,^\# (LOOKUP_DSEARCH=),\1,' .endif .if defined(WITHOUT_LSEARCH) SEDLIST+= -e 's,^(LOOKUP_LSEARCH=),\# \1,' .endif .if !defined(WITHOUT_NIS) SEDLIST+= -e 's,^\# (LOOKUP_NIS=),\1,' .endif .if !defined(WITHOUT_PASSWD) SEDLIST+= -e 's,^\# (LOOKUP_PASSWD=),\1,' .endif .if defined(WITH_SQLITE) USE_SQLITE= yes SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,-L${LOCALBASE}/lib -lsqlite3,' \ -e 's,XX_SQLITE_FLAGS_XX,-I${LOCALBASE}/include,' \ -e 's,^\# (LOOKUP_SQLITE=),\1,' .else SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ -e 's,XX_SQLITE_FLAGS_XX,,' .endif .if !defined(WITHOUT_LMTP) SEDLIST+= -e 's,^\# (TRANSPORT_LMTP=),\1,' .endif .if defined(WITHOUT_ALT_CONFIG_PREFIX) SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' .endif .if defined(WITH_SPF) LIB_DEPENDS+= spf2.2:${PORTSDIR}/mail/libspf2 SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ -e 's,XX_SPF_LIBS_XX,-lspf2 ${PTHREAD_LIBS},' \ -e 's,^\# (EXPERIMENTAL_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ -e 's,XX_SPF_LIBS_XX,,' .endif .if defined(WITH_DOMAINKEYS) LIB_DEPENDS+= domainkeys.3:${PORTSDIR}/mail/libdomainkeys SEDLIST+= -e 's,XX_DOMAINKEYS_LIBS_XX,-ldomainkeys,' \ -e 's,^\# (EXPERIMENTAL_DOMAINKEYS=),\1,' .else SEDLIST+= -e 's,XX_DOMAINKEYS_LIBS_XX,,' .endif .if defined(WITH_SRS) LIB_DEPENDS+= srs2.0:${PORTSDIR}/mail/libsrs2 SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ -e 's,XX_SRS_LIBS_XX,-lsrs2,' .elif defined(WITH_SRS_ALT) LIB_DEPENDS+= srs_alt.1:${PORTSDIR}/mail/libsrs_alt SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ -e 's,XX_SRS_LIBS_XX,-lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' .endif .if defined(WITH_SA_EXIM) RUN_DEPENDS+= ${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin PLIST_SUB+= SA_EXIM="" .else PLIST_SUB+= SA_EXIM="@comment " .endif .if defined(WITH_READLINE) SEDLIST+= -e 's,^\# (USE_READLINE=),\1,' .endif .if defined(WITH_CONTENT_SCAN) SEDLIST+= -e 's,^\# (WITH_CONTENT_SCAN=),\1,' .endif .if !defined(WITHOUT_OLD_DEMIME) SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\1,' .endif .if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON) USE_RC_SUBR= exim.sh PLIST_SUB+= DAEMON="" SUB_LIST+= LOGDIR="${LOGDIR}" .else PLIST_SUB+= DAEMON="@comment " .endif .include .if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR} .error EXIMON_ONLY is not user settable .endif -.if ${OSVERSION} < 400014 -WITHOUT_IPV6= yes -.endif - .if !defined(WITHOUT_IPV6) SEDLIST+= -e 's,^\# (HAVE_IPV6=),\1,' .endif DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g' pre-everything:: .if empty(.MAKEFLAGS:M-s) && defined(WITH_WISHLIST) @${ECHO} '' @${ECHO} 'Included extra patches:' @${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \ -exec ${SED} -ne 's,^# , ,p' {} \; @${ECHO} '' .endif post-extract: .if defined(WITH_SA_EXIM) @cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} .endif do-configure: @${MKDIR} ${WRKSRC}/Local @${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile .if defined(WITH_EXIMON) @${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf .endif @[ ! -f ${PKGDIR}/pkg-install ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install > ${PKGINSTALL} @${REINPLACE_CMD} -E ${SEDLIST} ${WRKSRC}/src/configure.default @${REINPLACE_CMD} -e 's/$$(LDFLAGS)/$$(DUMMY_LDFLAGS)/' ${WRKSRC}/OS/Makefile-Base @${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number (${OPSYS}))\\n\\t"/' \ ${WRKSRC}/src/globals.c @${REINPLACE_CMD} -e 's/Exim version %s \(#%s \)\{0,1\}/&(${OPSYS} ${OSREL}) /' ${WRKSRC}/src/exim.c @${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c @${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \ -e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default .if defined(WITH_SA_EXIM) @${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \ ${WRKSRC}/OS/Makefile-Default @${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local @{ \ ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \ ${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \ ${ECHO_CMD} "#define SPAMASSASSIN_CONF \"${PREFIX}/etc/exim/sa-exim.conf\""; \ } > ${WRKSRC}/Local/sa-exim.h @${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \ ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf .endif @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) post-build: .for script in ${DAILY_SCRIPTS} @${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh .endfor @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \ ${WRKDIR}/POST-INSTALL-NOTES @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES.clamd > ${WRKDIR}/POST-INSTALL-NOTES.clamd @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES @[ ! -f ${PKGDIR}/pkg-message ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message .if !defined(EXIMON_ONLY) pre-install: if ! /usr/sbin/pw groupshow ${EXIM_GROUP}; then /usr/sbin/pw groupadd ${EXIM_GROUP} -g 125; fi if ! /usr/sbin/pw usershow ${EXIM_USER}; then /usr/sbin/pw useradd ${EXIM_USER} -g ${EXIM_GROUP} -u 125 \ -h - -d /var/spool/exim -s /nonexistent -c "Exim User"; fi @[ -d "/etc" ] || ${MKDIR} "/etc" @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .if !defined(WITHOUT_DAEMON) @${MKDIR} ${PREFIX}/etc/periodic/daily .for script in ${DAILY_SCRIPTS} @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${PREFIX}/etc/periodic/daily/${script} .endfor .endif @[ -f ${PREFIX}/etc/exim/configure ] || \ ${CP} ${PREFIX}/etc/exim/configure.default ${PREFIX}/etc/exim/configure .for manfile in ${MAN8} @${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8 .endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR} @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR} .for docfile in ${PORTDOC_BASE} @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} .endfor .for docfile in ${PORTDOC_FILES} @${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR} .endfor @${MKDIR} ${EXAMPLESDIR} .for example in ${PORT_EXAMPLES} @${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${EXAMPLESDIR} .endfor .endif .if defined(WITH_SA_EXIM) @${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \ ${PREFIX}/etc/exim/sa-exim.conf.default @[ -f ${PREFIX}/etc/exim/sa-exim.conf ] || \ ${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \ ${PREFIX}/etc/exim/sa-exim.conf .endif @${CAT} ${PKGMESSAGE} @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .else post-install: @${CAT} ${PKGMESSAGE} .endif .include Property changes on: head/mail/exim/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.233 \ No newline at end of property +1.234 \ No newline at end of property Index: head/mail/listmanager/Makefile =================================================================== --- head/mail/listmanager/Makefile (revision 200759) +++ head/mail/listmanager/Makefile (revision 200760) @@ -1,68 +1,59 @@ # New ports collection makefile for: listmanager # Date created: 29 Dec 1999 # Whom: will # # $FreeBSD$ # PORTNAME= listmanager PORTVERSION= 2.109 CATEGORIES= mail MASTER_SITES= http://www.listmanager.org/v${PORTVERSION}/ \ http://www.listmanager.org/ DISTNAME= ${PORTNAME} -DIST_SUBDIR= ${PORTNAME} - -.include - -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif - -.if ${OSVERSION} >= 440000 EXTRACT_SUFX= .freebsd44 -.else -EXTRACT_SUFX= .freebsd35 -.endif DISTFILES= ${DISTNAME}${EXTRACT_SUFX} INSTALL help.tar.gz listmanager.8 ack +DIST_SUBDIR= ${PORTNAME} MAINTAINER= gshapiro@FreeBSD.org COMMENT= Fully-featured mailing list manager +LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x + EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= ${WRKDIR} NO_BUILD= yes ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR} PKGMESSAGE= ${WRKSRC}/pkg-message MAN8= listmanager.8 LISTMANAGER_HOME?=/var/listmanager pre-patch: (cd ${WRKSRC} && ${TAR} xfz help.tar.gz) post-patch: - @ for file in listmanager.cf pkg-message setup; do \ + @ for f in listmanager.cf pkg-message setup; do \ ${SED} -e "s|@@VARPREFIX@@|${LISTMANAGER_HOME}|g" \ -e "s|@@INSPREFIX@@|${PREFIX}|g" \ - < ${FILESDIR}/$$file.in > ${WRKSRC}/$$file; \ + < ${FILESDIR}/$$f.in > ${WRKSRC}/$$f; \ done do-install: @${MKDIR} ${PREFIX}/etc @${MKDIR} ${PREFIX}/share/listmanager/help ${INSTALL_DATA} ${WRKSRC}/listmanager.cf ${PREFIX}/etc/listmanager.cf.sample ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/listmanager ${INSTALL_DATA} ${WRKSRC}/ack ${PREFIX}/share/listmanager ${INSTALL_DATA} ${WRKSRC}/help/* ${PREFIX}/share/listmanager/help ${INSTALL_SCRIPT} ${WRKSRC}/setup ${PREFIX}/share/listmanager ${INSTALL_MAN} ${WRKSRC}/listmanager.8 ${PREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}${EXTRACT_SUFX} ${PREFIX}/sbin/listmanager ${CHMOD} 4510 ${PREFIX}/sbin/listmanager post-install: @${CAT} ${PKGMESSAGE} -.include +.include Property changes on: head/mail/listmanager/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/mail/mutt-devel/Makefile =================================================================== --- head/mail/mutt-devel/Makefile (revision 200759) +++ head/mail/mutt-devel/Makefile (revision 200760) @@ -1,577 +1,577 @@ # ex:ts=8 # Ports collection makefile for: mutt development # Date created: 6 Jun 2001 # Whom: Udo Schweigert # # $FreeBSD$ # # There are several knobs which are used to define additions to the core # mutt functionality. # # As all of the knobs have a unique name which should not interfere with # other ports you can add them to /etc/make.conf, e.g. a line like # "WITH_MUTT_NNTP=yes" will enable mutt's nntp facilities. # # In addition to the knobs listed below you can enable other configuration # options of mutt by adding them to the MUTT_CONFIGURE_ARGS variable. For # example you could say "MUTT_CONFIGURE_ARGS=--with-homespool=MyMail" to # configure a different file for mutt's homespool. # # The two most important knobs are: # # In general you can choose between using ncurses (WITH_MUTT_NCURSES) # and SLANG (WITH_MUTT_SLANG). Note that you may have to set the variables # COLORTERM=yes and COLORFGBG="color1;color2" in your environment to get slang # function properly. # The default version for slang is 1.x. Define WITH_MUTT_SLANG2 if you want # to use the slang version 2.x # The default version for ncurses is that which comes with the operating # system. If you want to use the ncurses supplied by the ports-system define # WITH_MUTT_NCURSES_PORT. # # If you want to install the mutt documentation in html and ps format define: # WITH_MUTT_HTML # This is a default knob and can be disabled by WITHOUT_MUTT_HTML # # If you do not want that the documentation is rebuilt using the xml tools # define: # WITHOUT_MUTT_XML # (this can only be stated if WITHOUT_MUTT_HTML is defined) # # If you want to access compressed email folders define: # WITH_MUTT_COMPRESSED_FOLDERS # This is a default knob and can be disabled by WITHOUT_MUTT_COMPRESSED_FOLDERS # # If you do not want mutt to use the iconv library define: # WITHOUT_MUTT_ICONV # # If you want mutt to use the idn library define: # WITH_MUTT_IDN # # If you want to make use of the gpgme interface define: # WITH_MUTT_GPGME # # If you want to enable extended quoting functions define: # WITH_MUTT_QUOTE_PATCH # This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH # # If you want to have the IMAP header cache define: # WITH_MUTT_IMAP_HEADER_CACHE # # If you want to have the Maildir and the IMAP header cache define: # WITH_MUTT_MAILDIR_HEADER_CACHE # # If you want to make SMIME outlook compatible define: # WITH_MUTT_SMIME_OUTLOOK_COMPAT # This is a default knob and can be disabled by # WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT # # If you want to read and post news with mutt define: # WITH_MUTT_NNTP # # If you want to use the SASL2 authentication features with your email server # define # WITH_MUTT_CYRUS_SASL2 # # If you want mutt to use the GNU aspell spelling checker define: # WITH_MUTT_ASPELL # # If you want mutt to use the ispell spelling checker define: # WITH_MUTT_ISPELL # # If you want to use the signature menu define: # WITH_MUTT_SIGNATURE_MENU # # If you want to use the printf-like enhancement to the mbox-hook command # define: # WITH_MUTT_MBOX_HOOK_PATCH # # If you want to use the ifdef feature define: # WITH_MUTT_IFDEF_PATCH # # If you want to have the Maildir mtime patch define: # WITH_MUTT_MAILDIR_MTIME_PATCH # # If you want to have the Mailbox Sidebar patch define: # WITH_MUTT_SIDEBAR_PATCH # # If you do not want mutt to use the flock() function define: # WITHOUT_MUTT_FLOCK # # If you want to enable the reverse_reply option define: # WITH_MUTT_REVERSE_REPLY_PATCH # # If you want to enable the `greeting' option define: # WITH_MUTT_GREETING_PATCH # # If you want to enable the internal SMTP relay support define: # WITH_MUTT_SMTP # PORTNAME= mutt-devel PORTVERSION= 1.5.16 PORTREVISION?= 3 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news .endif MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/ \ ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \ ftp://ftp.parodius.com/pub/mutt/devel/ \ http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www.spinnaker.de/mutt/compressed/:rr \ http://cedricduval.free.fr/mutt/patches/download/:cd \ http://lunar-linux.org/~tchan/mutt/:tchan DISTNAME= mutt-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \ http://cedricduval.free.fr/mutt/patches/download/:cd \ http://home.woolridge.ca/mutt/patches/:dw \ http://www.spinnaker.de/mutt/compressed/:rr \ http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp \ http://vc.org.ua/mutt/:vc \ http://yz.kiev.ua/mutt/:vc MAINTAINER?= udo.schweigert@siemens.com COMMENT?= The Mongrel of Mail User Agents (development version) CONFLICTS= mutt-[0-9]* DIST_SUBDIR= mutt DOCSDIR?= ${PREFIX}/share/doc/mutt EXAMPLESDIR?= ${PREFIX}/share/examples/mutt DATADIR?= ${PREFIX}/share/mutt LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-sharedir=${PREFIX}/share/mutt --with-docdir=${DOCSDIR} \ --sysconfdir=${PREFIX}/etc --enable-external-dotlock \ --enable-pop --enable-imap --disable-warnings .if defined(MUTT_CONFIGURE_ARGS) CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif USE_AUTOTOOLS= automake:19 autoconf:261 USE_OPENSSL= yes PLIST= ${WRKDIR}/PLIST PKGMESSAGE= ${WRKDIR}/pkg-message SCRIPTS_ENV= WRKDIR="${WRKDIR}" .include CD_PATCH_VERSION= 1.5.5.1 CD_IFDEF_PATCH_VERSION= 1.5.4 DW_PATCH_VERSION= 1.5.6 AC_PATCH_VERSION= 1.5.9 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(CD_PATCH_VERSION) CD_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(RR_PATCH_VERSION) RR_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(CD_IFDEF_PATCH_VERSION) CD_IFDEF_PATCH_VERSION= ${CD_PATCH_VERSION} .endif .if !defined(DW_PATCH_VERSION) DW_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(DW_MBOX_PATCH_VERSION) DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION} .endif .if !defined(AC_PATCH_VERSION) AC_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(VC_PATCH_VERSION) VC_PATCH_VERSION= ${PORTVERSION} .endif .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) WITH_MUTT_IMAP_HEADER_CACHE= yes .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) .if defined(WITH_MUTT_NNTP) IGNORE= cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible .endif .endif .if ${OSVERSION} >= 700033 || (${OSVERSION} < 700000 && ${OSVERSION} >= 602107) NCURSES_IS_DEFAULT= yes .else SLANG_IS_DEFAULT= yes .endif .if defined (MUTT_LITE) WITHOUT_MUTT_XML= yes WITHOUT_MUTT_COMPRESSED_FOLDERS= yes WITHOUT_MUTT_QUOTE_PATCH= yes WITHOUT_MUTT_HTML= yes WITH_MUTT_NCURSES= yes PKGNAMESUFFIX= -lite .endif # XXX # this should be done automagically by aclocal but .... # for now, this will have to do pre-build: @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \ -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \ -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \ -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \ ${BUILD_WRKSRC}/Makefile RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support .if !defined (MUTT_LITE) .if exists(${LOCALBASE}/bin/aspell) && !defined(WITH_MUTT_ISPELL) WITH_MUTT_ASPELL= yes .elif exists(${LOCALBASE}/bin/ispell) && !defined(WITH_MUTT_ASPELL) WITH_MUTT_ISPELL= yes .endif .if defined(PACKAGE_BUILDING) && !defined(WITH_MUTT_ASPELL) && \ !defined(WITH_MUTT_ISPELL) WITH_MUTT_ASPELL= yes .endif .if defined(WITH_MUTT_ASPELL) BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell .elif defined(WITH_MUTT_ISPELL) BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview .endif .endif .if defined(WITH_MUTT_NCURSES_PORT) WITH_MUTT_NCURSES= yes .endif .if defined(WITH_MUTT_SLANG) || defined(WITH_SLANG) MUTT_USES_SLANG= yes MUTT_USES_SLANG1= yes .endif .if defined(WITH_MUTT_SLANG2) MUTT_USES_SLANG= yes MUTT_USES_SLANG2= yes .endif .if defined(WITH_MUTT_NCURSES) && !defined(MUTT_USES_SLANG) MUTT_USES_NCURSES= yes .endif .if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES) .if defined(SLANG_IS_DEFAULT) MUTT_USES_SLANG= yes MUTT_USES_SLANG1= yes .elif defined(NCURSES_IS_DEFAULT) MUTT_USES_NCURSES= yes .endif .endif .if defined(WITHOUT_MUTT_SGMLFORMAT) XML_USED= no .endif .if defined(WITHOUT_MUTT_XML) XML_USED= no .endif .if !defined(XML_USED) XML_USED= no .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= yes .endif .if !defined(WITHOUT_MUTT_ICONV) USE_ICONV= yes .endif .if defined(NOPORTDOCS) XML_USED= no .endif .if defined(MUTT_USES_NCURSES) -.if ${OSVERSION} < 400000 || defined(WITH_MUTT_NCURSES_PORT) +.if defined(WITH_MUTT_NCURSES_PORT) MUTT_USES_NCURSES_PORT= yes .endif .endif .if defined(MUTT_USES_NCURSES_PORT) LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include .elif defined(MUTT_USES_SLANG1) LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(MUTT_USES_SLANG2) LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2 .endif .if defined(WITH_MUTT_CYRUS_SASL2) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 .endif .if defined(WITH_MUTT_IMAP_HEADER_CACHE) USE_BDB= 42+ .endif .if exists(${LOCALBASE}/lib/libidn.so) WITH_MUTT_IDN= yes .endif .if defined(WITH_MUTT_IDN) LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn .endif .if defined(WITH_MUTT_GPGME) LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme .endif .if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT) post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook .endif .if defined(WITH_MUTT_SIGNATURE_MENU) IGNORE= The WITH_MUTT_SIGNATURE_MENU does not work at the moment. XML_NEEDED= yes post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu .endif .if defined(WITH_MUTT_MAILDIR_MTIME_PATCH) post-patch:: .if defined(WITH_MUTT_NNTP) @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .else @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime .endif .endif .if defined(WITH_MUTT_ASPELL) post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell .endif .if defined(WITH_MUTT_REVERSE_REPLY_PATCH) post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply .endif .if defined(WITHOUT_MUTT_FLOCK) CONFIGURE_ARGS+= --disable-flock .else CONFIGURE_ARGS+= --enable-flock .endif .if defined(WITH_MUTT_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif .if defined(MUTT_USES_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${LOCALBASE} .elif defined(MUTT_USES_SLANG) CONFIGURE_ARGS+= --with-slang=${LOCALBASE} .endif .if defined(WITH_MUTT_CYRUS_SASL2) CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls .endif .if defined(WITHOUT_MUTT_ICONV) CONFIGURE_ARGS+= --disable-iconv .else CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} .endif .if defined(WITH_MUTT_IDN) CONFIGURE_ARGS+= --with-idn .else CONFIGURE_ARGS+= --without-idn .endif .if defined(WITH_MUTT_GPGME) CONFIGURE_ARGS+= --enable-gpgme .else CONFIGURE_ARGS+= --disable-gpgme .endif .if !defined(WITHOUT_GSSAPI) .if exists(${LOCALBASE}/bin/krb5-config) LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${LOCALBASE} .elif (defined(MAKE_KERBEROS5) && ${OSVERSION} > 500105) || exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+= --with-gss USE_KRB5_SYS=YES .endif .endif .if defined(WITH_MUTT_SMTP) CONFIGURE_ARGS+= --enable-smtp .else CONFIGURE_ARGS+= --disable-smtp .endif PATCH_DIST_STRIP= -p1 .if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS) DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.2.gz:vvv CONFIGURE_ARGS+= --enable-compressed XML_NEEDED= yes pre-patch:: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.2.gz > ${WRKDIR}/patch-compressed @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-compressed @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed .endif .if defined(WITH_MUTT_NNTP) DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz:vvv CONFIGURE_ARGS+= --enable-nntp XML_NEEDED= yes pre-patch:: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz > ${WRKDIR}/patch-nntp @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-nntp @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp .endif .if ! defined(WITHOUT_MUTT_QUOTE_PATCH) PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv XML_NEEDED= yes .endif .if defined(WITH_MUTT_IFDEF_PATCH) DISTFILES+= patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd #XML_NEEDED= yes pre-patch:: @${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \ ${WRKDIR}/patch-ifdef @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef .endif .if defined(WITH_MUTT_MBOX_HOOK_PATCH) PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) SIDEBAR_PATCH= patch-1.5.16.sidebar.20070704.txt DISTFILES+= ${SIDEBAR_PATCH}:tchan XML_NEEDED= yes pre-patch:: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar @${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \ ${WRKDIR}/patch-sidebar @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar .endif .if defined(WITH_MUTT_GREETING_PATCH) PATCHFILES+= mutt-${VC_PATCH_VERSION}.vc.greeting:vc .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 MAN5= muttrc.5 mbox.5 mmdf.5 post-patch:: @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ ${WRKSRC}/contrib/pgp6.rc @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ ${WRKSRC}/contrib/Makefile.am pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) .if defined(USE_KRB5_SYS) @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/imap/auth_gss.c .endif .if defined(MUTT_SLAVE_HTML_PAGES) SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}" .endif .if defined(WITH_MUTT_NNTP) SCRIPTS_ENV+= MUTT_NNTP="yes" .endif .if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS) SCRIPTS_ENV+= MUTT_COMPRESSED_FOLDERS="yes" .endif .if ! defined(WITHOUT_MUTT_QUOTE_PATCH) SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes" .endif .if defined(WITH_MUTT_IMAP_HEADER_CACHE) CONFIGURE_ARGS+= --enable-hcache --without-gdbm --with-bdb .else CONFIGURE_ARGS+= --disable-hcache .endif .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) CONFIGURE_ARGS+= --disable-inodesort --without-qdbm .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) SCRIPTS_ENV+= MUTT_SIDEBAR_PATCH="yes" .endif .if defined(WITH_MUTT_SIGNATURE_MENU) SCRIPTS_ENV+= MUTT_SIGNATURE_MENU="yes" .endif .if defined(WITH_MUTT_IFDEF_PATCH) SCRIPTS_ENV+= MUTT_IFDEF_PATCH="yes" .endif .if ! defined(WITHOUT_MUTT_HTML) SCRIPTS_ENV+= MUTT_HTML="yes" .endif .if !defined(WITHOUT_NLS) SCRIPTS_ENV+= MUTT_NLS="yes" .endif .if defined(WITH_MUTT_REVERSE_REPLY_PATCH) SCRIPTS_ENV+= MUTT_REVERSE_REPLY_PATCH="yes" .endif .if !defined(NOPORTDOCS) SCRIPTS_ENV+= MUTT_PORTDOCS="yes" post-build: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ ${WRKSRC}/doc/mutt.man @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ ${WRKSRC}/doc/muttrc.man .if ! defined(WITHOUT_MUTT_HTML) XML_USED= yes .endif .if defined(XML_NEEDED) && !defined(WITHOUT_MUTT_XML) XML_USED= yes .endif .else # ! NOPORTDOCS post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib .endif # ! NOPORTDOCS .if ${XML_USED} == yes BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${PREFIX}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ lynx:${PORTSDIR}/www/lynx post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml .endif pre-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST} post-install: @${ECHO} > ${PKGMESSAGE} ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist .if !defined(NOPORTDOCS) @${ECHO} "===> Installing Mutt documentation" @${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR} @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ ../ABOUT-NLS ../contrib/language* ${DOCSDIR} .if defined(WITH_MUTT_NNTP) @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR} .endif .if ! defined(WITHOUT_MUTT_HTML) @${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html .endif .endif .if defined(MUTT_USES_SLANG) @${ECHO} "=====================================================" >> ${PKGMESSAGE} @${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE} @${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE} @${ECHO} "COLORTERM=yes and COLORFGBG=\"color1;color2\" in your" >> ${PKGMESSAGE} @${ECHO} "environment." >> ${PKGMESSAGE} @${ECHO} "=====================================================" >> ${PKGMESSAGE} .endif .if !defined(BATCH) @${CAT} ${PKGMESSAGE} @${ECHO} .endif .include Property changes on: head/mail/mutt-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.288 \ No newline at end of property +1.289 \ No newline at end of property Index: head/mail/postfix/pkg-install =================================================================== --- head/mail/postfix/pkg-install (revision 200759) +++ head/mail/postfix/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix-current/pkg-install =================================================================== --- head/mail/postfix-current/pkg-install (revision 200759) +++ head/mail/postfix-current/pkg-install (revision 200760) @@ -1,180 +1,166 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi fi Property changes on: head/mail/postfix-current/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/mail/postfix1/pkg-install =================================================================== --- head/mail/postfix1/pkg-install (revision 200759) +++ head/mail/postfix1/pkg-install (revision 200760) @@ -1,169 +1,155 @@ #!/bin/sh # # $FreeBSD$ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix GROUP=postfix GROUP2=maildrop if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -h - then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -h - then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \ -d /var/spool/postfix \ -s /sbin/nologin \ -c "Postfix Mail System" then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then CONF1="main.cf master.cf access aliases canonical pcre_table \ regexp_table relocated transport virtual" for file in $CONF1 do if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file fi done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. fi replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then mv -f ${orig} ${orig}.OFF chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then + mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi fi Property changes on: head/mail/postfix1/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/mail/postfix21/pkg-install =================================================================== --- head/mail/postfix21/pkg-install (revision 200759) +++ head/mail/postfix21/pkg-install (revision 200760) @@ -1,183 +1,169 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then # CONF1 copied from Makefile. Keep consistent! CONF1="main.cf master.cf access aliases canonical \ header_checks relocated transport virtual" for file in $CONF1; do if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then cp ${PKG_PREFIX}/etc/postfix/dist-$file ${PKG_PREFIX}/etc/postfix/$file fi done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. fi replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then mv -f ${orig} ${orig}.OFF chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi fi Property changes on: head/mail/postfix21/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property Index: head/mail/postfix22/pkg-install =================================================================== --- head/mail/postfix22/pkg-install (revision 200759) +++ head/mail/postfix22/pkg-install (revision 200760) @@ -1,181 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID} then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi fi Property changes on: head/mail/postfix22/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property Index: head/mail/postfix23/pkg-install =================================================================== --- head/mail/postfix23/pkg-install (revision 200759) +++ head/mail/postfix23/pkg-install (revision 200760) @@ -1,180 +1,166 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi fi Property changes on: head/mail/postfix23/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix24/pkg-install =================================================================== --- head/mail/postfix24/pkg-install (revision 200759) +++ head/mail/postfix24/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix24/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix25/pkg-install =================================================================== --- head/mail/postfix25/pkg-install (revision 200759) +++ head/mail/postfix25/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix25/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix26/pkg-install =================================================================== --- head/mail/postfix26/pkg-install (revision 200759) +++ head/mail/postfix26/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix26/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix27/pkg-install =================================================================== --- head/mail/postfix27/pkg-install (revision 200759) +++ head/mail/postfix27/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix27/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/postfix28/pkg-install =================================================================== --- head/mail/postfix28/pkg-install (revision 200759) +++ head/mail/postfix28/pkg-install (revision 200760) @@ -1,180 +1,167 @@ #!/bin/sh # # $FreeBSD$ # # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it # will make the port/package use defaults which make postfix replace # sendmail as much as possible. PKG_PREFIX=${PKG_PREFIX:=/usr/local} BATCH=${BATCH:=no} POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then DEFAULT_REPLACE_MAILERCONF=n else DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then NOLOGIN=/usr/sbin/nologin else NOLOGIN=/sbin/nologin fi ask() { local question default answer question=$1 default=$2 if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then answer=${default} fi echo ${answer} } yesno() { local question default answer question=$1 default=$2 while :; do answer=$(ask "${question}" "${default}") case "${answer}" in [Yy]*) return 0;; [Nn]*) return 1;; esac echo "Please answer yes or no." done } if [ x"$2" = xPRE-INSTALL ]; then USER=postfix UID=125 GROUP=postfix GID=125 GROUP2=maildrop GID2=126 if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then echo "Added group \"${GROUP}\"." else echo "Adding group \"${GROUP}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then echo "You already have a group \"${GROUP2}\", so I will use it." else if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then echo "Added group \"${GROUP2}\"." else echo "Adding group \"${GROUP2}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." else if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then echo "Added user \"${USER}\"." else echo "Adding user \"${USER}\" failed..." echo "Please create it, and try again." exit 1 fi fi if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then echo "You already have user \"${USER}\" in group \"mail\", so I will use it." else echo "You need user \"${USER}\" added to group \"mail\"." if yesno "Would you like me to add it" y; then /usr/sbin/pw groupmod mail -m ${USER} || exit echo "Done." else echo "Please create it, and try again." exit 1 fi fi fi if [ x"$2" = xPOST-INSTALL ]; then if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then for file in ${PKG_PREFIX}/etc/postfix/dist/*; do if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then cp $file ${PKG_PREFIX}/etc/postfix/ fi done fi /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ command_directory=${PKG_PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PKG_PREFIX}/sbin/sendmail \ newaliases_path=${PKG_PREFIX}/bin/newaliases \ mailq_path=${PKG_PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PKG_PREFIX}/man \ sample_directory=${PKG_PREFIX}/etc/postfix \ readme_directory=no \ upgrade-package fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. replace() { local orig repl orig=$1 repl=$2 if [ -e ${orig} ]; then /bin/mv -f ${orig} ${orig}.OFF /bin/chmod 0 ${orig}.OFF fi if [ -e ${repl} ]; then /bin/ln -s ${repl} ${orig} fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi +fi fi Property changes on: head/mail/postfix28/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/mail/qpopper/Makefile =================================================================== --- head/mail/qpopper/Makefile (revision 200759) +++ head/mail/qpopper/Makefile (revision 200760) @@ -1,200 +1,196 @@ # New ports collection makefile for: qpopper # Date created: 1 April 1995 # Whom: pst # # $FreeBSD$ # PORTNAME= qpopper PORTVERSION= 4.0.9 PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \ http://core.ring.gr.jp/archives/net/mail/qpopper/ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= bc979@lafn.org COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) USE_AUTOTOOLS= autoconf:261 USE_REINPLACE= yes USE_OPENSSL= yes CONFIGURE_ENV= LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \ OS_DEFS="-DSETPROCTITLE ${OS_DEFS}" CONFIGURE_ARGS= --enable-nonauth-file=${POPUSERS_FILE} \ --without-gdbm \ --enable-keep-temp-drop PLIST_SUB= EPOPPASSD=${EPOPPASSD} \ POP_USER=${POP_USER} \ POP_GROUP=${POP_GROUP} \ POP_MODE_DIR=${POP_MODE_DIR} \ POP_MODE_CONF=${POP_MODE_CONF} \ QPOPAUTH=${QPOPAUTH} MAN8= qpopper.8 # internal configuration POP_USER= pop POP_GROUP= daemon POP_MODE_DIR= 0711 POP_MODE_CONF= 0444 POPUSERS_FILE= ${PREFIX}/etc/qpopper/popusers SAMPLE_EXT= .sample # PKGDEINSTALL= ${PKGINSTALL} OPTIONS= APOP_ONLY "build with APOP authentication only" off \ APOP "build with APOP" on \ DOCUMENTATION "install pdf documentation" off \ DRAC "build with Dynamic Relay Authorization" off \ FULL_POPD_DEBUG "build with more verbose debugging" off \ PAM "build with PAM authentication" off \ POPPASSD "build the poppassd daemon" off \ QPOPAUTH_SETUID "install qpopauth setuid to pop user" on \ SAMPLE_POPUSERS "build a default reject file" off \ SHY_ENABLED "hide qpopper version in POP3 banner" off \ SSL "build with SSL/TLS support" on \ STANDALONE_MODE "build qpopper to be run without inetd" off \ U_OPTION "include support for user .qpopper-options" on .include -.if ${OSVERSION} < 400014 -WITHOUT_IPV6= yes -.endif - .if !defined(WITHOUT_IPV6) PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ PATCHFILES= qpopper4.0.9-ipv6-20060626.diff.gz PATCH_DIST_STRIP= -p1 .endif .if defined(WITHOUT_APOP) QPOPAUTH= "@comment " .else CONFIGURE_ARGS+= --enable-apop=${PREFIX}/etc/qpopper/pop.auth \ --with-apopuid=pop MAN8+= qpopauth.8 QPOPAUTH= "" # If WITH_APOP_ONLY variable present in the environment, qpopper builds # with APOP authentication only. .if defined(WITH_APOP_ONLY) OS_DEFS+= -DAPOP_ONLY .endif .endif # Do not install documentation since it is in pdf format and normally # not used unless user wants it. .if !defined(WITH_DOCUMENTATION) NOPORTDOCS= yes .endif # If WITH_DRAC variable present in the environment, qpopper builds # with Dynamic Relay Authorization Control support. .if defined(WITH_DRAC) CONFIGURE_ARGS+= --with-drac BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif # If WITH_FULL_POPD_DEBUG variable present in the environment, qpopper builds # with more verbose debugging. See also -d option to qpopper. .if defined(WITH_FULL_POPD_DEBUG) CONFIGURE_ARGS+= --enable-debugging .endif # If WITH_PAM variable present qpopper builds with PAM authentication .if defined(WITH_PAM) CONFIGURE_ARGS+= --with-pam=pop3 .endif # If WITH_POPPASSD variable present in the environment, qpopper builds # with poppassd support. .if defined(WITH_POPPASSD) CONFIGURE_ARGS+= --enable-poppassd EXTRA_PATCHES+= ${FILESDIR}/extra-patch-password::poppassd.c \ ${FILESDIR}/extra-patch-password::auth_user.c EPOPPASSD= "" .else EPOPPASSD= "@comment " .endif # If WITH_SHY_ENABLED variable present, qpopper does not present # its version number within the POP3 session. .if defined(WITH_SHY_ENABLED) CONFIGURE_ARGS+= --enable-shy .endif # If WITH STANDALONE_MODE variable present qpopper is built so it runs # without inetd. .if defined(WITH_STANDALONE_MODE) CONFIGURE_ARGS+= --enable-standalone .endif # The default is to build without SSL/TLS support. .if !defined(WITHOUT_SSL) CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif post-patch: @${RM} -f ${WRKSRC}/popper/md5.h @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/* .if defined(WITH_POPPASSD) @${REINPLACE_CMD} -e 's|/usr/bin/smbpasswd|${LOCALBASE}/bin/smbpasswd|' \ ${WRKSRC}/password/poppassd.c .endif .if defined(WITHOUT_U_OPTION) @${REINPLACE_CMD} -E -e 's|(getopt \(.+)u|\1|' \ ${WRKSRC}/popper/main.c .endif pre-configure: @(cd ${WRKSRC}; ${CHMOD} u+w configure*) do-install: .if !defined(WITHOUT_APOP) @${INSTALL_PROGRAM} ${WRKSRC}/popper/popauth ${PREFIX}/bin/qpopauth # If WITHOUT_QPOPAUTH_SETUID variable present in the environment, # qpopper does not install qpopauth setuid to pop user so that # anyone can access the pop.auth database. .if !defined(WITHOUT_QPOPAUTH_SETUID) @${CHOWN} pop ${PREFIX}/bin/qpopauth @${CHMOD} u+s ${PREFIX}/bin/qpopauth .endif @${INSTALL_MAN} ${WRKSRC}/man/popauth.8 ${MANPREFIX}/man/man8/qpopauth.8 @${LN} -sf ${PREFIX}/bin/qpopauth ${PREFIX}/bin/qapopauth .endif @${INSTALL_PROGRAM} ${WRKSRC}/popper/popper ${PREFIX}/libexec/qpopper @${INSTALL_MAN} ${WRKSRC}/man/popper.8 ${MANPREFIX}/man/man8/qpopper.8 .if defined(WITH_POPPASSD) @${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${PREFIX}/libexec/qpoppassd .endif @${INSTALL} -d -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_DIR} \ ${PREFIX}/etc/${PORTNAME} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/GUIDE.pdf ${DOCSDIR} .endif post-install: install-conf-file @${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE} # based on original from op port, written by Cyrille Lefevre # . install-conf-file: @if [ ! -f ${CONF_DIR}/${CONF_FILE}${SAMP_SUFX} ]; then \ if [ -f /etc/ftpusers ] && [ -n "${WITH_SAMPLE_POPUSERS}" ]; then \ ${INSTALL} -c -o ${POP_USER} -g ${POP_GROUP} -m ${POP_MODE_CONF} \ /etc/ftpusers ${POPUSERS_FILE}${SAMPLE_EXT} ; \ else \ ${CP} /dev/null ${POPUSERS_FILE}${SAMPLE_EXT} ; \ ${CHOWN} ${POP_USER}:${POP_GROUP} ${POPUSERS_FILE}${SAMPLE_EXT} ; \ ${CHMOD} ${POP_MODE_CONF} ${POPUSERS_FILE}${SAMPLE_EXT} ; \ fi ; \ fi @${INSTALL} -c -m 0640 \ ${WRKSRC}/samples/qpopper.config ${PREFIX}/etc/qpopper.config${SAMPLE_EXT} @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/mail/qpopper/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.93 \ No newline at end of property +1.94 \ No newline at end of property