Attachment 22882 Details for Bug 39591 – file.diff

[patch] file.diff

file.diff (text/plain), 6.90 KB, created by obraun on 2002-06-20 21:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: obraun

Created: 2002-06-20 21:10:01 UTC

Size: 6.90 KB

patch

obsolete

>Index: beav/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/beav/Makefile,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile
>--- beav/Makefile	2002/03/25 12:18:39	1.18
>+++ beav/Makefile	2002/06/20 19:53:04
>@@ -15,15 +15,16 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
> 
>+USE_REINPLACE=	yes
> ALL_TARGET=	beav
> 
> MAN1=		beav.1
> 
> post-patch:
>-	@${PERL} -pi -e 's|^CFLAGS=|CFLAGS+=-DUNIX -DBSD #|g ; \
>+	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=-DUNIX -DBSD #|g ; \
> 		 s|^CC=|CC?=|g ; \
>-		 s|^\(|\$$\(|g' ${WRKSRC}/Makefile
>-	@${PERL} -pi -e 's|/usr/doc/beav|${DOCSDIR}|g' ${WRKSRC}/beav.1
>+		 s|^(|\$$(|g' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|/usr/doc/beav|${DOCSDIR}|g' ${WRKSRC}/beav.1
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/beav ${PREFIX}/bin/beav
>Index: elvis/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/elvis/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- elvis/Makefile	2000/04/17 00:17:22	1.4
>+++ elvis/Makefile	2002/06/20 19:53:05
>@@ -15,6 +15,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
> MAN1=		elvis.1 elvtags.1 ref.1
>@@ -30,7 +31,7 @@
> .endif
> 
> pre-configure:
>-	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/configure
> 
> do-install:
> .for file in elvis elvtags ref
>Index: em/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/em/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- em/Makefile	2001/11/23 17:39:18	1.2
>+++ em/Makefile	2002/06/20 19:53:05
>@@ -14,10 +14,11 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" DEFINES=""
> 
> pre-patch:
>-	@${PERL} -pi -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/epath.h
>+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/epath.h
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/em ${PREFIX}/bin/em
>Index: gmanedit/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/gmanedit/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- gmanedit/Makefile	2001/10/18 15:07:43	1.6
>+++ gmanedit/Makefile	2002/06/20 19:53:06
>@@ -14,6 +14,7 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> USE_BZIP2=	yes
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
>@@ -28,10 +29,11 @@
> 	@${RM} -rf ${WRKSRC}/config.cache
> 
> 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'
>+	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
>+		 's|\$(datadir)/locale|\$(prefix)/share/locale|g'
> 
> .include <bsd.port.mk>
>Index: lfhex/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/lfhex/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- lfhex/Makefile	2001/07/08 14:51:01	1.2
>+++ lfhex/Makefile	2002/06/20 19:53:06
>@@ -15,13 +15,14 @@
> 
> LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
> 
>+USE_REINPLACE=	yes
> USE_QT_VER=	2
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-qt-moc=${MOC}
> USE_GMAKE=	yes
> 
> post-patch:
>-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
>+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
> 		s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: poedit/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/poedit/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- poedit/Makefile	2002/05/08 15:33:29	1.10
>+++ poedit/Makefile	2002/06/20 19:53:08
>@@ -23,6 +23,7 @@
> 		db3:${PORTSDIR}/databases/db3
> 
> PATCH_DIST_ARGS=	-d ${PATCH_WRKSRC} -E ${PATCH_DIST_STRIP} -p1
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> WANT_GNOME=	yes
> GNU_CONFIGURE=	yes
>@@ -42,10 +43,10 @@
> .endif
> 
> 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.post.mk>
>Index: tamago/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/tamago/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- tamago/Makefile	2001/10/28 11:19:19	1.5
>+++ tamago/Makefile	2002/06/20 19:53:09
>@@ -22,6 +22,7 @@
> BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
> RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
> 
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> 
>@@ -31,7 +32,7 @@
> PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
> 
> pre-configure:
>-	@${PERL} -pi -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
>+	@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
> 	    ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>Index: ted/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/ted/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- ted/Makefile	2001/09/16 16:59:23	1.5
>+++ ted/Makefile	2002/06/20 19:53:09
>@@ -20,6 +20,7 @@
> 
> WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
> 
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_MOTIF=	yes
> GNU_CONFIGURE=	yes
>@@ -41,7 +42,7 @@
> 		-e 's,/usr/local/ind,${INDDIR},' \
> 		-e 's,/usr/local/info,${INFODIR},' \
> 		Ted.ad.sample >Ted
>-	${PERL} -pi -e 's|/usr/apps|${LOCALBASE}|g' ${WRKSRC}/bitmap/configure
>+	${REINPLACE_CMD} -e 's|/usr/apps|${LOCALBASE}|g' ${WRKSRC}/bitmap/configure
> 
> post-configure:
> .for dir in appFrame appUtil bitmap ind libreg
>Index: uemacs/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/uemacs/Makefile,v
>retrieving revision 1.15
>diff -u -r1.15 Makefile
>--- uemacs/Makefile	2000/04/14 00:25:45	1.15
>+++ uemacs/Makefile	2002/06/20 19:53:09
>@@ -13,11 +13,12 @@
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>+USE_REINPLACE=	yes
> NO_WRKSUBDIR=	yes
> USE_ZIP=	yes
> EXTRACT_BEFORE_ARGS=	-Laq
> 
> post-patch:
>-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/*.c
>+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/*.c
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 39591: 22882