From 98465bf9104a0a6acf527897ad0e3643bbdad6d8 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Fri, 11 Nov 2005 07:10:06 +0000
Subject: PKGBASE is defined too late to be used in PKG_OPTIONS_VAR, so it
 cannot be used here.

---
 mk/djbware.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'mk/djbware.mk')

diff --git a/mk/djbware.mk b/mk/djbware.mk
index ed9ab4a228d..776d03daa7f 100644
--- a/mk/djbware.mk
+++ b/mk/djbware.mk
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.11 2005/10/05 05:46:54 schmonz Exp $
+# $NetBSD: djbware.mk,v 1.12 2005/11/11 07:19:40 rillig Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -76,7 +76,9 @@ PKG_SUGGESTED_OPTIONS+=	djbware-errno-hack
 .if exists(${PKGDIR}/options.mk)
 . include "${PKGDIR}/options.mk"
 .else
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGBASE}
+# Note: This expression is the same as ${PKGBASE}, but the latter is
+# not defined yet, so we cannot use it here.
+PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 .include "../../mk/bsd.options.mk"
 .endif
 
-- 
cgit v1.2.3