Bug 39972 - ports/databases misc Makefile cleanup
Summary: ports/databases misc Makefile cleanup
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Tilman Keskinoz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-06-29 01:50 UTC by sf
Modified: 2002-11-18 23:03 UTC (History)
0 users

See Also:


Attachments
patch-dbview (351 bytes, text/plain)
2002-06-29 01:50 UTC, sf
no flags Details
patch-freetds (579 bytes, text/plain)
2002-06-29 01:50 UTC, sf
no flags Details
patch-rdb (517 bytes, text/plain)
2002-06-29 01:50 UTC, sf
no flags Details
patch-unixODBC (486 bytes, text/plain)
2002-06-29 01:50 UTC, sf
no flags Details
file.diff (98 bytes, patch)
2002-06-29 01:50 UTC, sf
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description sf 2002-06-29 01:50:01 UTC
	${PERL} -> ${REINPLACE_CMD}
	hardcoded tool names to Mk/bsd.port.mk variable names

Fix: --- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---



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 -----lLMriT8rGBJe2rWTQA3g5LUGKfiD2YYnZVH8FLi2KyaGL6a8
Content-Type: text/plain; name="patch-db3"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch-db3"

--- 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>
Comment 1 Tilman Keskinoz freebsd_committer freebsd_triage 2002-11-03 20:50:11 UTC
Responsible Changed
From-To: freebsd-ports->arved

i'll handle this one
Comment 2 Tilman Keskinoz freebsd_committer freebsd_triage 2002-11-18 23:02:56 UTC
State Changed
From-To: open->closed

Committed, thanks