Mon Sep 22 14:52:08 2008 UTC ()
For packages setting USE_BSD_MAKEFILE, explicitly set MKHTML to no.
This makes these packages build with the changed default in recent
NetBSD -current.

Approved by agc.


(dillo)
diff -r1.1951 -r1.1952 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.1951 -r1.1952 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2008/08/19 17:28:24 1.1951
+++ pkgsrc/mk/bsd.pkg.mk 2008/09/22 14:52:07 1.1952
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.1951 2008/08/19 17:28:24 agc Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.1952 2008/09/22 14:52:07 dillo Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -212,26 +212,27 @@ ALL_ENV+= PREFIX=${PREFIX} @@ -212,26 +212,27 @@ ALL_ENV+= PREFIX=${PREFIX}
212# This variable can be added to MAKE_ENV to ease installation of packages 212# This variable can be added to MAKE_ENV to ease installation of packages
213# that use BSD-style Makefiles. 213# that use BSD-style Makefiles.
214BSD_MAKE_ENV= BINOWN=${BINOWN} BINGRP=${BINGRP} 214BSD_MAKE_ENV= BINOWN=${BINOWN} BINGRP=${BINGRP}
215BSD_MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} 215BSD_MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP}
216BSD_MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} 216BSD_MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP}
217BSD_MAKE_ENV+= SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} 217BSD_MAKE_ENV+= SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP}
218BSD_MAKE_ENV+= DOCOWN=${DOCOWN} DOCGRP=${DOCGRP} 218BSD_MAKE_ENV+= DOCOWN=${DOCOWN} DOCGRP=${DOCGRP}
219BSD_MAKE_ENV+= BINMODE=${BINMODE} NONBINMODE=${NONBINMODE} 219BSD_MAKE_ENV+= BINMODE=${BINMODE} NONBINMODE=${NONBINMODE}
220BSD_MAKE_ENV+= BINDIR=${PREFIX}/bin 220BSD_MAKE_ENV+= BINDIR=${PREFIX}/bin
221BSD_MAKE_ENV+= INCSDIR=${PREFIX}/include 221BSD_MAKE_ENV+= INCSDIR=${PREFIX}/include
222BSD_MAKE_ENV+= LIBDIR=${PREFIX}/lib 222BSD_MAKE_ENV+= LIBDIR=${PREFIX}/lib
223BSD_MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} 223BSD_MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
224BSD_MAKE_ENV+= STRIPFLAG=${_STRIPFLAG_INSTALL:Q} 224BSD_MAKE_ENV+= STRIPFLAG=${_STRIPFLAG_INSTALL:Q}
 225BSD_MAKE_ENV+= MKHTML=no
225 226
226_BUILD_DEFS= ${BUILD_DEFS} 227_BUILD_DEFS= ${BUILD_DEFS}
227_BUILD_DEFS+= LOCALBASE 228_BUILD_DEFS+= LOCALBASE
228_BUILD_DEFS+= PKGINFODIR 229_BUILD_DEFS+= PKGINFODIR
229_BUILD_DEFS+= PKGMANDIR 230_BUILD_DEFS+= PKGMANDIR
230_BUILD_DEFS+= _USE_DESTDIR 231_BUILD_DEFS+= _USE_DESTDIR
231 232
232# Store the result in the +BUILD_INFO file so we can query for the build 233# Store the result in the +BUILD_INFO file so we can query for the build
233# options using "pkg_info -Q PKG_OPTIONS <pkg>". 234# options using "pkg_info -Q PKG_OPTIONS <pkg>".
234# 235#
235.if defined(PKG_SUPPORTED_OPTIONS) && defined(PKG_OPTIONS) 236.if defined(PKG_SUPPORTED_OPTIONS) && defined(PKG_OPTIONS)
236_BUILD_DEFS+= PKG_OPTIONS 237_BUILD_DEFS+= PKG_OPTIONS
237.endif 238.endif