Date: Tue, 02 May 2006 07:37:22 -0700 (PDT) From: Andrew Pantyukhin <infofarmer@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96665: update ftp/gwget to 0.97 Message-ID: <44576ea2.1c5fb53a.28ed.ffffee51@mx.gmail.com> Resent-Message-ID: <200605021440.k42EeDBc062984@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96665
>Category: ports
>Synopsis: update ftp/gwget to 0.97
>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: Tue May 02 14:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD thror.intranet.gubkin.ru 6.1-RC FreeBSD 6.1-RC #8: Mon Apr 10 16:20:57 MSD 2006 sat@thror.intranet.gubkin.ru:/usr/obj/usr/src/sys/SATH i386
>Description:
o Update to 0.97
o Patches renamed and updated
>How-To-Repeat:
>Fix:
--- gwget.diff begins here ---
diff -urN /usr/ports/ftp/gwget/Makefile gwget/Makefile
--- /usr/ports/ftp/gwget/Makefile Thu Feb 23 13:36:31 2006
+++ gwget/Makefile Tue May 2 18:25:07 2006
@@ -1,13 +1,12 @@
-# New ports collection makefile for: gwget
-# Date created: 1 November 2004
-# Whom: Radek Kozlowski <radek@raadradd.com>
+# New ports collection makefile for: gwget
+# Date created: 1 November 2004
+# Whom: Radek Kozlowski <radek@raadradd.com>
#
# $FreeBSD: ports/ftp/gwget/Makefile,v 1.14 2006/02/23 10:36:31 ade Exp $
#
PORTNAME= gwget
-PORTVERSION= 0.95
-PORTREVISION= 1
+PORTVERSION= 0.97
CATEGORIES= ftp www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -22,10 +21,10 @@
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
USE_X_PREFIX= yes
+USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib"
GCONF_SCHEMAS= gwget.schemas
EPHY_VER= 1.6
diff -urN /usr/ports/ftp/gwget/distinfo gwget/distinfo
--- /usr/ports/ftp/gwget/distinfo Sun Jan 22 12:48:54 2006
+++ gwget/distinfo Tue May 2 17:55:03 2006
@@ -1,3 +1,3 @@
-MD5 (gnome2/gwget-0.95.tar.bz2) = 8c268fb6c8f724f0e1971c033ada9c47
-SHA256 (gnome2/gwget-0.95.tar.bz2) = 2b54f05a006e9d8413b27fd981872b09a7a73bf24b64090f126e4866d30e6318
-SIZE (gnome2/gwget-0.95.tar.bz2) = 418952
+MD5 (gnome2/gwget-0.97.tar.bz2) = b31dd63a2b55f1c0c2dea58490ca8cd2
+SHA256 (gnome2/gwget-0.97.tar.bz2) = 4b67d5be3a5748ce5e4ffbd4f2a90f432c66915c7a068244c562c1ee810ee4dd
+SIZE (gnome2/gwget-0.97.tar.bz2) = 406743
diff -urN /usr/ports/ftp/gwget/files/patch-src__gwget_data.c gwget/files/patch-src__gwget_data.c
--- /usr/ports/ftp/gwget/files/patch-src__gwget_data.c Thu Jan 1 03:00:00 1970
+++ gwget/files/patch-src__gwget_data.c Tue May 2 17:55:53 2006
@@ -0,0 +1,10 @@
+--- ./src/gwget_data.c.orig Tue Dec 6 19:54:41 2005
++++ ./src/gwget_data.c Tue May 2 17:55:45 2006
+@@ -35,6 +35,7 @@
+ #include "main_window_cb.h"
+ #include "utils.h"
+ #include "systray.h"
++#include <netinet/in.h>
+
+
+
diff -urN /usr/ports/ftp/gwget/files/patch-src__main.c gwget/files/patch-src__main.c
--- /usr/ports/ftp/gwget/files/patch-src__main.c Thu Jan 1 03:00:00 1970
+++ gwget/files/patch-src__main.c Tue May 2 17:55:53 2006
@@ -0,0 +1,42 @@
+--- ./src/main.c.orig Wed Feb 16 22:41:29 2005
++++ ./src/main.c Tue May 2 17:55:45 2006
+@@ -120,6 +120,7 @@
+ Args *args_original = (Args*)client_data;
+ int argc_original = (*args_original).argc;
+ char **argv_original = (*args_original).argv;
++ int i, iPos, iL, iSize;
+
+ int argc;
+ char **argv;
+@@ -166,13 +167,12 @@
+ argc = argc_original + 2;
+ argv = g_malloc0(sizeof(char*)*argc);
+
+- int iPos = -1;
+- int i;
++ iPos = -1;
+ for (i=0;i<argc_original;i++)
+ if (strcmp(argv_original[i],"--force-tray-only") != 0) {
+ iPos++;
+- int iL = strlen(argv_original[i]);
+- int iSize = sizeof(char)*iL;
++ iL = strlen(argv_original[i]);
++ iSize = sizeof(char)*iL;
+ argv[iPos] = g_malloc0(iSize);
+ strcpy(argv[iPos],argv_original[i]);
+ }
+@@ -191,12 +191,13 @@
+ static void
+ gnome_session_join(int argc,char *argv[])
+ {
++ GnomeClient* client;
+ Args *args = g_malloc(sizeof(Args));
+
+ (*args).argc = argc;
+ (*args).argv = argv;
+
+- GnomeClient* client = gnome_master_client();
++ client = gnome_master_client();
+
+ gnome_client_set_restart_style(client,GNOME_RESTART_IF_RUNNING);
+ gtk_signal_connect(GTK_OBJECT(client),"save_yourself",
diff -urN /usr/ports/ftp/gwget/files/patch-src__wget-log.c gwget/files/patch-src__wget-log.c
--- /usr/ports/ftp/gwget/files/patch-src__wget-log.c Thu Jan 1 03:00:00 1970
+++ gwget/files/patch-src__wget-log.c Tue May 2 17:55:53 2006
@@ -0,0 +1,63 @@
+--- ./src/wget-log.c.orig Sat Jul 30 23:50:45 2005
++++ ./src/wget-log.c Tue May 2 17:55:45 2006
+@@ -62,11 +62,13 @@
+ static int
+ wget_log_process_line (GwgetData *gwgetdata)
+ {
+- if (gwgetdata->line == NULL)
+- return 0;
+-
+ gchar *p;
+ struct stat file_stat;
++ char *sName;
++ int iL;
++
++ if (gwgetdata->line == NULL)
++ return 0;
+
+ switch (gwgetdata->state) {
+ case DL_NOT_CONNECTED:
+@@ -76,10 +78,10 @@
+ * filesystem filename and set gwgetdata->filename
+ */
+ if (strstr(gwgetdata->line," => `")) {
+- int iL = strlen(gwgetdata->line);
++ iL = strlen(gwgetdata->line);
+ gwgetdata->line[iL-1] = 0; // Chop the final '
+
+- char *sName = gwgetdata->line;
++ sName = gwgetdata->line;
+ /*
+ * Now sName contains the whole pathname. No filename can
+ * contain '/' so the following search for the last component
+@@ -295,11 +297,14 @@
+
+ static void
+ wget_log_read_log_line(GwgetData *gwgetdata) {
++ char c;
++ int iRes, iBlockCount, iWritePos;
++ gchar *buffer;
++
+ g_free(gwgetdata->line);
+ gwgetdata->line = NULL;
+-
+- char c;
+- int iRes = read(gwgetdata->log_fd,&c,1);
++
++ iRes = read(gwgetdata->log_fd,&c,1);
+
+ if (iRes < 1) {
+ /*
+@@ -309,9 +314,9 @@
+ return;
+ }
+
+- int iBlockCount = 1;
+- gchar *buffer = g_malloc(sizeof(gchar)*(iBlockCount*BLOCK_SIZE));
+- int iWritePos = 0;
++ iBlockCount = 1;
++ buffer = g_malloc(sizeof(gchar)*(iBlockCount*BLOCK_SIZE));
++ iWritePos = 0;
+
+ buffer[iWritePos++] = c;
+ while (c != '\n') {
diff -urN /usr/ports/ftp/gwget/files/patch-src_gwget_data.c gwget/files/patch-src_gwget_data.c
--- /usr/ports/ftp/gwget/files/patch-src_gwget_data.c Fri May 20 20:26:20 2005
+++ gwget/files/patch-src_gwget_data.c Thu Jan 1 03:00:00 1970
@@ -1,10 +0,0 @@
---- src/gwget_data.c.orig Thu May 19 19:02:00 2005
-+++ src/gwget_data.c Thu May 19 19:02:38 2005
-@@ -31,6 +31,7 @@
- #include "main_window_cb.h"
- #include "utils.h"
- #include "systray.h"
-+#include <netinet/in.h>
-
- #include <config.h>
-
diff -urN /usr/ports/ftp/gwget/files/patch-src_main.c gwget/files/patch-src_main.c
--- /usr/ports/ftp/gwget/files/patch-src_main.c Sun Apr 3 03:54:25 2005
+++ gwget/files/patch-src_main.c Thu Jan 1 03:00:00 1970
@@ -1,42 +0,0 @@
---- src/main.c.orig Sat Apr 2 22:26:21 2005
-+++ src/main.c Sat Apr 2 22:52:48 2005
-@@ -120,6 +120,7 @@
- Args *args_original = (Args*)client_data;
- int argc_original = (*args_original).argc;
- char **argv_original = (*args_original).argv;
-+ int i, iPos, iL, iSize;
-
- int argc;
- char **argv;
-@@ -166,13 +167,12 @@
- argc = argc_original + 2;
- argv = g_malloc0(sizeof(char*)*argc);
-
-- int iPos = -1;
-- int i;
-+ iPos = -1;
- for (i=0;i<argc_original;i++)
- if (strcmp(argv_original[i],"--force-tray-only") != 0) {
- iPos++;
-- int iL = strlen(argv_original[i]);
-- int iSize = sizeof(char)*iL;
-+ iL = strlen(argv_original[i]);
-+ iSize = sizeof(char)*iL;
- argv[iPos] = g_malloc0(iSize);
- strcpy(argv[iPos],argv_original[i]);
- }
-@@ -191,12 +191,13 @@
- static void
- gnome_session_join(int argc,char *argv[])
- {
-+ GnomeClient* client;
- Args *args = g_malloc(sizeof(Args));
-
- (*args).argc = argc;
- (*args).argv = argv;
-
-- GnomeClient* client = gnome_master_client();
-+ client = gnome_master_client();
-
- gnome_client_set_restart_style(client,GNOME_RESTART_IF_RUNNING);
- gtk_signal_connect(GTK_OBJECT(client),"save_yourself",
diff -urN /usr/ports/ftp/gwget/files/patch-src_wget-log.c gwget/files/patch-src_wget-log.c
--- /usr/ports/ftp/gwget/files/patch-src_wget-log.c Sun Apr 3 03:54:25 2005
+++ gwget/files/patch-src_wget-log.c Thu Jan 1 03:00:00 1970
@@ -1,63 +0,0 @@
---- src/wget-log.c.orig Sat Apr 2 23:05:09 2005
-+++ src/wget-log.c Sat Apr 2 23:31:55 2005
-@@ -58,11 +58,13 @@
- static int
- wget_log_process_line (GwgetData *gwgetdata)
- {
-- if (gwgetdata->line == NULL)
-- return 0;
--
- gchar *p;
- struct stat file_stat;
-+ char *sName;
-+ int iL;
-+
-+ if (gwgetdata->line == NULL)
-+ return 0;
-
- switch (gwgetdata->state) {
- case DL_NOT_CONNECTED:
-@@ -72,10 +74,10 @@
- * filesystem filename and set gwgetdata->filename
- */
- if (strstr(gwgetdata->line," => `")) {
-- int iL = strlen(gwgetdata->line);
-+ iL = strlen(gwgetdata->line);
- gwgetdata->line[iL-1] = 0; // Chop the final '
-
-- char *sName = gwgetdata->line;
-+ sName = gwgetdata->line;
- /*
- * Now sName contains the whole pathname. No filename can
- * contain '/' so the following search for the last component
-@@ -272,11 +274,14 @@
-
- void
- wget_log_read_log_line(GwgetData *gwgetdata) {
-+ char c;
-+ int iRes, iBlockCount, iWritePos;
-+ gchar *buffer;
-+
- g_free(gwgetdata->line);
- gwgetdata->line = NULL;
--
-- char c;
-- int iRes = read(gwgetdata->log_fd,&c,1);
-+
-+ iRes = read(gwgetdata->log_fd,&c,1);
-
- if (iRes < 1) {
- /*
-@@ -286,9 +291,9 @@
- return;
- }
-
-- int iBlockCount = 1;
-- gchar *buffer = g_malloc(sizeof(gchar)*(iBlockCount*BLOCK_SIZE));
-- int iWritePos = 0;
-+ iBlockCount = 1;
-+ buffer = g_malloc(sizeof(gchar)*(iBlockCount*BLOCK_SIZE));
-+ iWritePos = 0;
-
- buffer[iWritePos++] = c;
- while (c != '\n') {
diff -urN /usr/ports/ftp/gwget/pkg-plist gwget/pkg-plist
--- /usr/ports/ftp/gwget/pkg-plist Sun Jan 22 08:52:05 2006
+++ gwget/pkg-plist Tue May 2 18:03:07 2006
@@ -24,6 +24,7 @@
share/gnome/gwget/preferences.glade
share/gnome/idl/GNOME_Gwget.idl
share/gnome/pixmaps/gwget.png
+share/locale/ar/LC_MESSAGES/gwget.mo
share/locale/bg/LC_MESSAGES/gwget.mo
share/locale/ca/LC_MESSAGES/gwget.mo
share/locale/cs/LC_MESSAGES/gwget.mo
@@ -40,6 +41,7 @@
share/locale/ja/LC_MESSAGES/gwget.mo
share/locale/lt/LC_MESSAGES/gwget.mo
share/locale/mk/LC_MESSAGES/gwget.mo
+share/locale/ne/LC_MESSAGES/gwget.mo
share/locale/nl/LC_MESSAGES/gwget.mo
share/locale/pa/LC_MESSAGES/gwget.mo
share/locale/pl/LC_MESSAGES/gwget.mo
@@ -52,6 +54,7 @@
share/locale/sq/LC_MESSAGES/gwget.mo
share/locale/sv/LC_MESSAGES/gwget.mo
share/locale/tr/LC_MESSAGES/gwget.mo
+share/locale/uk/LC_MESSAGES/gwget.mo
share/locale/zh_CN/LC_MESSAGES/gwget.mo
share/locale/zh_TW/LC_MESSAGES/gwget.mo
@dirrm include/gwget
--- gwget.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44576ea2.1c5fb53a.28ed.ffffee51>