Re: pkg/30929

[Chapman Flack <nbgnats%anastigmatix.net@localhost>]

The following reply was made to PR pkg/30929; it has been noted by GNATS.

From: Chapman Flack <nbgnats%anastigmatix.net@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/30929
Date: Tue, 09 Aug 2005 15:06:33 -0500

 Last patch got corrupted somehow (www form linewrap?) ... this should work.
 Also removed an unnecessary break I missed the first time--most shells
 ignore it, but pdksh would complain.
 
 --- /tmp/bsd.pkg.mk.orig       2005-08-09 14:32:15.000000000 -0500
 +++ /tmp/bsd.pkg.mk    2005-08-09 14:49:01.000000000 -0500
 @@ -3474,6 +3474,9 @@
  _BIN_INSTALL_FLAGS=   ${BIN_INSTALL_FLAGS}
  _BIN_INSTALL_FLAGS+=  ${PKG_ARGS_ADD}
  
 +_SHORT_UNAME_R!=      uname -r
 +_SHORT_UNAME_R:=      ${_SHORT_UNAME_R:C@\.([0-9])*[_.].*@.\1@} # 
n.n[_.]anything => n.n
 +
  # Install binary pkg, without strict uptodate-check first
  .PHONY: real-su-bin-install
  real-su-bin-install:
 @@ -3485,27 +3488,19 @@
                ${SHCOMMENT} ${ECHO_MSG} "*** or use \`\`${MAKE} bin-update'' 
to upgrade it and all of its dependencies."; \
                exit 1;                                                 \
        fi
 -      @if [ -f ${PKGFILE} ] ; then                                    \
 -              ${ECHO_MSG} "Installing from binary pkg ${PKGFILE}" ;   \
 -              ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGFILE} ;           \
 -      else                                                            \
 -              rel=`${UNAME} -r | ${SED} 's@\.\([0-9]*\)[\._].*@\.\1@'`; \
 -              arch=${MACHINE_ARCH};                                   \
 -              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 \
 -                              ${ECHO} "${PKGNAME} successfully installed."; \
 -                              break ;                                 \
 -                      fi ;                                            \
 -              done ;                                                  \
 -              if ! ${PKG_INFO} -qe "${PKGNAME}" ; then                \
 -                      ${SHCOMMENT} Cycle through some FTP server here ;\
 -                      ${ECHO_MSG} "Installing from source" ;          \
 -                      ${MAKE} ${MAKEFLAGS} package                    \
 -                              DEPENDS_TARGET=${DEPENDS_TARGET:Q} &&   \
 -                      ${MAKE} ${MAKEFLAGS} clean ;                    \
 -              fi ; \
 +      @rel=${_SHORT_UNAME_R:Q} ; \
 +      arch=${MACHINE_ARCH:Q} ; \
 +      pkgpath=${PKGREPOSITORY:Q} ; \
 +      for i in ${BINPKG_SITES} ; do pkgpath="$$pkgpath;$$i/All" ; done ; \
 +      ${ECHO} "Trying $$pkgpath" ;    \
 +      if ${SETENV} PKG_PATH="$$pkgpath" ${PKG_ADD} ${BIN_INSTALL_FLAGS} 
${PKGNAME}${PKG_SUFX} ; then \
 +              ${ECHO} ${PKGNAME} successfully installed.; \
 +      else                                                            \
 +              ${SHCOMMENT} Cycle through some FTP server here ;\
 +              ${ECHO_MSG} "Installing from source" ;          \
 +              ${MAKE} ${MAKEFLAGS} package                    \
 +                      DEPENDS_TARGET=${DEPENDS_TARGET:Q} &&   \
 +              ${MAKE} ${MAKEFLAGS} clean ;                    \
        fi
  
  .PHONY: bin-install