diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-06-04 22:43:38 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-06-04 22:43:38 +0000 |
commit | 93872f18cc0a948ab9c010bbe5694579bd59f8c4 (patch) | |
tree | 918c0e1660ed837a4087b57670a1b1c181c285e0 /audio | |
parent | Remove some local changes that crept in with the previous commit. (diff) |
Move inclusion of bsd.port.pre.mk later in the file for conditional BROKEN
tag. Early inclusion caused problems for some ports, so to be safe I'm
updating all of them.
Pointy hat to: kris
Notes
Notes:
svn path=/head/; revision=82300
Diffstat (limited to 'audio')
-rw-r--r-- | audio/denemo/Makefile | 12 | ||||
-rw-r--r-- | audio/fcplay/Makefile | 12 | ||||
-rw-r--r-- | audio/mq3/Makefile | 12 | ||||
-rw-r--r-- | audio/rebler/Makefile | 12 | ||||
-rw-r--r-- | audio/spiralloops/Makefile | 12 | ||||
-rw-r--r-- | audio/spiralsynth/Makefile | 12 |
6 files changed, 36 insertions, 36 deletions
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 1175c1ea37b1..93d0ed8a945c 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -18,12 +18,6 @@ LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ intl.4:${PORTSDIR}/devel/gettext \ xml.5:${PORTSDIR}/textproc/libxml -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - GNU_CONFIGURE= yes PLIST= ${WRKDIR}/pkg-plist SHARED= denemo.conf denemo.keymaprc english.keymaprc french.keymaprc @@ -32,6 +26,12 @@ DOCDIR= share/doc/${PORTNAME} USE_GNOME= gtk12 USE_X_PREFIX= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile" +.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 diff --git a/audio/fcplay/Makefile b/audio/fcplay/Makefile index 5cd127714117..fa6adad9f573 100644 --- a/audio/fcplay/Makefile +++ b/audio/fcplay/Makefile @@ -18,12 +18,6 @@ COMMENT= Future Composer Reference Player BUILD_DEPENDS= ${LOCALBASE}/include/sidplay/compconf.h:${PORTSDIR}/audio/libsidplay -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes @@ -31,6 +25,12 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CXXFLAGS+= -I${LOCALBASE}/include +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + post-patch: .for f in configure Config.h.in @${REINPLACE_CMD} -e "s@machine/soundcard\.h@sys/soundcard\.h@g; \ diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile index ff72a6d58f59..f823b1470906 100644 --- a/audio/mq3/Makefile +++ b/audio/mq3/Makefile @@ -19,12 +19,6 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ qthreads.15:${PORTSDIR}/lang/guile BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not build" -.endif - USE_QT_VER= 2 QT_NONSTANDARD= yes HAS_CONFIGURE= yes @@ -34,4 +28,10 @@ MAKE_ENV= CPPFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib}" \ QTDIR="${X11BASE}" CONFIGURE_ARGS= -prefix ${PREFIX} -platform FreeBSD +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not build" +.endif + .include <bsd.port.post.mk> diff --git a/audio/rebler/Makefile b/audio/rebler/Makefile index f8fb6cd2541c..b1b8645dd30b 100644 --- a/audio/rebler/Makefile +++ b/audio/rebler/Makefile @@ -19,12 +19,6 @@ LIB_DEPENDS= mpeg2:${PORTSDIR}/multimedia/libmpeg2 \ aviplay.0:${PORTSDIR}/multimedia/avifile \ popt:${PORTSDIR}/devel/popt -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - USE_BZIP2= yes AVIFILE_CONFIG?= ${LOCALBASE}/bin/avifile-config CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ @@ -32,6 +26,12 @@ CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ LIBS+= -L${LOCALBASE}/lib -lm -lmpeg2 ${PTHREAD_LIBS} \ `${AVIFILE_CONFIG} --libs` -lpopt +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + do-build: @(cd ${WRKSRC} ; \ ${CXX} ${CXXFLAGS} rebler.cpp -o rebler ${LIBS}) diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index 4281e4f02af5..7575ee103b36 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -16,12 +16,6 @@ COMMENT= Loop-based sampler LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - DOCDIR= share/doc/${PORTNAME} DOC_FILES= CHANGES COPYING README GNU_CONFIGURE= yes @@ -31,6 +25,12 @@ PLIST= ${WRKDIR}/pkg-plist USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${DISTNAME} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + 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 ; \ diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 3a14db670757..3a8638e6e3c7 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -16,12 +16,6 @@ COMMENT= MIDI-capable synthesizer for X LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - GNU_CONFIGURE= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" @@ -32,6 +26,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME} DOC_FILES= CHANGES COPYING README +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + post-patch: ${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ s|CFLAGS =|CFLAGS +=|g ; \ |