diff options
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f704f952d19..fb82760a01a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.35 2003/08/26 21:52:09 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.36 2003/08/26 21:58:05 jlam Exp $ # # This file is in the public domain. # @@ -207,17 +207,24 @@ PKG_FAIL_REASON+= "${PKGNAME} uses imake, but the buildlink-x11 package was foun . endif .endif # USE_IMAKE +.if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS:Mmake) +_USE_GMAKE= yes +.endif + +# XXX USE_GMAKE is redundant since USE_GNU_TOOLS+=make accomplishes the +# XXX same thing but by using the more general tools.mk framework. This +# XXX variable should eventually be reaped from pkgsrc. +# .if defined(USE_GMAKE) -. if ${_OPSYS_HAS_GMAKE} == "no" -BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake -. endif +_USE_GMAKE= yes +.endif + +.if defined(_USE_GMAKE) MAKE_PROGRAM= ${GMAKE} -.else -. if defined(USE_IMAKE) +.elif defined(USE_IMAKE) MAKE_PROGRAM= ${_IMAKE_MAKE} -. else +.else MAKE_PROGRAM= ${MAKE} -. endif .endif CONFIGURE_ENV+= MAKE="${MAKE_PROGRAM}" @@ -2352,6 +2359,12 @@ do-install: real-su-package: ${PLIST} ${DESCR} ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO_MSG} "${_PKGSRC_IN}> Building binary package for ${PKGNAME}"; \ + if ${PKG_INFO} -qe ${PKGNAME}; then \ + : The package is installed. ; \ + else \ + ${ECHO_MSG} "=> ${PKGNAME} is not installed."; \ + exit 1; \ + fi; \ if [ ! -d ${PKGREPOSITORY} ]; then \ ${MKDIR} ${PKGREPOSITORY}; \ if [ $$? -ne 0 ]; then \ @@ -4468,7 +4481,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} . if defined(USE_PERL5) && (${USE_PERL5} == "run") @${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE} . endif -. ifdef USE_GMAKE +. ifdef _USE_GMAKE @${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${BUILD_INFO_FILE} . endif . if ${CHECK_SHLIBS} == "YES" |