More on merge with FreeBSD ports tree. Still not done with it.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8276 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 53 insertions, 47 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index e8f878c02..9c256f516 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.101 2007/01/08 07:39:21 marcus Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.102 2007/01/28 22:16:58 marcus Exp $
 #
 
 PORTNAME=	gnome-media
 PORTVERSION=	2.17.90
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,7 +26,7 @@ USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		gail nautiluscdburner
-USE_GSTREAMER=	esound gconf good
+USE_GSTREAMER=	cdparanoia esound gconf good
 CONFIGURE_ARGS=	--enable-ipv6
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index bf9b39459..c1c32f2db 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -3,7 +3,8 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/devel/gamin/Makefile,v 1.1 2006/11/16 20:38:27 ahze Exp $
+#
 
 PORTNAME=	gamin
 PORTVERSION=	0.1.8
@@ -13,6 +14,7 @@ MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A file and directory monitoring system
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack glib20
 USE_LDCONFIG=	yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index e4323d97b..d005ede0c 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.24 2006/12/18 22:42:39 marcus Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.25 2006/12/19 13:45:41 ahze Exp $
 #
 
 PORTNAME=	glade3
@@ -23,10 +23,12 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-USE_LDCONFIG=	yes
+
+DOCSDIR=	share/doc/gladeui
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 4314f3285..d74e0bccb 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -50,43 +50,43 @@ lib/libgladeui-1.la
 lib/libgladeui-1.so
 lib/libgladeui-1.so.4
 libdata/pkgconfig/libgladeui-1.0.pc
-share/doc/gladeui/GladeApp.html
-share/doc/gladeui/GladeClipboard.html
-share/doc/gladeui/GladeClipboardView.html
-share/doc/gladeui/GladeEditor.html
-share/doc/gladeui/GladeEditorProperty.html
-share/doc/gladeui/GladeFixed.html
-share/doc/gladeui/GladePalette.html
-share/doc/gladeui/GladePlaceholder.html
-share/doc/gladeui/GladeProject.html
-share/doc/gladeui/GladeProjectView.html
-share/doc/gladeui/GladeProperty.html
-share/doc/gladeui/GladeWidget.html
-share/doc/gladeui/catalog.html
-share/doc/gladeui/catalogintro.html
-share/doc/gladeui/children.html
-share/doc/gladeui/core.html
-share/doc/gladeui/dockables.html
-share/doc/gladeui/gladeui-GladeCommand.html
-share/doc/gladeui/gladeui-GladePropertyClass.html
-share/doc/gladeui/gladeui-GladeWidgetClass.html
-share/doc/gladeui/gladeui-glade-base-editor.html
-share/doc/gladeui/gladeui-glade-parameter.html
-share/doc/gladeui/gladeui-glade-signal-editor.html
-share/doc/gladeui/gladeui-glade-utils.html
-share/doc/gladeui/gladeui.devhelp
-share/doc/gladeui/gladeui.devhelp2
-share/doc/gladeui/home.png
-share/doc/gladeui/index.html
-share/doc/gladeui/index.sgml
-share/doc/gladeui/ix01.html
-share/doc/gladeui/left.png
-share/doc/gladeui/misc.html
-share/doc/gladeui/properties.html
-share/doc/gladeui/right.png
-share/doc/gladeui/style.css
-share/doc/gladeui/up.png
-share/doc/gladeui/widgetclasses.html
+%%DOCSDIR%%/GladeApp.html
+%%DOCSDIR%%/GladeClipboard.html
+%%DOCSDIR%%/GladeClipboardView.html
+%%DOCSDIR%%/GladeEditor.html
+%%DOCSDIR%%/GladeEditorProperty.html
+%%DOCSDIR%%/GladeFixed.html
+%%DOCSDIR%%/GladePalette.html
+%%DOCSDIR%%/GladePlaceholder.html
+%%DOCSDIR%%/GladeProject.html
+%%DOCSDIR%%/GladeProjectView.html
+%%DOCSDIR%%/GladeProperty.html
+%%DOCSDIR%%/GladeWidget.html
+%%DOCSDIR%%/catalog.html
+%%DOCSDIR%%/catalogintro.html
+%%DOCSDIR%%/children.html
+%%DOCSDIR%%/core.html
+%%DOCSDIR%%/dockables.html
+%%DOCSDIR%%/gladeui-GladeCommand.html
+%%DOCSDIR%%/gladeui-GladePropertyClass.html
+%%DOCSDIR%%/gladeui-GladeWidgetClass.html
+%%DOCSDIR%%/gladeui-glade-base-editor.html
+%%DOCSDIR%%/gladeui-glade-parameter.html
+%%DOCSDIR%%/gladeui-glade-signal-editor.html
+%%DOCSDIR%%/gladeui-glade-utils.html
+%%DOCSDIR%%/gladeui.devhelp
+%%DOCSDIR%%/gladeui.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/misc.html
+%%DOCSDIR%%/properties.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/widgetclasses.html
 share/gnome/applications/glade-3.desktop
 %%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml
 %%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml.in
@@ -341,7 +341,7 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrm share/gnome/glade3/pixmaps
 @dirrm share/gnome/glade3/catalogs
 @dirrm share/gnome/glade3
-@dirrm share/doc/gladeui
+@dirrm %%DOCSDIR%%
 @dirrm lib/glade3/modules
 @dirrm lib/glade3/bindings
 @dirrm lib/glade3
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index badc66046..9543cca85 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,17 +3,18 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/totem/Makefile,v 1.71 2007/01/17 05:50:36 marcus Exp $
+#    $MCom: ports/multimedia/totem/Makefile,v 1.72 2007/01/29 18:34:55 marcus Exp $
+#
 
 PORTNAME=	totem
 PORTVERSION=	2.17.90
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	A Xine-based video player for the Gnome 2 Desktop
+COMMENT?=	A Xine-based video player for the GNOME 2 Desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
@@ -72,7 +73,7 @@ USE_GSTREAMER+=	gnomevfs core gconf hal good mpeg2dec ugly
 WITHOUT_DVDNAV=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
-LIB_DEPENDS+=	xine.15:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine.16:${PORTSDIR}/multimedia/libxine
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif