diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2006-08-12 03:00:12 +0800 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2006-08-12 03:00:12 +0800 |
| commit | 515ae2558348cf2cefde61661edcd53e34bbd89e (patch) | |
| tree | 0190bd0747a36f8f774d016099d1830dea2c07c8 /mail/qmail | |
| parent | a7e5361ab50ad7a45a3d94e2469e9a58b0892a22 (diff) | |
| download | freebsd-ports-gnome-515ae2558348cf2cefde61661edcd53e34bbd89e.tar.gz freebsd-ports-gnome-515ae2558348cf2cefde61661edcd53e34bbd89e.tar.zst freebsd-ports-gnome-515ae2558348cf2cefde61661edcd53e34bbd89e.zip | |
Permit big_todo and ext_todo be applied together
Reported by: Carlos A. Talhati <cat at iqsc.usp.br>
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 19 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 3 |
2 files changed, 14 insertions, 8 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 4e9663077062..dd0142089180 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -296,14 +296,6 @@ NO_MTREE= yes .include <bsd.port.pre.mk> -.if ( \ - (defined(WITH_BIG_TODO_PATCH) && !defined(BARRIER_BIG_TODO_PATCH)) || \ - (defined(SLAVE_SPAMCONTROL) && defined(WITH_BIGTODO)) \ - ) && \ - (defined(WITH_EXTTODO_PATCH) && !defined(BARRIER_EXTTODO_PATCH)) -IGNORE= EXT_TODO and BIG_TODO doesn't work together, choose just one of them -.endif - .if defined(SLAVE_TLS) CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS . if defined(WITH_TLS_DEBUG) @@ -392,6 +384,14 @@ PATCHFILES+= qmail-spf-rc5.patch:spf PLIST_SUB+= EXTTODO="" DOCFILES_WRKSRC+= EXTTODO +. if (defined(WITH_BIG_TODO_PATCH) && !defined(BARRIER_BIG_TODO_PATCH)) || \ + (defined(SLAVE_SPAMCONTROL) && defined(WITH_BIGTODO)) +MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ext_big_todo/} +MASTER_SITE_SUBDIR+= garga/qmail/:ext_big_todo +EXT_BIG_TODO_PATCH= ext_todo-20030105+big-todo.103.patch +DISTFILES= ${EXT_BIG_TODO_PATCH}:ext_big_todo +. endif + . if defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH) . if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL) MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/} @@ -609,6 +609,9 @@ post-patch: ${WRKSRC}/Makefile . endif .endif +.if defined(EXT_BIG_TODO_PATCH) + @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXT_BIG_TODO_PATCH} +.endif @${REINPLACE_CMD} 's!/var/qmail!${PREFIX}!; \ s!/usr/local/!${LOCALBASE}/!' \ ${WRKSRC}/Makefile diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index a6bbac57c1f4..f9b42daee954 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -91,3 +91,6 @@ SIZE (qmail/auth.patch.diff) = 4412 MD5 (qmail/auth.patch.diff-tls) = 7e706dd124deb9a25cecd91fe652a90b SHA256 (qmail/auth.patch.diff-tls) = 467c5f68d5d332d2400f937c76311e5358b613923d64e68ae98d51d178c7de5e SIZE (qmail/auth.patch.diff-tls) = 2993 +MD5 (qmail/ext_todo-20030105+big-todo.103.patch) = 5878870ef85d6a83ba9465ce94d9cd42 +SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7 +SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523 |