diff options
35 files changed, 105 insertions, 86 deletions
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index ea6327646e1..6f377d86b8d 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:32 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/12 23:15:01 salo Exp $ # DISTNAME= SDL_mixer-1.2.5 @@ -28,8 +28,8 @@ post-install: ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin -.include "../../audio/libogg/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/smpeg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/arts/Makefile b/audio/arts/Makefile index db65f2f2c2c..4450caacd6e 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/09 11:11:15 markd Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/12 23:15:01 salo Exp $ DISTNAME= arts-1.2.1 CATEGORIES= audio @@ -19,10 +19,11 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "../../audio/esound/buildlink2.mk" .include "../../audio/libaudiofile/buildlink2.mk" .include "../../audio/libmad/buildlink2.mk" -.include "../../audio/libogg/buildlink2.mk" .include "../../audio/libvorbis/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" .include "../../meta-pkgs/kde3/buildlink2.mk" +.include "../../multimedia/libogg/buildlink2.mk" + .include "../../mk/ossaudio.buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" diff --git a/audio/arts/buildlink2.mk b/audio/arts/buildlink2.mk index f5b8986ae4e..fa9c953b113 100644 --- a/audio/arts/buildlink2.mk +++ b/audio/arts/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.16 2004/02/06 13:48:05 tron Exp $ +# $NetBSD: buildlink2.mk,v 1.17 2004/04/12 23:15:01 salo Exp $ # # This Makefile fragment is included by packages that use arts. @@ -61,9 +61,10 @@ BUILDLINK_FILES.arts+= lib/mcop/x11globalcomm.mcoptype .include "../../audio/esound/buildlink2.mk" .include "../../audio/libaudiofile/buildlink2.mk" .include "../../audio/libmad/buildlink2.mk" -.include "../../audio/libogg/buildlink2.mk" .include "../../audio/libvorbis/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" +.include "../../multimedia/libogg/buildlink2.mk" + .include "../../mk/ossaudio.buildlink2.mk" BUILDLINK_TARGETS+= arts-buildlink diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk index c814e5f8dc1..b9c4d435917 100644 --- a/audio/arts/buildlink3.mk +++ b/audio/arts/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/04/12 23:15:01 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+ @@ -18,9 +18,10 @@ BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts .include "../../audio/esound/buildlink3.mk" .include "../../audio/libaudiofile/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/ossaudio.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index c82cc2eca24..3ac6436ce27 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/11 18:10:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:15:01 salo Exp $ # .include "Makefile.common" @@ -6,6 +6,7 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-oss/--enable-oss/} CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-vorbis/--enable-vorbis/} -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 44a09ec58df..f77396022eb 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/18 17:39:27 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/12 23:15:01 salo Exp $ # DISTNAME= flac-1.1.0 @@ -32,5 +32,6 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm BUILDLINK_TRANSFORM+= S:-O3: .endif -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/flac/buildlink2.mk b/audio/flac/buildlink2.mk index 34083a92528..450ca1ed8a2 100644 --- a/audio/flac/buildlink2.mk +++ b/audio/flac/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/12/08 14:42:44 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/04/12 23:15:01 salo Exp $ .if !defined(FLAC_BUILDLINK2_MK) FLAC_BUILDLINK2_MK= # defined @@ -18,7 +18,7 @@ BUILDLINK_FILES.flac+= lib/libFLAC.* BUILDLINK_FILES.flac+= lib/libOggFLAC++.* BUILDLINK_FILES.flac+= lib/libOggFLAC.* -.include "../../audio/libogg/buildlink2.mk" +.include "../../multimedia/libogg/buildlink2.mk" BUILDLINK_TARGETS+= flac-buildlink diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk index 762d2e2c9a1..0fc3dbb0e64 100644 --- a/audio/flac/buildlink3.mk +++ b/audio/flac/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/04/12 23:15:01 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+ @@ -15,6 +15,6 @@ BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1 BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac .endif # FLAC_BUILDLINK3_MK -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/gst-plugins-ogg/Makefile b/audio/gst-plugins-ogg/Makefile index 13630ff5e74..095054dbef5 100644 --- a/audio/gst-plugins-ogg/Makefile +++ b/audio/gst-plugins-ogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 09:41:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:15:01 salo Exp $ # GST_PLUGINS_NAME= ogg @@ -6,5 +6,6 @@ GST_PLUGINS_DIR= ext/ogg .include "../../multimedia/gst-plugins/Makefile.common" -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 7a10fee4a65..6ecb2ad8ce7 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2004/02/25 20:20:17 heinz Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/12 23:15:01 salo Exp $ +# DISTNAME= libogg-1.1 -CATEGORIES= devel audio +CATEGORIES= multimedia devel MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/ MAINTAINER= lukem@NetBSD.org @@ -10,17 +11,18 @@ COMMENT= Ogg project codecs library PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_BUILDLINK3= YES -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_BUILDLINK3= YES +GNU_CONFIGURE= YES +USE_LIBTOOL= YES -GCC_REQD+= 2.95.3 +GCC_REQD+= 2.95.3 -PLIST_SUBST+= DISTNAME=${DISTNAME} +PLIST_SUBST+= DISTNAME=${DISTNAME} PKGCONFIG_OVERRIDE+= ogg.pc.in -TEST_TARGET= check +TEST_TARGET= check .include "../../devel/pkgconfig/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk index 5abd341ed90..91b69460420 100644 --- a/audio/libogg/buildlink2.mk +++ b/audio/libogg/buildlink2.mk @@ -1,11 +1,12 @@ -# $NetBSD: buildlink2.mk,v 1.5 2004/02/19 17:54:05 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/04/12 23:15:01 salo Exp $ +# .if !defined(LIBOGG_BUILDLINK2_MK) LIBOGG_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libogg BUILDLINK_DEPENDS.libogg?= libogg>=1.1 -BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg +BUILDLINK_PKGSRCDIR.libogg?= ../../multimedia/libogg EVAL_PREFIX+= BUILDLINK_PREFIX.libogg=libogg BUILDLINK_PREFIX.libogg_DEFAULT= ${LOCALBASE} diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk index 53ea51a6994..2c9ff0641bd 100644 --- a/audio/libogg/buildlink3.mk +++ b/audio/libogg/buildlink3.mk @@ -1,4 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/04/12 23:15:01 salo Exp $ +# BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+ @@ -12,7 +13,7 @@ BUILDLINK_PACKAGES+= libogg .if !empty(LIBOGG_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libogg+= libogg>=1.1 -BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg +BUILDLINK_PKGSRCDIR.libogg?= ../../multimedia/libogg .endif # LIBOGG_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 3362fc51eb4..caf0b8ed3de 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/03/22 22:35:40 snj Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/12 23:15:01 salo Exp $ DISTNAME= libvorbis-1.0.1 CATEGORIES= devel audio @@ -21,5 +21,6 @@ PKGCONFIG_OVERRIDE+= vorbis.pc.in PKGCONFIG_OVERRIDE+= vorbisenc.pc.in PKGCONFIG_OVERRIDE+= vorbisfile.pc.in -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk index ee4d96043dd..da4c9dbb859 100644 --- a/audio/libvorbis/buildlink2.mk +++ b/audio/libvorbis/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/12/08 14:39:40 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2004/04/12 23:15:01 salo Exp $ .if !defined(LIBVORBIS_BUILDLINK2_MK) LIBVORBIS_BUILDLINK2_MK= # defined @@ -14,7 +14,7 @@ BUILDLINK_FILES.libvorbis+= lib/libvorbis.* BUILDLINK_FILES.libvorbis+= lib/libvorbisenc.* BUILDLINK_FILES.libvorbis+= lib/libvorbisfile.* -.include "../../audio/libogg/buildlink2.mk" +.include "../../multimedia/libogg/buildlink2.mk" BUILDLINK_TARGETS+= libvorbis-buildlink diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk index b5b345c03ef..a2f8ca8c998 100644 --- a/audio/libvorbis/buildlink3.mk +++ b/audio/libvorbis/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/04/12 23:15:01 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+ @@ -15,6 +15,6 @@ BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1 BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis .endif # LIBVORBIS_BUILDLINK3_MK -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile index 44f31681633..87fbb766b01 100644 --- a/audio/mp3splt/Makefile +++ b/audio/mp3splt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/04/11 17:31:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/12 23:15:01 salo Exp $ # DISTNAME= mp3splt-1.9-src @@ -17,6 +17,7 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes .include "../../audio/libmad/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index 77e3fce5ca3..5094423b254 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/04/11 17:39:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/12 23:15:01 salo Exp $ # DISTNAME= mserv-0.35 @@ -38,7 +38,7 @@ post-install: ${WRKSRC}/webclient/* \ ${PREFIX}/share/mserv/webclient -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-ogg/DESCR b/audio/py-ogg/DESCR index b7e8cdccc8e..1fa692eb659 100644 --- a/audio/py-ogg/DESCR +++ b/audio/py-ogg/DESCR @@ -1 +1 @@ -Libogg bindings for Python. See audio/libogg for details. +Libogg bindings for Python. See multimedia/libogg for details. diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile index 7952e14bbec..7deddc6c26f 100644 --- a/audio/py-ogg/Makefile +++ b/audio/py-ogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/15 01:49:15 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:15:01 salo Exp $ # DISTNAME= pyogg-1.3 @@ -18,6 +18,7 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${PYTHONBIN} config_unix.py CONFIGURE_ARGS+= --prefix ${PREFIX} -.include "../../audio/libogg/buildlink3.mk" .include "../../lang/python/extension.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk index e92e95c4747..140f8cdb8a9 100644 --- a/audio/py-ogg/buildlink3.mk +++ b/audio/py-ogg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/18 09:12:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/04/12 23:15:01 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3 BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg .endif # PY_OGG_BUILDLINK3_MK -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile index cb5a474e9e5..388d8768844 100644 --- a/audio/py-vorbis/Makefile +++ b/audio/py-vorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/15 15:47:29 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:15:01 salo Exp $ # DISTNAME= pyvorbis-1.3 @@ -19,7 +19,8 @@ CONFIGURE_SCRIPT= ${PYTHONBIN} config_unix.py CONFIGURE_ARGS+= --prefix ${PREFIX} .include "../../audio/py-ogg/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../lang/python/extension.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/speex/Makefile b/audio/speex/Makefile index ff28deb78ca..8eb13661fdb 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/19 01:49:18 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/12 23:15:01 salo Exp $ # DISTNAME= speex-1.0.3 @@ -18,6 +18,7 @@ CONFLICTS= Speex-[0-9]* CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}" -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/speex/buildlink2.mk b/audio/speex/buildlink2.mk index 133f86f5b81..cf26c5d5ae4 100644 --- a/audio/speex/buildlink2.mk +++ b/audio/speex/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2004/04/12 23:15:01 salo Exp $ # # This Makefile fragment is included by packages that use speex. # @@ -19,7 +19,7 @@ BUILDLINK_FILES.speex+= include/speex_header.h BUILDLINK_FILES.speex+= include/speex_stereo.h BUILDLINK_FILES.speex+= lib/libspeex.* -.include "../../audio/libogg/buildlink2.mk" +.include "../../multimedia/libogg/buildlink2.mk" BUILDLINK_TARGETS+= speex-buildlink diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk index 0e8597f5ed1..19cb4afa218 100644 --- a/audio/speex/buildlink3.mk +++ b/audio/speex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/04/12 23:15:01 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+ @@ -15,6 +15,6 @@ BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1 BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex .endif # SPEEX_BUILDLINK3_MK -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index 0ce45dc4718..0ab4ab41a7a 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:34 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/12 23:15:01 salo Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 @@ -33,11 +33,12 @@ pre-configure: cd ${WRKSRC} && ${AUTOCONF} .include "../../mk/automake.mk" -.include "../../audio/tremor/buildlink3.mk" -.include "../../audio/libvorbis/buildlink3.mk" + .include "../../audio/libao/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../audio/tremor/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/trm/Makefile b/audio/trm/Makefile index 900f0a83c05..d2e5fed8347 100644 --- a/audio/trm/Makefile +++ b/audio/trm/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2004/02/21 06:27:17 snj Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/12 23:15:02 salo Exp $ +# DISTNAME= trm-0.2.1 CATEGORIES= audio @@ -13,10 +14,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES GNU_CONFIGURE= YES +.include "../../audio/id3lib/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" -.include "../../audio/musicbrainz/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" -.include "../../audio/id3lib/buildlink3.mk" +.include "../../audio/musicbrainz/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 21c3caf4804..98472204615 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/26 02:27:34 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/12 23:15:02 salo Exp $ DISTNAME= vorbis-tools-1.0.1 PKGREVISION= 1 @@ -28,11 +28,11 @@ PTHREAD_OPTS+= require .include "../../audio/flac/buildlink3.mk" .include "../../audio/libao/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 5589786f26b..8c9b409a580 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/04/12 02:41:45 snj Exp $ +# $NetBSD: Makefile,v 1.34 2004/04/12 23:17:46 salo Exp $ # DISTNAME= blender-2.32 @@ -35,7 +35,7 @@ DEPENDS+= blender-doc:../../graphics/blender-doc .if defined(BLENDER_USE_OGG) CONFIGURE_ARGS+= --with-ogg=${PREFIX} -.include "../../audio/libogg/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .else CONFIGURE_ARGS+= --without-ogg --disable-oggtest .endif diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile index eb0a32b93a8..e31c663ed41 100644 --- a/graphics/transcode/Makefile +++ b/graphics/transcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/04/05 18:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2004/04/12 23:17:46 salo Exp $ DISTNAME= transcode-0.6.12 PKGREVISION= 1 @@ -45,21 +45,21 @@ post-install: .include "../../archivers/liblzo/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/libmpeg3/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../multimedia/libdvdread/buildlink3.mk" # depends on a much later avifile than the one in pkgsrc #.include "../../multimedia/avifile/buildlink3.mk" +.include "../../multimedia/libdvdread/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../multimedia/mjpegtools/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index 51c542a17dc..45089cc5c95 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $ # DISTNAME= libtheora-1.0alpha3 @@ -10,10 +10,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.theora.org/ COMMENT= Video codec for Ogg multimedia streaming -GNU_CONFIGURE= YES -USE_BUILDLINK3= YES -USE_LIBTOOL= YES +GNU_CONFIGURE= YES +USE_BUILDLINK3= YES +USE_LIBTOOL= YES -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk index aaa3d5a4819..011621ed90f 100644 --- a/multimedia/libtheora/buildlink3.mk +++ b/multimedia/libtheora/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/04/06 13:47:43 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/04/12 23:22:59 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBTHEORA_BUILDLINK3_MK:= ${LIBTHEORA_BUILDLINK3_MK}+ @@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.libtheora+= libtheora>=1.0alpha3 BUILDLINK_PKGSRCDIR.libtheora?= ../../multimedia/libtheora .endif # LIBTHEORA_BUILDLINK3_MK -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index adbdc3631e5..ec8de8c3d4e 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/10 12:44:31 salo Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $ # DISTNAME= mkvtoolnix-0.8.6 @@ -20,11 +20,11 @@ CONFIGURE_ARGS+= --with-extra-includes=${PREFIX} .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/liblzo/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../multimedia/libmatroska/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile index 943040a8af8..918bb7d642d 100644 --- a/multimedia/ogmtools/Makefile +++ b/multimedia/ogmtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/12 21:47:02 salo Exp $ +# $NetBSD: Makefile,v 1.2 2004/04/12 23:22:59 salo Exp $ # DISTNAME= ogmtools-1.3 @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-dvdread-includes=${BUILDLINK_DIR} .include "../../audio/libvorbis/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index edf646d408c..0d886613131 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/29 21:01:17 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/12 23:22:59 salo Exp $ # DISTNAME= vlc-0.7.1 @@ -69,7 +69,6 @@ PLIST_SUBST+= DVDCSS="@comment " .include "../../audio/libcddb/buildlink3.mk" .include "../../audio/libid3tag/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" @@ -82,6 +81,7 @@ PLIST_SUBST+= DVDCSS="@comment " .include "../../multimedia/libdvdplay/buildlink3.mk" .include "../../multimedia/libdvbpsi/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../net/openslp/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk index f3acf6b37b0..f2f97791493 100644 --- a/multimedia/vlc/buildlink3.mk +++ b/multimedia/vlc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/04/07 13:04:41 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/04/12 23:22:59 salo Exp $ # # This Makefile fragment is included by packages that use vlc. # @@ -20,7 +20,6 @@ BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc .include "../../audio/flac/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" -.include "../../audio/libogg/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" @@ -31,6 +30,7 @@ BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc .include "../../misc/libdvdcss/buildlink3.mk" .include "../../misc/libdvdplay/buildlink3.mk" .include "../../misc/libdvdread/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../net/openslp/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" |