summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/SDL/buildlink3.mk11
-rw-r--r--devel/apr-util/buildlink3.mk11
-rw-r--r--devel/apr0/buildlink3.mk11
-rw-r--r--devel/hdf5/buildlink3.mk10
-rw-r--r--devel/pango/buildlink3.mk11
-rw-r--r--devel/subversion-base/buildlink3.mk13
6 files changed, 22 insertions, 45 deletions
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 9b96dae83f9..97db39584be 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2007/01/09 15:06:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2007/05/30 08:54:28 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -29,13 +29,8 @@ PTHREAD_OPTS+= require
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.if !defined(PKG_BUILD_OPTIONS.SDL)
-PKG_BUILD_OPTIONS.SDL!= \
- cd ${BUILDLINK_PKGSRCDIR.SDL} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.SDL=${PKG_BUILD_OPTIONS.SDL:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.SDL
+pkgbase := SDL
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.SDL:Maalib)
.include "../../graphics/aalib/buildlink3.mk"
diff --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk
index f1af24ba891..d87eec297ba 100644
--- a/devel/apr-util/buildlink3.mk
+++ b/devel/apr-util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/24 19:37:20 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_UTIL_BUILDLINK3_MK:= ${APR_UTIL_BUILDLINK3_MK}+
@@ -20,13 +20,8 @@ BUILDLINK_FILES.apr-util+= lib/aprutil.exp
.include "../../mk/bsd.fast.prefs.mk"
-. if !defined(PKG_BUILD_OPTIONS.apr-util)
-PKG_BUILD_OPTIONS.apr-util!= cd ${BUILDLINK_PKGSRCDIR.apr-util} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.apr-util=${PKG_BUILD_OPTIONS.apr-util:Q}
-. endif
-MAKEVARS+= PKG_BUILD_OPTIONS.apr-util
-.endif # APR_UTIL_BUILDLINK3_MK
+pkgbase := apr-util
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
. include "../../databases/db4/buildlink3.mk"
diff --git a/devel/apr0/buildlink3.mk b/devel/apr0/buildlink3.mk
index 7d349ccd4c3..5f43c3bd3be 100644
--- a/devel/apr0/buildlink3.mk
+++ b/devel/apr0/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/05/29 22:13:41 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -25,12 +25,9 @@ BUILDLINK_FILES.apr+= lib/*.exp
.include "../../mk/bsd.fast.prefs.mk"
-. if !defined(PKG_BUILD_OPTIONS.apr)
-PKG_BUILD_OPTIONS.apr!= cd ${BUILDLINK_PKGSRCDIR.apr} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.apr=${PKG_BUILD_OPTIONS.apr:Q}
-. endif
-MAKEVARS+= PKG_BUILD_OPTIONS.apr
+pkgbase := apr
+.include "../../mk/pkg-build-options.mk"
+
.endif # APR_BUILDLINK3_MK
.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index de1301b2030..35b55381cfd 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HDF5_BUILDLINK3_MK:= ${HDF5_BUILDLINK3_MK}+
@@ -17,12 +17,8 @@ BUILDLINK_ABI_DEPENDS.hdf5+= hdf5>=1.6.5nb1
BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
.endif # HDF5_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.hdf5)
-PKG_BUILD_OPTIONS.hdf5!= cd ${BUILDLINK_PKGSRCDIR.hdf5} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.hdf5=${PKG_BUILD_OPTIONS.hdf5:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.hdf5
+pkgbase := hdf5
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip)
.include "../../archivers/szip/buildlink3.mk"
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 252bdfc426e..13d96a7073e 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+
@@ -19,13 +19,8 @@ BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
.include "../../mk/bsd.fast.prefs.mk"
-.if !defined(PKG_BUILD_OPTIONS.pango)
-PKG_BUILD_OPTIONS.pango!= \
- cd ${BUILDLINK_PKGSRCDIR.pango} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.pango=${PKG_BUILD_OPTIONS.pango:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.pango
+pkgbase := pango
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.pango:Mx11)
.include "../../x11/libXft/buildlink3.mk"
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index ba3583baf42..4503c4e6b77 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/25 18:15:49 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -21,16 +21,15 @@ BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base
BUILDLINK_FILES.subversion-base+= bin/svn-config
-.if !defined(PKG_BUILD_OPTIONS.subversion)
-PKG_BUILD_OPTIONS.subversion!=cd ${BUILDLINK_PKGSRCDIR.subversion-base} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-.endif
+pkgbase := subversion-base
+.include "../../mk/pkg-build-options.mk"
+
.endif # SUBVERSION_BASE_BUILDLINK3_MK
-.if !empty(PKG_BUILD_OPTIONS.subversion:Mapr1)
+.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
. include "../../devel/apr/buildlink3.mk"
. include "../../devel/apr-util/buildlink3.mk"
-. if !empty(PKG_BUILD_OPTIONS.subversion:Mserf)
+. if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
. include "../../www/serf/buildlink3.mk"
. else
. include "../../www/neon/buildlink3.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 19:58:35 +0000