From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 27 18:20:12 2004 Return-Path: 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 7F3A216A4CF for ; Mon, 27 Dec 2004 18:20:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F0B343D58 for ; Mon, 27 Dec 2004 18:20:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBRIKC5C089391 for ; Mon, 27 Dec 2004 18:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBRIKCbx089390; Mon, 27 Dec 2004 18:20:12 GMT (envelope-from gnats) Resent-Date: Mon, 27 Dec 2004 18:20:12 GMT Resent-Message-Id: <200412271820.iBRIKCbx089390@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, Julien Gabel Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1C3516A4CE for ; Mon, 27 Dec 2004 18:18:19 +0000 (GMT) Received: from smtp.thilelli.net (smtp.thilelli.net [213.41.129.161]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3342743D5D for ; Mon, 27 Dec 2004 18:18:19 +0000 (GMT) (envelope-from jgabel@thilelli.net) Received: from localhost (localhost [127.0.0.1]) by bento.thilelli.net (Postfix) with ESMTP id 6828378C94; Mon, 27 Dec 2004 19:18:18 +0100 (CET) Received: from bento.thilelli.net ([127.0.0.1]) by localhost (bento.thilelli.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 67337-01-8; Mon, 27 Dec 2004 19:18:17 +0100 (CET) Received: from titeuf.thilelli.net (titeuf.thilelli.net [192.168.1.19]) by bento.thilelli.net (Postfix) with ESMTP id DA5A378C8D; Mon, 27 Dec 2004 19:18:17 +0100 (CET) Received: by titeuf.thilelli.net (Postfix, from userid 1001) id CC3FA7301B; Mon, 27 Dec 2004 19:18:17 +0100 (CET) Message-Id: <20041227181817.CC3FA7301B@titeuf.thilelli.net> Date: Mon, 27 Dec 2004 19:18:17 +0100 (CET) From: Julien Gabel To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: Subject: ports/75551: [PATCH] Correct a 'post-patch' entry in the port's Makefile since a files/patch-* seems to do the same thing. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Julien Gabel List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Dec 2004 18:20:12 -0000 >Number: 75551 >Category: ports >Synopsis: [PATCH] Correct a 'post-patch' entry in the port's Makefile since a files/patch-* seems to do the same thing. >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 27 18:20:12 GMT 2004 >Closed-Date: >Last-Modified: >Originator: >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD bento.thilelli.net 5.2.1-RELEASE-p13 FreeBSD 5.2.1-RELEASE-p13 #0: Mon Dec 27 13:35:53 CET 2004 root@bento.thilelli.net:/usr/obj/usr/src/sys/BENTO i386 >Description: It seems there is two different metho to the same thing: patch the Makefile.in in the top of the source tree. The following patch do a little mode: - remove the sed entry in Makefile; - add the '@' sign to disable the printing of the first post-patch entry; - remove an old patch which seems not in use today: 310_to_320.pg.sql. >How-To-Repeat: Go to /usr/ports/mail/dspam and type 'make clean; make -DPATCH_DEBUG patch' then read ${WRKSRC}/Makefile.in. >Fix: # rm /usr/ports/mail/dspam/310_to_320.pg.sql # diff -ruN /usr/ports/mail/dspam/Makefile.orig /usr/ports/mail/dspam/Makefile --- /usr/ports/mail/dspam/Makefile.orig Mon Dec 27 17:04:51 2004 +++ /usr/ports/mail/dspam/Makefile Mon Dec 27 19:01:24 2004 @@ -567,12 +567,10 @@ .endfor post-patch: - ${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \ + @${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \ s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \ s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \ s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' ${WRKSRC}/tools.mysql_drv/purge.sql @${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.pgsql_drv/purge.sql @${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/tools.ora_drv/purge.sql >Release-Note: >Audit-Trail: >Unformatted: accordinf to our needs.