-Sync w/ FreeBSD.

-Reset the $FreeBSD$ while I am there.


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

8 files changed, 14 insertions, 84 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 6b475f96b..0c476229d 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/dbus/Makefile,v 1.32 2009/09/26 13:41:58 marcus Exp $
 #
 
 PORTNAME=	dbus
@@ -36,6 +36,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
 
+USERS=		messagebus
+GROUPS=		messagebus
+
 PLIST_SUB=	VERSION="1.0"
 
 MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
index 4ed46afa7..5ad0a1f84 100644
--- a/devel/dbus/pkg-install
+++ b/devel/dbus/pkg-install
@@ -4,33 +4,6 @@ case $2 in
 POST-INSTALL)
 	USER=messagebus
 	GROUP=${USER}
-	UID=556
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
 
 	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
 	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 1244260e2..32301604a 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.10 2009/01/10 05:21:21 marcus Exp $
-#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.20 2008/08/06 04:22:49 mezz Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.22 2009/10/10 16:04:54 marcus Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index e5a099a87..6bd0c82bf 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/devel/gnome-vfs/pkg-install.in,v 1.10 2009/01/10 05:21:21 marcus Exp $
-#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.20 2008/08/06 04:22:49 mezz Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.22 2009/10/10 16:04:54 marcus Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index b0df027f0..952732fd0 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/liboobs/Makefile,v 1.35 2008/03/09 18:52:59 mezz Exp $
 #
 
 PORTNAME=	liboobs
-PORTVERSION=	2.22.1
-PORTREVISION=	1
+PORTVERSION=	2.22.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
index 9e0c600db..7521018e6 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/liboobs-2.22.1.tar.bz2) = aa249b4b02ab5fee6d1bb91eea48945e
-SHA256 (gnome2/liboobs-2.22.1.tar.bz2) = e2e82ead07471ae3350c9c40b9968e8c64a4d6a5e337fd47f6f48861d13eb701
-SIZE (gnome2/liboobs-2.22.1.tar.bz2) = 355304
+MD5 (gnome2/liboobs-2.22.2.tar.bz2) = 84d20702942635e3bebc0c1c35bdad43
+SHA256 (gnome2/liboobs-2.22.2.tar.bz2) = 34a972fab68255902d4c1f82ba16dfbf673f9933f78c68b4551883b63984c58b
+SIZE (gnome2/liboobs-2.22.2.tar.bz2) = 364260
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index f6cb6c5e0..11e1ab182 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -32,50 +32,5 @@ lib/liboobs-1.la
 lib/liboobs-1.so
 lib/liboobs-1.so.4
 libdata/pkgconfig/liboobs-1.pc
-%%DOCSDIR%%/OobsGroup.html
-%%DOCSDIR%%/OobsGroupsConfig.html
-%%DOCSDIR%%/OobsIface.html
-%%DOCSDIR%%/OobsIfaceEthernet.html
-%%DOCSDIR%%/OobsIfaceIRLan.html
-%%DOCSDIR%%/OobsIfacePlip.html
-%%DOCSDIR%%/OobsIfaceWireless.html
-%%DOCSDIR%%/OobsIfacesConfig.html
-%%DOCSDIR%%/OobsList.html
-%%DOCSDIR%%/OobsNFSConfig.html
-%%DOCSDIR%%/OobsNTPConfig.html
-%%DOCSDIR%%/OobsObject.html
-%%DOCSDIR%%/OobsSMBConfig.html
-%%DOCSDIR%%/OobsService.html
-%%DOCSDIR%%/OobsServicesConfig.html
-%%DOCSDIR%%/OobsSession.html
-%%DOCSDIR%%/OobsShare.html
-%%DOCSDIR%%/OobsShareNFS.html
-%%DOCSDIR%%/OobsShareSMB.html
-%%DOCSDIR%%/OobsStaticHost.html
-%%DOCSDIR%%/OobsTimeConfig.html
-%%DOCSDIR%%/OobsUser.html
-%%DOCSDIR%%/OobsUsersConfig.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/ch05.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/ch07.html
-%%DOCSDIR%%/ch08.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/liboobs-OobsHostsConfig.html
-%%DOCSDIR%%/liboobs-OobsIfaceISDN.html
-%%DOCSDIR%%/liboobs-OobsIfaceModem.html
-%%DOCSDIR%%/liboobs-OobsNTPServer.html
-%%DOCSDIR%%/liboobs.devhelp
-%%DOCSDIR%%/liboobs.devhelp2
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
 @dirrm include/liboobs-1.0/oobs
 @dirrm include/liboobs-1.0
diff --git a/devel/libpthread-stubs/files/patch-Makefile.in b/devel/libpthread-stubs/files/patch-Makefile.in
index 4bfc2a9a8..0aed1ffa5 100644
--- a/devel/libpthread-stubs/files/patch-Makefile.in
+++ b/devel/libpthread-stubs/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/devel/libpthread-stubs/files/patch-Makefile.in,v 1.2 2009/11/05 20:16:01 miwi Exp $
+$FreeBSD$
 
 --- Makefile.in.orig
 +++ Makefile.in