Date: Tue, 4 Jun 2013 15:47:07 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319871 - in head/mail: dovecot enma mail-notification milter-greylist-devel qsheff simscan spamass-milter sqwebmail tpop3d Message-ID: <201306041547.r54Fl7Or051537@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Jun 4 15:47:06 2013 New Revision: 319871 URL: http://svnweb.freebsd.org/changeset/ports/319871 Log: Convert to new options framework Modified: head/mail/dovecot/Makefile head/mail/enma/Makefile head/mail/mail-notification/Makefile head/mail/milter-greylist-devel/Makefile head/mail/qsheff/Makefile head/mail/simscan/Makefile head/mail/spamass-milter/Makefile head/mail/sqwebmail/Makefile head/mail/tpop3d/Makefile Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/dovecot/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dovecot -# Date created: 12/08/2002 -# Whom: Dominic Marks <dominic.marks@btinternet.com> -# +# Created by: Dominic Marks <dominic.marks@btinternet.com> # $FreeBSD$ -# PORTNAME= dovecot PORTVERSION= 1.2.17 @@ -57,16 +53,11 @@ DOVECOT_GID?= 143 PROTOCOLS= imap pop3 -OPTIONS= KQUEUE "kqueue(2) support" on \ - SSL "SSL support" on \ - MANAGESIEVE "ManageSieve support" on \ - GSSAPI "GSSAPI support" off \ - VPOPMAIL "VPopMail support" off \ - BDB "BerkleyDB support" off \ - LDAP "OpenLDAP support" off \ - PGSQL "PostgreSQL support" off \ - MYSQL "MySQL support" off \ - SQLITE "SQLite support" off +OPTIONS_DEFINE= KQUEUE SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE +OPTIONS_DEFAULT= KQUEUE SSL MANAGESIEVE +KQUEUE_DESC= kqueue(2) support +MANAGESIEVE_DESC= ManageSieve support +VPOPMAIL_DESC= VPopMail support .include <bsd.port.pre.mk> @@ -88,13 +79,13 @@ REINPLACE= s!%%PROTOCOLS%%!${PROTOCOLS}! ## kqueue(2) support # -.if !defined(WITHOUT_KQUEUE) +.if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+= --with-ioloop=kqueue .endif ## SSL support # -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} PROTOCOLS+= imaps pop3s .else CONFIGURE_ARGS+= --without-ssl @@ -102,7 +93,7 @@ CONFIGURE_ARGS+= --without-ssl ## ManageSieve support # -.if defined(WITH_MANAGESIEVE) +.if ${PORT_OPTIONS:MMANAGESIEVE} MANAGESIEVEVERSION!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION PATCH_SITES!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES PATCHFILES+= dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz @@ -113,7 +104,7 @@ DOCS+= README.managesieve ## GSSAPI support # -.if defined(WITH_GSSAPI) +.if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+= --with-gssapi .else CONFIGURE_ARGS+= --without-gssapi @@ -121,7 +112,7 @@ CONFIGURE_ARGS+= --without-gssapi ## VPopMail Support # -.if defined(WITH_VPOPMAIL) +.if ${PORT_OPTIONS:MVPOPMAIL} VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail CONFIGURE_ARGS+= --with-vpopmail @@ -131,7 +122,7 @@ CONFIGURE_ARGS+= --without-vpopmail ## BDB Support # -.if defined(WITH_BDB) +.if ${PORT_OPTIONS:MBDB} USE_BDB= 42+ CONFIGURE_ARGS+= --with-db CFLAGS+= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR} @@ -143,7 +134,7 @@ PLIST_SUB+= BDB="@comment " ## OpenLDAP Support # -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap PLIST_SUB+= LDAP="" @@ -155,7 +146,7 @@ PLIST_SUB+= LDAP="@comment " ## PostgreSQL Support # -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= SQL="" @@ -167,7 +158,7 @@ PLIST_SUB+= SQL="@comment " ## MySQL Support # -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql PLIST_SUB+= SQL="" @@ -179,7 +170,7 @@ PLIST_SUB+= SQL="@comment " ## SQLite Support # -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= SQL="" @@ -219,7 +210,7 @@ post-install: | ${SED} -e 's:^@exec ::; s:%D:${PREFIX}:g;' \ > ${WRKDIR}/.PLIST.exec \ && ${SH} ${WRKDIR}/.PLIST.exec -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor Modified: head/mail/enma/Makefile ============================================================================== --- head/mail/enma/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/enma/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: enma -# Date created: 7 Sep 2008 -# Whom: Hirohisa Yamaguchi <umq@ueo.co.jp> -# +# Created by: Hirohisa Yamaguchi <umq@ueo.co.jp> # $FreeBSD$ -# PORTNAME= enma PORTVERSION= 1.2.0 @@ -12,12 +8,13 @@ CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/ENMA/${PORTVERSION} MAINTAINER= umq@ueo.co.jp -COMMENT= A sender authentication milter supporting SPF and Sender ID +COMMENT= Sender authentication milter supporting SPF and Sender ID LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS= LIBBIND "Link against dns/libbind instead of dns/ldns" Off +OPTIONS_DEFINE= LIBBIND +LIBBIND_DESC= Link against dns/libbind instead of dns/ldns HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/man \ @@ -47,7 +44,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/postf .include <bsd.port.pre.mk> .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.if defined(WITH_LIBBIND) +.if ${PORT_OPTIONS:MLIBBIND} CONFIGURE_ARGS+= --with-resolver=libbind \ --with-libbind-incdir=${LOCALBASE}/include/bind \ --with-libbind-libdir=${LOCALBASE}/lib @@ -62,7 +59,7 @@ pre-configure: post-install: ${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample ${PREFIX}/etc -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} Modified: head/mail/mail-notification/Makefile ============================================================================== --- head/mail/mail-notification/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/mail-notification/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mail-notification -# Date created: 18 Sep 2003 -# Whom: Jean-Yves Lefort <jylefort@brutele.be> -# +# Created by: Jean-Yves Lefort <jylefort@brutele.be> # $FreeBSD$ -# PORTNAME= mail-notification DISTVERSION= 5.4 @@ -31,63 +27,65 @@ GCONF_SCHEMAS= mail-notification.schemas INSTALLS_OMF= yes INSTALLS_ICONS= yes -OPTIONS= EVOLUTION "Evolution support" off \ - GMAIL "Gmail support" on \ - HOTMAIL "Windows Live Hotmail support" on \ - IMAP "IMAP support" on \ - MAILDIR "Maildir support" on \ - MBOX "mbox support" on \ - MH "MH support" on \ - MOZILLA "Mozilla products support" on \ - POP3 "POP3 support" on \ - SASL "SASL authentication support" on \ - SSL "SSL/TLS support" on \ - SYLPHEED "Sylpheed support" on \ - YAHOO "Yahoo! Mail support" on +OPTIONS_DEFINE= EVOLUTION GMAIL HOTMAIL IMAP MAILDIR MBOX MH MOZILLA \ + POP3 SASL SSL SYLPHEED YAHOO +OPTIONS_DEFAULT= GMAIL HOTMAIL IMAP MAILDIR MBOX MH MOZILLA \ + POP3 SASL SSL SYLPHEED YAHOO +EVOLUTION_DESC= Evolution support +GMAIL_DESC= Gmail support +HOTMAIL_DESC= Windows Live Hotmail support +IMAP_DESC= IMAP support +MAILDIR_DESC= Maildir support +MBOX_DESC= mbox support +MH_DESC= MH support +MOZILLA_DESC= Mozilla products support +POP3_DESC= POP3 support +SYLPHEED_DESC= Sylpheed support +YAHOO_DESC= Yahoo! Mail support .include <bsd.port.options.mk> -.if defined(WITHOUT_MBOX) +.if ! ${PORT_OPTIONS:MMBOX} JB_CONF_ARGS+= mbox=no .endif -.if defined(WITHOUT_MH) +.if ! ${PORT_OPTIONS:MMH} JB_CONF_ARGS+= mh=no .endif -.if defined(WITHOUT_MAILDIR) +.if ! ${PORT_OPTIONS:MMAILDIR} JB_CONF_ARGS+= maildir=no .endif -.if defined(WITHOUT_POP3) +.if ! ${PORT_OPTIONS:MPOP3} JB_CONF_ARGS+= pop3=no .endif -.if defined(WITHOUT_IMAP) +.if ! ${PORT_OPTIONS:MIMAP} JB_CONF_ARGS+= imap=no .endif -.if defined(WITHOUT_POP3) && defined(WITHOUT_IMAP) +.if ! ${PORT_OPTIONS:MPOP3} && ! ${PORT_OPTIONS:MIMAP} # only POP3 and IMAP use SSL and SASL WITHOUT_SSL= yes WITHOUT_SASL= yes .endif -.if defined(WITHOUT_GMAIL) +.if ! ${PORT_OPTIONS:MGMAIL} JB_CONF_ARGS+= gmail=no PLIST_SUB+= GMAIL="@comment " .else PLIST_SUB+= GMAIL="" .endif -.if defined(WITHOUT_HOTMAIL) +.if ! ${PORT_OPTIONS:MHOTMAIL} JB_CONF_ARGS+= hotmail=no PLIST_SUB+= HOTMAIL="@comment " .else RUN_DEPENDS+= getlive:${PORTSDIR}/mail/getlive PLIST_SUB+= HOTMAIL="" .endif -.if defined(WITHOUT_YAHOO) +.if ! ${PORT_OPTIONS:MYAHOO} JB_CONF_ARGS+= yahoo=no PLIST_SUB+= YAHOO="@comment " .else RUN_DEPENDS+= fetchyahoo:${PORTSDIR}/mail/fetchyahoo PLIST_SUB+= YAHOO="" .endif -.if defined(WITHOUT_EVOLUTION) +.if ! ${PORT_OPTIONS:MEVOLUTION} JB_CONF_ARGS+= evolution=no PLIST_SUB+= EVOLUTION="@comment " .else @@ -97,29 +95,29 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgco USE_GNOME+= gtkhtml3 PLIST_SUB+= EVOLUTION="" EVO_VERSION=${EVO_VERSION} .endif -.if defined(WITHOUT_MOZILLA) +.if ! ${PORT_OPTIONS:MMOZILLA} JB_CONF_ARGS+= mozilla=no .endif -.if defined(WITHOUT_SYLPHEED) +.if ! ${PORT_OPTIONS:MSYLPHEED} JB_CONF_ARGS+= sylpheed=no .endif -.if defined(WITH_MBOX) \ - || defined(WITH_MH) \ - || defined(WITH_MAILDIR) \ - || defined(WITH_POP3) \ - || defined(WITH_IMAP) \ - || defined(WITH_MOZILLA) \ - || defined(WITH_SYLPHEED) \ - || defined(WITH_HOTMAIL) \ - || defined(WITH_YAHOO) +.if ${PORT_OPTIONS:MMBOX} \ + || ${PORT_OPTIONS:MMH} \ + || ${PORT_OPTIONS:MMAILDIR} \ + || ${PORT_OPTIONS:MPOP3} \ + || ${PORT_OPTIONS:MIMAP} \ + || ${PORT_OPTIONS:MMOZILLA} \ + || ${PORT_OPTIONS:MSYLPHEED} \ + || ${PORT_OPTIONS:MHOTMAIL} \ + || ${PORT_OPTIONS:MYAHOO} LIB_DEPENDS+= gmime-2.0.4:${PORTSDIR}/mail/gmime2 .endif -.if defined(WITHOUT_SSL) +.if ! ${PORT_OPTIONS:MSSL} JB_CONF_ARGS+= ssl=no .else USE_OPENSSL= yes .endif -.if defined(WITHOUT_SASL) +.if ! ${PORT_OPTIONS:MSASL} JB_CONF_ARGS+= sasl=no .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 Modified: head/mail/milter-greylist-devel/Makefile ============================================================================== --- head/mail/milter-greylist-devel/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/milter-greylist-devel/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: milter-greylist -# Date created: 27 Apr 2004 -# Whom: Cyril Guibourg -# +# Created by: Cyril Guibourg # $FreeBSD$ -# PORTNAME= milter-greylist PORTVERSION= 4.3.9 @@ -23,11 +19,9 @@ PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_JOBS_UNSAFE= yes -OPTIONS= LIBSPF2 "Include SPF support" off\ - GEOIP "Include GeoIP support" off\ - CURL "Include curl support" off\ - OPENLDAP "Include OpenLDAP support" off\ - POSTFIX "Use Postfix instead of Sendmail" off +OPTIONS_DEFINE= LIBSPF2 GEOIP CURL LDAP POSTFIX +LIBSPF2_DESC= Include SPF support +POSTFIX_DESC= Use Postfix instead of Sendmail .include <bsd.port.pre.mk> @@ -48,23 +42,23 @@ MAN8= milter-greylist.8 ## # If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF ## -.if defined(WITH_LIBSPF2) +.if ${PORT_OPTIONS:MLIBSPF2} BUILD_DEPENDS+= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 CONFIGURE_ARGS+= --with-libspf2=${LOCALBASE} .endif -.if defined(WITH_GEOIP) +.if ${PORT_OPTIONS:MGEOIP} BUILD_DEPENDS+= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP CONFIGURE_ARGS+= --with-libGeoIP=${LOCALBASE} .endif -.if defined(WITH_CURL) +.if ${PORT_OPTIONS:MCURL} BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-libcurl=${LOCALBASE} .endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP=yes CONFIGURE_ARGS+= --with-openldap .endif -.if defined(WITH_POSTFIX) +.if ${PORT_OPTIONS:MPOSTFIX} CONFIGURE_ARGS+= --enable-postfix .else LDFLAGS+= ${SENDMAIL_LDFLAGS} @@ -96,11 +90,11 @@ do-install: post-install: @${MKDIR} /var/milter-greylist @${CHOWN} -R mailnull /var/milter-greylist -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.if !defined (NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR} .endif Modified: head/mail/qsheff/Makefile ============================================================================== --- head/mail/qsheff/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/qsheff/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -30,68 +30,68 @@ ETCFILES= install-wrapper.sh uninstall-w CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_PREFIX} -OPTIONS= CLAMAV "Integrate with Clam AntiVirus" on \ - SPAMTAG "Enable Spam Tagging" off \ - VIRUSTAG "Enable Virus Tagging" off \ - DISABLELOCAL "Disable Filters For Local Users" off \ - SYSLOG "Enable Syslog Logging" off \ - BACKUP "Enable Logging Incoming/Outgoing Mail" off \ - CUSTOMERROR "Enable Custom Error Patch" off \ - DEBUG "Enable Debug Messages" off +OPTIONS_DEFINE= CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP CUSTOMERROR DEBUG +OPTIONS_DEFAULT= CLAMAV +CLAMAV_DESC= Integrate with Clam AntiVirus +SPAMTAG_DESC= Spam Tagging +VIRUSTAGSC= Virus Tagging +DISABLELOCAL_DESC= Disable Filters For Local Users +BACKUP_DESC= Logging Incoming/Outgoing Mail +CUSTOMERROR_DESC= Custom Error Patch .include <bsd.port.pre.mk> -.if defined(WITH_CLAMAV) +.if ${PORT_OPTIONS:MCLAMAV} RUN_DEPENDS+= ${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav BUILD_DEPENDS+= ${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav CONFIGURE_ARGS+= --with-clamav CONFIGURE_ARGS+= --with-clamd-socket=/var/run/clamav/clamd .endif -.if defined(WITH_SPAMTAG) +.if ${PORT_OPTIONS:MSPAMTAG} CONFIGURE_ARGS+= --enable-spam-tag .endif -.if defined(WITH_VIRUSTAG) +.if ${PORT_OPTIONS:MVIRUSTAG} CONFIGURE_ARGS+= --enable-virus-tag .endif -.if defined(WITH_SYSLOG) +.if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --enable-syslog .endif -.if defined(WITH_DISABLELOCAL) +.if ${PORT_OPTIONS:MDISABLELOCAL} CONFIGURE_ARGS+= --disable-local-users .endif -.if defined(WITH_BACKUP) +.if ${PORT_OPTIONS:MBACKUP} CONFIGURE_ARGS+= --enable-backup .endif -.if defined(WITH_CUSTOMERROR) +.if ${PORT_OPTIONS:MCUSTOMERROR} CONFIGURE_ARGS+= --enable-custom-error .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif post-patch: @${REINPLACE_CMD} -e "s|^CFLAGS =|CFLAGS +=|" ${WRKSRC}/Makefile.in -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|\(install-data-am: \)install-qsheffdocDATA|\1|g' \ -e 's| contribute$$||g' \ ${WRKSRC}/Makefile.in .endif post-build: -.if defined(WITHOUT_CLAMAV) +.if ! ${PORT_OPTIONS:MCLAMAV} @${REINPLACE_CMD} -e 's|enable_virus_prog = 1|enable_virus_prog = 0|g' \ ${WRKSRC}/etc/qsheff.conf-default .endif do-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/doc @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/doc/ Modified: head/mail/simscan/Makefile ============================================================================== --- head/mail/simscan/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/simscan/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -28,16 +28,18 @@ SUB_LIST= QMAIL_PREFIX=${QMAIL_PREFIX} \ PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} \ SIMSCAN_DIR=${PORTNAME} -OPTIONS= CLAMAV "Support for ClamAV Virus Scanning" on \ - RIPMIME "Ripmime Processing (if Clamav ScanMail disabled)" on \ - SPAMD "Support for SpamAssassin Spam Filtering" off \ - USER "Turn On Per User SpamAssassin (required SPAMD)" off \ - DOMAIN "Turn On Per Domain Based Checking" off \ - ATTACH "Turn On Attachment Scanning (required CLAMAV)" off \ - DROPMSG "Drop Message in Case of Virus Found" off \ - PASSTHRU "Pass Spam Thru, Do Not Reject (required SPAMD)" off \ - HEADERS "Add a Received Line With Versions of Scanners" off \ - DSPAM "Turn on DSPAM scanning" off +OPTIONS_DEFINE= CLAMAV RIPMIME SPAMD USER DOMAIN ATTACH DROPMSG PASSTHRU HEADERS DSPAM +OPTIONS_DEFAULT= CLAMAV RIPMIME +CLAMAV_DESC= Support for ClamAV Virus Scanning +RIPMIME_DESC= Ripmime Processing (if Clamav ScanMail disabled) +SPAMD_DESC= Support for SpamAssassin Spam Filtering +USER_DESC= Turn On Per User SpamAssassin (required SPAMD) +DOMAIN_DESC= Turn On Per Domain Based Checking +ATTACH_DESC= Turn On Attachment Scanning (required CLAMAV) +DROPMSG_DESC= Drop Message in Case of Virus Found +PASSTHRU_DESC= Pass Spam Thru, Do Not Reject (required SPAMD) +HEADERS_DESC= Add a Received Line With Versions of Scanners +DSPAM_DESC= Turn on DSPAM scanning .include <bsd.port.pre.mk> @@ -47,50 +49,50 @@ CONFIGURE_ARGS=--enable-clamavdb-path=/v --enable-workdir=${WORKDIR} \ --enable-user=nobody -.if defined(WITHOUT_CLAMAV) +.if ! ${PORT_OPTIONS:MCLAMAV} CONFIGURE_ARGS+= --enable-clamav=n .else BUILD_DEPENDS+= clamdscan:${PORTSDIR}/security/clamav .endif -.if defined(WITHOUT_RIPMIME) +.if ! ${PORT_OPTIONS:MRIPMIME} CONFIGURE_ARGS+=--disable-ripmime .else BUILD_DEPENDS+= ripmime:${PORTSDIR}/mail/ripmime .endif -.if defined(WITH_SPAMD) +.if ${PORT_OPTIONS:MSPAMD} BUILD_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin CONFIGURE_ARGS+=--enable-spam=y CONFIGURE_ARGS+=--enable-spamassassin-path=${LOCALBASE}/bin/spamassassin .endif -.if defined(WITH_USER) +.if ${PORT_OPTIONS:MUSER} CONFIGURE_ARGS+=--enable-spamc-user=y .endif -.if defined(WITH_DOMAIN) +.if ${PORT_OPTIONS:MDOMAIN} CONFIGURE_ARGS+=--enable-per-domain=y .endif -.if defined(WITH_ATTACH) +.if ${PORT_OPTIONS:MATTACH} CONFIGURE_ARGS+=--enable-attach=y .endif -.if defined(WITH_DROPMSG) +.if ${PORT_OPTIONS:MDROPMSG} CONFIGURE_ARGS+=--enable-dropmsg=y .endif -.if defined(WITH_PASSTHRU) +.if ${PORT_OPTIONS:MPASSTHRU} CONFIGURE_ARGS+=--enable-spam-passthru=y .endif -.if defined(WITH_HEADERS) +.if ${PORT_OPTIONS:MHEADERS} CONFIGURE_ARGS+=--enable-received=y CONFIGURE_ARGS+=--enable-sigtool-path=${LOCALBASE}/bin/sigtool .endif -.if defined(WITH_DSPAM) +.if ${PORT_OPTIONS:MDSPAM} CONFIGURE_ARGS+=--enable-dspam=y BUILD_DEPENDS+= dspam:${PORTSDIR}/mail/dspam .endif @@ -148,7 +150,7 @@ pre-install: post-install: @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Modified: head/mail/spamass-milter/Makefile ============================================================================== --- head/mail/spamass-milter/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/spamass-milter/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: spamass-milter -# Date created: 29 April 2002 -# Whom: Eugene M. Kim <ab@astralblue.net> -# +# Created by: Eugene M. Kim <ab@astralblue.net> # $FreeBSD$ -# PORTNAME= spamass-milter PORTVERSION= 0.3.2 @@ -21,28 +17,27 @@ LICENSE= GPLv2 MAKE_JOBS_SAFE= yes -OPTIONS= ADDAUTH_PATCH "Bypass checks for SMTP AUTH connections" off \ - REJECTTEXT_PATCH "Customize SMTP reject message" off \ - LDAP "LDAP support" off \ - SENDMAIL_PORT "Build against sendmail port" off \ - IPV6 "Apply IPv6 whitelist patch" off +OPTIONS_DEFINE= ADDAUTH_PATCH REJECTTEXT_PATCH LDAP SENDMAIL_PORT IPV6 +ADDAUTH_PATCH_DESC= Bypass checks for SMTP AUTH connections +REJECTTEXT_PATCH_DESC= Customize SMTP reject message +SENDMAIL_PORT_DESC= Build against sendmail port .include <bsd.port.pre.mk> ORIG_ARGS= fd:mMp:P:r:u:D:i:b:B:e:x NEW_ARGS:= ${ORIG_ARGS} -.if defined(WITH_ADDAUTH_PATCH) +.if ${PORT_OPTIONS:MADDAUTH_PATCH} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-addauth NEW_ARGS:= ${NEW_ARGS}a .endif -.if defined(WITH_REJECTTEXT_PATCH) +.if ${PORT_OPTIONS:MREJECTTEXT_PATCH} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-rejecttext1 NEW_ARGS:= ${NEW_ARGS}R: .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ipv6 .endif @@ -56,13 +51,13 @@ WITH_LDAP=yes .undef WITHOUT_LDAP .endif -.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= AUTHORS ChangeLog NEWS README TODO .endif @@ -81,12 +76,12 @@ pre-patch: post-patch: @${SED} -e's,%%PREFIX%%,${PREFIX},g' \ ${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt -.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAP} @${REINPLACE_CMD} -e 's|-lmilter|-lmilter -lldap|g' ${WRKSRC}/configure .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/activation.txt ${DOCSDIR}/activation.txt .for f in ${PORTDOCS} Modified: head/mail/sqwebmail/Makefile ============================================================================== --- head/mail/sqwebmail/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/sqwebmail/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sqwebmail -# Date created: 23 Sep 2000 -# Whom: Neil Blakey-Milner -# +# Created by: Neil Blakey-Milner # $FreeBSD$ -# PORTNAME= sqwebmail PORTVERSION= 5.6.1 @@ -20,20 +16,19 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre CFLAGS:= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//} CXXFLAGS:= -I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//} -OPTIONS= CACHEDIR "Cache logins" on \ - FAM "Build in fam support for IDLE command" on \ - GDBM "Use gdbm db instead of system bdb" off \ - GZIP "Compress messages with gzip" on \ - HTTPS "Generate https:// URLs for all accesses" off \ - HTTPS_LOGIN "Generate https:// URLs only for login" off \ - ISPELL "Provide spell checking" off \ - MIMETYPES "search for a mime.types file" off \ - SENTRENAME "Periodic rename the Sent folder" on \ - CHARSET "Enable charsets" off +OPTIONS_DEFINE= CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET +OPTIONS_DEFAULT= CACHEDIR FAM GZIP SENTRENAME +CACHEDIR_DESC= Cache logins +FAM_DESC= Build in fam support for IDLE command +GDBM_DESC= Use gdbm db instead of system bdb +GZIP_DESC= Compress messages with gzip +HTTPS_DESC= Generate https:// URLs for all accesses +HTTPS_LOGIN_DESC= Generate https:// URLs only for login +MIMETYPES_DESC= search for a mime.types file +SENTRENAME_DESC= Periodic rename the Sent folder +CHARSET_DESC= charsets -.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" -.endif CGIBINDIR?= www/cgi-bin-dist CGIBINSUBDIR?= sqwebmail @@ -92,11 +87,11 @@ INSTALL_TARGET= install-strip install-co .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif -.if defined(WITH_FAM) +.if ${PORT_OPTIONS:MFAM} USE_FAM= yes .endif -.if defined(WITHOUT_CACHEDIR) +.if ! ${PORT_OPTIONS:MCACHEDIR} PLIST_SUB+= CACHE="@comment " CONFIGURE_ARGS+= --without-cachedir .else @@ -105,21 +100,21 @@ CONFIGURE_ARGS+= --with-cachedir=${CACHE --with-cacheowner=${CACHEOWNER} .endif -.if defined(WITH_HTTPS_LOGIN) +.if ${PORT_OPTIONS:MHTTPS_LOGIN} CONFIGURE_ARGS+= --enable-https=login -.elif defined(WITH_HTTPS) +.elif ${PORT_OPTIONS:MHTTPS} CONFIGURE_ARGS+= --enable-https .endif -.if defined(WITHOUT_SENTRENAME) +.if ! ${PORT_OPTIONS:MSENTRENAME} CONFIGURE_ARGS+= --disable-autorenamesent .endif -.if defined(WITHOUT_GZIP) +.if ! ${PORT_OPTIONS:MGZIP} CONFIGURE_ARGS+= --without-gzip .endif -.if defined(WITH_ISPELL) +.if ${PORT_OPTIONS:MISPELL} BUILD_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell @@ -127,46 +122,46 @@ CONFIGURE_ARGS+= --with-ispell=${LOCALBA CONFIGURE_ARGS+= --without-ispell .endif -.if defined(WITH_MIMETYPES) +.if ${PORT_OPTIONS:MMIMETYPES} RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support CONFIGURE_ARGS+= --enable-mimetypes=${LOCALBASE}/etc .else CONFIGURE_ARGS+= --disable-mimetypes .endif -.if defined(WITH_TIMEOUTHARD) +.if ${PORT_OPTIONS:MTIMEOUTHARD} CONFIGURE_ARGS+= --enable-hardtimeout=${WITH_TIMEOUTHARD} .endif -.if defined(WITH_TIMEOUTSOFT) +.if ${PORT_OPTIONS:MTIMEOUTSOFT} CONFIGURE_ARGS+= --enable-softtimeout=${WITH_TIMEOUTSOFT} .endif -.if defined(WITH_MAXMSGSIZE) +.if ${PORT_OPTIONS:MMAXMSGSIZE} CONFIGURE_ARGS+= --with-maxmsgsize=${WITH_MAXMSGSIZE} .endif -.if defined(WITH_MAXARGSIZE) +.if ${PORT_OPTIONS:MMAXARGSIZE} CONFIGURE_ARGS+= --with-maxargsize=${WITH_MAXARGSIZE} .endif -.if defined(WITH_MAXFORMARGSIZE) +.if ${PORT_OPTIONS:MMAXFORMARGSIZE} CONFIGURE_ARGS+= --with-maxformargsize=${WITH_MAXFORMARGSIZE} .endif -.if defined(WITH_CHARSET) +.if ${PORT_OPTIONS:MCHARSET} CONFIGURE_ARGS+= --enable-unicode .endif -.if defined(WITH_AUTOPURGE) +.if ${PORT_OPTIONS:MAUTOPURGE} CONFIGURE_ARGS+= --enable-autopurge=${WITH_AUTOPURGE} .endif -.if defined(WITH_MAXPURGE) +.if ${PORT_OPTIONS:MMAXPURGE} CONFIGURE_ARGS+= --enable-maxpurge=${WITH_MAXPURGE} .endif -.if defined(WITH_GDBM) +.if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm .else @@ -174,7 +169,7 @@ CONFIGURE_ARGS+=--with-db=db .endif post-patch: -.if !defined(WITH_FAM) +.if ! ${PORT_OPTIONS:MFAM} @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/maildir/configure .endif @@ -209,7 +204,7 @@ post-install: # ${FILESDIR}/sqwebmail-sqwebmaild.sh > ${WRKDIR}/sqwebmail-sqwebmaild.sh # ${INSTALL_SCRIPT} ${WRKDIR}/sqwebmail-sqwebmaild.sh ${RCDIR}/sqwebmail-sqwebmaild.sh -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} Modified: head/mail/tpop3d/Makefile ============================================================================== --- head/mail/tpop3d/Makefile Tue Jun 4 15:13:42 2013 (r319870) +++ head/mail/tpop3d/Makefile Tue Jun 4 15:47:06 2013 (r319871) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tpop3d -# Date created: 27 July 2001 -# Whom: chris@shagged.org -# +# Created by: chris@shagged.org # $FreeBSD$ -# PORTNAME= tpop3d PORTVERSION= 1.5.5 @@ -22,32 +18,30 @@ CONFIGURE_ARGS= --enable-auth-other \ --enable-tls \ --with-mailspool-directory=/var/mail -OPTIONS= MYSQL "Use MySQL authentication" off \ - PGSQL "Use PgSQL authentication" off \ - LDAP "Use LDAP authentication" off \ - PERLAUTH "Use Perl authentication" off \ - PASSWDAUTH "Use /etc/passwd authentication" off \ - FLATAUTH "Use /etc/passwd-style flat file authentication" off \ - GDBMAUTH "Use authentication against GNU dbm files" off \ - MAILDIR "Compile Maildir support" on \ - MBOXINDICES "Save Mbox indices" off \ - DRAC "Enable DRAC RFC for POP-before-SMTP relaying" off \ - FIX_PERLAUTH "Only try it if perl-auth coredumps" off +OPTIONS_DEFINE= LDAP PERLAUTH PASSWDAUTH FLATAUTH GDBMAUTH MAILDIR MBOXINDICES DRAC FIX_PERLAUTH +OPTIONS_RADIO= DB +OPTIONS_RADIO_DB= MYSQL PGSQL +DB_DESC= Authentication database +PERLAUTH_DESC= Use Perl authentication +PASSWDAUTH_DESC= Use /etc/passwd authentication +FLATAUTH_DESC= Use /etc/passwd-style flat file authentication +GDBMAUTH_DESC= Use authentication against GNU dbm files +MAILDIR_DESC= Compile Maildir support +MBOXINDICES_DESC= Save Mbox indices +DRAC_DESC= DRAC RFC for POP-before-SMTP relaying +FIX_PERLAUTH_DESC= Only try it if perl-auth coredumps .include <bsd.port.pre.mk> # MySQL authentication -.if defined(WITH_MYSQL) -.if defined(WITH_PGSQL) -BROKEN= MySQL and PgSQL authentication can not be build together -.endif +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --enable-auth-mysql \ --with-mysql-lib-dir=${LOCALBASE}/lib/mysql \ --with-mysql-include-dir=${LOCALBASE}/include/mysql .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes DEFAULT_PGSQL_VER= 80 CONFIGURE_ARGS+= --enable-auth-pgsql \ @@ -55,45 +49,45 @@ CONFIGURE_ARGS+= --enable-auth-pgsql \ --with-pgsql-include-dir=${LOCALBASE}/include .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --enable-auth-ldap --with-openldap-root=${LOCALBASE} .endif # Perl authentication -.if defined(WITH_PERLAUTH) +.if ${PORT_OPTIONS:MPERLAUTH} USE_PERL5= yes CONFIGURE_ARGS+= --enable-auth-perl .endif -.if defined(WITH_FLATAUTH) +.if ${PORT_OPTIONS:MFLATAUTH} CONFIGURE_ARGS+= --enable-auth-flatfile .endif -.if defined(WITH_GDBMAUTH) +.if ${PORT_OPTIONS:MGDBMAUTH} LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+= --enable-auth-gdbm .endif -.if defined(WITH_PASSWDAUTH) +.if ${PORT_OPTIONS:MPASSWDAUTH} CONFIGURE_ARGS+= --enable-auth-passwd .endif -.if defined(WITH_MAILDIR) +.if ${PORT_OPTIONS:MMAILDIR} CONFIGURE_ARGS+= --enable-mbox-maildir .endif -.if defined(WITH_MBOXINDICES) +.if ${PORT_OPTIONS:MMBOXINDICES} CONFIGURE_ARGS+= --enable-mbox-bsd-save-indices .endif -.if defined(WITH_DRAC) +.if ${PORT_OPTIONS:MDRAC} CONFIGURE_ARGS+= --enable-drac BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac LDFLAGS+= -L${LOCALBASE}/lib .endif -.if defined(WITH_FIX_PERLAUTH) +.if ${PORT_OPTIONS:MFIX_PERLAUTH} EXTRA_PATCHES+=${PATCHDIR}/extra-patch-auth_perl.c .endif @@ -102,7 +96,7 @@ DEFAULT_CONFIG= ${PREFIX}/etc/tpop3d.con MAN5= tpop3d.conf.5 MAN8= tpop3d.8 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \ README README.POP-before-SMTP README.auth_mysql TODO .endif @@ -119,7 +113,7 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/tpop3d.conf.dist \ ${PREFIX}/etc/tpop3d.conf ; \ fi -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306041547.r54Fl7Or051537>