From def53cc6287ee74ebeb7b26e4c702f11a8ff9aba Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Wed, 3 Apr 2002 21:10:43 +0000 Subject: [PATCH] o Fix breakage introduced in last rev: - Comma operator does not work for {DIST,PATCH}FILES just yet, re-arrange groups to achieve similar effect --- mail/qmail-ldap/Makefile | 2 +- mail/qmail-mysql/Makefile | 2 +- mail/qmail-smtp_auth+tls/Makefile | 2 +- mail/qmail-smtp_auth/Makefile | 2 +- mail/qmail-tls/Makefile | 2 +- mail/qmail/Makefile | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 254b58830694..ec30b14f1371 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -11,7 +11,7 @@ CATEGORIES= mail PKGNAMESUFFIX= -ldap PATCH_SITES= http://www.nrg4u.com/qmail/:ldap -PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap,local +PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap PATCH_DIST_STRIP+= -p1 EXTRA_PATCHES+= ${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index 985ee0f99514..4559601af023 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -12,7 +12,7 @@ CATEGORIES= mail PKGNAMESUFFIX= -mysql PATCH_SITES+= http://iain.cx/unix/qmail/download/:mysql -PATCHFILES+= qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql,local +PATCHFILES+= qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql MAINTAINER= lioux@FreeBSD.org diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile index 680558c16f80..a90330921fd6 100644 --- a/mail/qmail-smtp_auth+tls/Makefile +++ b/mail/qmail-smtp_auth+tls/Makefile @@ -11,7 +11,7 @@ CATEGORIES= mail PKGNAMESUFFIX= -tls PATCH_SITES+= http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls -PATCHFILES+= tls.patch:tls,local +PATCHFILES+= tls.patch:tls PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@FreeBSD.org diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile index 680558c16f80..a90330921fd6 100644 --- a/mail/qmail-smtp_auth/Makefile +++ b/mail/qmail-smtp_auth/Makefile @@ -11,7 +11,7 @@ CATEGORIES= mail PKGNAMESUFFIX= -tls PATCH_SITES+= http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls -PATCHFILES+= tls.patch:tls,local +PATCHFILES+= tls.patch:tls PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@FreeBSD.org diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile index 680558c16f80..a90330921fd6 100644 --- a/mail/qmail-tls/Makefile +++ b/mail/qmail-tls/Makefile @@ -11,7 +11,7 @@ CATEGORIES= mail PKGNAMESUFFIX= -tls PATCH_SITES+= http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls -PATCHFILES+= tls.patch:tls,local +PATCHFILES+= tls.patch:tls PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@FreeBSD.org diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 1bde3bff8ca1..f0cfaae84e28 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -17,9 +17,6 @@ MASTER_SITES= http://cr.yp.to/software/ \ ${MASTER_SITE_QMAIL} DISTNAME= ${PORTNAME}-${QMAIL_VERSION} -PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local/} -PATCH_SITE_SUBDIR+= lioux/:local - # qmail-* skeleton ports including this port may not want # its patches .if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) @@ -27,10 +24,13 @@ PATCH_SITE_SUBDIR+= lioux/:local # Since AOL has been using those, the problem has skyrocketed from minor to # groundzero. qmail being RFC compliant need to be "fixed" to work with those PATCH_SITES+= http://www.ckdhr.com/ckd/:dns -PATCHFILES+= qmail-103.patch:dns,local +PATCHFILES+= qmail-103.patch:dns PATCH_DIST_STRIP+= -p1 .endif # MAIN_QMAIL_PORT_DNS_PATCH_BARRIER +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,tls/} +PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,tls + MASTER_SITE_QMAIL+= \ http://qmail.deliver3.com/%SUBDIR%/ \ http://qmail.valueclick.com/%SUBDIR%/ \