Date: Fri, 28 Jun 2002 15:32:49 -0700 (PDT) From: Scott Flatman <sf@dsinw.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39964: ports/audio misc Makefile cleanup Message-ID: <20020628153205.Q56141-100000@ivymike.foo.kom>
next in thread | raw e-mail | index | archive | help
>Number: 39964
>Category: ports
>Synopsis: ports/audio misc Makefile cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 28 15:50:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Scott Flatman
>Release:
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
${PERL} -> ${REINPLACE_CMD}
various hardcoded tool names to Mk/bsd.port.mk variable names
--- patch-cdrdao begins here ---
--- Makefile.orig Thu Feb 7 14:43:57 2002
+++ Makefile Fri Jun 28 14:44:18 2002
@@ -50,7 +50,7 @@
@${CP} ${FILESDIR}/getopt.h ${WRKSRC}/utils
post-install:
- strip ${PREFIX}/bin/cdrdao
+ ${STRIP} ${PREFIX}/bin/cdrdao
@${INSTALL_PROGRAM} -s ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
@${MKDIR} ${PREFIX}/share/doc/cdrdao
.for i in COPYING CREDITS INSTALL README README.FreeBSD README.PlexDAE \
--- patch-cdrdao ends here ---
--- patch-cheesetracker begins here ---
--- Makefile.orig Sun Jun 9 16:17:13 2002
+++ Makefile Fri Jun 28 14:46:30 2002
@@ -17,6 +17,7 @@
LIB_DEPENDS= sigc:${PORTSDIR}/devel/libsigc++ \
gtkmm:${PORTSDIR}/x11-toolkits/gtk--
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -27,6 +28,6 @@
@${RM} -f ${WRKSRC}/config.cache
post-patch:
- @${PERL} -pi -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp
+ @${REINPLACE_CMD} -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp
.include <bsd.port.mk>
--- patch-cheesetracker ends here ---
--- patch-gdcd begins here ---
--- Makefile.orig Thu Nov 29 14:19:04 2001
+++ Makefile Fri Jun 28 14:48:45 2002
@@ -14,6 +14,7 @@
LIB_DEPENDS= cdaudio.1:${PORTSDIR}/audio/libcdaudio
+USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= yes
USE_AUTOMAKE_VER= 15
@@ -25,7 +26,7 @@
@cd ${WRKSRC}; ${ACLOCAL} -I ${X11BASE}/share/aclocal
pre-build:
- @${PERL} -pi -e "s/autoheader/${AUTOHEADER}/" \
+ @${REINPLACE_CMD} -e "s/autoheader/${AUTOHEADER}/" \
${BUILD_WRKSRC}/Makefile
.include <bsd.port.mk>
--- patch-gdcd ends here ---
--- patch-gsi begins here ---
--- Makefile.orig Fri Jun 7 11:43:26 2002
+++ Makefile Fri Jun 28 14:51:10 2002
@@ -44,10 +44,10 @@
@${INSTALL_DATA} ${WRKSRC}/server.conf/gsi.conf.fbsd \
${PREFIX}/etc/gsi.conf.sample
.for fileNdx in gsi_server gsifile gsiplay
- @strip ${PREFIX}/bin/${fileNdx}
+ @${STRIP} ${PREFIX}/bin/${fileNdx}
.endfor
.for lib in "" cd f midi_pcm mixer pcm synth
- @strip ${PREFIX}/lib/libgsi${lib}.so.[02]
+ @${STRIP} ${PREFIX}/lib/libgsi${lib}.so.[02]
.endfor
@${ECHO} "A sample configuration file was installed as" \
${PREFIX}/etc/gsi.conf.sample.
--- patch-gsi ends here ---
--- patch-ksmp3play begins here ---
--- Makefile.orig Wed Apr 17 05:37:48 2002
+++ Makefile Fri Jun 28 14:53:08 2002
@@ -17,6 +17,7 @@
smpeg:${PORTSDIR}/graphics/smpeg \
gnugetopt:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE= yes
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
GNU_CONFIGURE= yes
CONFIGURE_ENV= SDL_CONFIG=${SDL_CONFIG} \
@@ -24,7 +25,7 @@
MAN1= ksmp3play.1
post-patch:
- @${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
.if !defined(NOPORTDOCS)
post-install:
--- patch-ksmp3play ends here ---
--- patch-libmikmod begins here ---
--- Makefile.orig Wed Mar 6 18:42:36 2002
+++ Makefile Fri Jun 28 14:54:57 2002
@@ -14,6 +14,7 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_ESOUND= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
@@ -26,7 +27,7 @@
@${RM} -f ${WRKSRC}/docs/mikmod.info-*
post-patch:
- @${PERL} -pi -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g ; \
+ @${REINPLACE_CMD} -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g ; \
s|-pthread \$$REENTRANT|\$$REENTRANT ${PTHREAD_CFLAGS}|g ; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
s|-lc_r|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
--- patch-libmikmod ends here ---
--- patch-libsndfile begins here ---
--- Makefile.orig Thu May 2 14:23:37 2002
+++ Makefile Fri Jun 28 14:56:28 2002
@@ -13,6 +13,7 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --enable-justsrc --disable-gcc-pipe
INSTALLS_SHLIB= yes
@@ -21,7 +22,7 @@
new_file_type.HOWTO sndfile_info.html
pre-patch:
- @${PERL} -pi -e 's|-g -O2 ||g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-g -O2 ||g' ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
--- patch-libsndfile ends here ---
--- patch-mhwaveedit begins here ---
--- Makefile.orig Thu May 30 11:07:15 2002
+++ Makefile Fri Jun 28 14:58:06 2002
@@ -16,6 +16,7 @@
LIB_DEPENDS= sndfile.0:${PORTSDIR}/audio/libsndfile
+USE_REINPLACE= yes
USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
@@ -32,7 +33,7 @@
.endif
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|^CFLAGS =.*$$|CFLAGS = \@CFLAGS\@|g'
do-install:
--- patch-mhwaveedit ends here ---
--- patch-midimountain begins here ---
--- Makefile.orig Fri Dec 14 22:52:45 2001
+++ Makefile Fri Jun 28 14:59:28 2002
@@ -15,16 +15,17 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_GTK= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
post-patch:
.for file in midimountain.conf main.cpp
- @${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/midimountain/${file}
+ @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/midimountain/${file}
.endfor
.for dir in pixmaps languages
- ${PERL} -pi -e "s, ${dir}/, ${DATADIR}/${dir}/,g" ${WRKSRC}/midimountain/${dir}/Makefile.in
+ ${REINPLACE_CMD} -e "s, ${dir}/, ${DATADIR}/${dir}/,g" ${WRKSRC}/midimountain/${dir}/Makefile.in
.endfor
.include <bsd.port.mk>
--- patch-midimountain ends here ---
--- patch-mp32ogg begins here ---
--- Makefile.orig Thu May 9 21:29:35 2002
+++ Makefile Fri Jun 28 15:00:41 2002
@@ -19,6 +19,7 @@
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
+USE_REINPLACE= yes
USE_PERL5= yes
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
@@ -27,7 +28,7 @@
NO_BUILD= yes
post-patch:
- @${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/mp32ogg
+ @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/mp32ogg
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/mp32ogg ${PREFIX}/bin
--- patch-mp32ogg ends here ---
--- patch-mp3asm begins here ---
--- Makefile.orig Wed Aug 29 22:09:03 2001
+++ Makefile Fri Jun 28 15:01:52 2002
@@ -14,6 +14,7 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
USE_GMAKE= yes
@@ -24,7 +25,7 @@
@${RM} ${WRKSRC}/config.cache
post-patch:
- @${PERL} -pi -e "s,getprogname,_getprogname,g" ${WRKSRC}/src/mp3asm.c
+ @${REINPLACE_CMD} -e "s,getprogname,_getprogname,g" ${WRKSRC}/src/mp3asm.c
post-install:
.if !defined(NOPORTDOCS)
--- patch-mp3asm ends here ---
--- patch-muse begins here ---
--- Makefile.orig Sun Jun 9 10:40:37 2002
+++ Makefile Fri Jun 28 15:04:22 2002
@@ -20,6 +20,7 @@
vorbis.1:${PORTSDIR}/audio/libvorbis \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_REINPLACE= yes
USE_GTK= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -29,11 +30,11 @@
CONFIGURE_ARGS= --disable-debug
post-patch:
- @${PERL} -pi -e 's|-O3|\$$CFLAGS|g ; \
+ @${REINPLACE_CMD} -e 's|-O3|\$$CFLAGS|g ; \
s|\$$GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \
s|\$$GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \
${WRKSRC}/configure
- @${PERL} -pi -e 's|-lpthread||g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile.in
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/muse ${PREFIX}/bin
--- patch-muse ends here ---
--- patch-nas begins here ---
--- Makefile.orig Sun Dec 30 10:15:33 2001
+++ Makefile Fri Jun 28 15:06:23 2002
@@ -13,6 +13,7 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_IMAKE= yes
ALL_TARGET= World
# no need to "xmkmf -a" and create the Makefiles twice -- see above
@@ -24,8 +25,8 @@
.include "${.CURDIR}/Makefile.man"
post-patch:
- @find ${WRKSRC} -name '*.[ch]' | xargs \
- ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
+ @${FIND} ${WRKSRC} -name '*.[ch]' | xargs \
+ ${REINPLACE} -e "s|<malloc.h>|<stdlib.h>|g"
post-install:
@${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}
--- patch-nas ends here ---
--- patch-oslap begins here ---
--- Makefile.orig Sun Jun 9 10:40:38 2002
+++ Makefile Fri Jun 28 15:08:28 2002
@@ -23,11 +23,12 @@
LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
CONFIGURE_ARGS= --enable-blade --enable-mpg123 --enable-sox
INSTALLS_SHLIB= yes
+USE_REINPLACE= yes
PLIST_SUB= VERSION=${PORTVERSION}
post-patch:
- @${PERL} -pi -e 's|/usr/local/lib/aflib|${PREFIX}/lib/aflib|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local/lib/aflib|${PREFIX}/lib/aflib|g' \
${WRKSRC}/configure
.include <bsd.port.mk>
--- patch-oslap ends here ---
--- patch-pimp3 begins here ---
--- Makefile.orig Sun May 26 06:33:57 2002
+++ Makefile Fri Jun 28 15:12:09 2002
@@ -19,9 +19,10 @@
NO_BUILD= yes
USE_PYTHON= yes
+USE_REINPLACE= yes
post-patch:
- @${PERL} -pi -ne "s!/usr/bin/python!${LOCALBASE}/bin/python!;" ${WRKSRC}/pimp3.py
+ @${REINPLACE_CMD} -ne "s!/usr/bin/python!${LOCALBASE}/bin/python!;" ${WRKSRC}/pimp3.py
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/*.py ${PREFIX}/bin/
--- patch-pimp3 ends here ---
--- patch-rawrec begins here ---
--- Makefile.orig Sun Jun 9 10:40:38 2002
+++ Makefile Fri Jun 28 15:13:55 2002
@@ -21,6 +21,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/src
+USE_REINPLACE= yes
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}" \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
@@ -30,7 +31,7 @@
MLINKS= rawrec.1 rawplay.1
post-patch:
- @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${PERL} -pi -e \
+ @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
's|<linux/soundcard.h>|<sys/soundcard.h>|g'
do-install:
--- patch-rawrec ends here ---
--- patch-sfront begins here ---
--- Makefile.orig Sat May 25 09:51:12 2002
+++ Makefile Fri Jun 28 15:16:07 2002
@@ -14,12 +14,13 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_BISON= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/src
ALL_TARGET= # empty
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}/../bin/sfront ${PREFIX}/bin
--- patch-sfront ends here ---
--- patch-xmixer begins here ---
--- Makefile.orig Mon Feb 19 14:58:15 2001
+++ Makefile Fri Jun 28 15:20:02 2002
@@ -16,11 +16,12 @@
USE_GTK= yes
USE_AUTOCONF= yes
+USE_REINPLACE= yes
MAN1= xmixer.1
MLINKS= xmixer.1 xgmixer.1
pre-patch:
- @find ${WRKSRC} -type f | xargs ${PERL} -pi -e 's|rxvt -e|xterm -e|g'
+ @${FIND} ${WRKSRC} -type f | xargs ${REINPLACE_CMD} -e 's|rxvt -e|xterm -e|g'
.include <bsd.port.mk>
--- patch-xmixer ends here ---
--- patch-xmmix begins here ---
--- Makefile.orig Sun Dec 10 18:02:16 2000
+++ Makefile Fri Jun 28 15:21:16 2002
@@ -13,12 +13,13 @@
MAINTAINER= ports@FreeBSD.org
+USE_REINPLACE= yes
USE_IMAKE= yes
USE_MOTIF= yes
MAN1= xmmix.1
post-patch:
- @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMmix.ad
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMmix.ad
.include <bsd.port.mk>
--- patch-xmmix ends here ---
--- patch-xmp begins here ---
--- Makefile.orig Sat Dec 8 18:27:21 2001
+++ Makefile Fri Jun 28 15:22:34 2002
@@ -21,6 +21,7 @@
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include"
USE_AUTOCONF= yes
WANT_ESOUND= yes
+USE_REINPLACE= yes
.include <bsd.port.pre.mk>
@@ -36,6 +37,6 @@
MLINKS= xmp.1 xxmp.1
post-patch:
- @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
.include <bsd.port.post.mk>
--- patch-xmp ends here ---
--- patch-xmpeg3 begins here ---
--- Makefile.orig Sat Apr 8 14:25:00 2000
+++ Makefile Fri Jun 28 15:23:41 2002
@@ -19,9 +19,10 @@
WRKSRC= ${WRKDIR}/xmpeg3
NO_BUILD= yes
+USE_REINPLACE= yes
post-patch:
- @/usr/bin/perl -pi -e "s|\@\@PREFIX\@\@|${PREFIX}|;" ${WRKSRC}/xmpeg3
+ @${REINPLACE_CMD} -e "s|\@\@PREFIX\@\@|${PREFIX}|;" ${WRKSRC}/xmpeg3
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/xmpeg3 ${PREFIX}/bin
--- patch-xmpeg3 ends here ---
>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?20020628153205.Q56141-100000>