summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/libmikmod/buildlink3.mk11
-rw-r--r--databases/openldap-client/buildlink3.mk11
-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
-rw-r--r--geography/gdal-lib/buildlink3.mk11
-rw-r--r--graphics/aalib/buildlink3.mk11
-rw-r--r--graphics/cairo/buildlink3.mk11
-rw-r--r--misc/kdepim3/buildlink3.mk11
-rw-r--r--multimedia/gstreamer0.10/buildlink3.mk9
-rw-r--r--multimedia/mjpegtools/buildlink3.mk11
-rw-r--r--print/libgnomeprint/buildlink3.mk11
-rw-r--r--print/xfce4-print/buildlink3.mk11
-rw-r--r--security/heimdal/buildlink3.mk11
-rw-r--r--security/openssl/buildlink3.mk11
-rw-r--r--www/libwww/buildlink3.mk11
-rw-r--r--x11/gtk2/buildlink3.mk11
-rw-r--r--x11/kdebase3/buildlink3.mk11
-rw-r--r--x11/kdelibs3/buildlink3.mk11
22 files changed, 70 insertions, 171 deletions
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index dc07fa6e807..92bf7deb36c 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/05/30 08:54:28 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
@@ -16,13 +16,8 @@ BUILDLINK_API_DEPENDS.libmikmod+= libmikmod>=3.1.9
BUILDLINK_ABI_DEPENDS.libmikmod+= libmikmod>=3.1.11.1nb2
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
-. include "../../mk/bsd.fast.prefs.mk"
-. if !defined(PKG_BUILD_OPTIONS.libmikmod)
-PKG_BUILD_OPTIONS.libmikmod!= cd ${BUILDLINK_PKGSRCDIR.libmikmod} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.libmikmod=${PKG_BUILD_OPTIONS.libmikmod:Q}
-. endif
-MAKEVARS+= PKG_BUILD_OPTIONS.libmikmod
+pkgbase := libmikmod
+.include "../../mk/pkg-build-options.mk"
# On some platforms, libmikmod dynamically loads esound,
# so there is no library dependency
diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk
index 5fce146c13c..f3bf196db85 100644
--- a/databases/openldap-client/buildlink3.mk
+++ b/databases/openldap-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2007/05/30 08:54:28 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -21,13 +21,8 @@ BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client
BUILDLINK_CPPFLAGS.openldap-client+= -DLDAP_DEPRECATED
.endif # OPENLDAP_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.openldap-client)
-PKG_BUILD_OPTIONS.openldap-client!= \
- cd ${BUILDLINK_PKGSRCDIR.openldap-client} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.openldap-client=${PKG_BUILD_OPTIONS.openldap-client:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.openldap-client
+pkgbase := openldap-client
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \
!empty(PKG_BUILD_OPTIONS.openldap-client:Msasl)
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"
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 12bd2cfb450..a819afd589e 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/02/23 22:22:38 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2007/05/30 08:54:29 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDAL_LIB_BUILDLINK3_MK:= ${GDAL_LIB_BUILDLINK3_MK}+
@@ -16,13 +16,8 @@ BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.3.1
BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib
.endif # GDAL_LIB_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.gdal-lib)
-PKG_BUILD_OPTIONS.gdal-lib!= \
- cd ${BUILDLINK_PKGSRCDIR.gdal-lib} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.gdal-lib=${PKG_BUILD_OPTIONS.gdal-lib:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.gdal-lib
+pkgbase := gdal-lib
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.gdal-lib:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 4b8a3338f4c..c73ec32fd38 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/11/06 11:26:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/05/30 08:54:30 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+
@@ -17,13 +17,8 @@ BUILDLINK_ABI_DEPENDS.aalib+= aalib>=1.4.0.5nb2
BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib
.endif # AALIB_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.aalib)
-PKG_BUILD_OPTIONS.aalib!= \
- cd ${BUILDLINK_PKGSRCDIR.aalib} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.aalib=${PKG_BUILD_OPTIONS.aalib:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.aalib
+pkgbase := aalib
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
. include "../../devel/ncurses/buildlink3.mk"
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index a23cb2ebaef..907128057ad 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:30 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
@@ -21,13 +21,8 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
.include "../../mk/bsd.fast.prefs.mk"
-.if !defined(PKG_BUILD_OPTIONS.cairo)
-PKG_BUILD_OPTIONS.cairo!= \
- cd ${BUILDLINK_PKGSRCDIR.cairo} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.cairo=${PKG_BUILD_OPTIONS.cairo:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.cairo
+pkgbase := cairo
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
.include "../../x11/libXrender/buildlink3.mk"
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 623b9f7de4f..6bcb7cb6a45 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/01/17 23:47:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:30 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -17,13 +17,8 @@ BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.5nb2
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
.endif # KDEPIM_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.kdepim)
-PKG_BUILD_OPTIONS.kdepim!= \
- cd ${BUILDLINK_PKGSRCDIR.kdepim} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.kdepim=${PKG_BUILD_OPTIONS.kdepim:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.kdepim
+pkgbase := kdepim
+.include "../../mk/pkg-build-options.mk"
.include "../../comms/libmal/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk
index f7898b59e80..f92b146cf66 100644
--- a/multimedia/gstreamer0.10/buildlink3.mk
+++ b/multimedia/gstreamer0.10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/02/08 21:27:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/05/30 08:54:30 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSTREAMER0.10_BUILDLINK3_MK:= ${GSTREAMER0.10_BUILDLINK3_MK}+
@@ -20,11 +20,8 @@ PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \
{ print "@comment in gstreamer0.10: " $$0; next; }
.endif # GSTREAMER0.10_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.gstreamer)
-PKG_BUILD_OPTIONS.gstreamer!= \
- cd ${BUILDLINK_PKGSRCDIR.gstreamer0.10} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-.endif
+pkgbase := gstreamer
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.gstreamer:Mgstcheck)
.include "../../devel/check/buildlink3.mk"
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index 7558ef11c4c..0ec271666ec 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/05/30 08:54:30 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -23,13 +23,8 @@ BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.if !defined(PKG_BUILD_OPTIONS.mjpegtools)
-PKG_BUILD_OPTIONS.mjpegtools!= \
- cd ${BUILDLINK_PKGSRCDIR.mjpegtools} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.mjpegtools=${PKG_BUILD_OPTIONS.mjpegtools:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.mjpegtools
+pkgbase := mjpegtools
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.mjpegtools:Mdv)
. include "../../multimedia/libdv/buildlink3.mk"
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 6daba76a4f8..1400221b45b 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -26,13 +26,8 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-.if !defined(PKG_BUILD_OPTIONS.libgnomeprint)
-PKG_BUILD_OPTIONS.libgnomeprint!= \
- cd ${BUILDLINK_PKGSRCDIR.libgnomeprint} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.libgnomeprint=${PKG_BUILD_OPTIONS.libgnomeprint:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.libgnomeprint
+pkgbase := libgnomeprint
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.libgnomeprint:Mcups)
. include "../../print/libgnomecups/buildlink3.mk"
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 4b9b2cba481..1b21f8c8187 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:12 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -22,13 +22,8 @@ BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.if !defined(PKG_BUILD_OPTIONS.xfce4-print)
-PKG_BUILD_OPTIONS.xfce4-print!= \
- cd ${BUILDLINK_PKGSRCDIR.xfce4-print} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.xfce4-print=${PKG_BUILD_OPTIONS.xfce4-print:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.xfce4-print
+pkgbase := xfce4-print
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups)
. include "../../print/cups/buildlink3.mk"
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 09c1379d12a..d9aa33fc528 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+
@@ -20,13 +20,8 @@ BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal
BUILDLINK_INCDIRS.heimdal?= include/krb5
.endif # HEIMDAL_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.heimdal)
-PKG_BUILD_OPTIONS.heimdal!= \
- cd ${BUILDLINK_PKGSRCDIR.heimdal} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.heimdal=${PKG_BUILD_OPTIONS.heimdal:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.heimdal
+pkgbase := heimdal
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.heimdal:Mldap)
. include "../../databases/openldap-client/buildlink3.mk"
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 5003e4d5617..38c10175827 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2007/04/17 17:12:09 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+
@@ -27,13 +27,8 @@ SSLBASE= ${BUILDLINK_PREFIX.openssl}
BUILD_DEFS+= SSLBASE
.endif # OPENSSL_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.openssl)
-PKG_BUILD_OPTIONS.openssl!= \
- cd ${BUILDLINK_PKGSRCDIR.openssl} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.openssl=${PKG_BUILD_OPTIONS.openssl:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.openssl
+pkgbase := openssl
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref)
. include "../../security/rsaref/buildlink3.mk"
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index e437ca9283b..0a4b61de326 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+
@@ -19,13 +19,8 @@ BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww
.include "../../mk/bsd.fast.prefs.mk"
-.if !defined(PKG_BUILD_OPTIONS.libwww)
-PKG_BUILD_OPTIONS.libwww!= \
- cd ${BUILDLINK_PKGSRCDIR.libwww} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.libwww=${PKG_BUILD_OPTIONS.libwww:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.libwww
+pkgbase := libwww
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.libwww:Msocks4)
.include "../../net/socks4/buildlink3.mk"
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 8a5074024d5..3db26c87d0b 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2007/05/25 21:53:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+
@@ -26,13 +26,8 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.10.0\/(engines|filesystems|immodules|
.include "../../mk/bsd.fast.prefs.mk"
-.if !defined(PKG_BUILD_OPTIONS.gtk2)
-PKG_BUILD_OPTIONS.gtk2!= \
- cd ${BUILDLINK_PKGSRCDIR.gtk2} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.gtk2=${PKG_BUILD_OPTIONS.gtk2:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.gtk2
+pkgbase := gtk2
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
.include "../../x11/libXcursor/buildlink3.mk"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index b33b9c00fc3..b21dabca971 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/01/17 23:47:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+
@@ -17,13 +17,8 @@ BUILDLINK_ABI_DEPENDS.kdebase?= kdebase>=3.5.5nb1
BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3
.endif # KDEBASE_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.kdebase)
-PKG_BUILD_OPTIONS.kdebase!= \
- cd ${BUILDLINK_PKGSRCDIR.kdebase} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.kdebase
+pkgbase := kdebase
+.include "../../mk/pkg-build-options.mk"
BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 6c179325a3b..3430433511f 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2007/01/26 02:44:28 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
@@ -19,13 +19,8 @@ BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs>=3.5.6
BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3
.endif # KDELIBS_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.kdelibs)
-PKG_BUILD_OPTIONS.kdelibs!= \
- cd ${BUILDLINK_PKGSRCDIR.kdelibs} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.kdelibs=${PKG_BUILD_OPTIONS.kdelibs:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.kdelibs
+pkgbase := kdelibs
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups)
. include "../../print/cups/buildlink3.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 16:28:39 +0000