diff options
author | Patrick Li <pat@FreeBSD.org> | 2001-12-17 20:59:22 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2001-12-17 20:59:22 +0000 |
commit | dcf3eaff720b0336f33685aec1464d1312f521cf (patch) | |
tree | ffebdd4cb6463168165d85192f3e10dd879f2103 /graphics/gkrellkam | |
parent | b921b7314fc041919cee1a8be58ba880765cca8a (diff) | |
download | ports-dcf3eaff720b0336f33685aec1464d1312f521cf.tar.gz ports-dcf3eaff720b0336f33685aec1464d1312f521cf.zip |
Update to 0.3.0
Notes
Notes:
svn path=/head/; revision=51701
Diffstat (limited to 'graphics/gkrellkam')
-rw-r--r-- | graphics/gkrellkam/Makefile | 2 | ||||
-rw-r--r-- | graphics/gkrellkam/distinfo | 2 | ||||
-rw-r--r-- | graphics/gkrellkam/files/patch-gkrellkam.c | 139 |
3 files changed, 100 insertions, 43 deletions
diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile index 5d46f65c27a4..49d1c47a971b 100644 --- a/graphics/gkrellkam/Makefile +++ b/graphics/gkrellkam/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gkrellkam -PORTVERSION= 0.2.5 +PORTVERSION= 0.3.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gkrellkam/distinfo b/graphics/gkrellkam/distinfo index aa33f8b82599..3567e50d1e60 100644 --- a/graphics/gkrellkam/distinfo +++ b/graphics/gkrellkam/distinfo @@ -1 +1 @@ -MD5 (gkrellkam_0.2.5.tar.gz) = ab511a250697e00e9d564dceded045b8 +MD5 (gkrellkam_0.3.0.tar.gz) = faa4fcdaccf09d7c35d0325e51b1d1bb diff --git a/graphics/gkrellkam/files/patch-gkrellkam.c b/graphics/gkrellkam/files/patch-gkrellkam.c index 9c6305573271..3ee083eab175 100644 --- a/graphics/gkrellkam/files/patch-gkrellkam.c +++ b/graphics/gkrellkam/files/patch-gkrellkam.c @@ -1,24 +1,24 @@ ---- gkrellkam.c.orig Thu Nov 29 02:04:48 2001 -+++ gkrellkam.c Thu Nov 29 02:04:24 2001 -@@ -131,8 +131,7 @@ - "local picture file, list of files, or a script, enter the\n", +--- gkrellkam.c.orig Sun Dec 16 20:23:11 2001 ++++ gkrellkam.c Sun Dec 16 20:28:54 2001 +@@ -142,8 +142,7 @@ "_full_ filename in the \"Image Source\" box. To watch a webcam\n", - "or other online picture, just put its address (beginning with\n", --"http:// or ftp://) in the \"Image Source\" box. You'll need\n", --"GNU wget installed to be able to get pictures from the internet.\n", -+"http:// or ftp://) in the \"Image Source\" box.\n", + "or other online picture, or use an online list, just put its\n", + "address (beginning with http:// or ftp://) in the \"Image Source\n", +-"box. Lists should end in \"-list\" or \".list\". You'll need GNU\n", +-"wget installed to be able to get files from the internet.\n", ++"box. Lists should end in \"-list\" or \".list\".\n", "Special case: when this field begins with \"-x\" followed by a\n", "space and some more text, the remaining text is assumed to be a\n", "script or other system commmand, and the whole path does not\n", -@@ -172,7 +171,6 @@ - - static const char *default_viewer = "eeyes"; +@@ -181,7 +180,6 @@ + "" + }; -#define wget_opts "--proxy=off --cache=off" #define BUFLEN 256 #define MIN_NUMPANELS 0 #define MAX_NUMPANELS 5 -@@ -448,11 +446,11 @@ +@@ -532,11 +530,11 @@ /* start_img_dl () @@ -32,15 +32,15 @@ char tmpfile[] = TEMPTEMPLATE "XXXXXX"; int tmpfd; -@@ -473,20 +471,19 @@ - p->delete_when_done = TRUE; - p->from_script = FALSE; +@@ -552,16 +550,15 @@ + } + close (tmpfd); -- wget_str = g_strdup_printf ("wget -q %s -O %s %s", -- wget_opts, -+ fetch_str = g_strdup_printf ("fetch -p -q -o %s %s", - p->tmpfile, - panel_cursource (p)->img_name); +- wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"", +- wget_opts, tmpfile, +- panel_cursource (p)->img_name); ++ fetch_str = g_strdup_printf ("fetch -p -q -o %s \"%s\"", ++ tmpfile, panel_cursource (p)->img_name); - p->cmd_pipe = popen (wget_str, "r"); - g_free (wget_str); @@ -48,30 +48,87 @@ + g_free (fetch_str); if (p->cmd_pipe == NULL) { - unlink (p->tmpfile); - g_free (p->tmpfile); - p->tmpfile = NULL; - p->delete_when_done = FALSE; -- report_error (_("Couldn't start wget: %s"), strerror (errno)); -+ report_error (_("Couldn't start fetch: %s"), strerror (errno)); + unlink (tmpfile); +- report_error (p, _("Couldn't start wget: %s"), strerror (errno)); ++ report_error (p, _("Couldn't start fetch: %s"), strerror (errno)); return; } - fcntl (fileno (p->cmd_pipe), F_SETFL, O_NONBLOCK); -@@ -578,7 +575,7 @@ - /* if we reach here the pipe is dead- the command has finished. */ - code = pclose (p->cmd_pipe); + +@@ -661,7 +658,7 @@ p->cmd_pipe = NULL; -- if (p->from_script == FALSE && code == 0) /* success for wget */ -+ if (p->from_script == FALSE && code == 0) /* success for fetch */ + + /* pclose will return a -1 on a wait4 error. If that happens, +- we have no way to know whether wget succeeded. Just try */ ++ we have no way to know whether fetch succeeded. Just try */ + if (ks->type == SOURCE_URL && code <= 0) { - load_image_file (p, p->tmpfile); - g_free (p->tmpfile); -@@ -598,7 +595,7 @@ - load_image_file (p, buf); - } + ks->next_dl = time (NULL) + ks->tlife; +@@ -669,7 +666,7 @@ + return 1; + } -- /* if we get here with wget, then wget said something. This is generally -+ /* if we get here with fetch, then fetch said something. This is generally - not good, since we passed -q. We'll have to wait for it to die */ +- report_error (p, _("Error: wget gave bad code or script died. code %d"), ++ report_error (p, _("Error: fetch gave bad code or script died. code %d"), + code); + } + +@@ -686,10 +683,10 @@ + } + else + { +- /* if we get here with wget, then wget said something. This is generally ++ /* if we get here with fetch, then fetch said something. This is generally + not good, since we passed -q. We'll have to wait for it to die */ - pclose (p->cmd_pipe); +- report_error (p, _("wget said: \"%s\""), buf); ++ report_error (p, _("fetch said: \"%s\""), buf); + pclose (p->cmd_pipe); + p->cmd_pipe = NULL; + return -1; +@@ -788,14 +785,14 @@ + code = 256; + + /* pclose will return a -1 on a wait4 error. If that happens, +- we have no way to know whether wget succeeded. Just try */ ++ we have no way to know whether fetch succeeded. Just try */ + if (code <= 0) + { + kkam_read_list (p, p->listurl_file, 0); + update_image (p); + } + else +- report_error (p, _("Error: wget listurl download died. code %d"), code); ++ report_error (p, _("Error: fetch listurl download died. code %d"), code); + + unlink (p->listurl_file); + g_free (p->listurl_file); +@@ -1470,7 +1467,7 @@ + + static void kkam_read_listurl (KKamPanel *p, char *source) + { +- gchar *wget_str; ++ gchar *fetch_str; + char tmpfile[] = TEMPTEMPLATE "-urllistXXXXXX"; + int tmpfd; + +@@ -1486,15 +1483,15 @@ + } + close (tmpfd); + +- wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"", +- wget_opts, tmpfile, source); ++ fetch_str = g_strdup_printf ("fetch -p -q -o %s \"%s\"", ++ tmpfile, source); + +- p->listurl_pipe = popen (wget_str, "r"); +- g_free (wget_str); ++ p->listurl_pipe = popen (fetch_str, "r"); ++ g_free (fetch_str); + if (p->listurl_pipe == NULL) + { + unlink (tmpfile); +- report_error (p, _("Couldn't start wget for list download: %s"), ++ report_error (p, _("Couldn't start fetch for list download: %s"), + strerror (errno)); + return; + } |