diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2005-07-04 18:02:00 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2005-07-04 18:02:00 +0000 |
| commit | ca15d525a2ef04d45c6f3276b22f7482cbda393a (patch) | |
| tree | 7805bb22a89e278eba44d1d5e10e855c85d12e8f /mail/qmail | |
| parent | ddc4918fb46b5875ef2cade4ae7b83ea1c3f61d0 (diff) | |
- Fix RCDLINK option
- Fix qmail-ldap plist
- Fix checking WITH(OUT)_ vars before include bsd.port.pre.mk
PR: 82983
Submitted by: Renato Botelho (maintainer)
Notes
Notes:
svn path=/head/; revision=138475
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 26 | ||||
| -rw-r--r-- | mail/qmail/pkg-plist | 1 |
2 files changed, 16 insertions, 11 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 9f4247cdd232..055dd614e78e 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -105,13 +105,6 @@ NO_PACKAGE= djb's packaging license does not allow non-standard \ PREFIX?= /var/qmail QMAIL_VERSION?= 1.03 -.if defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_TLS) -CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS -.if defined(WITH_TLS_DEBUG) -CFLAGS+= -DDEBUG -.endif -.endif - .if !defined(BARRIER_QMAILQUEUE_PATCH) OPTIONS+= QMAILQUEUE_PATCH "run a QMAILQUEUE program" off .endif @@ -181,8 +174,6 @@ OPTIONS+= RELAYMAILFROM "Open relay based on mailfrom" off \ .endif .if !defined(SLAVE_LDAP) OPTIONS+= RCDLINK "create rc.d/qmail.sh" on -.else -WITHOUT_RCDLINK= yes .endif ALL_TARGET+= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \ @@ -314,6 +305,13 @@ USE_REINPLACE= yes .include <bsd.port.pre.mk> +.if defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_TLS) +CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS +.if defined(WITH_TLS_DEBUG) +CFLAGS+= -DDEBUG +.endif +.endif + .if defined(SLAVE_LDAP) PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2 @@ -329,6 +327,12 @@ LDAPFLAGS+= -D${param} .endif .endfor +.if defined(WITH_EXTERNAL_TODO) +PLIST_SUB+= EXTERNAL_TODO="" +.else +PLIST_SUB+= EXTERNAL_TODO="@comment " +.endif + .endif .if (defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) &&\ @@ -391,7 +395,7 @@ PATCHFILES+= qmail-date-localtime.patch:localtime WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?= 509 .endif -.if defined(WITH_RCDLINK) +.if defined(WITH_RCDLINK) && !defined(SLAVE_LDAP) PLIST_SUB+= RCDLINK="" RCDLINK= .else @@ -536,7 +540,7 @@ post-patch: ${WRKSRC}/hier.c do-configure: - @${SED} -e 's,%%RCDLINK%%,${RCDLINK2},g; s,%%LOCALBASE%%,${LOCALBASE},g' \ + @${SED} -e 's,%%RCDLINK%%,${RCDLINK},g; s,%%LOCALBASE%%,${LOCALBASE},g' \ ${FILESDIR}/pkg-install.in > ${WRKDIR}/pkg-install @${SETENV} PKG_PREFIX="${PREFIX}" ${CSH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist index 41de3358e794..b5489bfb1c19 100644 --- a/mail/qmail/pkg-plist +++ b/mail/qmail/pkg-plist @@ -57,6 +57,7 @@ bin/qmail-smtpd bin/qmail-start bin/qmail-tcpok bin/qmail-tcpto +%%LDAP%%%%EXTERNAL_TODO%%bin/qmail-todo %%LDAP%%bin/qmail-verify bin/qreceipt bin/qsmhook |