Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jan 2003 01:15:08 +0100 (CET)
From:      "Simon 'portlint' Schubert" <corecode@corecode.ath.cx>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        domi@saargate.de, dyfet@gnu.org, pat@FreeBSD.org
Subject:   ports/47656: unPERLify ports/comms
Message-ID:  <200301300015.h0U0F8nJ013526@terrorfish.uni.stoert.net>

next in thread | raw e-mail | index | archive | help

>Number:         47656
>Category:       ports
>Synopsis:       unPERLify ports/comms
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 29 16:20:22 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon 'portlint' Schubert
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD terrorfish.uni.stoert.net 5.0-CURRENT FreeBSD 5.0-CURRENT #43: Thu Jan 23 17:46:13 CET 2003 corecode@terrorfish.uni.stoert.net:/usr/obj/athlon/usr/src/sys/TERRORFISH i386


	
>Description:
	unPERLify
	find -> ${FIND}, xargs -> ${XARGS}
	
>How-To-Repeat:
	
>Fix:

Index: bayonne/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/bayonne/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- bayonne/Makefile	26 Aug 2001 03:19:54 -0000	1.2
+++ bayonne/Makefile	29 Jan 2003 22:04:56 -0000
@@ -20,14 +20,15 @@
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 PLIST_SUB=	BAYONNE_VERSION=%{PORT_VERSION}
 
 post-extract:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|-release \$$\(LT_RELEASE\)||g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-release \$$(LT_RELEASE)||g'
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: ghfaxviewer/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/ghfaxviewer/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ghfaxviewer/Makefile	13 May 2002 12:06:46 -0000	1.3
+++ ghfaxviewer/Makefile	29 Jan 2003 22:06:52 -0000
@@ -20,6 +20,7 @@
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -28,10 +29,10 @@
 MAN1=	halifax.1 ghfaxviewer.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\(\$$(datadir)/\)gnome/|\1|g ; \
+		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
Index: yawmppp/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/yawmppp/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- yawmppp/Makefile	30 Aug 2002 13:09:01 -0000	1.9
+++ yawmppp/Makefile	29 Jan 2003 22:10:20 -0000
@@ -14,6 +14,7 @@
 MAINTAINER=	pat@FreeBSD.org
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
@@ -26,14 +27,14 @@
 MAN1=		yawmppp.1x
 
 pre-patch:
-	@${PERL} -pi -e "s@-g -O2@${CFLAGS}@g; s@-O2 -Wall@${CFLAGS} -Wall@g; \
+	@${REINPLACE_CMD} -e "s@-g -O2@${CFLAGS}@g; s@-O2 -Wall@${CFLAGS} -Wall@g; \
 			s@-O2@${CFLAGS}@g" ${WRKSRC}/*/Makefile.in \
 			${WRKSRC}/configure ${WRKSRC}/*/*/Makefile.in
-	@${PERL} -pi -e 's!\/usr\/local!${PREFIX}!; \
+	@${REINPLACE_CMD} -e 's!\/usr\/local!${PREFIX}!; \
 		s!/usr/bin!${PREFIX}/bin!' ${WRKSRC}/src/ycommon.c
-	@${PERL} -pi.orig -e 's|/etc/ppp/yagetmodemspeed|${PREFIX}/bin/yagetmodemspeed|' \
+	@${REINPLACE_CMD} -e 's|/etc/ppp\(/yagetmodemspeed\)|${PREFIX}/bin\1|' \
 		${WRKSRC}/src/gtksetup/applet.c
-	@${PERL} -pi.orig -e 's|tac|cat|' ${WRKSRC}/src/dockapp/getmodemspeed.c
+	@${REINPLACE_CMD} e 's|tac|cat|' ${WRKSRC}/src/dockapp/getmodemspeed.c
 
 do-install:
 .for file in dockapp/yagetmodemspeed dockapp/${PORTNAME} gtklog/${PORTNAME}.log \
	


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301300015.h0U0F8nJ013526>