Date: Mon, 27 Dec 2004 19:18:17 +0100 (CET) From: Julien Gabel <jpeg@thilelli.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75551: [PATCH] Correct a 'post-patch' entry in the port's Makefile since a files/patch-* seems to do the same thing. Message-ID: <20041227181817.CC3FA7301B@titeuf.thilelli.net> Resent-Message-ID: <200412271820.iBRIKCbx089390@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041227181817.CC3FA7301B>