[BACK]Return to bsd.pkg.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/mk/bsd.pkg.mk between version 1.1540.2.24 and 1.1540.2.26

version 1.1540.2.24, 2005/02/25 14:46:51 version 1.1540.2.26, 2005/03/21 15:43:00
Line 78  PLIST_SRC+=  ${PKGDIR}/PLIST.common
Line 78  PLIST_SRC+=  ${PKGDIR}/PLIST.common
 .  endif  .  endif
 .  if exists(${PKGDIR}/PLIST.${OPSYS})  .  if exists(${PKGDIR}/PLIST.${OPSYS})
 PLIST_SRC+=             ${PKGDIR}/PLIST.${OPSYS}  PLIST_SRC+=             ${PKGDIR}/PLIST.${OPSYS}
 .  elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})  .  endif
   .  if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
 PLIST_SRC+=             ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}  PLIST_SRC+=             ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .  elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})  .  endif
   .  if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
 PLIST_SRC+=             ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}  PLIST_SRC+=             ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .  elif exists(${PKGDIR}/PLIST)  .  endif
   .  if exists(${PKGDIR}/PLIST)
 PLIST_SRC+=             ${PKGDIR}/PLIST  PLIST_SRC+=             ${PKGDIR}/PLIST
 .  endif  .  endif
 .  if exists(${PKGDIR}/PLIST.common_end)  .  if exists(${PKGDIR}/PLIST.common_end)
Line 133  BUILD_DEFS_FIXED+= NO_SRC_ON_FTP NO_SRC_
Line 136  BUILD_DEFS_FIXED+= NO_SRC_ON_FTP NO_SRC_
 BUILD_DEFS_FIXED+=      NO_BIN_ON_FTP NO_BIN_ON_CDROM  BUILD_DEFS_FIXED+=      NO_BIN_ON_FTP NO_BIN_ON_CDROM
 BUILD_DEFS_FIXED+=      ${OSVERSION_SPECIFIC:DOSVERSION_SPECIFIC}  BUILD_DEFS_FIXED+=      ${OSVERSION_SPECIFIC:DOSVERSION_SPECIFIC}
   
   .if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS)
   _INSTALL_UNSTRIPPED=    # set (flag used by platform/*.mk)
   .endif
   
 ##### Non-overridable constants  ##### Non-overridable constants
   
 # Latest versions of tools required for correct pkgsrc operation.  # Latest versions of tools required for correct pkgsrc operation.
Line 366  ALL_ENV+= CPPFLAGS=${CPPFLAGS:Q}
Line 373  ALL_ENV+= CPPFLAGS=${CPPFLAGS:Q}
 ALL_ENV+=       CXX=${CXX:Q}  ALL_ENV+=       CXX=${CXX:Q}
 ALL_ENV+=       CXXFLAGS=${CXXFLAGS:Q}  ALL_ENV+=       CXXFLAGS=${CXXFLAGS:Q}
 ALL_ENV+=       COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}  ALL_ENV+=       COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}
 ALL_ENV+=       F77=${F77:Q}  ALL_ENV+=       F77=${FC:Q}
 ALL_ENV+=       FC=${FC:Q}  ALL_ENV+=       FC=${FC:Q}
 ALL_ENV+=       FFLAGS=${FFLAGS:Q}  ALL_ENV+=       FFLAGS=${FFLAGS:Q}
   ALL_ENV+=       LANG=C
   ALL_ENV+=       LC_COLLATE=C
   ALL_ENV+=       LC_CTYPE=C
   ALL_ENV+=       LC_MESSAGES=C
   ALL_ENV+=       LC_MONETARY=C
   ALL_ENV+=       LC_NUMERIC=C
   ALL_ENV+=       LC_TIME=C
 ALL_ENV+=       LDFLAGS=${LDFLAGS:Q}  ALL_ENV+=       LDFLAGS=${LDFLAGS:Q}
 ALL_ENV+=       LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}  ALL_ENV+=       LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
 ALL_ENV+=       PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin  ALL_ENV+=       PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
Line 732  _CHECK_VULNERABLE=       \
Line 746  _CHECK_VULNERABLE=       \
                   PKGBASE="${PKGBASE}"                                  \                    PKGBASE="${PKGBASE}"                                  \
                 ${AWK} '/^$$/ { next }                                  \                  ${AWK} '/^$$/ { next }                                  \
                         /^\#.*/ { next }                                \                          /^\#.*/ { next }                                \
                           $$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { next } \
                         { s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); } \                          { s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); } \
                 ' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'                  ' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'
   
Line 1991  _FETCH_FILE=        \
Line 2006  _FETCH_FILE=        \
                         fi;                                             \                          fi;                                             \
                         if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${bfile} ${FETCH_AFTER_ARGS}; then \                          if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${bfile} ${FETCH_AFTER_ARGS}; then \
                                 if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \                                  if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \
                                         alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \                                          alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1; exit}' ${DISTINFO_FILE}`; \
                                         if [ -z "$$alg" ]; then         \                                          if [ -z "$$alg" ]; then         \
                                                 alg=${PATCH_DIGEST_ALGORITHM};\                                                  alg=${PATCH_DIGEST_ALGORITHM};\
                                         fi;                             \                                          fi;                             \

Legend:
Removed from v.1.1540.2.24  
changed lines
  Added in v.1.1540.2.26

CVSweb <webmaster@jp.NetBSD.org>