Date: Fri, 15 Mar 2013 22:03:43 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314324 - in head: Mk Mk/Uses mail/ezmlm mail/ezmlm-idx mail/mailfront mail/mess822 mail/qmail mail/qmail-activedir mail/qmail-auditor mail/qmail-conf mail/qmail-contrib mail/qmail-dk m... Message-ID: <201303152203.r2FM3hEe086283@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 15 22:03:42 2013 New Revision: 314324 URL: http://svnweb.freebsd.org/changeset/ports/314324 Log: - Convert USE_QMAIL_RUN, USE_QMAIL_BUILD and WANT_QMAIL into USES feature bapt contributed to the qmail.mk as well - Trim headers USES= qmail:run will add qmail into RUN_DEPENDS USES= qmail:build will add qmail into BUILD_DEPENDS USES= qmail[:both] will add qmail into both RUN and BUILD DEPENDS USES= qmail:vars will set QMAIL_PREFIX With hat: portmgr Added: head/Mk/Uses/qmail.mk - copied, changed from r313928, head/Mk/bsd.mail.mk Deleted: head/Mk/bsd.mail.mk Modified: head/Mk/bsd.port.mk head/mail/ezmlm-idx/Makefile head/mail/ezmlm/Makefile head/mail/mailfront/Makefile head/mail/mess822/Makefile head/mail/qmail-activedir/Makefile head/mail/qmail-auditor/Makefile head/mail/qmail-conf/Makefile head/mail/qmail-contrib/Makefile head/mail/qmail-dk/Makefile head/mail/qmail-rblchk/Makefile head/mail/qmail-scanner/Makefile head/mail/qmail-scanner1/Makefile head/mail/qmail/Makefile head/mail/qmailadmin-devel/Makefile head/mail/qmailadmin/Makefile head/mail/qmailanalog/Makefile head/mail/qmailmrtg7/Makefile head/mail/qmhandle/Makefile head/mail/qscan/Makefile head/mail/qsheff/Makefile head/mail/qtools/Makefile head/mail/queue-fix/Makefile head/mail/queue-repair/Makefile head/mail/sendok/Makefile head/mail/serialmail/Makefile head/mail/simscan/Makefile head/mail/softfail/Makefile head/mail/spamdyke/Makefile head/mail/usendmail/Makefile head/mail/vpopmail/Makefile head/mail/vqadmin/Makefile head/mail/xf-spf/Makefile Copied and modified: head/Mk/Uses/qmail.mk (from r313928, head/Mk/bsd.mail.mk) ============================================================================== --- head/Mk/bsd.mail.mk Mon Mar 11 18:45:16 2013 (r313928, copy source) +++ head/Mk/Uses/qmail.mk Fri Mar 15 22:03:42 2013 (r314324) @@ -1,71 +1,64 @@ -#-*- tab-width: 4; -*- -# ex:ts=4 -# # $FreeBSD$ # -# Please view me with 4 column tabs! - -.if !defined(_POSTMKINCLUDED) && !defined(Mail_Pre_Include) - -# Please make sure all changes to this file are passed through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Mail_Include_MAINTAINER= bdrewery@FreeBSD.org -Mail_Pre_Include= bsd.mail.mk - - -## Begin QMAIL Stuff - +# MAINTAINER= bdrewery@FreeBSD.org +# +# Feature: qmail +# Usage: USES=qmail or USES=qmail:ARGS +# Valid ARGS: both (default, implicit), run, build, vars +# # Ports can use the following vars: # # QMAIL_PREFIX - Define it if qmail is installed in a different PREFIX. -# Default: /var/qmail +# Default: /var/qmail # # QMAIL_SLAVEPORT - Define it if you install a slaveport of qmail, to -# prevent stale dependencies. Valid slaveports are: -# ldap, mysql, spamcontrol and tls. -# -# USE_QMAIL_BUILD - Add qmail or qmail slaveport to BUILD_DEPENDS. -# -# USE_QMAIL_RUN - Add qmail or qmail slaveport to RUN_DEPENDS. -# -# USE_QMAIL - Add qmail or qmail slaveport to RUN and BUILD_DEPENDS. +# prevent stale dependencies. Valid slaveports are: +# ldap, mysql, spamcontrol and tls. # -# WANT_QMAIL - Set vars related to qmail, like QMAIL_PREFIX. -QMAIL_PREFIX?= /var/qmail - -_QMAIL_VALID_SLAVEPORTS= ldap mysql spamcontrol tls +.if !defined(_INCLUDE_QMAIL_MK) +_INCLUDE_QMAIL_MK= yes -.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined (USE_QMAIL_BUILD) - -.if defined(QMAIL_SLAVEPORT) -. for slave in ${_QMAIL_VALID_SLAVEPORTS} -. if ${QMAIL_SLAVEPORT:L} == ${slave} -_QMAIL_SLAVEPORT_OKAY= true -. endif -. endfor +QMAIL_PREFIX?= /var/qmail -. if !defined(_QMAIL_SLAVEPORT_OKAY) -IGNORE= Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${_QMAIL_VALID_SLAVEPORTS} -. endif +.if !defined(qmail_ARGS) +qmail_ARGS= both .endif -.if defined(QMAIL_SLAVEPORT) -QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L} +.if ${qmail_ARGS} == "build" +BUILD_DEPENDS+= ${_QMAIL_DEPENDS} +.elif ${qmail_ARGS} == "run" +RUN_DEPENDS+= ${_QMAIL_DEPENDS} +.elif ${qmail_ARGS} == "both" +BUILD_DEPENDS+= ${_QMAIL_DEPENDS} +RUN_DEPENDS+= ${_QMAIL_DEPENDS} +.elif ${qmail_ARGS} == "vars" .else -QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail +IGNORE= USES=qmail - invalid args: [${qmail_ARGS}] specified .endif -.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) -RUN_DEPENDS+= ${QMAIL_DEPENDS} -.endif +.if ${qmail_ARGS} != "vars" -.if defined(USE_QMAIL) || defined(USE_QMAIL_BUILD) -BUILD_DEPENDS+= ${QMAIL_DEPENDS} -.endif +_QMAIL_VALID_SLAVEPORTS= ldap mysql spamcontrol tls -.endif +. if defined(QMAIL_SLAVEPORT) +. for slave in ${_QMAIL_VALID_SLAVEPORTS} +. if ${QMAIL_SLAVEPORT:L} == ${slave} +_QMAIL_SLAVEPORT_OKAY= true +. endif +. endfor + +. if !defined(_QMAIL_SLAVEPORT_OKAY) +IGNORE= Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${_QMAIL_VALID_SLAVEPORTS} +. endif +. endif + +. if defined(QMAIL_SLAVEPORT) +_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L} +. else +_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail +. endif -## End QMAIL Stuff +.endif .endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Mar 15 21:39:16 2013 (r314323) +++ head/Mk/bsd.port.mk Fri Mar 15 22:03:42 2013 (r314324) @@ -1488,10 +1488,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif -.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) -.include "${PORTSDIR}/Mk/bsd.mail.mk" -.endif - .if defined(USE_SDL) || defined(WANT_SDL) .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif Modified: head/mail/ezmlm-idx/Makefile ============================================================================== --- head/mail/ezmlm-idx/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/ezmlm-idx/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ezmlm-idx -# Date created: 28 November 1998 -# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za> -# +# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za> # $FreeBSD$ -# PORTNAME= ezmlm-idx PORTVERSION= 7.1.1 @@ -19,7 +15,7 @@ MAKE_JOBS_UNSAFE= yes LICENSE= GPLv2 -USE_QMAIL_RUN= yes +USES= qmail:run CONFLICTS= ezmlm-0.* Modified: head/mail/ezmlm/Makefile ============================================================================== --- head/mail/ezmlm/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/ezmlm/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -16,8 +16,9 @@ MASTER_SITES= http://cr.yp.to/software/ MAINTAINER= c.petrik.sosa@gmail.com COMMENT= Easy-to-use, high-speed mailing list manager for qmail +USES= qmail:run + USE_GCC= any -USE_QMAIL_RUN= yes CONFLICTS= ezmlm-idx-* Modified: head/mail/mailfront/Makefile ============================================================================== --- head/mail/mailfront/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/mailfront/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -14,7 +14,8 @@ LIB_DEPENDS= cvm-v2client:${PORTSDIR}/se OPTIONS_DEFINE= LUA -WANT_QMAIL= yes +USES= qmail:vars + CFLAGS+= -I${CVM_INC} CFLAGS_SO= ${CFLAGS} -fPIC -shared -L${CVM_LIB} LDFLAGS+= -g -L${CVM_LIB} Modified: head/mail/mess822/Makefile ============================================================================== --- head/mail/mess822/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/mess822/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mess822 -# Date created: 4 February 2001 -# Whom: David Siebörger <drs@rucus.ru.ac.za> -# +# Created by: David Siebörger <drs@rucus.ru.ac.za> # $FreeBSD$ -# PORTNAME= mess822 PORTVERSION= 0.58 @@ -17,7 +13,7 @@ MASTER_SITES= http://cr.yp.to/software/ MAINTAINER= drs@rucus.ru.ac.za COMMENT= RFC 822 mail message parsing library and rewriting utilities -USE_QMAIL_RUN= yes +USES= qmail:run RESTRICTED= Violates djb\'s license Modified: head/mail/qmail-activedir/Makefile ============================================================================== --- head/mail/qmail-activedir/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-activedir/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmail-activedir -# Date created: 2005-11-08 -# Whom: Jean Milanez Melo <jmelo@FreeBSD.org> -# +# Created by: Jean Milanez Melo <jmelo@FreeBSD.org> # $FreeBSD$ -# PORTNAME= qmail-activedir PORTVERSION= 0.17 @@ -14,7 +10,7 @@ MASTER_SITES= http://fo2k.com/qmail-acti MAINTAINER= jmelo@FreeBSD.org COMMENT= Programs to allow qmail to authenticate users through a MS ad -USE_QMAIL_RUN= yes +USES= qmail:run SUB_FILES= pkg-message SUB_LIST+= QMAIL_PREFIX=${QMAIL_PREFIX} USE_OPENLDAP= yes Modified: head/mail/qmail-auditor/Makefile ============================================================================== --- head/mail/qmail-auditor/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-auditor/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmail-auditor -# Date created: 2007-02-08 -# Whom: Patrick Tracanelli <eksffa@freebsdbrasil.com.br> -# +# Created by: Patrick Tracanelli <eksffa@freebsdbrasil.com.br> # $FreeBSD$ -# PORTNAME= qmail-auditor PORTVERSION= 0.47 @@ -16,7 +12,7 @@ COMMENT= Selective e-mail auditing for q WRKSRC= ${WRKDIR}/${PORTNAME:R} -USE_QMAIL_RUN= yes +USES= qmail:run GNU_CONFIGURE= yes SUB_FILES= pkg-message Modified: head/mail/qmail-conf/Makefile ============================================================================== --- head/mail/qmail-conf/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-conf/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmail-conf -# Date created: 8 April 2003 -# Whom: roam@FreeBSD.org -# +# Created by: roam@FreeBSD.org # $FreeBSD$ -# PORTNAME= qmail-conf PORTVERSION= 0.60 @@ -18,7 +14,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Configure various qmail services to run under daemontools -WANT_QMAIL= yes +USES= qmail:vars ALL_TARGET= it INSTALL_TARGET= setup check Modified: head/mail/qmail-contrib/Makefile ============================================================================== --- head/mail/qmail-contrib/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-contrib/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -16,7 +16,7 @@ COMMENT= Contributed programs for qmail OPTIONS_DEFINE= DOCS -USE_QMAIL_RUN= yes +USES= qmail:run MAKE_JOBS_SAFE= yes ALL_TARGET= it Modified: head/mail/qmail-dk/Makefile ============================================================================== --- head/mail/qmail-dk/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-dk/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -17,7 +17,8 @@ LIB_DEPENDS+= domainkeys:${PORTSDIR}/mai PATCH_SITES= ${MASTER_SITE_QMAIL} PATCHFILES= qmail-1.03-dk-0.54.patch -USE_QMAIL= yes +USES= qmail + MAKE_JOBS_SAFE= yes PREFIX?= ${QMAIL_PREFIX} Modified: head/mail/qmail-rblchk/Makefile ============================================================================== --- head/mail/qmail-rblchk/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-rblchk/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmail-rblchk -# Date created: 21 Jun 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> -# +# Created by: Emanuel Haupt <ehaupt@critical.ch> # $FreeBSD$ -# PORTNAME= qmail-rblchk PORTVERSION= 2.4.1 @@ -12,9 +8,10 @@ MASTER_SITES= http://www.morettoni.net/q CRITICAL MAINTAINER= ports@FreeBSD.org -COMMENT= A qmail RBL filter +COMMENT= Qmail RBL filter + +USES= qmail:run -USE_QMAIL_RUN= yes MAKE_JOBS_SAFE= yes LDFLAGS?= -s Modified: head/mail/qmail-scanner/Makefile ============================================================================== --- head/mail/qmail-scanner/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-scanner/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -21,8 +21,9 @@ BUILD_DEPENDS+= reformime:${PORTSDIR}/ma CONFLICTS= qmail-scanner-1.* +USES= qmail + USE_PERL5= yes -USE_QMAIL= yes SPOOLDIR?= /var/spool/qscand PLIST_SUB= SPOOLDIR=${SPOOLDIR} Modified: head/mail/qmail-scanner1/Makefile ============================================================================== --- head/mail/qmail-scanner1/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail-scanner1/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmail-scanner -# Date created: 2003-08-24 -# Whom: moeti -# +# Created by: moeti # $FreeBSD$ -# PORTNAME= qmail-scanner PORTVERSION= 1.25 @@ -27,6 +23,8 @@ SUB_LIST= SPOOLDIR=${SPOOLDIR} NO_LATEST_LINK= yes CONFLICTS= qmail-scanner-2.* +USES= qmail + QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue USE_PERL5= yes @@ -82,8 +80,6 @@ CONFIGURE_ARGS+= --spams-tosuffix "${QMA RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_QMAIL= yes - SPOOLDIR= ${PREFIX}/qmailscan PLIST_SUB= SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}" Modified: head/mail/qmail/Makefile ============================================================================== --- head/mail/qmail/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmail/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -18,6 +18,9 @@ DIST_SUBDIR= qmail CONFLICTS?= qmail-ldap-[0-9]* qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* CONFLICTS+= qmail-vida-[0-9]* +USES= qmail:vars +PREFIX?= ${QMAIL_PREFIX} + MAKE_JOBS_UNSAFE= yes PORTSCOUT= skipv:1.04 @@ -150,7 +153,6 @@ PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_ PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/} PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip -PREFIX?= ${QMAIL_PREFIX} QMAIL_VERSION?= 1.03 .if !defined(BARRIER_SMTP_AUTH_PATCH) @@ -336,8 +338,6 @@ BOOTFILES= home home+df proc proc+df bin CONFIGUREPROGRAMS= install dnsfq hostname dnsip ipmeprint dnsptr CONFIGURESCRIPTS= config config-fast -WANT_QMAIL= yes - .include <bsd.port.options.mk> .if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MTLS} Modified: head/mail/qmailadmin-devel/Makefile ============================================================================== --- head/mail/qmailadmin-devel/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmailadmin-devel/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmailadmin -# Date created: 31 May 2009 -# Whom: Ismail YENIGUL -# +# Created by: Ismail YENIGUL # $FreeBSD$ -# PORTNAME= qmailadmin PORTVERSION= 1.2.13 @@ -42,7 +38,7 @@ LATEST_LINK= qmailadmin-devel GNU_CONFIGURE= YES USE_GMAKE= YES -WANT_QMAIL= yes +USES= qmail:vars # # User-configurable variables Modified: head/mail/qmailadmin/Makefile ============================================================================== --- head/mail/qmailadmin/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmailadmin/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -21,6 +21,8 @@ RUN_DEPENDS= \ autorespond:${PORTSDIR}/mail/autorespond \ ${VPOPMAIL_DIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail +USES= qmail:vars + CONFLICTS= qmailadmin-devel-1.* PATCH_SITES+= http://qmail.jms1.net/vpopmail/:onchange \ @@ -57,7 +59,6 @@ VPOPMAIL_DIR?= ${LOCALBASE}/vpopmail GNU_CONFIGURE= YES USE_GMAKE= YES -WANT_QMAIL= yes # Notes and comments: # Modified: head/mail/qmailanalog/Makefile ============================================================================== --- head/mail/qmailanalog/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmailanalog/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -11,7 +11,8 @@ MASTER_SITES= http://cr.yp.to/software/ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Tools to analyze qmail-send's activity -USE_QMAIL_RUN= yes +USES= qmail:run + MAKE_JOBS_SAFE= yes ALL_TARGET= it Modified: head/mail/qmailmrtg7/Makefile ============================================================================== --- head/mail/qmailmrtg7/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmailmrtg7/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmailmrtg7 -# Date created: 16 Jun 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# +# Created by: Alex Dupre <ale@FreeBSD.org> # $FreeBSD$ -# PORTNAME= qmailmrtg7 PORTVERSION= 4.2 @@ -15,7 +11,8 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A program to create mrtg graphs for qmail activity RUN_DEPENDS= mrtg:${PORTSDIR}/net-mgmt/mrtg -USE_QMAIL= yes + +USES= qmail .include <bsd.port.pre.mk> Modified: head/mail/qmhandle/Makefile ============================================================================== --- head/mail/qmhandle/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qmhandle/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -12,7 +12,7 @@ COMMENT= Tool to view and manage a qmail OPTIONS_DEFINE= DOCS -USE_QMAIL_RUN= yes +USES= qmail:run NO_BUILD= yes USE_PERL5= yes Modified: head/mail/qscan/Makefile ============================================================================== --- head/mail/qscan/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qscan/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qscan -# Date created: 8 Apr 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# +# Created by: Alex Dupre <ale@FreeBSD.org> # $FreeBSD$ -# PORTNAME= qscan PORTVERSION= 1.5 @@ -17,7 +13,8 @@ COMMENT= A mail filter for Qmail that sc RUN_DEPENDS= clamdscan:${PORTSDIR}/security/clamav \ ripmime:${PORTSDIR}/mail/ripmime -USE_QMAIL_RUN= yes + +USES= qmail:run GNU_CONFIGURE= yes Modified: head/mail/qsheff/Makefile ============================================================================== --- head/mail/qsheff/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qsheff/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qsheff -# Date created: 14 Jul 2005 -# Whom: Ozkan KIRIK <ozkan@enderunix.org> -# +# Created by: Ozkan KIRIK <ozkan@enderunix.org> # $FreeBSD$ -# PORTNAME= qsheff-II PORTVERSION= 2.1.r3 @@ -22,7 +18,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} GNU_CONFIGURE= YES -USE_QMAIL= yes +USES= qmail DOCS= README COPYING AUTHORS ChangeLog INSTALL THANKS TODO EXAMPLES= sample-OK.msg sample-SPAM.msg sample-VIRUS.msg Modified: head/mail/qtools/Makefile ============================================================================== --- head/mail/qtools/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/qtools/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qtools -# Date created: 3 July 2001 -# Whom: petef@FreeBSD.org -# +# Created by: petef@FreeBSD.org # $FreeBSD$ -# PORTNAME= qtools PORTVERSION= 0.56 @@ -16,7 +12,7 @@ COMMENT= Tools to use in .qmail files RUN_DEPENDS= ${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm -WANT_QMAIL= yes +USES= qmail:vars ALL_TARGET= it INSTALL_TARGET= setup check Modified: head/mail/queue-fix/Makefile ============================================================================== --- head/mail/queue-fix/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/queue-fix/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -11,7 +11,8 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= bdrewery@FreeBSD.org COMMENT= Repairs or generates a qmail queue structure -USE_QMAIL_RUN= yes +USES= qmail:run + MAKE_JOBS_SAFE= yes PREFIX?= ${QMAIL_PREFIX} Modified: head/mail/queue-repair/Makefile ============================================================================== --- head/mail/queue-repair/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/queue-repair/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: queue-repair -# Date created: 22 Aug 2002 -# Whom: Sergei Kolobov <sergei@kolobov.com> -# +# Created by: Sergei Kolobov <sergei@kolobov.com> # $FreeBSD$ -# PORTNAME= queue-repair PORTVERSION= 0.9.0 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A qmail queue diagnostic and repair tool .if !defined(WITHOUT_QMAIL_PORT) -USE_QMAIL_RUN= yes +USES= qmail:run .endif USE_PYTHON= yes Modified: head/mail/sendok/Makefile ============================================================================== --- head/mail/sendok/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/sendok/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sendok -# Date created: 18 October 2005 -# Whom: Zak Johnson <zakj@nox.cx> -# +# Created by: Zak Johnson <zakj@nox.cx> # $FreeBSD$ -# PORTNAME= sendok PORTVERSION= 0.9.2 @@ -14,7 +10,7 @@ MASTER_SITES= http://peff.net/sendok/ \ MAINTAINER= zakj@nox.cx COMMENT= Generates qmail email addresses with timed cookies -USE_QMAIL_RUN= yes +USES= qmail:run PLIST_FILES= bin/sendok-check bin/sendok-create Modified: head/mail/serialmail/Makefile ============================================================================== --- head/mail/serialmail/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/serialmail/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: serialmail -# Date created: 2 November 1998 -# Whom: Tom Hukins <tom@eborcom.com> -# +# Created by: Tom Hukins <tom@eborcom.com> # $FreeBSD$ -# PORTNAME= serialmail PORTVERSION= 0.75 @@ -18,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tools for passing mail across serial links RUN_DEPENDS= tcpserver:${PORTSDIR}/sysutils/ucspi-tcp -USE_QMAIL_RUN= yes +USES= qmail:run RESTRICTED= Unsure of DJB license Modified: head/mail/simscan/Makefile ============================================================================== --- head/mail/simscan/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/simscan/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: simscan -# Date created: 1 Apr 2005 -# Whom: Anton Karpov <toxa@toxahost.ru> -# +# Created by: Anton Karpov <toxa@toxahost.ru> # $FreeBSD$ -# PORTNAME= simscan PORTVERSION= 1.4.0 @@ -15,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r MAINTAINER= lippe@FreeBSD.org COMMENT= Fast Content/Anti-virus Scanner for qmail Written in C -USE_QMAIL_BUILD= yes +USES= qmail:build GNU_CONFIGURE= yes Modified: head/mail/softfail/Makefile ============================================================================== --- head/mail/softfail/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/softfail/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: softfail -# Date created: 2007-02-01 -# Whom: Patrick Tracanelli <eksffa@freebsdbrasil.com.br> -# +# Created by: Patrick Tracanelli <eksffa@freebsdbrasil.com.br> # $FreeBSD$ -# PORTNAME= softfail PORTVERSION= 2.0 @@ -25,9 +21,10 @@ PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} PORTDOCS= README softfail.sql +USES= qmail + USE_BZIP2= yes USE_MYSQL= yes -USE_QMAIL= yes .if defined(QMAIL_SLAVEPORT) && ( ${QMAIL_SLAVEPORT} != "spamcontrol" && ${QMAIL_SLAVEPORT} != "ldap" ) IGNORE= software only works with qmail-spamcontrol or qmail-ldap Modified: head/mail/spamdyke/Makefile ============================================================================== --- head/mail/spamdyke/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/spamdyke/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: spamdyke -# Date created: 11 January 2007 -# Whom: Peter Kieser <peter@kieser.ca> -# +# Created by: Peter Kieser <peter@kieser.ca> # $FreeBSD$ -# PORTNAME= spamdyke PORTVERSION= 4.3.1 @@ -18,7 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:$ WRKSRC= ${WRKDIR}/${DISTNAME}/spamdyke -USE_QMAIL= yes +USES= qmail + GNU_CONFIGURE= yes ALL_TARGET= spamdyke Modified: head/mail/usendmail/Makefile ============================================================================== --- head/mail/usendmail/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/usendmail/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: usendmail -# Date created: 2004-02-19 -# Whom: Thomas Seck <tmseck@netcologne.de> -# +# Created by: Thomas Seck <tmseck@netcologne.de> # $FreeBSD$ -# PORTNAME= usendmail PORTVERSION= 0.1.6 @@ -14,7 +10,7 @@ MASTER_SITES= http://www.ohse.de/uwe/use MAINTAINER= tmseck@FreeBSD.org COMMENT= A replacement for qmail's sendmail drop-in -USE_QMAIL= yes +USES= qmail WRKSRC= ${WRKDIR}/mail/${DISTNAME} Modified: head/mail/vpopmail/Makefile ============================================================================== --- head/mail/vpopmail/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/vpopmail/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:$ PATCH_STRIP= -p1 -USE_QMAIL= yes +USES= qmail CONFLICTS= vpopmail-devel-5.* Modified: head/mail/vqadmin/Makefile ============================================================================== --- head/mail/vqadmin/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/vqadmin/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: vqadmin -# Date created: 29 Mar 2001 -# Whom: nbm -# +# Created by: nbm # $FreeBSD$ -# PORTNAME= vqadmin PORTVERSION= 2.3.6 @@ -18,7 +14,8 @@ BUILD_DEPENDS= ${LOCALBASE}/vpopmail/lib RUN_DEPENDS= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail GNU_CONFIGURE= YES -WANT_QMAIL= yes + +USES= qmail:vars CGIBINDIR?= www/cgi-bin-dist WEBDATADIR?= www/data-dist Modified: head/mail/xf-spf/Makefile ============================================================================== --- head/mail/xf-spf/Makefile Fri Mar 15 21:39:16 2013 (r314323) +++ head/mail/xf-spf/Makefile Fri Mar 15 22:03:42 2013 (r314324) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf-spf -# Date created: 2007-09-12 -# Whom: Felippe de Meirelles Motta <lippe@freebsdbrasil.com.br> -# +# Created by: Felippe de Meirelles Motta <lippe@freebsdbrasil.com.br> # $FreeBSD$ -# PORTNAME= xf-spf PORTVERSION= 0.2 @@ -16,7 +12,7 @@ COMMENT= SPF checker for Qmail's SMTPEXT LIB_DEPENDS+= spf2.3:${PORTSDIR}/mail/libspf2 -USE_QMAIL= yes +USES= qmail USE_BZIP2= yes SUB_FILES= pkg-message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303152203.r2FM3hEe086283>