[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.18 and 1.1540.2.19

version 1.1540.2.18, 2005/01/24 19:49:23 version 1.1540.2.19, 2005/02/11 15:27:57
Line 132  BUILD_DEFS_FIXED+= ${OSVERSION_SPECIFIC:
Line 132  BUILD_DEFS_FIXED+= ${OSVERSION_SPECIFIC:
   
 # Latest versions of tools required for correct pkgsrc operation.  # Latest versions of tools required for correct pkgsrc operation.
 DIGEST_REQD=            20010302  DIGEST_REQD=            20010302
 PKGTOOLS_REQD=          ${_OPSYS_PKGTOOLS_REQD:U20030918}  PKGTOOLS_REQD=          ${_OPSYS_PKGTOOLS_REQD:U20050204}
   
 PKG_DB_TMPDIR=          ${WRKDIR}/.pkgdb  PKG_DB_TMPDIR=          ${WRKDIR}/.pkgdb
 DDIR=                   ${WRKDIR}/.DDIR  DDIR=                   ${WRKDIR}/.DDIR
Line 1110  CONFIG_SHELL?=  ${SH}
Line 1110  CONFIG_SHELL?=  ${SH}
 CONFIGURE_ENV+=         CONFIG_SHELL=${CONFIG_SHELL}  CONFIGURE_ENV+=         CONFIG_SHELL=${CONFIG_SHELL}
 CONFIGURE_ENV+=         install_sh=${INSTALL:Q}  CONFIGURE_ENV+=         install_sh=${INSTALL:Q}
 CONFIGURE_ENV+=         LIBS=${LIBS:Q}  CONFIGURE_ENV+=         LIBS=${LIBS:Q}
 CONFIGURE_ENV+=         ${USE_LIBTOOL:Dlt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}}  CONFIGURE_ENV+=         ${USE_LIBTOOL:Dlt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:D${_OPSYS_MAX_CMDLEN_CMD:sh}}}
 #  #
 # GNU_CONFIGURE_PREFIX is the argument to the --prefix option passed to the  # GNU_CONFIGURE_PREFIX is the argument to the --prefix option passed to the
 # GNU configure script.  # GNU configure script.
Line 1181  _REAL_TARGETS.test+= test-message pre-te
Line 1181  _REAL_TARGETS.test+= test-message pre-te
   
 .  include "../../mk/plist.mk"  .  include "../../mk/plist.mk"
   
   ##### Handle alternatives
   
   .  include "../../mk/alternatives.mk"
   
 ##### Make subtargets for non-su portion of "install".  ##### Make subtargets for non-su portion of "install".
   
 #===> "install-check-pkgname"  #===> "install-check-pkgname"
Line 1199  install-check-pkgname:
Line 1203  install-check-pkgname:
                 ${MAKE} clean && ${MAKE} build ;;                       \                  ${MAKE} clean && ${MAKE} build ;;                       \
         esac          esac
   
 #===> "install-make-pkgdbdir"  
   
 _REAL_TARGETS.install+=         install-make-pkgdbdir  
 .PHONY: install-make-pkgdbdir  
 install-make-pkgdbdir:  
         ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}  
   
 #===> "do-su-install"  #===> "do-su-install"
 # su to root, then run real-su-install  # su to root, then run real-su-install
   
Line 1582  ${def:C/=.*$//}= ${_${def:C/=.*$//}_CMD:
Line 1579  ${def:C/=.*$//}= ${_${def:C/=.*$//}_CMD:
 .if !defined(_PATH_ORIG)  .if !defined(_PATH_ORIG)
 _PATH_ORIG:=            ${PATH}  _PATH_ORIG:=            ${PATH}
 MAKEFLAGS+=             _PATH_ORIG=${_PATH_ORIG:Q}  MAKEFLAGS+=             _PATH_ORIG=${_PATH_ORIG:Q}
   .endif
   
   .if !empty(PREPEND_PATH)
 # This is very Special.  Because PREPEND_PATH is set with += in reverse order,  # This is very Special.  Because PREPEND_PATH is set with += in reverse order,
 # the awk expression reverses the order again (since bootstrap bmake doesn't  # the awk expression reverses the order again (since bootstrap bmake doesn't
 # yet support the :[-1..1] construct).  # yet support the :[-1..1] construct).
Line 2125  ${WRKDIR}:
Line 2124  ${WRKDIR}:
 .  endif  .  endif
 .endif  .endif
         ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}          ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
           ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}
 .ifdef WRKOBJDIR  .ifdef WRKOBJDIR
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"  .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
 .    if !exists(${LOCKFILE})  .    if !exists(${LOCKFILE})
Line 3364  print-pkg-size-this:
Line 3364  print-pkg-size-this:
         | ${SORT} -u                                                    \          | ${SORT} -u                                                    \
         | ${SED} -e "s/'/'\\\\''/g" -e "s/.*/'&'/"                      \          | ${SED} -e "s/'/'\\\\''/g" -e "s/.*/'&'/"                      \
         | ${XARGS} -n 256 ${LS} -ld                                     \          | ${XARGS} -n 256 ${LS} -ld                                     \
         | ${AWK} 'BEGIN { print("0 "); }                                \          | ${AWK} '{ s += $$5; } END { print s; }'                       \
                   { print($$5, " + "); }                                \  
                   END { print("p"); }'                                  \  
         | ${DC}  
   
 # Sizes of required pkgs (only)  # Sizes of required pkgs (only)
 #  #
Line 3381  print-pkg-size-depends:
Line 3378  print-pkg-size-depends:
                 | ${XARGS} -n 1 ${SETENV} ${PKG_BEST_EXISTS}            \                  | ${XARGS} -n 1 ${SETENV} ${PKG_BEST_EXISTS}            \
                 | ${SORT} -u                                            \                  | ${SORT} -u                                            \
                 | ${XARGS} -n 256 ${SETENV} ${PKG_INFO} -qs             \                  | ${XARGS} -n 256 ${SETENV} ${PKG_INFO} -qs             \
                 | ${AWK} -- 'BEGIN { print("0 "); }                     \                  | ${AWK} '/^[0-9]+$$/ { s += $$1; } END { print s; }';  \
                         /^[0-9]+$$/ { print($$1, " + "); }              \  
                         END { print("p"); }'                            \  
                 | ${DC};                                                \  
         else                                                            \          else                                                            \
                 ${ECHO} "0";                                            \                  ${ECHO} "0";                                            \
         fi          fi
Line 3548  post-install-fake-pkg: ${PLIST} ${DESCR}
Line 3542  post-install-fake-pkg: ${PLIST} ${DESCR}
         size_this=`${MAKE} ${MAKEFLAGS} print-pkg-size-this`;           \          size_this=`${MAKE} ${MAKEFLAGS} print-pkg-size-this`;           \
         size_depends=`${MAKE} ${MAKEFLAGS} print-pkg-size-depends`;     \          size_depends=`${MAKE} ${MAKEFLAGS} print-pkg-size-depends`;     \
         ${ECHO} $$size_this >${SIZE_PKG_FILE};                          \          ${ECHO} $$size_this >${SIZE_PKG_FILE};                          \
         ${ECHO} $$size_this $$size_depends + p | ${DC} >${SIZE_ALL_FILE}          ${ECHO} $$size_this $$size_depends                              \
                   | ${AWK} '{ print $$1 + $$2; }' >${SIZE_ALL_FILE}
   
 # Fake installation of package so that user can pkg_delete it later.  # Fake installation of package so that user can pkg_delete it later.
 # Also, make sure that an installed package is recognized correctly in  # Also, make sure that an installed package is recognized correctly in

Legend:
Removed from v.1.1540.2.18  
changed lines
  Added in v.1.1540.2.19

CVSweb <webmaster@jp.NetBSD.org>