[pkgsrc/trunk]: pkgsrc/mk Reverted everything that had not been mentioned in ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/229e193c1173
branches:  trunk
changeset: 532113:229e193c1173
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Aug 11 21:15:22 2007 +0000

description:
Reverted everything that had not been mentioned in the previous commit
message. Related to PR 36588.

diffstat:

 mk/pkg-build-options.mk |  23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diffs (44 lines):

diff -r 4b932c6e5e79 -r 229e193c1173 mk/pkg-build-options.mk
--- a/mk/pkg-build-options.mk   Sat Aug 11 18:13:13 2007 +0000
+++ b/mk/pkg-build-options.mk   Sat Aug 11 21:15:22 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-build-options.mk,v 1.4 2007/08/11 16:25:16 rillig Exp $
+# $NetBSD: pkg-build-options.mk,v 1.5 2007/08/11 21:15:22 rillig Exp $
 #
 # This procedure determines the PKG_OPTIONS that have been in effect
 # when the package ${pkgbase} has been built. When the package is not
@@ -7,8 +7,6 @@
 # Parameters:
 #      pkgbase
 #              The basename of the package.
-#      pkgpath
-#              The directory in which the source package lives.
 #
 # Returns:
 #      PKG_BUILD_OPTIONS.${pkgbase}
@@ -35,25 +33,6 @@
 
 MAKEVARS+=     PKG_BUILD_OPTIONS.${b}
 .  endfor
-
-.elif defined(bl4_package) && defined(pkgpath)
-.  for b in ${bl4_package}
-.    if !defined(PKG_BUILD_OPTIONS.${b})
-.      if ${pkgpath} == ${PKGPATH}
-PKG_BUILD_OPTIONS.${b} = ${PKG_OPTIONS}
-.      else
-PKG_BUILD_OPTIONS.${b} != \
-       ${PKG_INFO} -Q PKG_OPTIONS ${b} 2>/dev/null \
-       || { cd ${PKGSRCDIR}/${pkgpath} \
-            && ${MAKE} ${MAKEFLAGS} show-var VARNAME=PKG_OPTIONS; }
-
-MAKEFLAGS+=    PKG_BUILD_OPTIONS.${b}=${PKG_BUILD_OPTIONS.${b}:Q}
-.      endif
-.    endif
-
-MAKEVARS+=     PKG_BUILD_OPTIONS.${b}
-.  endfor
-
 .else
 .  for b in ${pkgbase}
 PKG_FAIL_REASON+=      "[pkg-build-options.mk] This file may only be included from a buildlink3.mk file (pkgbase=${b})."