From sf@dsinw.com  Fri Jun 28 17:04:33 2002
Return-Path: <sf@dsinw.com>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DD7C037B401
	for <freebsd-gnats-submit@freebsd.org>; Fri, 28 Jun 2002 17:04:32 -0700 (PDT)
Received: from innovations.dsinw.com (ns.dsinw.com [207.149.40.194])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A96DB43E06
	for <freebsd-gnats-submit@freebsd.org>; Fri, 28 Jun 2002 17:04:31 -0700 (PDT)
	(envelope-from sf@dsinw.com)
Received: from ivymike.foo.kom (03-124.021.popsite.net [192.216.196.124])
	by innovations.dsinw.com (8.11.6/8.11.6) with ESMTP id g5T02Sm29299
	for <freebsd-gnats-submit@freebsd.org>; Fri, 28 Jun 2002 17:02:28 -0700
Message-Id: <20020628170339.V56575-100000@ivymike.foo.kom>
Date: Fri, 28 Jun 2002 17:04:19 -0700 (PDT)
From: Scott Flatman <sf@dsinw.com>
To: freebsd-gnats-submit@freebsd.org
Subject: ports/cad  misc Makefile cleanup

>Number:         39968
>Category:       ports
>Synopsis:       ports/cad  misc Makefile cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 28 17:10:01 PDT 2002
>Closed-Date:    Sun Nov 03 10:28:29 PST 2002
>Last-Modified:  Sun Nov 03 10:28:29 PST 2002
>Originator:     Scott Flatman
>Release:        
>Organization:
>Environment:
>Description:
	various hardcoded tool names to Mk/bsd.port.mk variable names
	${PERL} -> ${REINPLACE_CMD}

>How-To-Repeat:
>Fix:

--- patch-xcircuit begins here ---
--- Makefile.orig	Wed May 22 05:58:21 2002
+++ Makefile	Fri Jun 28 16:48:52 2002
@@ -16,6 +16,7 @@
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

+USE_REIPLACE=	yes
 USE_BZIP2=	yes
 USE_XPM=	yes
 USE_IMAKE=	yes
@@ -24,7 +25,7 @@
 MAN1=		xcircuit.1

 post-patch:
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'

 post-install:
--- patch-xcircuit ends here ---

--- patch-felt begins here ---
--- Makefile.orig	Sun Apr 28 09:31:45 2002
+++ Makefile	Fri Jun 28 16:51:33 2002
@@ -21,13 +21,14 @@
 WRKSRC=		${WRKDIR}/FElt-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes

 MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4

 post-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
 	${WRKSRC}/lib/Felt/parser.c ${WRKSRC}/lib/Felt/parser.c	\
 	${WRKSRC}/lib/Widgets/xwd.c ${WRKSRC}/lib/Matrix/data.c	\
 	${WRKSRC}/lib/Matrix/factor.c ${WRKSRC}/lib/Matrix/eigen.c \
--- patch-felt ends here ---

--- patch-gtkwave begins here ---
--- Makefile.orig	Thu Jun 13 09:45:06 2002
+++ Makefile	Fri Jun 28 16:54:39 2002
@@ -21,10 +21,11 @@

 USE_GTK=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes

 post-patch:
 	@${GREP} -lR "heapsort" ${WRKSRC}/src | ${XARGS} \
-		${PERL} -pi -e "s/heapsort/hsort/g"
+		${REINPLACE_CMD} -e "s/heapsort/hsort/g"

 .if !defined(NOPORTDOCS)
 post-install:
--- patch-gtkwave ends here ---

--- patch-irsim begins here ---
--- Makefile.orig	Tue Feb 13 05:30:17 2001
+++ Makefile	Fri Jun 28 16:55:55 2002
@@ -20,6 +20,6 @@

 # othewise patch will complain
 post-extract:
-	@find ${WRKSRC} -name RCS | xargs ${RM} -rf
+	@${FIND} ${WRKSRC} -name RCS | ${XARGS} ${RM} -rf

 .include <bsd.port.mk>
--- patch-irsim ends here ---

--- patch-qcad begins here ---
--- Makefile.orig	Thu May 30 11:08:37 2002
+++ Makefile	Fri Jun 28 16:59:19 2002
@@ -17,6 +17,7 @@
 USE_QT_VER=	2
 MAKE_ENV=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
 		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
+USE_REINPLACE=	yes

 .include <bsd.port.pre.mk>

@@ -25,7 +26,7 @@
 .endif

 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin
--- patch-qcad ends here ---

--- patch-slffea begins here ---
--- Makefile.orig	Fri Feb  8 23:30:11 2002
+++ Makefile	Fri Jun 28 17:01:45 2002
@@ -16,6 +16,7 @@

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_MESA=	yes
 CFLAGS+=	-I${X11BASE}/include ${PTHREAD_CFLAGS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.3
@@ -37,8 +38,8 @@
 	truss/truss_gr/tspost

 post-patch:
-	@(find ${WRKSRC} -name Makefile | xargs \
-	  ${PERL} -pi -e "s,^CC = (.*),CC = ${CC} ${CFLAGS},g ; \
+	@(${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
+	  ${REINPLACE_CMD} -e "s,^CC = (.*),CC = ${CC} ${CFLAGS},g ; \
 	    s,-lglut,-lglut ${PTHREAD_LIBS},g")

 do-install:
--- patch-slffea ends here ---


>Release-Note:
>Audit-Trail:

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: freebsd-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: ports/39968: ports/cad  misc Makefile cleanup
Date: Sat, 29 Jun 2002 08:49:46 +0200

 Most of this, but not everything, has been already submitted as
 follow-up to Problem Report ports/39273.
 
 Committer: Please take a look at Problem Report ports/39273 while
 committing this.
 
 Regards,
          Olli
 -- 
 IST & IIS _ INF _ UniBwM ___________ http://ist.unibw-muenchen.de/People/obraun/
 Tele-Consulting GmbH _______________ http://www.tele-consulting.com/ ___ obraun@
 FreeBSD: The Power To Serve ________ http://www.freebsd.org/ ___________________
 GnuPG: 0xEF25B1BA Fingerprint: 6A3B 042A 732E 17E4 B6E7 3EAF C0B1 6B7D EF25 B1BA
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Sun Nov 3 10:28:18 PST 2002 
State-Changed-Why:  
All Changes are now in the Repository, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39968 
>Unformatted:
 
