8 files changed, 212 insertions, 0 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index dd5e353a9f7a..6dc360faeab4 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -102,6 +102,7 @@
     SUBDIR += gimp1
     SUBDIR += giram
     SUBDIR += gkrellkam
+    SUBDIR += gkrellkam2
     SUBDIR += glass
     SUBDIR += gle
     SUBDIR += glide3
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
new file mode 100644
index 000000000000..d2c858ea41bf
--- /dev/null
+++ b/graphics/gkrellkam2/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	gkrellkam2
+# Date Created:		24 Nov 2002
+# Whom:			Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD$
+# $Id: Makefile,v 1.1.1.1 2002/11/24 03:37:56 jylefort Exp $
+#
+
+PORTNAME=		gkrellkam
+PORTVERSION=		2.0.0
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=		${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	jylefort@brutele.be
+
+BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+
+MAN5=		gkrellkam-list.5
+
+MAKE_ENV+=	MKDIR="${MKDIR}" \
+		INSTALL_DATA="${INSTALL_DATA}"
+
+.include <bsd.port.mk>
diff --git a/graphics/gkrellkam2/distinfo b/graphics/gkrellkam2/distinfo
new file mode 100644
index 000000000000..73190c372d6a
--- /dev/null
+++ b/graphics/gkrellkam2/distinfo
@@ -0,0 +1 @@
+MD5 (gkrellkam_2.0.0.tar.gz) = 657c99de172bc7598098a6a4196ff07b
diff --git a/graphics/gkrellkam2/files/patch-aa b/graphics/gkrellkam2/files/patch-aa
new file mode 100644
index 000000000000..d775452b0d81
--- /dev/null
+++ b/graphics/gkrellkam2/files/patch-aa
@@ -0,0 +1,37 @@
+--- Makefile.orig	Sun Nov 24 04:21:27 2002
++++ Makefile	Sun Nov 24 04:24:30 2002
+@@ -9,17 +9,14 @@
+ # To facilitate packaging- leave blank for normal installation
+ DESTDIR =
+ 
+-# This should point to the GKrellM headers
+-GKRELLM_HDRS = /usr/include
+-
+ CC := gcc
+ GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
+-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) -I$(GKRELLM_HDRS)
++CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS)
+ LDFLAGS := -shared -Wl
+-INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins
++INST_DIR=${PREFIX}/libexec/gkrellm2/plugins
+ USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm2/plugins
+ MANPAGES := gkrellkam-list.5
+-MANPAGE_DIR := $(DESTDIR)/usr/share/man/man5
++MANPAGE_DIR=${PREFIX}/man/man5
+ 
+ .PHONY: clean install
+ 
+@@ -32,9 +29,10 @@
+ 	-rm -f $(TARGET).so $(TARGET).o
+ 
+ install:
+-	mkdir -p $(INST_DIR)
+-	cp -f $(TARGET).so $(INST_DIR)
+-	cp -f $(MANPAGES) $(MANPAGE_DIR)
++	${MKDIR} ${INST_DIR}
++	${INSTALL_DATA} ${TARGET}.so ${INST_DIR}
++	${MKDIR} ${MANPAGE_DIR}
++	${INSTALL_DATA} ${MANPAGES} ${MANPAGE_DIR}
+ 
+ userinstall:
+ 	mkdir -p $(USER_INST_DIR)
diff --git a/graphics/gkrellkam2/files/patch-ba b/graphics/gkrellkam2/files/patch-ba
new file mode 100644
index 000000000000..e72b51368ae6
--- /dev/null
+++ b/graphics/gkrellkam2/files/patch-ba
@@ -0,0 +1,134 @@
+--- gkrellkam2.c.orig	Sun Nov 24 04:26:59 2002
++++ gkrellkam2.c	Sun Nov 24 04:30:50 2002
+@@ -139,8 +139,7 @@
+ "_full_ filename in the \"Image Source\" box. To watch a webcam\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",
+@@ -178,7 +177,6 @@
+   ""
+ };
+ 
+-#define wget_opts "--cache=off"
+ #define BUFLEN 256
+ #define MIN_NUMPANELS 0
+ #define MAX_NUMPANELS 5
+@@ -690,11 +688,11 @@
+ /*
+   start_img_dl ()
+ 
+-  Open a pipe and spawn wget.
++  Open a pipe and spawn fetch.
+ */
+ static void start_img_dl (KKamPanel *p)
+ {
+-  gchar *wget_str;
++  gchar *fetch_str;
+   char tmpfile[] = TEMPTEMPLATE "XXXXXX";
+   int tmpfd;
+ 
+@@ -710,16 +708,16 @@
+   }
+   close (tmpfd);
+ 
+-  wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"",
+-                              wget_opts, tmpfile,
++  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);
++  p->cmd_pipe = popen (fetch_str, "r");
++  g_free (fetch_str);
+   if (p->cmd_pipe == NULL)
+   {
+     unlink (tmpfile);
+-    report_error (p, _("Couldn't start wget: %s"), strerror (errno));
++    report_error (p, _("Couldn't start fetch: %s"), strerror (errno));
+     return;
+   }
+   
+@@ -819,7 +817,7 @@
+     p->cmd_pipe = NULL;
+ 
+     /* 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)
+     {
+       ks->next_dl = time (NULL) + ks->tlife;
+@@ -827,7 +825,7 @@
+       return 1;
+     }
+ 
+-    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);
+     return -1;
+   }
+@@ -848,10 +846,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 */
+     
+-    report_error (p, _("wget said: \"%s\""), buf);
++    report_error (p, _("fetch said: \"%s\""), buf);
+     return -1;
+   }
+ }
+@@ -949,14 +947,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);
+@@ -1607,7 +1605,7 @@
+ 
+ static void kkam_read_listurl (KKamPanel *p, char *source)
+ {
+-  gchar *wget_str;
++  gchar *fetch_str;
+   char tmpfile[] = TEMPTEMPLATE "-urllistXXXXXX";
+   int tmpfd;
+ 
+@@ -1623,15 +1621,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;
+   }
diff --git a/graphics/gkrellkam2/pkg-comment b/graphics/gkrellkam2/pkg-comment
new file mode 100644
index 000000000000..7952655153bf
--- /dev/null
+++ b/graphics/gkrellkam2/pkg-comment
@@ -0,0 +1 @@
+GKrellM plugin that display thumbnails of periodically updated images
diff --git a/graphics/gkrellkam2/pkg-descr b/graphics/gkrellkam2/pkg-descr
new file mode 100644
index 000000000000..721ce8172674
--- /dev/null
+++ b/graphics/gkrellkam2/pkg-descr
@@ -0,0 +1,7 @@
+A plugin to GKrellM that displays thumbnails of periodically updated
+images.
+
+WWW: http://gkrellkam.sourceforge.net/
+
+- Jean-Yves Lefort
+jylefort@brutele.be
diff --git a/graphics/gkrellkam2/pkg-plist b/graphics/gkrellkam2/pkg-plist
new file mode 100644
index 000000000000..63d7c335e513
--- /dev/null
+++ b/graphics/gkrellkam2/pkg-plist
@@ -0,0 +1 @@
+libexec/gkrellm2/plugins/gkrellkam2.so