Attachment 23240 Details for Bug 40012 – file.diff

[patch] file.diff

file.diff (text/plain), 13.32 KB, created by obraun on 2002-06-29 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: obraun

Created: 2002-06-29 21:40:01 UTC

Size: 13.32 KB

patch

obsolete

>Index: 3dpong/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/3dpong/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- 3dpong/Makefile	2001/06/10 23:34:24	1.9
>+++ 3dpong/Makefile	2002/06/29 20:27:16
>@@ -13,10 +13,11 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> MAKEFILE=	makefile
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> 
> post-patch:
>-	@${PERL} -pi.fbsd -e 's.\tchmod .\t${CHMOD} .g' \
>+	@${REINPLACE_CMD} -e 's.	chmod .	${CHMOD} .g' \
> 		${WRKSRC}/makefile
> 
> do-install:
>Index: adgali/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/adgali/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- adgali/Makefile	2002/04/17 12:37:54	1.5
>+++ adgali/Makefile	2002/06/29 20:27:17
>@@ -23,6 +23,7 @@
> 
> SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> 
>+USE_REINPLACE=	yes
> USE_FREETYPE=	yes
> USE_GMAKE=	yes
> USE_LIBTOOL=	yes
>@@ -35,7 +36,7 @@
> INSTALLS_SHLIB=	yes
> 
> post-patch:
>-	@${PERL} -pi -e 's|-O3 ||g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-O3 ||g' ${WRKSRC}/configure
> 
> post-install:
> .if !defined(NOPORTDOCS)
>Index: cryptoslam/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/cryptoslam/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- cryptoslam/Makefile	2001/11/25 07:56:19	1.1
>+++ cryptoslam/Makefile	2002/06/29 20:27:18
>@@ -14,6 +14,8 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=  yes
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 400010
>@@ -23,7 +25,7 @@
> .endif
> 
> post-patch:
>-	@${PERL} -pi -e "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/cryptoslam ${PREFIX}/bin
>Index: glife/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/glife/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- glife/Makefile	2001/09/11 21:56:26	1.12
>+++ glife/Makefile	2002/06/29 20:27:19
>@@ -15,16 +15,17 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_LIBTOOL=	yes
> USE_GNOME=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
> 
> 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/|\$$(datadir)/|g ; \
>+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
> 
> .include <bsd.port.mk>
>Index: gno3dtet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/gno3dtet/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- gno3dtet/Makefile	2002/03/29 00:52:18	1.14
>+++ gno3dtet/Makefile	2002/06/29 20:27:19
>@@ -14,6 +14,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
> USE_GNOME=	yes
>@@ -22,11 +23,11 @@
> 		LIBS="-L${LOCALBASE}/lib"
> 
> 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/|\$$(datadir)/|g ; \
>+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
> 
> post-install:
> 	${CHOWN} root:games ${PREFIX}/bin/gno3dtet
>Index: gnomebreakout/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/gnomebreakout/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- gnomebreakout/Makefile	2001/06/11 17:57:13	1.7
>+++ gnomebreakout/Makefile	2002/06/29 20:27:19
>@@ -13,6 +13,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GNOME=	yes
> GNU_CONFIGURE=	yes
>@@ -20,10 +21,10 @@
> 		LIBS="-L${LOCALBASE}/lib"
> 
> 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/|\$$(datadir)/|g ; \
>+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
> 
> .include <bsd.port.mk>
>Index: gnomememoryblocks/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/gnomememoryblocks/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- gnomememoryblocks/Makefile	2001/03/29 16:33:50	1.7
>+++ gnomememoryblocks/Makefile	2002/06/29 20:27:19
>@@ -14,6 +14,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GNOME=	yes
> USE_LIBTOOL=	yes
>@@ -21,10 +22,10 @@
> 		LIBS="-L${LOCALBASE}/lib"
> 
> 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/|\$$(datadir)/|g ; \
>+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
> 
> .include <bsd.port.mk>
>Index: gtkballs/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/gtkballs/Makefile,v
>retrieving revision 1.16
>diff -u -r1.16 Makefile
>--- gtkballs/Makefile	2002/02/17 03:07:14	1.16
>+++ gtkballs/Makefile	2002/06/29 20:27:20
>@@ -12,6 +12,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_GTK=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>@@ -22,7 +23,7 @@
> MAN6=		gtkballs.6x
> 
> post-patch:
>-	@${PERL} -pi -e 's|^install-data-local|#install-data-local|g' \
>+	@${REINPLACE_CMD} -e 's|^install-data-local|#install-data-local|g' \
> 		${WRKSRC}/Makefile.in
> 
> post-install:
>Index: qgo/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/qgo/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- qgo/Makefile	2002/05/20 16:31:41	1.2
>+++ qgo/Makefile	2002/06/29 20:27:22
>@@ -14,6 +14,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_QT_VER=	2
> GNU_CONFIGURE=	yes
> QTCPPFLAGS+=	-DDONT_USE_GETOPT
>@@ -21,8 +22,8 @@
> USE_GMAKE=	yes
> 
> post-patch:
>-	@${PERL} -pi -e "s,qt.so,qt2.so,g ; \
>+	@${REINPLACE_CMD} -e "s,qt.so,qt2.so,g ; \
> 		s,/moc,/moc2,g" ${WRKSRC}/configure
>-	@${PERL} -pi -e "s,-lqt,-lqt2,g" ${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: tinymux/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/tinymux/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- tinymux/Makefile	2002/06/07 22:23:21	1.9
>+++ tinymux/Makefile	2002/06/29 20:27:23
>@@ -17,6 +17,7 @@
> 
> WRKSRC=		${WRKDIR}/src
> 
>+USE_REINPLACE=	yes
> USE_AUTOCONF=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LIBS="-L${LOCALBASE}/lib"
>@@ -25,7 +26,7 @@
> 	@${RM} -f ${WRKSRC}/gdbm.h
> 
> post-patch:
>-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/udb_ochunk.c
>+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/udb_ochunk.c
> 
> #
> # Distribution does not include an install target.  So here it is.
>Index: tux-aqfh/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/tux-aqfh/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- tux-aqfh/Makefile	2001/11/28 22:36:17	1.2
>+++ tux-aqfh/Makefile	2002/06/29 20:27:23
>@@ -14,6 +14,7 @@
> 
> BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_NEWGCC=	yes
> USE_MESA=	yes
>@@ -24,11 +25,11 @@
> CONFIGURE_ARGS=	--with-plib=${X11BASE}
> 
> post-patch:
>-	@${PERL} -pi -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
>+	@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
> 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
> 		 s|datadir/games|datadir|g' ${WRKSRC}/configure
>-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
>-		's|\$$$prefix$/games|\@bindir\@|g ; \
>-		 s|\$$$datadir$/games|\$$$datadir$|g'
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|\$$(prefix)/games|\@bindir\@|g ; \
>+		 s|\$$(datadir)/games|\$$(datadir)|g'
> 
> .include <bsd.port.mk>
>Index: tuxkart/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/tuxkart/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- tuxkart/Makefile	2001/11/29 06:57:13	1.2
>+++ tuxkart/Makefile	2002/06/29 20:27:23
>@@ -14,6 +14,7 @@
> 
> BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_NEWGCC=	yes
> USE_MESA=	yes
>@@ -24,11 +25,11 @@
> CONFIGURE_ARGS=	--with-plib=${X11BASE}
> 
> post-patch:
>-	@${PERL} -pi -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
>+	@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
> 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
> 		 s|datadir/games|datadir|g' ${WRKSRC}/configure
>-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
>-		's|\$$$prefix$/games|\@bindir\@|g ; \
>-		 s|\$$$datadir$/games|\$$$datadir$|g'
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|\$$(prefix)/games|\@bindir\@|g ; \
>+		 s|\$$(datadir)/games|\$$(datadir)|g'
> 
> .include <bsd.port.mk>
>Index: wordplay/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/wordplay/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- wordplay/Makefile	2001/04/03 09:25:32	1.6
>+++ wordplay/Makefile	2002/06/29 20:27:23
>@@ -14,11 +14,12 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> NO_WRKSUBDIR=	yes
>+USE_REINPLACE=	yes
> MAKEFILE=	makefile
> ALL_TARGET=	wordplay
> 
> post-patch:
>-	@${PERL} -pi -e \
>+	@${REINPLACE_CMD} -e \
> 	  "s#words721.txt#${PREFIX}/share/wordplay/words721.txt#" \
> 	  ${WRKSRC}/wordplay.c
> 
>Index: xdigger/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/xdigger/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- xdigger/Makefile	2001/12/24 02:15:16	1.13
>+++ xdigger/Makefile	2002/06/29 20:27:24
>@@ -14,11 +14,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_IMAKE=	yes
> MAN6=		xdigger.6
> 
> post-patch:
>-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
>+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
> 
> post-install:
> 	@${CHMOD} 2755 ${PREFIX}/bin/xdigger
>Index: xmastermind/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/xmastermind/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- xmastermind/Makefile	2002/01/02 04:16:50	1.12
>+++ xmastermind/Makefile	2002/06/29 20:27:25
>@@ -15,10 +15,11 @@
> 
> LIB_DEPENDS=		xforms.0:${PORTSDIR}/x11-toolkits/xforms
> 
>+USE_REINPLACE=		yes
> USE_X_PREFIX=		yes
> 
> pre-patch:
>-	@${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' \
>+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
> 		${WRKSRC}/list.h
> 
> do-install:
>Index: xscrabble/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/xscrabble/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- xscrabble/Makefile	2000/08/03 09:24:21	1.13
>+++ xscrabble/Makefile	2002/06/29 20:27:26
>@@ -15,11 +15,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=		yes
> USE_IMAKE=		yes
> USE_XPM=		yes
> NO_INSTALL_MANPAGES=	yes
> 
> post-patch:
>-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/XScrabble.ad
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/XScrabble.ad
> 
> .include <bsd.port.mk>
>Index: xtic/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/xtic/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- xtic/Makefile	2001/01/16 17:30:52	1.11
>+++ xtic/Makefile	2002/06/29 20:27:26
>@@ -14,11 +14,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_IMAKE=	yes
> USE_XPM=	yes
> MAN1=		xtic.1
> 
> post-patch:
>-	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h
>+	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h
> 
> .include <bsd.port.mk>
>Index: xtron/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/games/xtron/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- xtron/Makefile	2001/12/24 02:15:26	1.8
>+++ xtron/Makefile	2002/06/29 20:27:26
>@@ -14,11 +14,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_XPM=	yes
> 
> post-patch:
>-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc
>+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/xtron ${PREFIX}/bin

Actions: View | Diff

Attachments on bug 40012: 23240