There's a fine utility in base, called ftp. There's no reason at

all that some of the ports RUN_DEPEND on wget. "Nice!" naddy@, who also went even further and made libxml not BUILD_DEPEND on wget.
2008-06-20 10:49:42 +00:00 · 2008-06-20 10:49:42 +00:00 · 9ff4557468
commit 9ff4557468
parent 89ee0b1fcf
11 changed files with 202 additions and 28 deletions
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2007/12/18 10:39:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2008/06/20 10:49:42 martynas Exp $

 COMMENT=		wm-dockapp; space weather monitor

 DISTNAME=		wmSpaceWeather-1.04
-PKGNAME=		${DISTNAME:L}p1
+PKGNAME=		${DISTNAME:L}p2
 CATEGORIES=		astro x11 x11/windowmaker

 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@ -18,8 +18,6 @@ WANTLIB=		X11 Xext Xpm c

 MASTER_SITES=		http://humppa.nl/distfiles/

-RUN_DEPENDS=		:wget-*:net/wget
-
 MAKE_ENV=		CC="${CC}"
 USE_X11=		Yes
 NO_REGRESS=		Yes
--- a/astro/wmspaceweather/patches/patch-GetKp
+++ b/astro/wmspaceweather/patches/patch-GetKp
@ -1,6 +1,6 @@
-$OpenBSD: patch-GetKp,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
+$OpenBSD: patch-GetKp,v 1.3 2008/06/20 10:49:42 martynas Exp $
 --- wmSpaceWeather/GetKp.orig	Fri Feb 12 06:42:01 1999
-+++ wmSpaceWeather/GetKp	Tue Dec 18 10:22:00 2007
+++ wmSpaceWeather/GetKp	Thu Jun 19 20:41:26 2008
@@ -7,19 +7,31 @@
 
     require "ctime.pl";
@ -37,7 +37,7 @@ $OpenBSD: patch-GetKp,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
 
 -    $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
 +
-+    $grabcmd = "wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
+    $grabcmd = "ftp -V ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
     system "$grabcmd";
 
 
@ -55,7 +55,7 @@ $OpenBSD: patch-GetKp,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
     # Add in very latest stuff
     #
 -    $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/latest/curind.txt";
-+    $grabcmd = "wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/latest/curind.txt";
+    $grabcmd = "ftp -V ftp://www.sec.noaa.gov/pub/latest/curind.txt";
     system "$grabcmd";
     %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
 
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.16 2008/06/20 10:49:42 martynas Exp $

 COMMENT=		wm-dockapp; WWW image monitor

 DISTNAME=		wmGrabImage-0.72
-PKGNAME=		${DISTNAME:L}p0
+PKGNAME=		${DISTNAME:L}p1
 CATEGORIES=		graphics x11 x11/windowmaker
 EXTRACT_SUFX=		.tgz

@ -20,8 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/

 RUN_DEPENDS=		:ImageMagick-*:graphics/ImageMagick \
-			:xv-*:graphics/xv \
-			:wget-*:net/wget
+			:xv-*:graphics/xv

 WANTLIB=		X11 c Xext Xpm
 USE_X11=		Yes
--- a/graphics/wmgrabimage/patches/patch-Makefile
+++ b/graphics/wmgrabimage/patches/patch-Makefile
@ -1,5 +1,5 @@
--- wmGrabImage/Makefile.orig	Mon Feb  1 22:55:30 1999
-+++ wmGrabImage/Makefile	Fri Dec 22 14:03:33 2000
+--- wmGrabImage/Makefile.orig	Sun May 27 21:02:18 2001
+++ wmGrabImage/Makefile	Wed Jun 18 22:55:56 2008
@@ -1,8 +1,5 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
@ -16,9 +16,9 @@
 
 .c.o:
 -	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
 +	$(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR)
 
+-
 all:	wmGrabImage.o wmGrabImage
 
 wmGrabImage.o: wmGrabImage_master.xpm wmGrabImage_mask.xbm
--- a/graphics/wmgrabimage/patches/patch-wmGrabImage_GrabImage
+++ b/graphics/wmgrabimage/patches/patch-wmGrabImage_GrabImage
@ -0,0 +1,18 @@
+$OpenBSD: patch-wmGrabImage_GrabImage,v 1.1 2008/06/20 10:49:42 martynas Exp $
+--- wmGrabImage/GrabImage.orig	Sun May 27 21:02:18 2001
+++ wmGrabImage/GrabImage	Thu Jun 19 21:08:20 2008
+@@ -47,13 +47,7 @@
+ 	system("cp $ImagePath $home/.wmGrabImage/$ImageName");
+ 
+     } else {
+-
+-
+-        #
+-        #  I think some of these wget command line options may cause problems
+-        #  for some people? Dont know why...
+-        #
+-        $GrabCmd = "wget --proxy=off --passive-ftp --tries 0 -q -O $home/.wmGrabImage/$ImageName $URL";
+        $GrabCmd = "ftp -V -o $home/.wmGrabImage/$ImageName $URL";
+         system "$GrabCmd";
+ 
+     }
--- a/graphics/wmgrabimage/patches/patch-wmGrabImage_c
+++ b/graphics/wmgrabimage/patches/patch-wmGrabImage_c
@ -1,5 +1,5 @@
 --- wmGrabImage/wmGrabImage.c.orig	Sun May 27 21:45:28 2001
-+++ wmGrabImage/wmGrabImage.c	Fri Jun 15 10:55:38 2001
+++ wmGrabImage/wmGrabImage.c	Wed Jun 18 22:55:56 2008
@@ -158,7 +158,7 @@ int		n, s, m, dt1, dt2, dt3, len;
 int 		Year, Month, Day;
 int		Hours, Mins, Secs;
@ -34,7 +34,7 @@
 	    system(command);
 
 	    ForceUpdate = 1;
-@@ -470,7 +470,7 @@ void ParseCMDLine(int argc, char *argv[]
+@@ -470,7 +470,7 @@ void ParseCMDLine(int argc, char *argv[]) {
 
         } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){
 
@ -43,7 +43,7 @@
 
         } else if (!strcmp(argv[i], "-delay")){
 
-@@ -482,7 +482,7 @@ void ParseCMDLine(int argc, char *argv[]
+@@ -482,7 +482,7 @@ void ParseCMDLine(int argc, char *argv[]) {
 
         } else if (!strcmp(argv[i], "-http")){
 
--- a/graphics/wmgrabimage/patches/patch-wmGrabImage_wmGrabImage_1
+++ b/graphics/wmgrabimage/patches/patch-wmGrabImage_wmGrabImage_1
@ -1,6 +1,6 @@
-$OpenBSD: patch-wmGrabImage_wmGrabImage_1,v 1.1 2001/06/15 09:29:02 wilfried Exp $
+$OpenBSD: patch-wmGrabImage_wmGrabImage_1,v 1.2 2008/06/20 10:49:42 martynas Exp $
 --- wmGrabImage/wmGrabImage.1.orig	Sun May 27 21:02:18 2001
-+++ wmGrabImage/wmGrabImage.1	Fri Jun 15 11:23:27 2001
+++ wmGrabImage/wmGrabImage.1	Thu Jun 19 20:44:48 2008
@@ -1,6 +1,6 @@
 -.TH WMGRABIMGAE 1 "16 December 1998" 
 +.TH WMGRABIMAGE 1 "16 December 1998" 
@ -10,7 +10,7 @@ $OpenBSD: patch-wmGrabImage_wmGrabImage_1,v 1.1 2001/06/15 09:29:02 wilfried Exp
 .SH SYNOPSIS
 .B wmGrabImage
 [-h] [-display <Display>] -url <Image URL> [-http <URL>] [-c] [-delay <Time>]
-@@ -43,6 +43,9 @@ Center the image vertically within the i
+@@ -43,11 +43,14 @@ Center the image vertically within the icon. 
 .TP
 .B \-delay <Time>
 The time between updates. The default is about 5 minutes.
@ -20,3 +20,9 @@ $OpenBSD: patch-wmGrabImage_wmGrabImage_1,v 1.1 2001/06/15 09:29:02 wilfried Exp
 .SH FILES
 The original sized image and the thumbnail XPM image are both stored in
 ~/.wmGrabImage/ which gets created if it doesnt already exist.
+ .SH SEE ALSO
+-wget and the ImageMagick convert utility.
+ftp and the ImageMagick convert utility.
+ .SH BUGS
+ Who knows? -- its still Beta though. (Let me know if you find any). Oldish
+ versions of the ImageMagick convert utility have a memory leak -- if you have
--- a/sysutils/gkrellm/plugins/kam/Makefile
+++ b/sysutils/gkrellm/plugins/kam/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2008/06/20 10:49:42 martynas Exp $

 COMMENT=	webcam plugin for GkrellM2

 V=		2.0.0
 DISTNAME=	gkrellkam-${V}
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	graphics

 HOMEPAGE=	http://gkrellkam.sourceforge.net
@ -12,8 +12,6 @@ HOMEPAGE=	http://gkrellkam.sourceforge.net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gkrellkam/}
 DISTFILES=	gkrellkam_${V}.tar.gz

-RUN_DEPENDS+=	:wget-*:net/wget
-
 PLUGIN=		${WRKSRC}/gkrellkam2.so

 WANTLIB=
--- a/sysutils/gkrellm/plugins/kam/patches/patch-gkrellkam-list_5
+++ b/sysutils/gkrellm/plugins/kam/patches/patch-gkrellkam-list_5
@ -0,0 +1,18 @@
+$OpenBSD: patch-gkrellkam-list_5,v 1.1 2008/06/20 10:49:42 martynas Exp $
+--- gkrellkam-list.5.orig	Wed Oct 23 17:32:10 2002
+++ gkrellkam-list.5	Thu Jun 19 21:00:11 2008
+@@ -55,7 +55,7 @@ If set, this sets the minimum length of time that must
+ image is re-loaded. If the image cycles up before that time, the old
+ image will be used. For \fBscript\fP types, this means that the script
+ will not be re-run. For \fBurl\fP types, the image will not be fetched
+-using wget. When this property is not set, \fBurl\fP images will be
+using ftp. When this property is not set, \fBurl\fP images will be
+ downloaded every time they are displayed, and \fBscript\fPs will be run
+ every time.
+ .PP
+@@ -94,4 +94,4 @@ GKrellKam panel
+ This manual page was written by the same author for inclusion in the
+ GKrellKam distribution, and may be used by others.
+ .SH "SEE ALSO"
+-.BR wget (8)
+.BR ftp (1)
--- a/sysutils/gkrellm/plugins/kam/patches/patch-gkrellkam2_c
+++ b/sysutils/gkrellm/plugins/kam/patches/patch-gkrellkam2_c
@ -0,0 +1,136 @@
+$OpenBSD: patch-gkrellkam2_c,v 1.1 2008/06/20 10:49:42 martynas Exp $
+--- gkrellkam2.c.orig	Wed Oct 23 18:35:59 2002
+++ gkrellkam2.c	Thu Jun 19 20:59:33 2008
+@@ -139,8 +139,8 @@ static gchar *kkam_info_text[] = 
+ "_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\". You'll need \n",
+"ftp installed to be able to get files from the internet.\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 +178,6 @@ static const char *default_source[] = {
+   ""
+ };
+ 
+-#define wget_opts "--cache=off"
+ #define BUFLEN 256
+ #define MIN_NUMPANELS 0
+ #define MAX_NUMPANELS 5
+@@ -690,11 +689,11 @@ static void draw_pixbuf (KKamPanel *p)
+ /*
+   start_img_dl ()
+ 
+-  Open a pipe and spawn wget.
+  Open a pipe and spawn ftp.
+ */
+ static void start_img_dl (KKamPanel *p)
+ {
+-  gchar *wget_str;
+  gchar *ftp_str;
+   char tmpfile[] = TEMPTEMPLATE "XXXXXX";
+   int tmpfd;
+ 
+@@ -710,16 +709,15 @@ static void start_img_dl (KKamPanel *p)
+   }
+   close (tmpfd);
+ 
+-  wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"",
+-                              wget_opts, tmpfile,
+  ftp_str = g_strdup_printf ("ftp -V -o %s \"%s\"", tmpfile,
+                               panel_cursource (p)->img_name);
+ 
+-  p->cmd_pipe = popen (wget_str, "r");
+-  g_free (wget_str);
+  p->cmd_pipe = popen (ftp_str, "r");
+  g_free (ftp_str);
+   if (p->cmd_pipe == NULL)
+   {
+     unlink (tmpfile);
+-    report_error (p, _("Couldn't start wget: %s"), strerror (errno));
+    report_error (p, _("Couldn't start ftp: %s"), strerror (errno));
+     return;
+   }
+   
+@@ -819,7 +817,7 @@ static int cmd_results (KKamPanel *p)
+     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 ftp succeeded. Just try */
+     if (ks->type == SOURCE_URL && code <= 0)
+     {
+       ks->next_dl = time (NULL) + ks->tlife;
+@@ -827,7 +825,7 @@ static int cmd_results (KKamPanel *p)
+       return 1;
+     }
+ 
+-    report_error (p, _("Error: wget gave bad code or script died. code %d"),
+    report_error (p, _("Error: ftp gave bad code or script died. code %d"),
+                   code);
+     return -1;
+   }
+@@ -848,10 +846,10 @@ static int cmd_results (KKamPanel *p)
+   }
+   else
+   {
+-    /* if we get here with wget, then wget said something. This is generally
+-       not good, since we passed -q. We'll have to wait for it to die */
+    /* if we get here with ftp, then ftp said something. This is generally
+       not good, since we passed -V. We'll have to wait for it to die */
+     
+-    report_error (p, _("wget said: \"%s\""), buf);
+    report_error (p, _("ftp said: \"%s\""), buf);
+     return -1;
+   }
+ }
+@@ -949,14 +947,14 @@ static int listurl_results (KKamPanel *p)
+     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 ftp 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: ftp listurl download died. code %d"), code);
+ 
+   unlink (p->listurl_file);
+   g_free (p->listurl_file);
+@@ -1607,7 +1605,7 @@ static void kkam_read_list (KKamPanel *p, char *listna
+ 
+ static void kkam_read_listurl (KKamPanel *p, char *source)
+ {
+-  gchar *wget_str;
+  gchar *ftp_str;
+   char tmpfile[] = TEMPTEMPLATE "-urllistXXXXXX";
+   int tmpfd;
+ 
+@@ -1623,15 +1621,15 @@ static void kkam_read_listurl (KKamPanel *p, char *sou
+   }
+   close (tmpfd);
+ 
+-  wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"",
+-                              wget_opts, tmpfile, source);
+  ftp_str = g_strdup_printf ("ftp -V -o %s \"%s\"",
+                              tmpfile, source);
+ 
+-  p->listurl_pipe = popen (wget_str, "r");
+-  g_free (wget_str);
+  p->listurl_pipe = popen (ftp_str, "r");
+  g_free (ftp_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 ftp for list download: %s"),
+                   strerror (errno));
+     return;
+   }
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2008/06/01 14:56:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.115 2008/06/20 10:49:42 martynas Exp $

 COMMENT-main=		XML parsing library
 COMMENT-python=		Python bindings for libxml
@ -30,6 +30,8 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc"
 CONFIGURE_ARGS+=	--with-html-subdir="libxml2/html"
 CONFIGURE_ARGS+=	--with-iconv="${DEPBASE}"
+# only used to fetch data during regression test
+CONFIGURE_ENV=		WGET=/usr/bin/ftp

 PSEUDO_FLAVORS=		no_python
 FLAVOR?=
@ -44,12 +46,11 @@ MULTI_PACKAGES+=	-python
 MODULES+=		lang/python
 LIB_DEPENDS-python=	xml2.>=9::textproc/libxml,-main \
 			${MODLIBICONV_LIB_DEPENDS}
-CONFIGURE_ENV=		PYTHON=${MODPY_BIN}
+CONFIGURE_ENV+=		PYTHON=${MODPY_BIN}
 FAKE_FLAGS=		EXAMPLE_DIR=${PREFIX}/share/examples/libxml2/
 .endif

 CONFIGURE_ARGS+=	--without-threads
-BUILD_DEPENDS+= 	::net/wget
 REGRESS_DEPENDS=	::devel/gmake

 post-configure: