Date: Fri, 28 Jun 2002 17:43:39 -0700 (PDT) From: Scott Flatman <sf@dsinw.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39972: ports/databases misc Makefile cleanup Message-ID: <20020628174306.B57209-100000@ivymike.foo.kom>
next in thread | raw e-mail | index | archive | help
>Number: 39972
>Category: ports
>Synopsis: ports/databases misc Makefile cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 28 17:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Scott Flatman
>Release:
>Organization:
>Environment:
>Description:
${PERL} -> ${REINPLACE_CMD}
hardcoded tool names to Mk/bsd.port.mk variable names
>How-To-Repeat:
>Fix:
--- patch-db3 begins here ---
--- Makefile.orig Thu May 30 16:02:39 2002
+++ Makefile Fri Jun 28 17:19:08 2002
@@ -17,6 +17,7 @@
PATCH_SITES= http://www.sleepycat.com/update/${PORTVERSION}/
PATCHFILES= patch.${PORTVERSION}.1 patch.${PORTVERSION}.2
PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
+USE_REINPLACE= yes
MAINTAINER= ports@FreeBSD.org
@@ -34,10 +35,10 @@
--target=${ARCH}-unknown-freebsd${OSREL}
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
post-patch:
@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
- @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
.include <bsd.port.mk>
--- patch-db3 ends here ---
--- patch-db4 begins here ---
--- Makefile.orig Thu May 30 16:02:39 2002
+++ Makefile Fri Jun 28 17:21:28 2002
@@ -22,6 +22,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ../dist/configure
@@ -33,10 +34,10 @@
--target=${ARCH}-unknown-freebsd${OSREL}
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
post-patch:
@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
- @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
.include <bsd.port.mk>
--- patch-db4 ends here ---
--- patch-dbview begins here ---
--- Makefile.orig Wed May 15 07:26:22 2002
+++ Makefile Fri Jun 28 17:23:00 2002
@@ -16,11 +16,13 @@
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE= yes
+
MAN1= dbview.1
pre-patch:
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
${WRKSRC}/db_dump.c
do-install:
--- patch-dbview ends here ---
--- patch-edb begins here ---
--- Makefile.orig Mon Jun 3 18:38:42 2002
+++ Makefile Fri Jun 28 17:24:02 2002
@@ -16,9 +16,10 @@
USE_LIBTOOL= yes
USE_GTK= yes
INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
post-patch:
- @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|g' ${WRKSRC}/configure \
+ @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g' ${WRKSRC}/configure \
${WRKSRC}/tools/edb_gtk_ed/Makefile.in
.include <bsd.port.mk>
--- patch-edb ends here ---
--- patch-freetds begins here ---
--- Makefile.orig Sat Mar 30 00:30:29 2002
+++ Makefile Fri Jun 28 17:25:46 2002
@@ -16,6 +16,7 @@
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
+USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -41,7 +42,7 @@
.endif
post-patch:
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|/freetds.conf|/freetds.conf.dist|g ; \
s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
--- patch-freetds ends here ---
--- patch-msql begins here ---
--- Makefile.orig Fri Dec 7 15:23:01 2001
+++ Makefile Fri Jun 28 17:30:36 2002
@@ -26,7 +26,7 @@
post-patch:
cd ${FILESDIR}; \
- cp slibinstall.mm slibrary_unix.mm ${WRKSRC}/src/makegen
+ ${CP} slibinstall.mm slibrary_unix.mm ${WRKSRC}/src/makegen
do-configure:
cd ${WRKSRC}; ${MAKE} target
@@ -41,9 +41,9 @@
@${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
@${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
@for file in msqladmin msqlimport msqlexport; do\
- /usr/bin/chgrp msql ${PREFIX}/bin/$$file; \
+ ${CHGRP} msql ${PREFIX}/bin/$$file; \
done
- /usr/bin/chgrp msql ${PREFIX}/sbin/msql2d
+ ${CHGRP} msql ${PREFIX}/sbin/msql2d
@for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
done
--- patch-msql ends here ---
--- patch-rdb begins here ---
--- Makefile.orig Sun Dec 23 18:13:30 2001
+++ Makefile Fri Jun 28 17:35:50 2002
@@ -16,6 +16,7 @@
WRKSRC= ${WRKDIR}/rdb
USE_PERL5= yes
+USE_REINPLACE= yes
BINFILES= column compute dataent etbl headchg jointbl lst2tbl \
mergetbl mktbl ptbl rdb rdbt repair reporttbl row search \
@@ -25,7 +26,7 @@
do-build:
cd ${WRKSRC}; \
- ${PERL} -pi -e 's|^\#\! /usr/bin/perl|\#\!${PERL}|g' ${BINFILES}
+ ${REINPLACE_CMD} -e 's|^\#\! /usr/bin/perl|\#\!${PERL}|g' ${BINFILES}
do-install:
.for binfile in ${BINFILES}
--- patch-rdb ends here ---
--- patch-typhoon begins here ---
--- Makefile.orig Sat Mar 30 20:14:28 2002
+++ Makefile Fri Jun 28 17:37:50 2002
@@ -16,6 +16,7 @@
HAS_CONFIGURE= yes
INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
MAN1= ddlp.1
MAN3= d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
@@ -25,7 +26,7 @@
d_recread.3 d_recwrite.3 d_setfiles.3
pre-patch:
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
${WRKSRC}/util/dbdview.c
post-install:
--- patch-typhoon ends here ---
--- patch-unixODBC begins here ---
--- Makefile.orig Sat Feb 9 15:43:39 2002
+++ Makefile Fri Jun 28 17:39:24 2002
@@ -15,6 +15,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static --enable-shared
INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
.if defined(WITH_GUI)
USE_QT_VER= 2
@@ -40,7 +41,7 @@
.endif
post-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|"-lqt"|"-l${QT_NAME}"|g ; \
s|"-lqt-mt"|"-l${QT_NAME}"|g' ${WRKSRC}/configure
--- patch-unixODBC ends here ---
--- patch-db33 begins here ---
--- Makefile.orig Sun Jun 16 08:57:09 2002
+++ Makefile Fri Jun 28 17:41:12 2002
@@ -23,6 +23,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
@@ -35,10 +36,10 @@
--target=${ARCH}-unknown-freebsd${OSREL}
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
post-patch:
@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
- @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
.include <bsd.port.mk>
--- patch-db33 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020628174306.B57209-100000>