Bug 39964 - ports/audio misc Makefile cleanup
Summary: ports/audio misc Makefile cleanup
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Tilman Keskinoz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-06-28 23:50 UTC by sf
Modified: 2002-11-18 23:06 UTC (History)
0 users

See Also:


Attachments
patch-cdrdao (397 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-gdcd (475 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-ksmp3play (546 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-libsndfile (468 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-midimountain (682 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-mp3asm (461 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-nas (575 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-pimp3 (403 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-sfront (436 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-xmmix (374 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details
patch-xmpeg3 (384 bytes, text/plain)
2002-06-28 23:50 UTC, sf
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description sf 2002-06-28 23:50:02 UTC

Fix: ${PERL} -> ${REINPLACE_CMD}
	various hardcoded tool names to Mk/bsd.port.mk variable names

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---

--- 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 ---
Comment 1 obraun 2002-06-29 07:42:39 UTC
Most of this, but not everything, has been already submitted as
follow-up to Problem Report ports/39283.

Committer: Please take also a look at Problem Report ports/39283 while
commiting this.

Regards,
         Olli
-- 
IST & IIS _ INF _ UniBwM ___________ http://ist.unibw-muenchen.de/People/obraun/
Tele-Consulting GmbH _______________ http://www.tele-consulting.com/ ___ obraun@
FreeBSD: The Power To Serve ________ http://www.freebsd.org/ ___________________
GnuPG: 0xEF25B1BA Fingerprint: 6A3B 042A 732E 17E4 B6E7 3EAF C0B1 6B7D EF25 B1BA
Comment 2 Tilman Keskinoz freebsd_committer freebsd_triage 2002-11-03 18:25:12 UTC
Responsible Changed
From-To: freebsd-ports->arved

I'll handle this one
Comment 3 Tilman Keskinoz freebsd_committer freebsd_triage 2002-11-18 23:05:58 UTC
State Changed
From-To: open->closed

Committed, thanks