Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jun 2002 22:23:39 +0200 (CEST)
From:      Oliver Braun <obraun@informatik.unibw-muenchen.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/39594: Update ports@ maintained ports in category ftp: ${PERL} -> ${REINPLACE_CMD}
Message-ID:  <20020620202339.A92C8263@unsane.de>

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

>Number:         39594
>Category:       ports
>Synopsis:       Update ports@ maintained ports in category ftp: ${PERL} -> ${REINPLACE_CMD}
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 20 13:30:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Braun
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 12:43:32 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386


>Description:

Replace ${PERL} with ${REINPLACE_CMD} in

ftp/downloader
ftp/ftpq
ftp/junglemonkey
ftp/libfxp
ftp/mget
ftp/muddleftpd
ftp/pavuk

Regards,
         Olli
>How-To-Repeat:
>Fix:

Index: downloader/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/downloader/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- downloader/Makefile	2002/06/07 19:11:53	1.33
+++ downloader/Makefile	2002/06/20 20:20:13
@@ -20,6 +20,7 @@
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_ESOUND=	yes
 USE_GMAKE=	yes
@@ -37,11 +38,11 @@
 		INSTALL.pt_BR LICENSE NAMES THANKS TROUBLES
 
 post-patch:
-	@${PERL} -pi -e 's|CXXFLAGS="-O."|CXXFLAGS=\$$CXXFLAGS|g ; \
+	@${REINPLACE_CMD} -e 's|CXXFLAGS="-O."|CXXFLAGS=\$$CXXFLAGS|g ; \
 		 s|OS_CXXFLAGS="-pthread"|OS_CXXFLAGS="${PTHREAD_CFLAGS}"|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's| DOC||g' ${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's|-not|\\!|g' ${WRKSRC}/share/Makefile.in
+	@${REINPLACE_CMD} -e 's| DOC||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-not|\\!|g' ${WRKSRC}/share/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/DOC/nt.1 ${MANPREFIX}/man/man1
Index: ftpq/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/ftpq/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ftpq/Makefile	2001/09/05 14:36:53	1.10
+++ ftpq/Makefile	2002/06/20 20:20:13
@@ -14,6 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		ftpq.1
@@ -23,7 +24,7 @@
 SPOOLDIR?=	/var/spool/ftpq
 
 post-patch:
-	@ ${PERL} -pi -e 's#%%SPOOLDIR%%#${SPOOLDIR}#' \
+	@ ${REINPLACE_CMD} -e 's#%%SPOOLDIR%%#${SPOOLDIR}#' \
 	  ${WRKSRC}/Makefile.in ${WRKSRC}/src/ftpq.h
 
 post-install:
Index: junglemonkey/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/junglemonkey/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- junglemonkey/Makefile	2002/06/01 06:29:42	1.15
+++ junglemonkey/Makefile	2002/06/20 20:20:14
@@ -16,6 +16,7 @@
 
 LIB_DEPENDS=	gnet.0:${PORTSDIR}/net/gnet
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_GMAKE=	yes
@@ -27,11 +28,11 @@
 MAN1=		jm.1 jmlite.1 mtprendezvous.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|/gnome/help/|/help/|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/|\$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
Index: libfxp/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/libfxp/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- libfxp/Makefile	2002/02/05 11:32:33	1.1
+++ libfxp/Makefile	2002/06/20 20:20:14
@@ -13,17 +13,18 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 CFLAGS+=	-I. -Ilibmillweed
 
 post-patch:
 .for file in Makefile libmillweed/Makefile
-	@${PERL} -pi -e "s,^CC,#CC,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
 		s,^CFLAGS,#CFLAGS,g ; \
 		s,^PREFIX,#PREFIX,g" ${WRKSRC}/${file}
 .endfor
 	@(cd ${WRKSRC} ; \
 	  ${GREP} -l -R malloc.h * | xargs \
-	  ${PERL} -pi -e "s|malloc.h|stdlib.h|g")
+	  ${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g")
 
 .include <bsd.port.mk>
Index: mget/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/mget/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- mget/Makefile	2001/11/28 21:04:38	1.2
+++ mget/Makefile	2002/06/20 20:20:14
@@ -19,8 +19,10 @@
 		-I${LOCALBASE}/include ${PTHREAD_CFLAGS:S/"//g}
 LDFLAGS=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS:S/"//g}
 
+USE_REINPLACE=	yes
+
 pre-patch:
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \
 		's|#include <malloc.h>||g'
 
 do-build:
Index: muddleftpd/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/muddleftpd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- muddleftpd/Makefile	2001/07/09 23:38:36	1.3
+++ muddleftpd/Makefile	2002/06/20 20:20:14
@@ -14,15 +14,16 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		muddleftpd.1 ftpwho.1 mudpasswd.1
 
 post-patch:
-	@${PERL} -pi -e 's|^NEWMALLOC|#NEWMALLOC|g' ${WRKSRC}/Makefile.defs
-	@${PERL} -pi -e 's|"/etc|"${PREFIX}/etc|g' ${WRKSRC}/defaults.h
-	@${PERL} -pi -e 's|#include <malloc.h>||g' ${WRKSRC}/src/ftpd.h
+	@${REINPLACE_CMD} -e 's|^NEWMALLOC|#NEWMALLOC|g' ${WRKSRC}/Makefile.defs
+	@${REINPLACE_CMD} -e 's|"/etc|"${PREFIX}/etc|g' ${WRKSRC}/defaults.h
+	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' ${WRKSRC}/src/ftpd.h
 
 pre-configure:
 	@${CHMOD} -f u+x ${WRKSRC}/configure
Index: pavuk/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/pavuk/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- pavuk/Makefile	2002/04/12 17:09:35	1.24
+++ pavuk/Makefile	2002/06/20 20:20:14
@@ -19,6 +19,7 @@
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
+USE_REINPLACE=	yes
 WANT_GTK=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -39,11 +40,11 @@
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-pthread -DHAVE_MT|${PTHREAD_CFLAGS} -DHAVE_MT|g ; \
+	@${REINPLACE_CMD} -e 's|-pthread -DHAVE_MT|${PTHREAD_CFLAGS} -DHAVE_MT|g ; \
 		 s|-pthread|${PTHREAD_LIBS}|g ; \
 		 s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@find  ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/icons|\$$\(pkgdatadir\)/icons|g'
+	@find  ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/icons|\$$(pkgdatadir)/icons|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
>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?20020620202339.A92C8263>