ports/print/foo2zjs/patches/patch-getweb_in

Index: getweb.in
--- getweb.in.orig
+++ getweb.in
@@ -11,7 +11,7 @@
 
 VERSION='20201003'
 
-WGETOPTS="--passive-ftp -q"
+WGETOPTS="-V"
 
 usage() {
 cat <<EOF
@@ -107,11 +107,11 @@ error() {
 }
 
 SYSTEM=`uname -s`
-WGET=`type wget 2>/dev/null`
+WGET=`type ftp 2>/dev/null`
 if [ "$SYSTEM" = Darwin -a "$WGET" = "" ]
 then
     WGETOPTS=
-    wget() {
+    ftp() {
 	shift
 	curl -o $*
     }
@@ -125,7 +125,7 @@ getexe() {
     exefile="$2"
     shift; shift
     
-    wget $WGETOPTS -O $exefile "$url/$exefile" ||
+    ftp $WGETOPTS -o $exefile "$url/$exefile" ||
 	error "Couldn't download $url/$exefile"
     unzip -oj $exefile "$@"
     rm $exefile
@@ -139,7 +139,7 @@ gettgz() {
     file="$2"
     what="$3"
     
-    wget $WGETOPTS -O $file "$url/$file" ||
+    ftp $WGETOPTS -o $file "$url/$file" ||
 	error "Couldn't download $url/$file"
     gunzip <$file | tar xvf - $what
     rm $file
@@ -155,7 +155,7 @@ getone() {
     case "$1" in
     lj1000|1000)
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihp1000.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihp1000.tar.gz \
 	    ""
 	#echo "provided"
 	#getexe \
@@ -166,7 +166,7 @@ getone() {
 	;;
     lj1005|1005)
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihp1005.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihp1005.tar.gz \
 	    ""
 	#echo "provided"
 	#getexe \
@@ -175,45 +175,45 @@ getone() {
 	    #sihp1005.img
 	copyright "(c) Copyright Hewlett-Packard 2002"
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihpP1005.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2009"
 	;;
     lj1018|1018)
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihp1018.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2005"
 	;;
     lj1020|1020)
 	# http://ftp.hp.com/pub/softlib/software8/COL14041/lj-39322-2/hp_LJ_1020-1022_Full_Solution.exe
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihp1020.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2005"
 	;;
     [pP]100[57])
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihpP1005.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2009"
 	;;
     [pP]100[68])
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihpP1006.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihpP1006.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2009"
 	;;
     [pP]1505)
 	gettgz \
-	    http://foo2zjs.rkkda.com/firmware sihpP1505.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/firmware sihpP1505.tar.gz \
 	    ""
 	copyright "(c) Copyright Hewlett-Packard 2009"
 	;;
     2200dl|2200)
 	if true; then
 	    gettgz \
-		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \
+		https://foo2zjs.linkevich.net/foo2zjs/icm dl2300.tar.gz \
 		""
 	else
 	    getexe \
@@ -225,7 +225,7 @@ getone() {
     2300dl|2300)
 	if true; then
 	    gettgz \
-		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \
+		https://foo2zjs.linkevich.net/foo2zjs/icm dl2300.tar.gz \
 		""
 	else
 	    getexe \
@@ -233,7 +233,7 @@ getone() {
 		"*.icm"
 	fi
 	gettgz \
-	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/icm km2430.tar.gz \
 	    ""
 	copyright "(c) Copyright Minolta-QMS 2001"
 	;;
@@ -243,13 +243,13 @@ getone() {
 	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
 	FILE="MC2300DL_v255.zip"
 	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
-	wget $WGETOPTS "$URL" || error "Couldn't download $URL"
+	ftp $WGETOPTS "$URL" || error "Couldn't download $URL"
 	echo "*** Now use a windows box to unzip and install $FILE ***"
 	;;
     cpwl|pageworks)
 	if true; then
 	    gettgz \
-		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \
+		https://foo2zjs.linkevich.net/foo2zjs/icm dl2300.tar.gz \
 		""
 	else
 	    getexe \
@@ -259,7 +259,7 @@ getone() {
 	    do
 		base=`basename $i .IC_`
 		mv $base.IC_ $base.ic_
-		./msexpand $base.ic_
+		${PREFIX}/share/doc/foo2zjs/msexpand $base.ic_
 		rm -f $base.ic_
 	    done
 	fi
@@ -267,7 +267,7 @@ getone() {
 	;;
     2430)
 	gettgz \
-	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/icm km2430.tar.gz \
 	    ""
 	copyright "(c) Copyright Konica Minolta 2003"
 	;;
@@ -295,7 +295,7 @@ getone() {
 	;;
     1025)
 	gettgz \
-	    http://foo2zjs.rkkda.com/icm hp-cp1025.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/icm hp-cp1025.tar.gz \
 	    ""
 	copyright "(c) Copyright Rick Richardson 2010.  All Rights Reserved"
 	;;
@@ -304,7 +304,7 @@ getone() {
 	    http://foo2hp.rkkda.com/icm hpclj2600n.tar.gz \
 	    ""
 	gettgz \
-	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+	    https://foo2zjs.linkevich.net/foo2zjs/icm km2430.tar.gz \
 	    "km2430_2.icm"
 	copyright "(c) Copyright Hewlett-Packard 2003"
 	copyright "(c) Copyright Rick Richardson 2006.  All Rights Reserved"
@@ -408,7 +408,7 @@ getone() {
 	    URL="$URL?driver=$driver&printer=$printer"
 	    URL="$URL&.submit=Generate+PPD+file"
 	    URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
-	    wget $WGETOPTS -O PPD/$printer.ppd "$URL" ||
+	    ftp $WGETOPTS -o PPD/$printer.ppd "$URL" ||
 		error "Couldn't dowload $URL"
 	done
 	;;
@@ -446,7 +446,7 @@ getone() {
     update)
 	url=${URLZJS}
 	file=foo2zjs.tar.gz
-	wget $WGETOPTS -O $file $url/$file ||
+	ftp $WGETOPTS -o $file $url/$file ||
 		error "Couldn't download $url/$exefile"
 	mv getweb getweb.old
 	HERE=`pwd`