summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/SDL/buildlink3.mk17
-rw-r--r--devel/binutils/buildlink3.mk8
-rw-r--r--devel/boehm-gc/buildlink3.mk15
-rw-r--r--devel/dlcompat/buildlink3.mk15
-rw-r--r--devel/gettext-lib/buildlink3.mk8
-rw-r--r--devel/glib/buildlink3.mk15
-rw-r--r--devel/libgetopt/buildlink3.mk8
-rw-r--r--devel/libmm/buildlink3.mk15
-rw-r--r--devel/libslang/buildlink3.mk21
-rw-r--r--devel/ncurses/buildlink3.mk8
-rw-r--r--devel/pcre/buildlink3.mk15
-rw-r--r--devel/pkgconfig/buildlink3.mk17
-rw-r--r--devel/popt/buildlink3.mk15
-rw-r--r--devel/pth/buildlink3.mk15
-rw-r--r--devel/readline/buildlink3.mk8
-rw-r--r--devel/smpeg/buildlink3.mk15
-rw-r--r--devel/zlib/buildlink3.mk8
17 files changed, 94 insertions, 129 deletions
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index ed859ccd975..36a3d815b49 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,21 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
-.if !empty(SDL_BUILDLINK3_MK:M\+)
-. include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_DEPENDS.SDL?= SDL>=1.2.5nb5
-BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
-.endif # SDL_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= SDL
.endif
-.if !empty(SDL_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= SDL
+.if !empty(SDL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= SDL
+BUILDLINK_DEPENDS.SDL?= SDL>=1.2.5nb5
+BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
USE_X11= YES
PTHREAD_OPTS+= require
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 020c265a1e6..b1c4bbb1ba6 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
@@ -6,7 +6,7 @@ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
.if !defined(BINUTILS_BUILDLINK3_MK)
BINUTILS_BUILDLINK3_MK= # defined
-.if !empty(BINUTILS_BUILDLINK3_MK:M\+)
+.if !empty(BINUTILS_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.binutils?= binutils>=2.14.0
@@ -54,12 +54,12 @@ MAKEFLAGS+= _NEED_BINUTILS="${_NEED_BINUTILS}"
.endif
.if ${_NEED_BINUTILS} == "YES"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= binutils
. endif
.endif
-.if !empty(BINUTILS_BUILDLINK3_MK:M\+)
+.if !empty(BINUTILS_BUILDLINK3_MK:M+)
. if ${_NEED_BINUTILS} == "YES"
BUILDLINK_PACKAGES+= binutils
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index 8c77f114c5c..4ead28595a9 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+
-.if !empty(BOEHM_GC_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.boehm-gc?= boehm-gc>=6.2nb1
-BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
-.endif # BOEHM_GC_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= boehm-gc
.endif
-.if !empty(BOEHM_GC_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= boehm-gc
+.if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= boehm-gc
+BUILDLINK_DEPENDS.boehm-gc?= boehm-gc>=6.2nb1
+BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
.endif # BOEHM_GC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index 704334f42bb..a1decc3f4ae 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+
-.if !empty(DLCOMPAT_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.dlcompat?= dlcompat>=20020606
-BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
-.endif # DLCOMPAT_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= dlcompat
.endif
-.if !empty(DLCOMPAT_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= dlcompat
+.if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= dlcompat
+BUILDLINK_DEPENDS.dlcompat?= dlcompat>=20020606
+BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
.endif # DLCOMPAT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index b720068110c..1f6f13c0f25 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
-.if !empty(GETTEXT_BUILDLINK3_MK:M\+)
+.if !empty(GETTEXT_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.gettext?= gettext-lib>=0.10.35nb1
@@ -64,12 +64,12 @@ MAKEFLAGS+= _BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
.endif
.if ${_NEED_GNU_GETTEXT} == "YES"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gettext
. endif
.endif
-.if !empty(GETTEXT_BUILDLINK3_MK:M\+)
+.if !empty(GETTEXT_BUILDLINK3_MK:M+)
. if ${_NEED_GNU_GETTEXT} == "YES"
BUILDLINK_PACKAGES+= gettext
_BLNK_LIBINTL= -lintl
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 5f0043674a7..273da9a898a 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
-.if !empty(GLIB_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.glib?= glib>=1.2.10nb5
-BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
-.endif # GLIB_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= glib
.endif
-.if !empty(GLIB_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= glib
+.if !empty(GLIB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= glib
+BUILDLINK_DEPENDS.glib?= glib>=1.2.10nb5
+BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
PTHREAD_OPTS+= require
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 3c4780d687c..392c92ebfbf 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETOPT_BUILDLINK3_MK:= ${GETOPT_BUILDLINK3_MK}+
-.if !empty(GETOPT_BUILDLINK3_MK:M\+)
+.if !empty(GETOPT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.getopt?= libgetopt>=1.3
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # GETOPT_BUILDLINK3_MK
@@ -31,12 +31,12 @@ MAKEFLAGS+= _NEED_GETOPT="${_NEED_GETOPT}"
.endif
.if ${_NEED_GETOPT} == "YES"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= getopt
. endif
.endif
-.if !empty(GETOPT_BUILDLINK3_MK:M\+)
+.if !empty(GETOPT_BUILDLINK3_MK:M+)
. if ${_NEED_GETOPT} == "YES"
BUILDLINK_PACKAGES+= getopt
LIBGETOPT= -lgetopt
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 8eb94f0c2f8..be5151c5014 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+
-.if !empty(LIBMM_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.libmm?= libmm>=1.2.1
-BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm
-.endif # LIBMM_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libmm
.endif
-.if !empty(LIBMM_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= libmm
+.if !empty(LIBMM_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= libmm
+BUILDLINK_DEPENDS.libmm?= libmm>=1.2.1
+BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm
.endif # LIBMM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 7fe19fc17a4..62a57a34740 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(LIBSLANG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.libslang?= libslang>=1.4.9nb1
-BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
-.endif # LIBSLANG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libslang
.endif
-.if !empty(LIBSLANG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= libslang
+.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
+. include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_PACKAGES+= libslang
+BUILDLINK_DEPENDS.libslang?= libslang>=1.4.9nb1
+BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
# Debian adds a dependency on ncurses.
-. if ${OPSYS} == "Linux" && ${LOWER_VENDOR} == "debian"
+. if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
. include "../../devel/ncurses/buildlink3.mk"
. endif
.endif # LIBSLANG_BUILDLINK3_MK
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 5c4634971d5..f65853605b6 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
#
# Optionally define:
#
@@ -9,7 +9,7 @@
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
-.if !empty(NCURSES_BUILDLINK3_MK:M\+)
+.if !empty(NCURSES_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.ncurses?= ncurses>=5.3nb1
@@ -69,12 +69,12 @@ MAKEFLAGS+= _NEED_NCURSES="${_NEED_NCURSES}"
.endif
.if ${_NEED_NCURSES} == "YES"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= ncurses
. endif
.endif
-.if !empty(NCURSES_BUILDLINK3_MK:M\+)
+.if !empty(NCURSES_BUILDLINK3_MK:M+)
. if ${_NEED_NCURSES} == "YES"
BUILDLINK_PACKAGES+= ncurses
. else
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 07180cac848..7b135e4a219 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
-.if !empty(PCRE_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.pcre?= pcre>=3.4nb1
-BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
-.endif # PCRE_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pcre
.endif
-.if !empty(PCRE_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= pcre
+.if !empty(PCRE_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= pcre
+BUILDLINK_DEPENDS.pcre?= pcre>=3.4nb1
+BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
.endif # PCRE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk
index 838ae571330..21a1e971157 100644
--- a/devel/pkgconfig/buildlink3.mk
+++ b/devel/pkgconfig/buildlink3.mk
@@ -1,20 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+
-.if !empty(PKGCONFIG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.pkgconfig?= pkgconfig>=0.15.0
-BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig
-BUILDLINK_DEPMETHOD.pkgconfig?= build
-.endif # PKGCONFIG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= pkgconfig
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= pkgconfig
.endif
-.if !empty(PKGCONFIG_BUILDLINK3_MK:M\+)
+.if !empty(PKGCONFIG_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= pkgconfig
+BUILDLINK_DEPENDS.pkgconfig?= pkgconfig>=0.15.0
+BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig
+BUILDLINK_DEPMETHOD.pkgconfig?= build
PKG_CONFIG_PATH?= ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
CONFIGURE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 117a591eb34..19f118a89e8 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+
-.if !empty(POPT_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.popt?= popt>=1.7nb3
-BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
-.endif # POPT_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= popt
.endif
-.if !empty(POPT_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= popt
+.if !empty(POPT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= popt
+BUILDLINK_DEPENDS.popt?= popt>=1.7nb3
+BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
. include "../../devel/gettext-lib/buildlink3.mk"
.endif # POPT_BUILDLINK3_MK
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 8ac152f2645..fab52bdfffa 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+
-.if !empty(PTH_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.pth?= pth>=2.0.0
-BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth
-.endif # PTH_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pth
.endif
-.if !empty(PTH_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= pth
+.if !empty(PTH_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= pth
+BUILDLINK_DEPENDS.pth?= pth>=2.0.0
+BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth
.endif # PTH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 9a8b28c10bd..df16ec60433 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
#
# Optionally define USE_GNU_READLINE to force use of GNU readline.
#
@@ -8,7 +8,7 @@
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+
-.if !empty(READLINE_BUILDLINK3_MK:M\+)
+.if !empty(READLINE_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_PACKAGES+= readline
BUILDLINK_DEPENDS.readline?= readline>=2.2
@@ -55,12 +55,12 @@ MAKEFLAGS+= \
.endif
.if ${BUILDLINK_USE_BUILTIN.readline} == "NO"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= readline
. endif
.endif
-.if !empty(READLINE_BUILDLINK3_MK:M\+)
+.if !empty(READLINE_BUILDLINK3_MK:M+)
. if ${BUILDLINK_USE_BUILTIN.readline} == "YES"
BUILDLINK_PREFIX.readline= /usr
. if !defined(_BLNK_LIBEDIT_FOUND)
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index 2a567fa91a5..e38b99c4b2e 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+
-.if !empty(SPMEG_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.4nb3
-BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
-.endif # SMPEG_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= smpeg
.endif
-.if !empty(SPMEG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= smpeg
+.if !empty(SPMEG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= smpeg
+BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.4nb3
+BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
. include "../../devel/SDL/buildlink3.mk"
. include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 195bdfb1687..0db3114fbac 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+
-.if !empty(ZLIB_BUILDLINK3_MK:M\+)
+.if !empty(ZLIB_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.zlib?= zlib>=1.1.4nb1
@@ -56,12 +56,12 @@ MAKEFLAGS+= _NEED_ZLIB="${_NEED_ZLIB}"
.endif
.if ${_NEED_ZLIB} == "YES"
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= zlib
. endif
.endif
-.if !empty(ZLIB_BUILDLINK3_MK:M\+)
+.if !empty(ZLIB_BUILDLINK3_MK:M+)
. if ${_NEED_ZLIB} == "YES"
BUILDLINK_PACKAGES+= zlib
. else