pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Removed some code duplication from the buildlink3 file...
details: https://anonhg.NetBSD.org/pkgsrc/rev/abebe6af91a8
branches: trunk
changeset: 529294:abebe6af91a8
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed May 30 08:54:28 2007 +0000
description:
Removed some code duplication from the buildlink3 files by using the new
pkg-build-options.mk procedure.
diffstat:
audio/libmikmod/buildlink3.mk | 11 +++--------
databases/openldap-client/buildlink3.mk | 11 +++--------
devel/SDL/buildlink3.mk | 11 +++--------
devel/apr-util/buildlink3.mk | 11 +++--------
devel/apr0/buildlink3.mk | 11 ++++-------
devel/hdf5/buildlink3.mk | 10 +++-------
devel/pango/buildlink3.mk | 11 +++--------
devel/subversion-base/buildlink3.mk | 13 ++++++-------
geography/gdal-lib/buildlink3.mk | 11 +++--------
graphics/aalib/buildlink3.mk | 11 +++--------
graphics/cairo/buildlink3.mk | 11 +++--------
misc/kdepim3/buildlink3.mk | 11 +++--------
multimedia/gstreamer0.10/buildlink3.mk | 9 +++------
multimedia/mjpegtools/buildlink3.mk | 11 +++--------
print/libgnomeprint/buildlink3.mk | 11 +++--------
print/xfce4-print/buildlink3.mk | 11 +++--------
security/heimdal/buildlink3.mk | 11 +++--------
security/openssl/buildlink3.mk | 11 +++--------
www/libwww/buildlink3.mk | 11 +++--------
x11/gtk2/buildlink3.mk | 11 +++--------
x11/kdebase3/buildlink3.mk | 11 +++--------
x11/kdelibs3/buildlink3.mk | 11 +++--------
22 files changed, 70 insertions(+), 171 deletions(-)
diffs (truncated from 553 to 300 lines):
diff -r 1822af73dce8 -r abebe6af91a8 audio/libmikmod/buildlink3.mk
--- a/audio/libmikmod/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/audio/libmikmod/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 databases/openldap-client/buildlink3.mk
--- a/databases/openldap-client/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/databases/openldap-client/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 devel/SDL/buildlink3.mk
--- a/devel/SDL/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/SDL/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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 @@
.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 -r 1822af73dce8 -r abebe6af91a8 devel/apr-util/buildlink3.mk
--- a/devel/apr-util/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/apr-util/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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 @@
.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 -r 1822af73dce8 -r abebe6af91a8 devel/apr0/buildlink3.mk
--- a/devel/apr0/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/apr0/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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 @@
.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 -r 1822af73dce8 -r abebe6af91a8 devel/hdf5/buildlink3.mk
--- a/devel/hdf5/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/hdf5/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 devel/pango/buildlink3.mk
--- a/devel/pango/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/pango/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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 @@
.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 -r 1822af73dce8 -r abebe6af91a8 devel/subversion-base/buildlink3.mk
--- a/devel/subversion-base/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/devel/subversion-base/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 geography/gdal-lib/buildlink3.mk
--- a/geography/gdal-lib/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/geography/gdal-lib/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 graphics/aalib/buildlink3.mk
--- a/graphics/aalib/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/graphics/aalib/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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 -r 1822af73dce8 -r abebe6af91a8 graphics/cairo/buildlink3.mk
--- a/graphics/cairo/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/graphics/cairo/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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 @@
.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 -r 1822af73dce8 -r abebe6af91a8 misc/kdepim3/buildlink3.mk
--- a/misc/kdepim3/buildlink3.mk Wed May 30 07:58:59 2007 +0000
+++ b/misc/kdepim3/buildlink3.mk Wed May 30 08:54:28 2007 +0000
@@ -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_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
Home |
Main Index |
Thread Index |
Old Index