From owner-freebsd-ports  Mon Jun 17 01:32:13 1996
Return-Path: owner-ports
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA26713
          for ports-outgoing; Mon, 17 Jun 1996 01:32:13 -0700 (PDT)
Received: from silvia.HIP.Berkeley.EDU (silvia.HIP.Berkeley.EDU [136.152.64.181])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id BAA26618;
          Mon, 17 Jun 1996 01:32:00 -0700 (PDT)
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.7.5/8.6.9) id BAA04643; Mon, 17 Jun 1996 01:31:42 -0700 (PDT)
Date: Mon, 17 Jun 1996 01:31:42 -0700 (PDT)
Message-Id: <199606170831.BAA04643@silvia.HIP.Berkeley.EDU>
To: committers@freebsd.org
CC: ports@freebsd.org, jmz@freebsd.org
In-reply-to: <199606170804.BAA04456@silvia.HIP.Berkeley.EDU> (asami@cs.berkeley.edu)
Subject: Re: review: ftpget final source
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-ports@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

 * This is the change that goes with the ftpget program.  The variable
 * ${NCFTP] is replaced with ${FTP_CMD}, ${NCFTPFLAGS} with
 * ${FTP_BEFORE_ARGS} and ${NCFTPTAIL} with ${FTP_AFTER_ARGS} (yes I know
 * that's kinda ugly but we already have a precedent in the extract
 * target).
 * 
 * Note that we can trust the exit status of the ftpget program so the
 * "|| true" kludge in do-fetch is gone.

Sorry, please ignore the previous one, I obviously wasn't thinking
hard enough.  Here is a version that works.

Satoshi
=======
diff -ru /usr/src/share/mk/bsd.port.mk /usr/share/mk/bsd.port.mk
--- /usr/src/share/mk/bsd.port.mk	Thu Jun 13 02:26:42 1996
+++ /usr/share/mk/bsd.port.mk	Mon Jun 17 01:24:51 1996
@@ -141,8 +141,12 @@
 #				  Arguments to ${EXTRACT_CMD} following filename
 #				  (default: none).
 #
-# NCFTP			- Full path to ncftp command if not in $PATH (default: ncftp).
-# NCFTPFLAGS    - Arguments to ${NCFTP} (default: -N).
+# FTP_CMD		  - Full path to ftp/http fetch command if not in $PATH
+#				  (default: /usr/bin/ftpget).
+# FTP_BEFORE_ARGS -
+#				  Arguments to ${FTP_CMD} before filename (default: none).
+# FTP_AFTER_ARGS -
+#				  Arguments to ${FTP_CMD} followingfilename (default: none).
 #
 # Motif support:
 #
@@ -265,8 +269,7 @@
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
 
-NCFTP?=			/usr/bin/ncftp
-NCFTPFLAGS?=	-N
+FTP_CMD?=		/usr/bin/ftpget
 
 TOUCH?=			/usr/bin/touch
 TOUCH_FLAGS?=	-f
@@ -553,8 +556,7 @@
 			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
 			for site in ${MASTER_SITES}; do \
 			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
-				(${NCFTP} ${NCFTPFLAGS} $${site}$${file} ${NCFTPTAIL} || true); \
-				if [ -f $$file -o -f `${BASENAME} $$file` ]; then \
+				if ${FTP_CMD} ${FTP_BEFORE_ARGS} $${site}$${file} ${FTP_AFTER_ARGS}; then \
 					continue 2; \
 				fi \
 			done; \
@@ -577,8 +579,7 @@
 			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
 			for site in ${PATCH_SITES}; do \
 			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
-				(${NCFTP} ${NCFTPFLAGS} $${site}$${file} ${NCFTPTAIL} || true); \
-				if [ -f $$file -o -f `${BASENAME} $$file` ]; then \
+				if ${FTP_CMD} ${FTP_BEFORE_ARGS} $${site}$${file} ${FTP_AFTER_ARGS}; then \
 					continue 2; \
 				fi \
 			done; \
@@ -958,7 +959,7 @@
 	 for file in ${DISTFILES}; do \
 		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
 			for site in ${MASTER_SITES}; do \
-				${ECHO} -n ${NCFTP} ${NCFTPFLAGS} $${site}$${file} "${NCFTPTAIL}" '||' ; \
+				${ECHO} -n ${FTP_CMD} ${FTP_BEFORE_ARGS} $${site}$${file} "${FTP_AFTER_ARGS}" '||' ; \
 					break; \
 			done; \
 			${ECHO} "echo $${file} not fetched" ; \
@@ -969,7 +970,7 @@
 	 for file in ${PATCHFILES}; do \
 		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
 			for site in ${PATCH_SITES}; do \
-				${ECHO} -n ${NCFTP} ${NCFTPFLAGS} $${site}$${file} "${NCFTPTAIL}" '||' ; \
+				${ECHO} -n ${FTP_CMD} ${FTP_BEFORE_ARGS} $${site}$${file} "${FTP_AFTER_ARGS}" '||' ; \
 					break; \
 			done; \
 			${ECHO} "echo $${file} not fetched" ; \