Sync w/ FreeBSD ports. Here's a script to get rid of MD5:

------------------
#!/bin/sh
for blah in `find /path/to/ports -maxdepth 3 -name distinfo`; do
	sed -e 's|MD5.*||g' -e "/^$/d" ${blah} > ${blah}.new
	mv ${blah}.new ${blah}
done
------------------


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

8 files changed, 18 insertions, 157 deletions

diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 561be1ad5..3aebf5ec7 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	gksu
-PORTVERSION=	1.3.7
-PORTREVISION=	7
+PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/gksu/
+MASTER_SITES=	http://people.debian.org/~kov/gksu/
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Graphical frontend to su
 
-LIB_DEPENDS=	gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
-		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
+LIB_DEPENDS=	gksu2:${PORTSDIR}/sysutils/libgksu \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 
-USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
+USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack nautilus2
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	gksu.schemas
-MAN1=		gksu.1 gksuexec.1
-MLINKS=		gksu.1 gksudo.1
+MAN1=		gksu.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/gksu/distinfo b/sysutils/gksu/distinfo
index cb55d5dc9..7fe87d046 100644
--- a/sysutils/gksu/distinfo
+++ b/sysutils/gksu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gksu-1.3.7.tar.gz) = 8e3b0a51bacbb7172246ae91d1e232863a2da0d8a9393a74de909d91211a6b6d
-SIZE (gksu-1.3.7.tar.gz) = 620451
+SHA256 (gksu-2.0.2.tar.gz) = a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a
+SIZE (gksu-2.0.2.tar.gz) = 468121
diff --git a/sysutils/gksu/files/patch-gksu_Makefile.in b/sysutils/gksu/files/patch-gksu_Makefile.in
deleted file mode 100644
index 4df2b171e..000000000
--- a/sysutils/gksu/files/patch-gksu_Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- gksu/Makefile.in.orig	Mon Nov 14 19:40:58 2005
-+++ gksu/Makefile.in	Mon Nov 14 19:48:36 2005
-@@ -266,7 +266,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CFLAGS = -g -O2 -Wall
-+AM_CFLAGS = $(CFLAGS)
- INCLUDES = @GKSU_CFLAGS@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/share/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
- schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-@@ -577,18 +577,19 @@
- 	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
- 	uninstall-schemasDATA
- 
--@INTLTOOL_SCHEMAS_RULE@
-+gksu.schemas:
-+	LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $@.in $@
- 
- install-exec-hook:
- 	cd $(DESTDIR)$(bindir) && \
- 		$(LN_S) -f gksu gksudo
- 
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@        if test -z "$(DESTDIR)" ; then \
--@GCONF_SCHEMAS_INSTALL_TRUE@          for p in $(schemas_DATA) ; do \
--@GCONF_SCHEMAS_INSTALL_TRUE@            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
--@GCONF_SCHEMAS_INSTALL_TRUE@          done \
--@GCONF_SCHEMAS_INSTALL_TRUE@        fi
-+@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
-+@GCONF_SCHEMAS_INSTALL_TRUE@	  for p in $(schemas_DATA) ; do \
-+@GCONF_SCHEMAS_INSTALL_TRUE@	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@	  done \
-+@GCONF_SCHEMAS_INSTALL_TRUE@	fi
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/gksu/files/patch-gksu_gksu.c b/sysutils/gksu/files/patch-gksu_gksu.c
deleted file mode 100644
index 5df2cac05..000000000
--- a/sysutils/gksu/files/patch-gksu_gksu.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- gksu/gksu.c.orig	Wed Mar 29 06:18:28 2006
-+++ gksu/gksu.c	Mon May 22 16:29:36 2006
-@@ -513,6 +513,7 @@
- 
- pid_t test_lock(const char* fname)
- {
-+   struct flock fl;
-    int FD = open(fname, 0);
-    if(FD < 0) {
-       if(errno == ENOENT) {
-@@ -523,7 +524,6 @@
- 	 return(-1);
-       }
-    }
--   struct flock fl;
-    fl.l_type = F_WRLCK;
-    fl.l_whence = SEEK_SET;
-    fl.l_start = 0;
-@@ -543,6 +543,7 @@
- 
- int get_lock(const char *File)
- {
-+   struct flock fl;
-    int FD = open(File,O_RDWR | O_CREAT | O_TRUNC,0640);
-    if (FD < 0)
-    {
-@@ -560,13 +561,13 @@
-    fcntl(FD,F_SETFD, FD_CLOEXEC);
- 
-    // Aquire a write lock
--   struct flock fl;
-    fl.l_type = F_WRLCK;
-    fl.l_whence = SEEK_SET;
-    fl.l_start = 0;
-    fl.l_len = 0;
-    if (fcntl(FD,F_SETLK,&fl) == -1)
-    {
-+      int Tmp;
-       if (errno == ENOLCK)
-       {
- 	 g_warning(_("Not using locking for nfs mounted lock file %s"), File);
-@@ -575,7 +576,7 @@
- 	 return dup(0);       // Need something for the caller to close
-       }
- 
--      int Tmp = errno;
-+      Tmp = errno;
-       close(FD);
-       errno = Tmp;
-       return -1;
-@@ -773,6 +774,7 @@
-   GtkWidget *dialog = GTK_WIDGET(data);
- 
-   int retvalue = 0;
-+  int lock = 0;
- 
-   if (prompt)
-     gksuui_dialog_set_prompt (GKSUUI_DIALOG(dialog), prompt);
-@@ -796,7 +798,6 @@
-       g_free (msg);
-     }
- 
--  int lock = 0;
-   if (grab)
-     lock = grab_keyboard_and_mouse (dialog);
-   retvalue = gtk_dialog_run (GTK_DIALOG(dialog));
-@@ -1220,6 +1221,7 @@
- 
-   if (print_pass)
-     {
-+      int lock = 0;
-       if (!gksuui_dialog_get_message (GKSUUI_DIALOG(dialog)))
- 	{
- 	  gchar *msg =
-@@ -1230,7 +1232,6 @@
- 	  g_free (msg);
- 	}
- 
--      int lock = 0;
-       if (grab)
- 	lock = grab_keyboard_and_mouse (dialog);
-       retvalue = gtk_dialog_run (GTK_DIALOG(dialog));
diff --git a/sysutils/gksu/pkg-plist b/sysutils/gksu/pkg-plist
index deca7847d..1d01a0483 100644
--- a/sysutils/gksu/pkg-plist
+++ b/sysutils/gksu/pkg-plist
@@ -1,28 +1,12 @@
 bin/gksu
 bin/gksudo
-bin/gksuexec
+lib/nautilus/extensions-2.0/libnautilus-gksu.la
+lib/nautilus/extensions-2.0/libnautilus-gksu.so
+lib/nautilus/extensions-2.0/libnautilus-gksu.a
 share/applications/gksu.desktop
-share/applications/gksuexec.desktop
 share/pixmaps/gksu-icon.png
 share/pixmaps/gksu-root-terminal.png
 share/gksu/gksu-migrate-conf.sh
-share/locale/ca/LC_MESSAGES/gksu.mo
-share/locale/da/LC_MESSAGES/gksu.mo
-share/locale/de/LC_MESSAGES/gksu.mo
-share/locale/es/LC_MESSAGES/gksu.mo
-share/locale/pt_BR/LC_MESSAGES/gksu.mo
-share/locale/ru/LC_MESSAGES/gksu.mo
-share/locale/cs/LC_MESSAGES/gksu.mo
-share/locale/fr/LC_MESSAGES/gksu.mo
-share/locale/gl/LC_MESSAGES/gksu.mo
-share/locale/hu/LC_MESSAGES/gksu.mo
-share/locale/it/LC_MESSAGES/gksu.mo
-share/locale/nb/LC_MESSAGES/gksu.mo
-share/locale/nl/LC_MESSAGES/gksu.mo
-share/locale/pl/LC_MESSAGES/gksu.mo
-share/locale/pt/LC_MESSAGES/gksu.mo
-share/locale/ro/LC_MESSAGES/gksu.mo
-share/locale/sk/LC_MESSAGES/gksu.mo
-share/locale/xh/LC_MESSAGES/gksu.mo
+man/man1/gksudo.1
 @dirrm share/gksu
 @dirrmtry share/applications
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
index 99faf8250..48d3c6c54 100644
--- a/sysutils/gnome-mount/distinfo
+++ b/sysutils/gnome-mount/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome-mount-0.8.tar.gz) = 562ec9d0196e5e000bdd249a04a3aa6a
 SHA256 (gnome-mount-0.8.tar.gz) = 44ca6b78b49a4181435e489c7b7d416c8f26442dcecdc01ec4b981274ed957e2
 SIZE (gnome-mount-0.8.tar.gz) = 505788
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index de8d5c831..bd5348709 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.8.1
+PORTVERSION=	4.8.2
 PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
@@ -16,8 +16,6 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings application
 
-CONFLICTS=	xfce4-settings-4.6*
-
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
@@ -28,6 +26,7 @@ OPTIONS=	XKLAVIER	"Keyboard layout settings"		off \
 
 CONFIGURE_ARGS=	--disable-sound-settings \
 		--disable-debug
+CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -36,7 +35,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gtk20 desktopfileutils intltool intlhack \
 		pkgconfig
 USE_XFCE=	configenv libexo libmenu libutil xfconf
-USE_XORG=	x11 xi
+USE_XORG=	inputproto x11 xi
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 1b71f8686..6a0fc8259 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-settings-4.8.1.tar.bz2) = 0df5fa505c0a5c0ec0741c0ecb1f18b3fbb59eed39a0b21851ee0379501f1b5a
-SIZE (xfce4/xfce4-settings-4.8.1.tar.bz2) = 660885
+SHA256 (xfce4/xfce4-settings-4.8.2.tar.bz2) = 3f79865a6a3817f3c868f2412cbf105e73e54810438f62035699ae5fd72c29d0
+SIZE (xfce4/xfce4-settings-4.8.2.tar.bz2) = 668903