Attachment 22939 Details for Bug 39668 – file.diff

[patch] file.diff

file.diff (text/plain), 11.51 KB, created by obraun on 2002-06-22 19:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: obraun

Created: 2002-06-22 19:30:02 UTC

Size: 11.51 KB

patch

obsolete

>Index: amcl/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/amcl/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- amcl/Makefile	2001/01/12 16:02:50	1.6
>+++ amcl/Makefile	2002/06/22 18:20:13
>@@ -13,6 +13,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GTK=	yes
> GNU_CONFIGURE=	yes
>@@ -20,6 +21,6 @@
> 		LIBS="-L${LOCALBASE}/lib"
> 
> post-patch:
>-	@${PERL} -pi -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>Index: angst/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/angst/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- angst/Makefile	2001/12/03 18:56:00	1.1
>+++ angst/Makefile	2002/06/22 18:20:13
>@@ -18,10 +18,12 @@
> 
> LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
> 
>+USE_REINPLACE=	yes
>+
> MAN8=	angst.8
> 
> post-patch:
>-	@${PERL} -pi -e "s,^CC,#CC,g ; \
>+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
> 		s,^CFLAGS,#CFLAGS,g ; \
> 		s,libnet-config,${LIBNET_CONFIG},g" ${WRKSRC}/Makefile
> 
>Index: cnet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/cnet/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- cnet/Makefile	2002/01/17 04:37:02	1.19
>+++ cnet/Makefile	2002/06/22 18:20:14
>@@ -15,6 +15,7 @@
> 
> LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_XPM=	yes
> USE_GMAKE=	yes
>@@ -22,9 +23,9 @@
> MAN1=		cnet.1
> 
> post-patch:
>-	@${PERL} -pi -e 's|8.2|8.3|g ; \
>+	@${REINPLACE_CMD} -e 's|8.2|8.3|g ; \
> 		 s|82|83|g' ${WRKSRC}/src/Makefile.freebsd
>-	@${PERL} -pi -e 's|%%CC%%|${CC}|g ; \
>+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
> 		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/config.h
> 
> do-install:
>Index: dlint/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/dlint/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- dlint/Makefile	2001/12/24 02:16:32	1.11
>+++ dlint/Makefile	2002/06/22 18:20:15
>@@ -14,11 +14,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> NO_BUILD=	yes
> MAN8=		dlint.8
> 
> do-configure:
>-	@${PERL} -pi.orig -e 's:/usr/local/bin:${PREFIX}/sbin:g' ${WRKSRC}/dlint
>+	@${REINPLACE_CMD} -e 's:/usr/local/bin:${PREFIX}/sbin:g' ${WRKSRC}/dlint
> 	@${SED} -e 's:DLINT 1:DLINT 8:g' ${WRKSRC}/dlint.1  >${WRKSRC}/dlint.8
> 
> do-install:
>Index: fidelio/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/fidelio/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- fidelio/Makefile	2002/04/12 17:09:56	1.9
>+++ fidelio/Makefile	2002/06/22 18:20:15
>@@ -19,6 +19,7 @@
> 
> XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
> USE_GNOME=	yes
>@@ -32,14 +33,14 @@
> CFLAGS+=	-DHAVE_STRCASESTR
> 
> 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'
>-	@${PERL} -pi -e 's|-lxml|-lxml2|g' \
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
>+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
>+	@${REINPLACE_CMD} -e 's|-lxml|-lxml2|g' \
> 		${WRKSRC}/configure
>-	@${PERL} -pi -e 's|extern int strcasestr|//extern int strcasestr|' \
>+	@${REINPLACE_CMD} -e 's|extern int strcasestr|//extern int strcasestr|' \
> 		${WRKSRC}/src/trackers.c
> 
> .include <bsd.port.mk>
>Index: forg/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/forg/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- forg/Makefile	2001/09/24 19:44:58	1.1
>+++ forg/Makefile	2002/06/22 18:20:15
>@@ -16,12 +16,13 @@
> RUN_DEPENDS= 	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
> 		${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/pmw
> 
>+USE_REINPLACE=	yes
> USE_PYTHON=	yes
> NO_BUILD=	yes
> 
> post-patch:
> .for file in forg.py mini-forg.py
>-	@${PERL} -pi -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/${file}
>+	@${REINPLACE_CMD} -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/${file}
> .endfor
> 
> do-install:
>Index: fping/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/fping/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- fping/Makefile	2002/04/30 18:33:29	1.13
>+++ fping/Makefile	2002/06/22 18:20:15
>@@ -14,12 +14,13 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS= --bindir="${PREFIX}/sbin"
> MAN8=		fping.8
> 
> post-patch:
>-	${PERL} -pi.fbsd -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \
>+	@${REINPLACE_CMD} -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \
> 	    ${WRKSRC}/fping.c
> 
> post-install:
>Index: gnosamba/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/gnosamba/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- gnosamba/Makefile	2002/03/30 18:40:11	1.17
>+++ gnosamba/Makefile	2002/06/22 18:20:16
>@@ -13,11 +13,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GNOME=	yes
> GNU_CONFIGURE=	yes
> 
> post-patch:
>-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
>+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
> 
> .include <bsd.port.mk>
>Index: gps/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/gps/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- gps/Makefile	2002/03/01 03:12:06	1.1
>+++ gps/Makefile	2002/06/22 18:20:17
>@@ -15,12 +15,13 @@
> 
> BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
> 
>+USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
> USE_GMAKE=	yes
> 
> post-patch:
>-	@${PERL} -pi -e "s,-Wall -O3,${CFLAGS},g" ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e "s,-Wall -O3,${CFLAGS},g" ${WRKSRC}/configure
> 
> .if !defined(NOPORTDOCS)
> post-install:
>Index: hagelslag/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/hagelslag/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- hagelslag/Makefile	2001/05/07 14:43:37	1.2
>+++ hagelslag/Makefile	2002/06/22 18:20:17
>@@ -15,13 +15,14 @@
> 
> BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
> 
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
> MAKEFILES=	Makefile gui/Makefile src/Makefile
> HS_DOCDIR=	${PREFIX}/share/doc/${PORTNAME}
> 
> post-patch:
> .for mfile in ${MAKEFILES}
>-	@ ${PERL} -pi -e 's#make -C#\$${MAKE} -C#' ${WRKSRC}/${mfile}
>+	@ ${REINPLACE_CMD} -e 's#make -C#\$${MAKE} -C#' ${WRKSRC}/${mfile}
> .endfor
> 
> post-install:
>Index: kdetelnet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/kdetelnet/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- kdetelnet/Makefile	2002/04/12 17:09:57	1.17
>+++ kdetelnet/Makefile	2002/06/22 18:20:18
>@@ -17,12 +17,13 @@
> 
> BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
> 
>+USE_REINPLACE=	yes
> USE_KDELIBS_VER=2
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> 
> pre-patch:
>-	@${PERL} -pi -e 's|-lqt|-l${QTNAME}|g ; \
>+	@${REINPLACE_CMD} -e 's|-lqt|-l${QTNAME}|g ; \
> 		 s|qt_libdir=NONE|qt_libdir=|g' ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>Index: libfreenet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/libfreenet/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- libfreenet/Makefile	2001/12/30 15:44:17	1.4
>+++ libfreenet/Makefile	2002/06/22 18:20:18
>@@ -13,6 +13,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_OPENSSL=	yes
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
>@@ -20,6 +21,6 @@
> INSTALLS_SHLIB=	yes
> 
> post-patch:
>-	@${PERL} -pi -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>Index: maradns/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/maradns/Makefile,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile
>--- maradns/Makefile	2002/06/18 06:28:32	1.20
>+++ maradns/Makefile	2002/06/22 18:20:19
>@@ -14,6 +14,8 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
>+REINPLACE_ARGS=	-i ""
> USE_BZIP2=	yes
> MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
> 
>@@ -22,9 +24,9 @@
> MAN8=	maradns.8 zoneserver.8
> 
> post-patch:
>-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
>+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|/etc/mara|${PREFIX}/etc/mara|g'
>-	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${PERL} -pi -e \
>+	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|make|\$$\{MAKE\}|g ; \
> 		 s|^FLAGS =|#FLAGS =|g ; \
> 		 s|-lpthread|${PTHREAD_LIBS}|g'
>Index: netscript/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/netscript/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- netscript/Makefile	2002/02/20 06:01:23	1.12
>+++ netscript/Makefile	2002/06/22 18:20:20
>@@ -17,6 +17,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> WANT_GTK=	yes
> 
> .include <bsd.port.pre.mk>
>@@ -29,7 +30,7 @@
> .endif
> 
> post-patch:
>-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin
>Index: oproute/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/oproute/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- oproute/Makefile	2002/06/09 19:14:11	1.2
>+++ oproute/Makefile	2002/06/22 18:20:21
>@@ -14,7 +14,9 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
>+
> post-patch:
>-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile
> 
> .include <bsd.port.mk>
>Index: py-libnet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/py-libnet/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- py-libnet/Makefile	2002/01/30 03:32:10	1.1
>+++ py-libnet/Makefile	2002/06/22 18:20:23
>@@ -19,12 +19,13 @@
> BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
> 		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
> 
>+USE_REINPLACE=	yes
> USE_PYTHON=	yes
> USE_GMAKE=	yes
> WRKSRC=		${WRKDIR}/${DISTNAME}/src
> 
> post-patch:
>-	@${PERL} -pi -e "s,^CC,#CC,g ; \
>+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
> 		s,%%PYTHON_INCLUDEDIR%%,${PYTHON_INCLUDEDIR},g ; \
> 		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
> 
>Index: tn5250/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/tn5250/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- tn5250/Makefile	2002/06/11 00:29:42	1.14
>+++ tn5250/Makefile	2002/06/22 18:20:25
>@@ -13,6 +13,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_LIBTOOL=	yes
> CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ARGS=	--enable-os-dir=no
>@@ -40,7 +41,7 @@
> .endif
> 
> post-patch:
>-	@${FIND} ${WRKSRC}/src -name '*.[ch]' | ${XARGS} ${PERL} -pi -e \
>+	@${FIND} ${WRKSRC}/src -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|<malloc.h>|<stdlib.h>|g'
> 
> post-install:

Actions: View | Diff

Attachments on bug 39668: 22939