Attachment 28290 Details for Bug 47652 – file.diff

[patch] file.diff

file.diff (text/plain), 8.49 KB, created by corecode@corecode.ath.cx on 2003-01-30 00:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: corecode@corecode.ath.cx

Created: 2003-01-30 00:20:04 UTC

Size: 8.49 KB

patch

obsolete

>Index: celestia/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/celestia/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- celestia/Makefile	30 Aug 2002 03:20:17 -0000	1.4
>+++ celestia/Makefile	29 Jan 2003 16:36:12 -0000
>@@ -20,6 +20,7 @@
> 
> GNU_CONFIGURE=	yes
> PLIST=		${WRKDIR}/pkg-plist
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
> USE_MESA=	yes
> USE_X_PREFIX=	yes
>@@ -34,18 +35,18 @@
> CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/GL -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
> 
> pre-patch:
>-	${PERL} -pi -e \
>-"s:-O2::g; s:-Wall::g; s:-ffast-math::g; s:-fexpensive-optimizations::g; s:\!\ /bin/sh:\!\ ${LOCALBASE}/bin/bash:g" \
>+	${REINPLACE_CMD} -e \
>+'s:-O2::g; s:-Wall::g; s:-ffast-math::g; s:-fexpensive-optimizations::g; s:! /bin/sh:! ${LOCALBASE}/bin/bash:g' \
> 	${WRKSRC}/configure
> 
> pre-install:
> 	${ECHO_CMD} bin/celestia > ${PLIST}
> 	${FIND} ${WRKSRC}/data/ -name '*.???' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> 	${FIND} ${WRKSRC}/extras/ -name '*.ssc' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> 	${FIND} ${WRKSRC}/fonts/ -name '*.txf' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> .for ii in celestia.cfg demo.cel guide.cel start.cel
> 	${ECHO_CMD} share/celestia/${ii} >> ${PLIST}
> .endfor
>@@ -54,17 +55,17 @@
> 	${ECHO_CMD} share/doc/celestia/${ii} >> ${PLIST}
> .endfor
> 	 ${FIND} ${WRKSRC}/manual/ -name '*.???*' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/doc/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/doc/celestia/:g" >> ${PLIST}
> .for ii in celestia/manual celestia
> 	${ECHO_CMD} @dirrm share/doc/${ii} >> ${PLIST}
> .endfor
> .endif
> 	${FIND} ${WRKSRC}/models/ -name '*.???' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> 	${FIND} ${WRKSRC}/shaders/ -name '*.vp' | \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> 	${FIND} ${WRKSRC}/textures/ -name '*.jpg' -o -name '*.png'| \
>-		${PERL} -pi -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
>+		${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
> .for ii in /data /extras /textures/lores /textures/medres /textures /models \
> 	/shaders /fonts /
> 	${ECHO_CMD} @dirrm share/celestia${ii} >> ${PLIST}
>Index: gkrellmseti/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/gkrellmseti/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- gkrellmseti/Makefile	30 Aug 2002 03:20:18 -0000	1.3
>+++ gkrellmseti/Makefile	29 Jan 2003 16:30:56 -0000
>@@ -18,6 +18,7 @@
> RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
> 
> USE_BZIP2=	yes
>+USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
> USE_GNOMENG=	yes
> USE_GNOME=	imlib
>@@ -26,11 +27,11 @@
> DOC_FILES=	AUTHORS README TODO
> 
> post-patch:
>-	@${PERL} -pi -e "s|gtk-config|${GTK_CONFIG}|; s|imlib-config|${IMLIB_CONFIG}|; \
>-		s|DBGFLAGS= -O3||; s|gcc|${CC}|; s|(CFLAGS)=|\1+=|; \
>-		s|(LDFLAGS)=|\1+=|; s|/usr/X11R6|${PREFIX}|" \
>+	@${REINPLACE_CMD} -e "s|gtk-config|${GTK_CONFIG}|; s|imlib-config|${IMLIB_CONFIG}|; \
>+		s|DBGFLAGS= -O3||; s|gcc|${CC}|; s|CFLAGS=|CFLAGS+=|; \
>+		s|LDFLAGS=|LDFLAGS+=|; s|/usr/X11R6|${PREFIX}|" \
> 		${WRKSRC}/Makefile
>-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/seti.c
>+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/seti.c
> 
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/seti.so \
>Index: glunarclock/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/glunarclock/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- glunarclock/Makefile	18 Sep 2002 19:00:03 -0000	1.13
>+++ glunarclock/Makefile	29 Jan 2003 16:31:30 -0000
>@@ -28,7 +28,7 @@
> 	@${RM} -f ${WRKSRC}/config.cache
> 
> post-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
> 
> .include <bsd.port.mk>
>Index: spacechart/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/spacechart/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- spacechart/Makefile	30 Aug 2002 03:20:22 -0000	1.8
>+++ spacechart/Makefile	29 Jan 2003 16:34:31 -0000
>@@ -17,6 +17,7 @@
> LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
> 
> USE_X_PREFIX=	yes
>+USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> USE_GNOMENG=	yes
> USE_GNOME=	gnomelibs
>@@ -24,7 +25,7 @@
> 
> # trick it into using ports installed gettext
> post-patch:
>-	@${PERL} -pi -ne "s|(INTLLIBS =).*$$|\1-I${LOCALBASE}/lib -lintl|" \
>+	@${REINPLACE_CMD} -e 's|$INTLLIBS =$.*$$|\1-I${LOCALBASE}/lib -lintl|' \
> 		${WRKSRC}/src/Makefile.in
> 
> pre-build:
>Index: starplot/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/starplot/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- starplot/Makefile	30 Aug 2002 03:20:23 -0000	1.5
>+++ starplot/Makefile	29 Jan 2003 16:37:16 -0000
>@@ -13,6 +13,7 @@
> MAINTAINER=	pat@FreeBSD.org
> 
> USE_X_PREFIX=	yes
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
> USE_GNOMENG=	yes
> USE_GNOME=	gtk12
>@@ -23,10 +24,10 @@
> MAN1=		starplot.1 starconvert.1
> 
> pre-patch:
>-	@${PERL} -pi.orig -e 's|DATADIR|${DATADIR}|; s|DOCDIR|${DOCSDIR}|; \
>+	@${REINPLACE_CMD} -e 's|DATADIR|${DATADIR}|; s|DOCDIR|${DOCSDIR}|; \
> 		s|BINARYNAME|${PORTNAME}|; s|CONVERTNAME|starconvert|' \
> 		${WRKSRC}/doc/man/*
>-	@${PERL} -pi.orig -e 's|/usr/local/share/starplot|${DATADIR}|; \
>+	@${REINPLACE_CMD} -e 's|/usr/local/share/starplot|${DATADIR}|; \
> 		s|/usr/local/share/doc/starplot|${DOCSDIR}|' \
> 		${WRKSRC}/gui/starplot.h
> 
>Index: wmjupiter/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/wmjupiter/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- wmjupiter/Makefile	17 Jan 2002 02:33:15 -0000	1.2
>+++ wmjupiter/Makefile	29 Jan 2003 16:37:51 -0000
>@@ -14,11 +14,12 @@
> 
> WRKSRC=		${WRKDIR}/wmJupiter
> USE_X_PREFIX=	yes
>+USE_REINPLACE=	yes
> USE_XPM=	yes
> USE_GMAKE=	yes
> 
> pre-patch:
>-	@${PERL} -pi.orig -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \
>+	@${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \
> 		${WRKSRC}/wmJupiter.c
> 
> do-install:
>Index: xplanet/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/xplanet/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- xplanet/Makefile	6 Jul 2002 10:13:38 -0000	1.19
>+++ xplanet/Makefile	29 Jan 2003 16:39:20 -0000
>@@ -19,10 +19,10 @@
> 		png.5:${PORTSDIR}/graphics/png \
> 		tiff.4:${PORTSDIR}/graphics/tiff \
> 		netpbm.1:${PORTSDIR}/graphics/netpbm
>-
> RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
> 
> USE_X_PREFIX=	yes
>+USE_REINPLACE=	yes
> USE_MESA=	yes
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>@@ -43,10 +43,10 @@
> .include <bsd.port.pre.mk>
> 
> pre-configure:
>-	@${PERL} -pi -e 's|-O3||' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/configure
> 
> pre-build:
>-	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/auxfiles.h
>+	@${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/auxfiles.h
> 
> # Install the list of FreeBSD sites & committers locations from astro/xearth
> post-install:
>Index: xtide/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/xtide/Makefile,v
>retrieving revision 1.21
>diff -u -r1.21 Makefile
>--- xtide/Makefile	23 Nov 2002 02:25:39 -0000	1.21
>+++ xtide/Makefile	29 Jan 2003 22:21:25 -0000
>@@ -20,6 +20,7 @@
> 
> USE_XPM=	yes
> USE_X_PREFIX=	yes
>+USE_REINPLACE=	yes
> GNU_CONFIGURE=	yes
> MAN1=	xtide.1 tide.1
> MANCOMPRESSED=	no
>@@ -28,14 +29,14 @@
> 	@${GZCAT} ${DISTDIR}/harmonics.txt.gz > ${WRKSRC}/harmonics
> 
> post-patch:
>-	@${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/TideContext.cc
>+	@${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/TideContext.cc
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xtide.1 ${PREFIX}/man/man1/xtide.1
> 	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/tide.1 ${PREFIX}/man/man1/tide.1
>-	@${MKDIR} ${PREFIX}/share/xtide
>-	${INSTALL_DATA} ${WRKSRC}/harmonics ${PREFIX}/share/xtide
>+	@${MKDIR} ${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/harmonics ${DATADIR}
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 47652: 28290