pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Follow libogg into multimedia/.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b7c59706838
branches:  trunk
changeset: 472857:6b7c59706838
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Apr 12 23:15:01 2004 +0000

description:
Follow libogg into multimedia/.

diffstat:

 audio/SDL_mixer/Makefile           |   4 ++--
 audio/arts/Makefile                |   5 +++--
 audio/arts/buildlink2.mk           |   5 +++--
 audio/arts/buildlink3.mk           |   5 +++--
 audio/bmp/Makefile                 |   5 +++--
 audio/flac/Makefile                |   5 +++--
 audio/flac/buildlink2.mk           |   4 ++--
 audio/flac/buildlink3.mk           |   4 ++--
 audio/gst-plugins-ogg/Makefile     |   5 +++--
 audio/libogg/Makefile              |  18 ++++++++++--------
 audio/libogg/buildlink2.mk         |   5 +++--
 audio/libogg/buildlink3.mk         |   5 +++--
 audio/libvorbis/Makefile           |   5 +++--
 audio/libvorbis/buildlink2.mk      |   4 ++--
 audio/libvorbis/buildlink3.mk      |   4 ++--
 audio/mp3splt/Makefile             |   5 +++--
 audio/mserv/Makefile               |   4 ++--
 audio/py-ogg/DESCR                 |   2 +-
 audio/py-ogg/Makefile              |   5 +++--
 audio/py-ogg/buildlink3.mk         |   4 ++--
 audio/py-vorbis/Makefile           |   5 +++--
 audio/speex/Makefile               |   5 +++--
 audio/speex/buildlink2.mk          |   4 ++--
 audio/speex/buildlink3.mk          |   4 ++--
 audio/tremor-tools/Makefile        |  11 ++++++-----
 audio/trm/Makefile                 |  10 ++++++----
 audio/vorbis-tools/Makefile        |   6 +++---
 graphics/blender/Makefile          |   4 ++--
 graphics/transcode/Makefile        |   8 ++++----
 multimedia/libtheora/Makefile      |  11 ++++++-----
 multimedia/libtheora/buildlink3.mk |   4 ++--
 multimedia/mkvtoolnix/Makefile     |   4 ++--
 multimedia/ogmtools/Makefile       |   4 ++--
 multimedia/vlc/Makefile            |   4 ++--
 multimedia/vlc/buildlink3.mk       |   4 ++--
 35 files changed, 105 insertions(+), 86 deletions(-)

diffs (truncated from 706 to 300 lines):

diff -r d2daeb1af1ce -r 6b7c59706838 audio/SDL_mixer/Makefile
--- a/audio/SDL_mixer/Makefile  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/SDL_mixer/Makefile  Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
        ${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 -r d2daeb1af1ce -r 6b7c59706838 audio/arts/Makefile
--- a/audio/arts/Makefile       Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/arts/Makefile       Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 .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 -r d2daeb1af1ce -r 6b7c59706838 audio/arts/buildlink2.mk
--- a/audio/arts/buildlink2.mk  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/arts/buildlink2.mk  Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 .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 -r d2daeb1af1ce -r 6b7c59706838 audio/arts/buildlink3.mk
--- a/audio/arts/buildlink3.mk  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/arts/buildlink3.mk  Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 .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 -r d2daeb1af1ce -r 6b7c59706838 audio/bmp/Makefile
--- a/audio/bmp/Makefile        Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/bmp/Makefile        Mon Apr 12 23:15:01 2004 +0000
@@ -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 -r d2daeb1af1ce -r 6b7c59706838 audio/flac/Makefile
--- a/audio/flac/Makefile       Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/flac/Makefile       Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 BUILDLINK_TRANSFORM+=  S:-O3:
 .endif
 
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r d2daeb1af1ce -r 6b7c59706838 audio/flac/buildlink2.mk
--- a/audio/flac/buildlink2.mk  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/flac/buildlink2.mk  Mon Apr 12 23:15:01 2004 +0000
@@ -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/libOggFLAC++.*
 BUILDLINK_FILES.flac+= lib/libOggFLAC.*
 
-.include "../../audio/libogg/buildlink2.mk"
+.include "../../multimedia/libogg/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    flac-buildlink
 
diff -r d2daeb1af1ce -r 6b7c59706838 audio/flac/buildlink3.mk
--- a/audio/flac/buildlink3.mk  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/flac/buildlink3.mk  Mon Apr 12 23:15:01 2004 +0000
@@ -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_PKGSRCDIR.flac?=     ../../audio/flac
 .endif # FLAC_BUILDLINK3_MK
 
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r d2daeb1af1ce -r 6b7c59706838 audio/gst-plugins-ogg/Makefile
--- a/audio/gst-plugins-ogg/Makefile    Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/gst-plugins-ogg/Makefile    Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 
 .include "../../multimedia/gst-plugins/Makefile.common"
 
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r d2daeb1af1ce -r 6b7c59706838 audio/libogg/Makefile
--- a/audio/libogg/Makefile     Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libogg/Makefile     Mon Apr 12 23:15:01 2004 +0000
@@ -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@localhost
@@ -10,17 +11,18 @@
 
 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 -r d2daeb1af1ce -r 6b7c59706838 audio/libogg/buildlink2.mk
--- a/audio/libogg/buildlink2.mk        Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libogg/buildlink2.mk        Mon Apr 12 23:15:01 2004 +0000
@@ -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 -r d2daeb1af1ce -r 6b7c59706838 audio/libogg/buildlink3.mk
--- a/audio/libogg/buildlink3.mk        Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libogg/buildlink3.mk        Mon Apr 12 23:15:01 2004 +0000
@@ -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 @@
 
 .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 -r d2daeb1af1ce -r 6b7c59706838 audio/libvorbis/Makefile
--- a/audio/libvorbis/Makefile  Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libvorbis/Makefile  Mon Apr 12 23:15:01 2004 +0000
@@ -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+=   vorbisenc.pc.in
 PKGCONFIG_OVERRIDE+=   vorbisfile.pc.in
 
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r d2daeb1af1ce -r 6b7c59706838 audio/libvorbis/buildlink2.mk
--- a/audio/libvorbis/buildlink2.mk     Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libvorbis/buildlink2.mk     Mon Apr 12 23:15:01 2004 +0000
@@ -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/libvorbisenc.*
 BUILDLINK_FILES.libvorbis+=    lib/libvorbisfile.*
 
-.include "../../audio/libogg/buildlink2.mk"
+.include "../../multimedia/libogg/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    libvorbis-buildlink
 
diff -r d2daeb1af1ce -r 6b7c59706838 audio/libvorbis/buildlink3.mk
--- a/audio/libvorbis/buildlink3.mk     Mon Apr 12 23:02:59 2004 +0000
+++ b/audio/libvorbis/buildlink3.mk     Mon Apr 12 23:15:01 2004 +0000
@@ -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_PKGSRCDIR.libvorbis?=        ../../audio/libvorbis
 .endif # LIBVORBIS_BUILDLINK3_MK
 
-.include "../../audio/libogg/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r d2daeb1af1ce -r 6b7c59706838 audio/mp3splt/Makefile
--- a/audio/mp3splt/Makefile    Mon Apr 12 23:02:59 2004 +0000



Home | Main Index | Thread Index | Old Index