Get those ports to catch up with gnome-keyring that splitted into

libgnome-keyring and gnome-keyring. It helps a lot with resolve the
conflict that prevent you to install some important ports such as
gimp and etc. Bump the PORTREVISION on those ports.


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

6 files changed, 188 insertions, 0 deletions

diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
new file mode 100644
index 000000000..7ef63ba0a
--- /dev/null
+++ b/sysutils/gksu/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:   gksu
+# Date created:        2 October 2004
+# Whom:                Jesse van den Kieboom <troplosti@orcaweb.cjb.net>
+#
+# $FreeBSD: ports/sysutils/gksu/Makefile,v 1.22 2010/03/28 06:43:45 dinoex Exp $
+#
+
+PORTNAME=	gksu
+PORTVERSION=	1.3.7
+PORTREVISION=	7
+CATEGORIES=	sysutils
+MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/gksu/
+
+MAINTAINER=	bsam@FreeBSD.org
+COMMENT=	Graphical frontend to su
+
+LIB_DEPENDS=	gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
+		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+
+USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
+GNU_CONFIGURE=	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
+
+.include <bsd.port.mk>
diff --git a/sysutils/gksu/distinfo b/sysutils/gksu/distinfo
new file mode 100644
index 000000000..cb55d5dc9
--- /dev/null
+++ b/sysutils/gksu/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gksu-1.3.7.tar.gz) = 8e3b0a51bacbb7172246ae91d1e232863a2da0d8a9393a74de909d91211a6b6d
+SIZE (gksu-1.3.7.tar.gz) = 620451
diff --git a/sysutils/gksu/files/patch-gksu_Makefile.in b/sysutils/gksu/files/patch-gksu_Makefile.in
new file mode 100644
index 000000000..4df2b171e
--- /dev/null
+++ b/sysutils/gksu/files/patch-gksu_Makefile.in
@@ -0,0 +1,37 @@
+--- 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
new file mode 100644
index 000000000..5df2cac05
--- /dev/null
+++ b/sysutils/gksu/files/patch-gksu_gksu.c
@@ -0,0 +1,82 @@
+--- 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-descr b/sysutils/gksu/pkg-descr
new file mode 100644
index 000000000..cd37cdb35
--- /dev/null
+++ b/sysutils/gksu/pkg-descr
@@ -0,0 +1,9 @@
+gksu is a Gtk+ frontend to /bin/su. It supports login shells and preserving
+environment when acting as a su frontend. It is useful to menu items or other
+graphical programs that need to ask a user's password to run another program
+as another user.
+
+WWW: http://www.gnu.org/non-gnu/gksu/
+
+- Jesse van den Kieboom
+troplosti@orcaweb.cjb.net
diff --git a/sysutils/gksu/pkg-plist b/sysutils/gksu/pkg-plist
new file mode 100644
index 000000000..deca7847d
--- /dev/null
+++ b/sysutils/gksu/pkg-plist
@@ -0,0 +1,28 @@
+bin/gksu
+bin/gksudo
+bin/gksuexec
+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
+@dirrm share/gksu
+@dirrmtry share/applications