mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Update to 1.3.6

Browse Source 
- Unbreak

PR:		ports/89024
Submitted by:	Boris B. Samorodov <bsam@ipt.ru>
This commit is contained in:
Pav Lucistnik 2005-11-14 23:43:15 +00:00
parent 2ebae98420
commit b41d6b7854
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=148297
5 changed files with 134 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysutils/gksu/Makefile
View File

@ -6,26 +6,26 @@
#
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 intlhack
USE_LIBTOOL_VER=15
USE_GETOPT_LONG=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>

5
sysutils/gksu/distinfo
View File

@ -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

34
sysutils/gksu/files/patch-gksu_Makefile.in
View File

@ -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.

82
sysutils/gksu/files/patch-gksu_gksu.c Normal file
View File

@ -0,0 +1,82 @@
--- gksu/gksu.c.orig Wed Oct 26 14:50:43 2005
+++ gksu/gksu.c Tue Nov 15 00:28:41 2005
@@ -499,6 +499,7 @@
pid_t test_lock(const char* fname)
{
+ struct flock fl;
int FD = open(fname, 0);
if(FD < 0) {
if(errno == ENOENT) {
@@ -509,7 +510,6 @@
return(-1);
}
}
- struct flock fl;
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
fl.l_start = 0;
@@ -529,6 +529,7 @@
int get_lock(const char *File)
{
+ struct flock fl;
int FD = open(File,O_RDWR | O_CREAT | O_TRUNC,0640);
if (FD < 0)
{
@@ -546,13 +547,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);
@@ -561,7 +562,7 @@
return dup(0); // Need something for the caller to close
}
- int Tmp = errno;
+ Tmp = errno;
close(FD);
errno = Tmp;
return -1;
@@ -759,6 +760,7 @@
GtkWidget *dialog = GTK_WIDGET(data);
int retvalue = 0;
+ int lock = 0;
if (prompt)
gksuui_dialog_set_prompt (GKSUUI_DIALOG(dialog), prompt);
@@ -782,7 +784,6 @@
g_free (msg);
}
- int lock = 0;
if (grab)
lock = grab_keyboard_and_mouse (dialog);
retvalue = gtk_dialog_run (GTK_DIALOG(dialog));
@@ -1206,6 +1207,7 @@
if (print_pass)
{
+ int lock = 0;
if (!gksuui_dialog_get_message (GKSUUI_DIALOG(dialog)))
{
gchar *msg =
@@ -1216,7 +1218,6 @@
g_free (msg);
}
- int lock = 0;
if (grab)
lock = grab_keyboard_and_mouse (dialog);
retvalue = gtk_dialog_run (GTK_DIALOG(dialog));

13
sysutils/gksu/pkg-plist
View File

@ -5,10 +5,21 @@ share/gnome/applications/gksu.desktop
share/gnome/applications/gksuexec.desktop
share/gnome/pixmaps/gksu-icon.png
share/gnome/pixmaps/gksu-root-terminal.png
share/gnome/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/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
@dirrm share/gnome/gksu