Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Nov 2005 20:59:40 +0300 (MSK)
From:      "Boris B. Samorodov" <bsam@ipt.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/89024: [patch] sysutils/gksu update to new release version 1.3.6
Message-ID:  <200511141759.jAEHxewJ082934@mi.ipt.ru>
Resent-Message-ID: <200511141810.jAEIA9al051945@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         89024
>Category:       ports
>Synopsis:       [patch] sysutils/gksu update to new release version 1.3.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 14 18:10:08 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Boris B. Samorodov
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
InPharmTech, Co. http://www.ipt.ru
>Environment:
System: FreeBSD mi.ipt.ru 6.0-STABLE FreeBSD 6.0-STABLE #0: Wed Nov 2 17:58:38 MSK 2005 bsam@mi.ipt.ru:/usr/obj/usr/src/sys/PROBA1 i386

>Description:
	Unbreak fetching and update to new release:
	http://portsmon.freebsd.org/portoverview.py?category=sysutils&portname=gksu
>How-To-Repeat:
>Fix:
	This PR depends on two PRs:
	http://www.freebsd.org/cgi/query-pr.cgi?pr=88983
	http://www.freebsd.org/cgi/query-pr.cgi?pr=89001

	The patch is relative to the port:
	# cd /usr/ports/sysutils
	# patch -p0 < _the_patch_
	<delete gksu/*.orig gksu/files/*.orig files>

	A new file is introduced: files/patch-intltool-merge.in.
	Two new dependancies: gconf2, gnomekeyring.

--- gksu.patch begins here ---
diff -ruN gksu.orig/Makefile gksu/Makefile
--- gksu.orig/Makefile	Mon Nov 14 14:41:12 2005
+++ gksu/Makefile	Mon Nov 14 20:31:41 2005
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	gksu
-PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTVERSION=	1.3.6
 CATEGORIES=	sysutils
-MASTER_SITES=	#http://people.debian.org/~kov/gksu/gksu/
+MASTER_SITES=	http://people.debian.org/~kov/gksu/gksu/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical frontend to su
 
 LIB_DEPENDS=	gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
-		gksuui1.0.0:${PORTSDIR}/sysutils/libgksuui
-
-BROKEN=		Port is unfetchable, needs an update to the latest version
+		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
+		gnome-keyring.0:${PORTSDIR}/security/gnomekeyring
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack
+USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2
 USE_LIBTOOL_VER=15
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff -ruN gksu.orig/distinfo gksu/distinfo
--- gksu.orig/distinfo	Mon Nov 14 14:41:12 2005
+++ gksu/distinfo	Mon Nov 14 14:43:37 2005
@@ -1,2 +1,3 @@
-MD5 (gksu-1.2.2.tar.gz) = 564504badbd41fbe554a8133d07b5e94
-SIZE (gksu-1.2.2.tar.gz) = 553299
+MD5 (gksu-1.3.6.tar.gz) = 1c082d2037dd7090d899b633f9258b19
+SHA256 (gksu-1.3.6.tar.gz) = d273e82919e9d61a56c7da7ffc95351aded7701de4fe8a127c5d73135690f0dc
+SIZE (gksu-1.3.6.tar.gz) = 607022
diff -ruN gksu.orig/files/patch-gksu_Makefile.in gksu/files/patch-gksu_Makefile.in
--- gksu.orig/files/patch-gksu_Makefile.in	Mon Nov 14 14:41:12 2005
+++ gksu/files/patch-gksu_Makefile.in	Mon Nov 14 19:52:24 2005
@@ -1,11 +1,37 @@
---- gksu/Makefile.in.orig	Fri Nov  5 00:55:23 2004
-+++ gksu/Makefile.in	Fri Nov  5 00:55:33 2004
-@@ -167,7 +167,7 @@
+--- 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 = `pkg-config --cflags gtk+-2.0 libgksu1.2 libgksuui1.0`
+ 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 -ruN gksu.orig/files/patch-intltool-merge.in gksu/files/patch-intltool-merge.in
--- gksu.orig/files/patch-intltool-merge.in	Thu Jan  1 03:00:00 1970
+++ gksu/files/patch-intltool-merge.in	Mon Nov 14 19:51:20 2005
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	Mon Nov 14 19:50:19 2005
++++ intltool-merge.in	Mon Nov 14 19:50:37 2005
+@@ -91,7 +91,7 @@
+ 
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
++my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/local/bin/iconv";
+ 
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
diff -ruN gksu.orig/pkg-plist gksu/pkg-plist
--- gksu.orig/pkg-plist	Mon Nov 14 14:41:12 2005
+++ gksu/pkg-plist	Mon Nov 14 19:54:42 2005
@@ -9,6 +9,16 @@
 share/locale/da/LC_MESSAGES/gksu.mo
 share/locale/de/LC_MESSAGES/gksu.mo
 share/locale/es/LC_MESSAGES/gksu.mo
-share/locale/no_NB/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/hu/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
+
--- gksu.patch ends here ---

WBR
-- 
bsam

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511141759.jAEHxewJ082934>