FreeBSD Bugzilla – Attachment 28289 Details for
Bug 47651
unPERLify ports/audio
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 12.68 KB, created by
corecode@corecode.ath.cx
on 2003-01-30 00:20:02 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
corecode@corecode.ath.cx
Created:
2003-01-30 00:20:02 UTC
Size:
12.68 KB
patch
obsolete
>Index: denemo/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/denemo/Makefile,v >retrieving revision 1.8 >diff -u -r1.8 Makefile >--- denemo/Makefile 31 Aug 2002 00:13:05 -0000 1.8 >+++ denemo/Makefile 29 Jan 2003 21:14:49 -0000 >@@ -13,44 +13,48 @@ > > MAINTAINER= trevor@FreeBSD.org > >-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ >- intl.4:${PORTSDIR}/devel/gettext \ >+LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ > xml.5:${PORTSDIR}/textproc/libxml > > GNU_CONFIGURE= yes > PLIST= ${WRKDIR}/pkg-plist > SHARED= denemo.conf denemo.keymaprc english.keymaprc french.keymaprc > DOCS= AUTHORS ChangeLog DESIGN GOALS NEWS README TODO >-DOCDIR= share/doc/${PORTNAME} > USE_GNOMENG= yes > USE_GNOME= gtk12 > USE_X_PREFIX= yes >+USE_REINPLACE= yes >+ >+.if !exists(/usr/include/getopt.h) >+LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt >+LIBGETOPT= -lgnugetopt >+.endif > > post-configure: >- ${PERL} -pi -e "s:module12:module12 -lgnugetopt:g" ${WRKSRC}/Makefile >- ${PERL} -pi -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c >+ ${REINPLACE_CMD} -e "s:module12:module12 ${LIBGETOPT}:g" ${WRKSRC}/Makefile >+ ${REINPLACE_CMD} -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c > > pre-install: > ${ECHO_CMD} bin/${PORTNAME} > ${PLIST} > .for i in ${SHARED} >- ${ECHO_CMD} share/denemo/$i >> ${PLIST} >+ ${ECHO_CMD} ${DATADIR:C#${PREFIX}/##}/$i >> ${PLIST} > .endfor > .for i in ${DOCS} >- ${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST} >+ ${ECHO_CMD} ${DOCSDIR:C#${PREFIX}/##}/$i >> ${PLIST} > .endfor >- ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} >- ${ECHO_CMD} @dirrm share/denemo >> ${PLIST} >+ ${ECHO_CMD} @dirrm ${DOCSDIR:C#${PREFIX}/##} >> ${PLIST} >+ ${ECHO_CMD} @dirrm ${DATADIR:C#${PREFIX}/##} >> ${PLIST} > > do-install: >- ${MKDIR} ${PREFIX}/share/denemo >+ ${MKDIR} ${DATADIR} > ${INSTALL_PROGRAM} ${WRKSRC}/denemo ${PREFIX}/bin > .for i in ${SHARED} >- ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/denemo >+ ${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR} > .endfor > .if !defined(NOPORTDOCS) >- ${MKDIR} ${PREFIX}/${DOCDIR} >+ ${MKDIR} ${DOCSDIR} > .for i in ${DOCS} >- ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR} >+ ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} > .endfor > .endif > >Index: ecasound/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/ecasound/Makefile,v >retrieving revision 1.10 >diff -u -r1.10 Makefile >--- ecasound/Makefile 14 Jan 2003 04:17:21 -0000 1.10 >+++ ecasound/Makefile 29 Jan 2003 21:17:32 -0000 >@@ -15,6 +15,7 @@ > USE_GMAKE= yes > USE_AUTOMAKE_VER=14 > USE_LIBTOOL= yes >+USE_REINPLACE= yes > INSTALLS_SHLIB= yes > > CONFIGURE_ARGS+= --enable-sys-readline >@@ -34,8 +35,8 @@ > > .if defined(WITH_AUDIOFILE) > # very crappy hack to detect audiofile properly >-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ >- LDFLAGS="-L${LOCALBASE}/lib" \ >+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \ >+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \ > CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ > CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" > LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile >@@ -70,7 +71,7 @@ > > post-patch: > .if !defined(WITH_OPTIMIZED_CFLAGS) >- @${PERL} -pi -e 's!-O2 -ffast-math!!' ${WRKSRC}/kvutils/Makefile.am >+ @${REINPLACE_CMD} -e 's!-O2 -ffast-math!!' ${WRKSRC}/kvutils/Makefile.am > .endif > > post-install: >Index: ecawave/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/ecawave/Makefile,v >retrieving revision 1.2 >diff -u -r1.2 Makefile >--- ecawave/Makefile 26 Dec 2002 10:59:33 -0000 1.2 >+++ ecawave/Makefile 29 Jan 2003 21:20:07 -0000 >@@ -17,6 +17,7 @@ > GNU_CONFIGURE= yes > USE_QT_VER= 2 > USE_X_PREFIX= yes >+USE_REINPLACE= yes > > CFLAGS+= ${PTHREAD_CFLAGS:S/"//g} > LDFLAGS+= ${PTHREAD_LIBS:S/"//g} >@@ -28,7 +29,7 @@ > MAN1= ecawave.1 > > post-patch: >- @${PERL} -pi -e 's,-lqt,-lqt2,g' ${WRKSRC}/src/Makefile.in >+ @${REINPLACE_CMD} -e 's,-lqt,-lqt2,g' ${WRKSRC}/src/Makefile.in > > post-install: > .if !defined(NOPORTDOCS) >Index: pd/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/pd/Makefile,v >retrieving revision 1.1 >diff -u -r1.1 Makefile >--- pd/Makefile 25 May 2002 11:48:29 -0000 1.1 >+++ pd/Makefile 29 Jan 2003 21:21:24 -0000 >@@ -25,20 +25,21 @@ > PLIST= ${WRKDIR}/pkg-plist > USE_GMAKE= yes > USE_X_PREFIX= yes >+USE_REINPLACE= yes > WRKSRC= ${WRKDIR}/pd-0.35-test23/src > > pre-patch: > ${CP} ${WRKSRC}/s_linux.c ${WRKSRC}/s_freebsd.c > > post-patch: >- ${FIND} ${WRKDIR} -type f -name '*.c' -exec ${PERL} -pi -e \ >+ ${FIND} ${WRKDIR} -type f -name '*.c' -exec ${REINPLACE_CMD} -e \ > "s:malloc.h:stdlib.h:g" {} \; > > pre-configure: > ${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT} > > post-configure: >- ${PERL} -pi -e \ >+ ${REINPLACE_CMD} -e \ > "s:^INCLUDE = :INCLUDE = -I${LOCALBASE}/include/tk8.3 -I${LOCALBASE}/include/tcl8.3 -I${X11BASE}/include :g; s:^LIB =:LIB =${PTHREAD_LIBS}:g; s:^CFLAGS =:CFLAGS+=${PTHREAD_CFLAGS}:g" \ > ${WRKSRC}/makefile > >Index: rosegarden/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/rosegarden/Makefile,v >retrieving revision 1.17 >diff -u -r1.17 Makefile >--- rosegarden/Makefile 19 Dec 2000 08:34:51 -0000 1.17 >+++ rosegarden/Makefile 29 Jan 2003 21:21:52 -0000 >@@ -17,6 +17,7 @@ > RUN_DEPENDS= ${LOCALBASE}/lib/tclmidi/tclmidi31.so:${PORTSDIR}/audio/tclmidi > > USE_X_PREFIX= yes >+USE_REINPLACE= yes > USE_AUTOCONF= yes > CONFIGURE_ENV= MAKEDEPEND=${TRUE} > CONFIGURE_ARGS= --with-tclincl=${LOCALBASE}/include/tcl8.2 >@@ -24,7 +25,7 @@ > post-patch: > @${CP} ${FILESDIR}/rosegarden ${WRKSRC}/rosegarden.sh > .for file in Rosegarden rosegarden.sh >- @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} >+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} > .endfor > > do-install: >Index: sdl_mixer/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/sdl_mixer/Makefile,v >retrieving revision 1.17 >diff -u -r1.17 Makefile >--- sdl_mixer/Makefile 2 Jan 2003 15:06:01 -0000 1.17 >+++ sdl_mixer/Makefile 29 Jan 2003 21:22:55 -0000 >@@ -22,12 +22,13 @@ > > USE_LIBTOOL= yes > USE_GMAKE= yes >+USE_REINPLACE= yes > INSTALLS_SHLIB= yes > CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ > CPPFLAGS="-I${X11BASE}/include" > > post-configure: >- @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ >+ @${REINPLACE_CMD} -e 's|^\(deplibs_check_method=\).*|\1pass_all|' \ > ${WRKSRC}/libtool > > .include <bsd.port.mk> >Index: snd/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/snd/Makefile,v >retrieving revision 1.26 >diff -u -r1.26 Makefile >--- snd/Makefile 20 Jan 2003 10:02:03 -0000 1.26 >+++ snd/Makefile 29 Jan 2003 21:26:10 -0000 >@@ -74,11 +74,12 @@ > USE_GNOMENG= yes > USE_GNOME= gtk12 > USE_XLIB= yes >+USE_REINPLACE= yes > .endif > WRKSRC= ${WRKDIR}/snd-5 > > post-configure: >- @${PERL} -pi -e "s: -ldl::g" ${WRKSRC}/makefile >+ @${REINPLACE_CMD} -e "s: -ldl::g" ${WRKSRC}/makefile > > pre-install: > ${ECHO_CMD} bin/snd > ${PLIST} >@@ -93,14 +94,14 @@ > ${ECHO_CMD} share/doc/snd/${i} >> ${PLIST} > .endfor > ${FIND} ${WRKDIR} -name '*.html' | \ >- ${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST} >+ ${SED} -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST} > ${FIND} ${WRKDIR} -name '*.png' | \ >- ${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST} >+ ${SED} -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST} > ${ECHO_CMD} "@dirrm share/doc/snd" >> ${PLIST} > .endif > .if !defined(WITHOUT_GUILE) > ${FIND} ${WRKSRC} -name '*.scm' | \ >- ${PERL} -pi -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST} >+ ${SED} -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST} > ${ECHO_CMD} "share/snd/contrib/dlp/README" >> ${PLIST} > ${ECHO_CMD} "@dirrm share/snd/contrib/dlp" >> ${PLIST} > ${ECHO_CMD} "@dirrm share/snd/contrib" >> ${PLIST} >Index: soribada/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/soribada/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- soribada/Makefile 31 Aug 2002 00:13:18 -0000 1.6 >+++ soribada/Makefile 29 Jan 2003 21:31:04 -0000 >@@ -16,12 +16,13 @@ > LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext > > USE_X_PREFIX= yes >+USE_REINPLACE= yes > USE_GNOMENG= yes > USE_GNOME= gtk12 > USE_GMAKE= yes > GNU_CONFIGURE= yes > > pre-patch: >- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure >+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure > > .include <bsd.port.mk> >Index: sphinx/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/sphinx/Makefile,v >retrieving revision 1.11 >diff -u -r1.11 Makefile >--- sphinx/Makefile 13 Oct 2002 04:52:51 -0000 1.11 >+++ sphinx/Makefile 29 Jan 2003 21:31:51 -0000 >@@ -18,6 +18,7 @@ > INSTALLS_SHLIB= yes > PKGMESSAGE= ${WRKDIR}/pkg-message > USE_GMAKE= yes >+USE_REINPLACE= yes > > IGNORE= "audio read error" > >@@ -25,7 +26,7 @@ > ONLY_FOR_ARCHS= i386 > > post-patch: >- ${FIND} ${WRKSRC} -type f -exec ${PERL} -pi -e \ >+ ${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -e \ > "s:<malloc.h>:<stdlib.h>:g" {} \; > > post-build: >Index: spiralloops/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/spiralloops/Makefile,v >retrieving revision 1.8 >diff -u -r1.8 Makefile >--- spiralloops/Makefile 24 May 2002 00:45:17 -0000 1.8 >+++ spiralloops/Makefile 29 Jan 2003 21:34:30 -0000 >@@ -15,6 +15,7 @@ > > LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk > >+USE_REINPLACE= yes > DOCDIR= share/doc/${PORTNAME} > DOC_FILES= CHANGES COPYING README > GNU_CONFIGURE= yes >@@ -25,8 +26,8 @@ > WRKSRC= ${WRKDIR}/${DISTNAME} > > post-patch: >- ${PERL} -pi -e "s:-ldl::g; s:^CFLAGS:XCFLAGS:g; s:^CXXFLAGS:XCXXFLAGS:g; s:usr/X11R6:${PREFIX}:g" ${WRKSRC}/Makefile.in >- ${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ >+ ${REINPLACE_CMD} -e 's:-ldl::g; s:^CFLAGS:#CFLAGS:g; s:^CXXFLAGS:#CXXFLAGS:g; s:usr/X11R6:${PREFIX}:g' ${WRKSRC}/Makefile.in >+ ${REINPLACE_CMD} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ > s|CFLAGS =|CFLAGS +=|g ; \ > s|CXXFLAGS=|CXXFLAGS+=|g ; \ > s|-lm|${PTHREAD_LIBS} -lm|g ; \ >Index: spiralsynth/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/spiralsynth/Makefile,v >retrieving revision 1.6 >diff -u -r1.6 Makefile >--- spiralsynth/Makefile 23 May 2002 12:34:02 -0000 1.6 >+++ spiralsynth/Makefile 29 Jan 2003 21:35:26 -0000 >@@ -20,13 +20,14 @@ > PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" > PLIST= ${WRKDIR}/pkg-plist > USE_X_PREFIX= yes >+USE_REINPLACE= yes > > WRKSRC= ${WRKDIR}/${DISTNAME} > > DOC_FILES= CHANGES COPYING README > > post-patch: >- ${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ >+ ${REINPLACE_CMD} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ > s|CFLAGS =|CFLAGS +=|g ; \ > s|CXXFLAGS=|CXXFLAGS+=|g ; \ > s|-lm|${PTHREAD_LIBS} -lm|g ; \ >@@ -34,7 +35,7 @@ > ${WRKSRC}/PluginLink.sh > # Use as a plugin to SpiralLoops 2.0.0 results in "Can't open audio driver." > .if defined(PLUGIN) >- ${PERL} -pi -e 's|^//#define PLUGIN|#define PLUGIN|g' \ >+ ${REINPLACE_CMD} -e 's|^//#define PLUGIN|#define PLUGIN|g' \ > ${WRKSRC}/Synth.C > > post-build: >Index: spiralsynthbaby/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/spiralsynthbaby/Makefile,v >retrieving revision 1.7 >diff -u -r1.7 Makefile >--- spiralsynthbaby/Makefile 24 May 2002 00:38:17 -0000 1.7 >+++ spiralsynthbaby/Makefile 29 Jan 2003 21:36:35 -0000 >@@ -20,13 +20,14 @@ > PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" > PLIST= ${WRKSRC}/pkg-plist > USE_X_PREFIX= yes >+USE_REINPLACE= yes > > WRKSRC= ${WRKDIR}/${DISTNAME} > > DOC_FILES= CHANGES COPYING README > > post-patch: >- ${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ >+ ${REINPLACE_CMD} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ > s|CFLAGS =|CFLAGS +=|g ; \ > s|CXXFLAGS=|CXXFLAGS+=|g ; \ > s|-lm|${PTHREAD_LIBS} -lm|g ; \ >Index: sweep/Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/sweep/Makefile,v >retrieving revision 1.4 >diff -u -r1.4 Makefile >--- sweep/Makefile 29 Mar 2001 16:32:48 -0000 1.4 >+++ sweep/Makefile 29 Jan 2003 21:39:30 -0000 >@@ -14,6 +14,7 @@ > MAINTAINER= sobomax@FreeBSD.org > > USE_X_PREFIX= yes >+USE_REINPLACE= yes > USE_GNOME= yes > USE_GMAKE= yes > USE_LIBTOOL= yes >@@ -24,10 +25,10 @@ > MAN1= sweep.1 > > 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/|\1|g ; \ >+ s|\$$(datadir)/locale|$$(prefix)/share/locale|g' > > .include <bsd.port.mk>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 47651
: 28289