From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 4 17:40:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3089F16A41C for ; Mon, 4 Jul 2005 17:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E086043D55 for ; Mon, 4 Jul 2005 17:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j64HeJjZ085987 for ; Mon, 4 Jul 2005 17:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j64HeJFG085986; Mon, 4 Jul 2005 17:40:19 GMT (envelope-from gnats) Resent-Date: Mon, 4 Jul 2005 17:40:19 GMT Resent-Message-Id: <200507041740.j64HeJFG085986@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BDD516A41C for ; Mon, 4 Jul 2005 17:30:31 +0000 (GMT) (envelope-from renato@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3E9B43D48 for ; Mon, 4 Jul 2005 17:30:30 +0000 (GMT) (envelope-from renato@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by data.galle.com.br (8.13.3/8.13.1) with ESMTP id j64HTR9H006445 for ; Mon, 4 Jul 2005 14:29:27 -0300 (BRST) (envelope-from renato@data.galle.com.br) Received: (from root@localhost) by data.galle.com.br (8.13.3/8.13.1/Submit) id j64HTMrL006442; Mon, 4 Jul 2005 14:29:22 -0300 (BRST) (envelope-from renato) Message-Id: <200507041729.j64HTMrL006442@data.galle.com.br> Date: Mon, 4 Jul 2005 14:29:22 -0300 (BRST) From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/82983: [MAINTAINER] mail/qmail: Fix RCDLINK option and qmail-ldap plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2005 17:40:20 -0000 >Number: 82983 >Category: ports >Synopsis: [MAINTAINER] mail/qmail: Fix RCDLINK option and qmail-ldap plist >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 04 17:40:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.4-RELEASE-p3 i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.4-RELEASE-p3 FreeBSD 5.4-RELEASE-p3 #2: Thu Jun 30 10:57:16 BRST 2005 >Description: - Fix RCDLINK option - Fix qmail-ldap plist - Fix checking WITH(OUT)_ vars before include bsd.port.pre.mk Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- qmail-1.03_4.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/qmail/Makefile,v retrieving revision 1.69 diff -u -r1.69 Makefile --- Makefile 28 Jun 2005 15:40:25 -0000 1.69 +++ Makefile 4 Jul 2005 17:28:40 -0000 @@ -105,13 +105,6 @@ 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 @@ .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 @@ .include +.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 @@ .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 @@ 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 @@ ${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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/qmail/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 6 Jun 2005 21:49:59 -0000 1.7 +++ pkg-plist 4 Jul 2005 17:28:40 -0000 @@ -57,6 +57,7 @@ bin/qmail-start bin/qmail-tcpok bin/qmail-tcpto +%%LDAP%%%%EXTERNAL_TODO%%bin/qmail-todo %%LDAP%%bin/qmail-verify bin/qreceipt bin/qsmhook --- qmail-1.03_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: