Update port to version 0.23. Fix: --- grdesktop-0.23.diff begins here. --- --- grdesktop-0.23.diff ends here. -----sPZijbiIk7g3GO8dlgzTZ4N57yGXbpP2J3Mlgr23irZcl3vY Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -ruN grdesktop/Makefile grdesktop.new/Makefile --- grdesktop/Makefile Mon Apr 5 05:30:18 2004 +++ grdesktop.new/Makefile Mon May 3 17:43:49 2004 @@ -2,12 +2,11 @@ # Date created: Jan 3 2003 # Whom: Florent Thoumie <flz@xbsd.org> # -# $FreeBSD: ports/net/grdesktop/Makefile,v 1.3 2004/04/05 03:30:18 marcus Exp $ +# $FreeBSD: ports/net/grdesktop/Makefile,v 1.2 2004/02/29 17:12:05 krion Exp $ # PORTNAME= grdesktop -PORTVERSION= 0.22 -PORTREVISION= 1 +PORTVERSION= 0.23 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,10 +20,13 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= libgnomeui gnomeprefix gnomehack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_REINPLACE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps post-patch: - @${REINPLACE_CMD} -e 's|man_MANS = grdesktop.1|man_MANS =|' ${WRKSRC}/doc/Makefile.in + ${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in + +MAN1= grdesktop.1 .include <bsd.port.mk> diff -ruN grdesktop/distinfo grdesktop.new/distinfo --- grdesktop/distinfo Sun Feb 29 18:12:05 2004 +++ grdesktop.new/distinfo Sun May 2 10:54:06 2004 @@ -1,2 +1,2 @@ -MD5 (grdesktop-0.22.tar.gz) = 6fa64e007e2b26bfe96e2516c0d6ddf4 -SIZE (grdesktop-0.22.tar.gz) = 428426 +MD5 (grdesktop-0.23.tar.gz) = 46f8f3e2d4aa2433b8b1537fefa8a4b7 +SIZE (grdesktop-0.23.tar.gz) = 299914 diff -ruN grdesktop/files/patch-intl::dcigettext.c grdesktop.new/files/patch-intl::dcigettext.c --- grdesktop/files/patch-intl::dcigettext.c Thu Feb 26 11:37:48 2004 +++ grdesktop.new/files/patch-intl::dcigettext.c Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- intl/dcigettext.c.orig Fri Oct 11 21:38:35 2002 -+++ intl/dcigettext.c Mon Dec 22 10:27:28 2003 -@@ -58,11 +58,6 @@ - #include <stdlib.h> - - #include <string.h> --#if !HAVE_STRCHR && !defined _LIBC --# ifndef strchr --# define strchr index --# endif --#endif - - #if defined HAVE_UNISTD_H || defined _LIBC - # include <unistd.h> diff -ruN grdesktop/files/patch-src::global.h grdesktop.new/files/patch-src::global.h --- grdesktop/files/patch-src::global.h Thu Feb 26 11:37:48 2004 +++ grdesktop.new/files/patch-src::global.h Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- src/global.h.old Mon Feb 2 14:05:53 2004 -+++ src/global.h Tue Feb 3 15:07:16 2004 -@@ -61,9 +61,9 @@ - - #define MAXHOSTS 10 /* maximum hosts to store */ - #define PIXDIR DATADIR"/pixmaps/grdesktop" --#ifndef KBPATH -+ -+#undef KBPATH - #define KBPATH "/usr/local/share/rdesktop/keymaps/" --#endif - - #define GCONF_BASE "/apps/grdesktop/options" - diff -ruN grdesktop/files/patch-src::options.c grdesktop.new/files/patch-src::options.c --- grdesktop/files/patch-src::options.c Sun Feb 29 18:12:05 2004 +++ grdesktop.new/files/patch-src::options.c Thu Jan 1 01:00:00 1970 @@ -1,36 +0,0 @@ ---- src/options.c Tue Feb 3 09:49:48 2004 -+++ src/options.c.new Sun Feb 29 17:23:08 2004 -@@ -20,6 +20,7 @@ - */ - - -+#include "global.h" - #include "options.h" - - void fillRdpProtocols() { -@@ -276,6 +277,9 @@ - item = g_slist_nth_data(values, i); - typ = gconf_entry_get_value(item); - -+ if (!typ) -+ continue ; -+ - path = g_strsplit(gconf_entry_get_key(item), "/", 0); - while(path[y] != NULL) - y++; -@@ -487,6 +491,7 @@ - - while((entry = readdir(licence_dir)) != NULL) { - gchar *fullname = NULL; -+ gchar *hostname = &entry->d_name[strlen(prefix)]; - struct stat sts; - - fullname = g_strdup_printf("%s/%s", licence_path, -@@ -500,7 +505,6 @@ - if(strlen(entry->d_name) <= strlen(prefix)) - continue; - -- gchar *hostname = &entry->d_name[strlen(prefix)]; - licence_list = g_list_append(licence_list, g_strdup(hostname)); - } - closedir(licence_dir); diff -ruN grdesktop/pkg-plist grdesktop.new/pkg-plist --- grdesktop/pkg-plist Thu Feb 26 11:37:47 2004 +++ grdesktop.new/pkg-plist Mon May 3 17:51:47 2004 @@ -1,8 +1,8 @@ bin/grdesktop -etc/gconf/gconf.xml.defaults/apps/grdesktop/options/%gconf.xml etc/gconf/gconf.xml.defaults/apps/grdesktop/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/options/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/grdesktop/options/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/options/%gconf.xml etc/gconf/schemas/grdesktop.schemas share/gnome/application-registry/grdesktop.applications share/gnome/applications/grdesktop.desktop @@ -33,10 +33,21 @@ share/locale/es/LC_MESSAGES/grdesktop.mo share/locale/fr/LC_MESSAGES/grdesktop.mo @dirrm share/gnome/pixmaps/grdesktop +@unexec rmdir share/gnome/pixmaps 2>/dev/null || true @dirrm share/gnome/omf/grdesktop +@unexec rmdir share/gnome/omf 2>/dev/null || true +@unexec share/gnome/mime-info 2>/dev/null || true @dirrm share/gnome/help/grdesktop/C @dirrm share/gnome/help/grdesktop -@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop/options -@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop +@unexec rmdir share/gnome/help 2>/dev/null || true +@unexec rmdir share/gnome/applications 2>/dev/null || true +@unexec rmdir share/gnome/application-registry 2>/dev/null || true +@unexec rmdir etc/gconf/schemas 2>/dev/null || true @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/options @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop +@unexec rmdir etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || true +@unexec rmdir etc/gconf/gconf.xml.defaults/schemas 2>/dev/null || true +@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop/options +@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop +@unexec rmdir etc/gconf/gconf.xml.defaults/apps 2>/dev/null || true +@unexec rmdir etc/gconf/gconf.xml.defaults 2>/dev/null || true How-To-Repeat: N/A
Responsible Changed From-To: freebsd-ports-bugs->pav Take.
State Changed From-To: open->closed Committed, thanks! Please don't try to remove system directories or GNOME common directories from gnomehier port