From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 14 18:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69EC3A6 for ; Thu, 14 Nov 2013 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CF6A2170 for ; Thu, 14 Nov 2013 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAEIA1Gk082121 for ; Thu, 14 Nov 2013 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAEIA134082120; Thu, 14 Nov 2013 18:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 14 Nov 2013 18:10:01 GMT Resent-Message-Id: <201311141810.rAEIA134082120@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, Alan Hicks Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87A60D04 for ; Thu, 14 Nov 2013 18:05:35 +0000 (UTC) Received: from avasout05.plus.net (avasout05.plus.net [84.93.230.250]) by mx1.freebsd.org (Postfix) with ESMTP id E26DB20DA for ; Thu, 14 Nov 2013 18:05:34 +0000 (UTC) Received: from mail.p-o.co.uk ([80.229.143.200]) by avasout05 with smtp id pW2P1m0054Ke75s01W2Q8D; Thu, 14 Nov 2013 18:02:25 +0000 Received: from alan by p-o.co.uk with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1Vh1Bs-000DCU-Co for FreeBSD-gnats-submit@freebsd.org; Thu, 14 Nov 2013 17:58:52 +0000 Message-Id: Date: Thu, 14 Nov 2013 17:58:52 +0000 From: Alan Hicks To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/183961: Add staging support to mail/dbmail22 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: Alan Hicks List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 18:10:01 -0000 >Number: 183961 >Category: ports >Synopsis: Add staging support to mail/dbmail22 >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: Thu Nov 14 18:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Alan Hicks >Release: FreeBSD 9.2-RELEASE i386 >Organization: >Environment: System: FreeBSD schnittke.p-o.co.uk 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: Add staging support >How-To-Repeat: >Fix: Apply patch --- dbmail22-staging.diff begins here --- diff -ur dbmail22/Makefile dbmail22/Makefile --- dbmail22/Makefile 2013-11-06 17:52:42.000000000 +0000 +++ dbmail22/Makefile 2013-11-14 17:19:53.000000000 +0000 @@ -56,7 +56,6 @@ PLIST_SUB+= PORTDOCS="" .endif -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -114,24 +113,24 @@ # fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error. pre-install: @for f in 'a' 'la' 'so' 'so.0'; do \ - if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \ - ${RM} ${PREFIX}/lib/libdbmail.$$f; \ + if [ -f ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f ] ; then \ + ${RM} ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f; \ fi; \ done post-install: - @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \ - ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \ + @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist + @if [ ! -f ${STAGEDIR}${PREFIX}/etc/dbmail.conf ] ; then \ + ${CP} -p ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist ${STAGEDIR}${PREFIX}/etc/dbmail.conf; \ fi - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} @for f in ${DATABASE}; do \ - ${MKDIR} ${DATADIR}/$$f ; \ - ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \ + ${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \ + ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \ done .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} --- dbmail22-staging.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: