summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/amarok/Makefile10
-rw-r--r--audio/rhythmbox/Makefile19
-rw-r--r--audio/tunesbrowser/Makefile14
-rw-r--r--mail/evolution/Makefile6
-rw-r--r--meta-pkgs/gnome-base/Makefile8
-rw-r--r--misc/kdeaccessibility3/Makefile8
-rw-r--r--multimedia/gnome2-media/Makefile14
-rw-r--r--multimedia/kdemultimedia3/Makefile8
-rw-r--r--multimedia/totem/Makefile10
-rw-r--r--multimedia/totem/Makefile.common4
-rw-r--r--x11/gnome2-applets/Makefile8
-rw-r--r--x11/gnome2-control-center/Makefile6
12 files changed, 54 insertions, 61 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 858951f5083..f2a0f6cd923 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= amarok-1.3.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amarok/}
EXTRACT_SUFX= .tar.bz2
@@ -23,8 +23,6 @@ CONFIGURE_ARGS+= --without-arts # disable aRts engine
LIBS+= ${LIBOSSAUDIO}
-BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.6
-BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.6
BUILDLINK_DEPENDS.kdebase+= kdebase>=3.3.0
BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0
BUILDLINK_DEPENDS.taglib+= taglib>=1.4
@@ -35,8 +33,8 @@ BUILDLINK_DEPENDS.taglib+= taglib>=1.4
.include "../../audio/xmms/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../multimedia/kdemultimedia3/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 70f5ff81f4b..a072662a5a6 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/18 12:55:55 jmmv Exp $
#
DISTNAME= rhythmbox-0.8.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.8/}
EXTRACT_SUFX= .tar.bz2
@@ -12,13 +12,10 @@ HOMEPAGE= http://www.rhythmbox.org/
COMMENT= Music management application for GNOME
BUILD_USES_MSGFMT= YES
-DEPENDS+= gst-plugins-esound>=0.8.1:../../audio/gst-plugins-esound
-DEPENDS+= gst-plugins-gnomevfs>=0.8.1:../../sysutils/gst-plugins-gnomevfs
-DEPENDS+= gst-plugins-mad>=0.8.1:../../audio/gst-plugins-mad
-DEPENDS+= gst-plugins-vorbis>=0.8.1:../../audio/gst-plugins-vorbis
-
-BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.1
-BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.1
+DEPENDS+= gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
+DEPENDS+= gst-plugins0.8-gnomevfs>=0.8.1:../../sysutils/gst-plugins0.8-gnomevfs
+DEPENDS+= gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
+DEPENDS+= gst-plugins0.8-vorbis>=0.8.1:../../audio/gst-plugins0.8-vorbis
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
@@ -38,8 +35,8 @@ GCONF2_SCHEMAS= rhythmbox.schemas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 1b34278e989..35915cb55ea 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/18 12:55:55 jmmv Exp $
#
DISTNAME= tunesbrowser-0.3.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://craz.net/programs/itunes/files/
EXTRACT_SUFX= .tar.bz2
@@ -17,16 +17,16 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser
-DEPENDS+= gst-plugins-esound>=0.8.1:../../audio/gst-plugins-esound
-DEPENDS+= gst-plugins-mad>=0.8.1:../../audio/gst-plugins-mad
+DEPENDS+= gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
+DEPENDS+= gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.4.0
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../audio/libopendaap/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/gst-plugins-gnomevfs/buildlink3.mk"
+.include "../../sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8bea1745ef5..aa801d645cb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2006/01/06 15:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= evolution-2.4.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.4/}
EXTRACT_SUFX= .tar.bz2
@@ -130,7 +130,7 @@ LDFLAGS+= -lsemaphore
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 5b19fae652f..9abd6df6f76 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/01/06 15:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= gnome-base-2.12.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= meta-pkgs x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -64,8 +64,8 @@ DEPENDS+= gnome-menus>=2.12.0:../../sysutils/gnome-menus
DEPENDS+= eel2>=2.12.1:../../devel/eel2
DEPENDS+= nautilus>=2.12.1:../../sysutils/nautilus
DEPENDS+= metacity>=2.12.1:../../wm/metacity
-DEPENDS+= gstreamer>=0.8.11:../../multimedia/gstreamer
-DEPENDS+= gst-plugins>=0.8.11:../../multimedia/gst-plugins
+DEPENDS+= gstreamer0.8>=0.8.11:../../multimedia/gstreamer0.8
+DEPENDS+= gst-plugins0.8>=0.8.11:../../multimedia/gst-plugins0.8
DEPENDS+= gnome2-control-center>=2.12.1:../../x11/gnome2-control-center
DEPENDS+= evolution-data-server>=1.4.1:../../mail/evolution-data-server
DEPENDS+= gnome-panel>=2.12.1:../../x11/gnome-panel
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 5aeb7fc1459..7d104ff55ac 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/01/06 15:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
COMMENT= Accessibility support for the KDE integrated X11 desktop
@@ -17,8 +17,8 @@ PKG_SUPPORTED_OPTIONS= gstreamer
.if !empty(PKG_OPTIONS:Mgstreamer)
CONFIGURE_ARGS+= --enable-kttsd-gstreamer
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
PLIST_SUBST+= HAVE_GST=""
.else
PLIST_SUBST+= HAVE_GST="@comment "
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index d8e63e02149..5a4cb6bb472 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/12/31 12:32:42 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= gnome-media-2.12.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.12/}
EXTRACT_SUFX= .tar.bz2
@@ -11,9 +11,9 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Set of audio/multimedia applications for GNOME2
BUILD_USES_MSGFMT= yes
-DEPENDS+= gst-plugins-cdparanoia>=0.8.8:../../audio/gst-plugins-cdparanoia
-DEPENDS+= gst-plugins-esound>=0.8.8:../../audio/gst-plugins-esound
-DEPENDS+= gst-plugins-oss>=0.8.8:../../audio/gst-plugins-oss
+DEPENDS+= gst-plugins0.8-cdparanoia>=0.8.8:../../audio/gst-plugins0.8-cdparanoia
+DEPENDS+= gst-plugins0.8-esound>=0.8.8:../../audio/gst-plugins0.8-esound
+DEPENDS+= gst-plugins0.8-oss>=0.8.8:../../audio/gst-plugins0.8-oss
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
@@ -45,8 +45,8 @@ GCONF2_SCHEMAS+= gnome-sound-recorder.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 532786d01f9..dde53432046 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2006/01/06 15:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/01/18 12:55:55 jmmv Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
@@ -31,8 +31,8 @@ PKG_SUPPORTED_OPTIONS= gstreamer oss
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgstreamer)
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Moss)
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index ee57d89a92f..7b3abc1ce4c 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2006/01/12 16:57:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/18 12:55:55 jmmv Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
+
COMMENT+= (using GStreamer)
CONFLICTS+= totem-xine-[0-9]*
-BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.6.1
-
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index e1ace3ba56c..bacb67e06f8 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/01/15 04:49:46 minskim Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/01/18 12:55:55 jmmv Exp $
#
DISTNAME= totem-1.3.0
@@ -33,8 +33,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.totem
.include "../../mk/bsd.options.mk"
BUILDLINK_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0
-BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.4.1
-BUILDLINK_DEPENDS.gst-plugins+= gstreamer>=0.8.4.1
.include "../../audio/musicbrainz/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index bb6a0b68ec4..2d2677a9f23 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/01/18 12:55:56 jmmv Exp $
#
DISTNAME= gnome-applets-2.12.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.12/}
EXTRACT_SUFX= .tar.bz2
@@ -84,8 +84,8 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/libwnck/buildlink3.mk"
.include "../../fonts/gucharmap/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/libgtop2/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 67e75401b2f..a561d206765 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/01/18 12:55:56 jmmv Exp $
#
DISTNAME= control-center-2.12.1
PKGNAME= gnome2-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.12/}
EXTRACT_SUFX= .tar.bz2
@@ -56,7 +56,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"