>Number:         19004
>Category:       pkg
>Synopsis:       BINPKG_SITE[S] name is inconsistent
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 10 07:55:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Todd Vierling
>Release:        pkgsrc 20021110
>Organization:
	DUH.ORG: Pointing out the obvious since 1994.

>Environment:
>Description:

packages(7), including the version in NetBSD 1.6, contains the following:

           BINPKG_SITES
                      List of sites carrying binary pkgs. Variables

This variable is currently implemented in pkgsrc/mk as BINPKG_SITE, not
BINPKG_SITES.

>How-To-Repeat:
>Fix:

(Ignoring the grammar problem for a moment, which will be addressed in
another PR along with another doc-bug:)

In order to make the variable more consistent with other uses of SITE (as
well as make the 1.6 manpage work as advertised), here's a diff:

--- bsd.pkg.defaults.mk	2002/11/10 12:17:31	1.103
+++ bsd.pkg.defaults.mk	2002/11/10 15:49:16
@@ -376,7 +376,7 @@
 # Possible: defined, not defined
 # Default: not defined
 
-#BINPKG_SITE=...
+#BINPKG_SITES=...
 # Whitespace seperated list of URLs for binary packages. Directories
 # "All" etc. are expected in the named place, variables "rel" and
 # "arch" are replaced with OS release ("1.5", ...) and architecture
--- bsd.pkg.mk	2002/11/07 04:22:29	1.1081
+++ bsd.pkg.mk	2002/11/10 15:49:18
@@ -3322,7 +3322,7 @@
 
 # List of sites carrying binary pkgs. Variables "rel" and "arch" are
 # replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
-BINPKG_SITE?= \
+BINPKG_SITES?= \
 	ftp://ftp.netbsd.org/pub/NetBSD/packages/$${rel}/$${arch}
 
 # List of flags to pass to pkg_add(8) for bin-install:
@@ -3344,7 +3344,7 @@
 	else 				 				\
 		rel=`${UNAME} -r | ${SED} 's@\.\([0-9]*\)[\._].*@\.\1@'`; \
 		arch=${MACHINE_ARCH}; 					\
-		for site in ${BINPKG_SITE} ; do 			\
+		for site in ${BINPKG_SITES} ; do 			\
 			${ECHO} Trying `eval ${ECHO} $$site`/All ; 	\
 			${SHCOMMENT} ${ECHO} ${SETENV} PKG_PATH="`eval ${ECHO} $$site`/All" ${PKG_ADD} ${BIN_INSTALL_FLAGS} ${PKGNAME}${PKG_SUFX} ; \
 			if ${SETENV} PKG_PATH="`eval ${ECHO} $$site`/All" ${PKG_ADD} ${BIN_INSTALL_FLAGS} ${PKGNAME}${PKG_SUFX} ; then \
>Release-Note:
>Audit-Trail:
>Unformatted: