diff options
67 files changed, 389 insertions, 526 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index dbfc951e797..1faa397e43a 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/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:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ -.if !empty(BZIP2_BUILDLINK3_MK:M\+) +.if !empty(BZIP2_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.bzip2?= bzip2>=1.0.1 @@ -54,12 +54,12 @@ MAKEFLAGS+= _NEED_BZIP2="${_NEED_BZIP2}" .endif .if ${_NEED_BZIP2} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= bzip2 . endif .endif -.if !empty(BZIP2_BUILDLINK3_MK:M\+) +.if !empty(BZIP2_BUILDLINK3_MK:M+) . if ${_NEED_BZIP2} == "YES" BUILDLINK_PACKAGES+= bzip2 . else diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk index c2d217ddede..45812e57978 100644 --- a/audio/SDL_mixer/buildlink3.mk +++ b/audio/SDL_mixer/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:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+ -.if !empty(SDL_MIXER_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.SDL_mixer?= SDL_mixer>=1.2.5nb1 -BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer -.endif # SDL_MIXER_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= SDL_mixer .endif -.if !empty(SDL_MIXER_BUILDLINK3_MK:M\+) +.if !empty(SDL_MIXER_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= SDL_mixer +BUILDLINK_DEPENDS.SDL_mixer?= SDL_mixer>=1.2.5nb1 +BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer BUILDLINK_INCDIRS.SDL_mixer?= include/SDL . include "../../devel/SDL/buildlink3.mk" diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk index 0b981268b0e..8375d43acd5 100644 --- a/audio/esound/buildlink3.mk +++ b/audio/esound/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:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+ -.if !empty(ESOUND_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.esound?= esound>=0.2.18 -BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound -.endif # ESOUND_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= esound .endif -.if !empty(ESOUND_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= esound +.if !empty(ESOUND_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= esound +BUILDLINK_DEPENDS.esound?= esound>=0.2.18 +BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound . include "../../audio/libaudiofile/buildlink3.mk" .endif # ESOUND_BUILDLINK3_MK diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk index d7cb8d0b478..0bb38bd6ba3 100644 --- a/audio/libaudiofile/buildlink3.mk +++ b/audio/libaudiofile/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:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+ -.if !empty(AUDIOFILE_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1 -BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile -.endif # AUDIOFILE_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= audiofile .endif -.if !empty(AUDIOFILE_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= audiofile +.if !empty(AUDIOFILE_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= audiofile +BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1 +BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile .endif # AUDIOFILE_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk index ae252c23631..afa11d38d31 100644 --- a/audio/libogg/buildlink3.mk +++ b/audio/libogg/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}+ LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+ -.if !empty(LIBOGG_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.8 -BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg -.endif # LIBOGG_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libogg .endif -.if !empty(LIBOGG_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= libogg +.if !empty(LIBOGG_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libogg +BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.8 +BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg .endif # LIBOGG_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk index 9e00efe8f92..5043d28317c 100644 --- a/audio/oss/buildlink3.mk +++ b/audio/oss/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}+ OSS_BUILDLINK3_MK:= ${OSS_BUILDLINK3_MK}+ -.if !empty(OSS_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.oss?= oss-[0-9]* -BUILDLINK_PKGSRCDIR.oss?= ../../audio/oss -.endif # OSS_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= oss .endif -.if !empty(OSS_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= oss -BUILDLINK_INCDIRS.oss= include lib/oss/include +.if !empty(OSS_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= oss +BUILDLINK_DEPENDS.oss?= oss-[0-9]* +BUILDLINK_PKGSRCDIR.oss?= ../../audio/oss +BUILDLINK_INCDIRS.oss= include lib/oss/include # If we are using audio/oss, then we don't need the NetBSD OSS # compatibility library. diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index 49c559135eb..81991203b5c 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/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}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ -.if !empty(ICONV_BUILDLINK3_MK:M\+) +.if !empty(ICONV_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.iconv?= libiconv>=1.9.1 @@ -43,12 +43,12 @@ MAKEFLAGS+= _NEED_GNU_ICONV=${_NEED_GNU_ICONV} .endif .if ${_NEED_GNU_ICONV} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= iconv . endif .endif -.if !empty(ICONV_BUILDLINK3_MK:M\+) +.if !empty(ICONV_BUILDLINK3_MK:M+) . if ${_NEED_GNU_ICONV} == "YES" BUILDLINK_PACKAGES+= iconv _BLNK_LIBICONV= -liconv diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index a9518948b67..fbb6638add0 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/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}+ DB2_BUILDLINK3_MK:= ${DB2_BUILDLINK3_MK}+ -.if !empty(DB2_BUILDLINK3_MK:M\+) +.if !empty(DB2_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= db BUILDLINK_DEPENDS.db?= db>=2.7.3 BUILDLINK_PKGSRCDIR.db?= ../../databases/db @@ -26,12 +26,12 @@ MAKEFLAGS+= _NEED_DB2="${_NEED_DB2}" .endif .if ${_NEED_DB2} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db . endif .endif -.if !empty(DB2_BUILDLINK3_MK:M\+) +.if !empty(DB2_BUILDLINK3_MK:M+) . if ${_NEED_DB2} == "YES" BUILDLINK_INCDIRS.db= include/db2 BUILDLINK_TRANSFORM+= l:db:db2 diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index bd5f19685cc..fb46d1ce397 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/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}+ DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ -.if !empty(DB3_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.db3?= db3>=2.9.2 -BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 -.endif # DB3_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db3 .endif -.if !empty(DB3_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= db3 +.if !empty(DB3_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= db3 +BUILDLINK_DEPENDS.db3?= db3>=2.9.2 +BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 .endif # DB3_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 14524df16c0..6c49ff3ea93 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/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}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ -.if !empty(DB4_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.db4?= db4>=4.1.25 -BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 -BUILDLINK_CPPFLAGS.db4?= -I${BUILDLINK_PREFIX.db4}/include/db4 -.endif # DB4_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= db4 .endif -.if !empty(DB4_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= db4 +.if !empty(DB4_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= db4 +BUILDLINK_DEPENDS.db4?= db4>=4.1.25 +BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 +BUILDLINK_CPPFLAGS.db4?= -I${BUILDLINK_PREFIX.db4}/include/db4 .endif # DB4_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk index 6b19103f3b3..da13371341b 100644 --- a/databases/mysql-client/buildlink3.mk +++ b/databases/mysql-client/buildlink3.mk @@ -1,22 +1,19 @@ -# $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}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ -.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M\+) +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= mysql-client +.endif + +.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= mysql-client BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.58 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client BUILDLINK_LDFLAGS.mysql-client?= \ -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql -.endif # MYSQL_CLIENT_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) -BUILDLINK_DEPENDS+= mysql-client -.endif - -.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= mysql-client . include "../../devel/zlib/buildlink3.mk" .endif # MYSQL_CLIENT_BUILDLINK3_MK diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk index 85194a528b0..b932e274033 100644 --- a/databases/openldap/buildlink3.mk +++ b/databases/openldap/buildlink3.mk @@ -1,21 +1,18 @@ -# $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}+ OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ -.if !empty(OPENLDAP_BUILDLINK3_MK:M\+) +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= openldap +.endif + +.if !empty(OPENLDAP_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" +BUILDLINK_PACKAGES+= openldap BUILDLINK_DEPENDS.openldap?= openldap>=2.1.22 BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap -.endif # OPENLDAP_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) -BUILDLINK_DEPENDS+= openldap -.endif - -.if !empty(OPENLDAP_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= openldap . if defined(USE_SASL2) && (${USE_SASL2} == "YES") . include "../../security/cyrus-sasl2/buildlink3.mk" diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk index ff21b0785b0..0c302fcd7c7 100644 --- a/databases/p5-DBI/buildlink3.mk +++ b/databases/p5-DBI/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}+ P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+ -.if !empty(P5_DBI_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.p5-DBI?= p5-DBI>=1.30 -BUILDLINK_PKGSRCDIR.p5-DBI?= ../../databases/p5-DBI -BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/auto/DBI -.endif # P5_DBI_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= p5-DBI .endif -.if !empty(P5_DBI_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= p5-DBI +.if !empty(P5_DBI_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= p5-DBI +BUILDLINK_DEPENDS.p5-DBI?= p5-DBI>=1.30 +BUILDLINK_PKGSRCDIR.p5-DBI?= ../../databases/p5-DBI +BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/auto/DBI . include "../../lang/perl5/buildlink3.mk" .endif # P5_DBI_BUILDLINK3_MK diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk index d4533bc1934..d4fc7a050ab 100644 --- a/databases/postgresql-lib/buildlink3.mk +++ b/databases/postgresql-lib/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}+ POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+ -.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=7.3.1 -BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib -BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql -.endif # POSTGRESQL_LIB_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= postgresql-lib .endif -.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= postgresql-lib +.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= postgresql-lib +BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=7.3.1 +BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib +BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql . include "../../security/openssl/buildlink3.mk" .endif # POSTGRESQL_LIB_BUILDLINK3_MK 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 diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 95f1fa70f80..f8ab82733bb 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.8 2003/09/30 10:18:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/01/04 23:34:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ -.if !empty(MESALIB_BUILDLINK3_MK:M\+) +.if !empty(MESALIB_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" MESA_REQD?= 3.4.2 @@ -63,12 +63,12 @@ MAKEFLAGS+= _NEED_MESALIB="${_NEED_MESALIB}" # major number bump. # BUILDLINK_DEPENDS.MesaLib= MesaLib>=5.0 -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= MesaLib . endif .endif -.if !empty(MESALIB_BUILDLINK3_MK:M\+) +.if !empty(MESALIB_BUILDLINK3_MK:M+) . if ${_NEED_MESALIB} == "YES" BUILDLINK_PACKAGES+= MesaLib BUILDLINK_CPPFLAGS.MesaLib= -DGLX_GLXEXT_LEGACY diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index fbb3c3b54d8..4ca7dc72ffc 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+ -.if !empty(SDL_IMAGE_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.SDL_image?= SDL_image>=1.2.2nb2 -BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image -.endif # SDL_IMAGE_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= SDL_image .endif -.if !empty(SDL_IMAGE_BUILDLINK3_MK:M\+) +.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= SDL_image +BUILDLINK_DEPENDS.SDL_image?= SDL_image>=1.2.2nb2 +BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image BUILDLINK_INCDIRS.SDL_image?= include/SDL . include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk index ac1a61750cc..9d150dc8397 100644 --- a/graphics/aalib-x11/buildlink3.mk +++ b/graphics/aalib-x11/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+ -.if !empty(AALIB_X11_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4nb1 -BUILDLINK_PKGSRCDIR.aalib-x11?= ../../graphics/aalib-x11 -.endif # AALIB_X11_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= aalib-x11 .endif -.if !empty(AALIB_X11_BUILDLINK3_MK:M\+) +.if !empty(AALIB_X11_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= aalib-x11 +BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4nb1 +BUILDLINK_PKGSRCDIR.aalib-x11?= ../../graphics/aalib-x11 BUILDLINK_FILES.aalib-x11= include/aalib-x11.h BUILDLINK_TRANSFORM.aalib-x11+= -e "s|/aalib-x11.h|/aalib.h|g" diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk index cc74e905284..455bbebb2b5 100644 --- a/graphics/freetype-lib/buildlink3.mk +++ b/graphics/freetype-lib/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+ -.if !empty(FREETYPE_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1nb1 -BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib -.endif # FREETYPE_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= freetype .endif -.if !empty(FREETYPE_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= freetype +.if !empty(FREETYPE_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= freetype +BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1nb1 +BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib . include "../../devel/gettext-lib/buildlink3.mk" .endif # FREETYPE_BUILDLINK3_MK diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 4433b25f6ea..d007badf629 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ -.if !empty(FREETYPE2_BUILDLINK3_MK:M\+) +.if !empty(FREETYPE2_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.freetype2?= freetype2>=2.0.1 @@ -67,17 +67,20 @@ MAKEFLAGS+= _NEED_FREETYPE2="${_NEED_FREETYPE2}" # major number bump. # BUILDLINK_DEPENDS.freetype2= freetype2>=2.1.3 -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= freetype2 . endif .endif -.if !empty(FREETYPE2_BUILDLINK3_MK:M\+) +.if !empty(FREETYPE2_BUILDLINK3_MK:M+) . if ${_NEED_FREETYPE2} == "YES" BUILDLINK_PACKAGES+= freetype2 . else BUILDLINK_PREFIX.freetype2= ${X11BASE} . endif + +FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config +CONFIGURE_ENV+= FREETYPE_CONFIG="${FREETYPE_CONFIG}" .endif # FREETYPE2_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 865d959f18a..dbe5ff44e0d 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+ -.if !empty(GD_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.gd?= gd>=2.0.15 -BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd -.endif # GD_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= gd .endif -.if !empty(GD_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= gd +.if !empty(GD_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gd +BUILDLINK_DEPENDS.gd?= gd>=2.0.15 +BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd . include "../../devel/zlib/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk index 4be30c194a7..b69b0fe22d8 100644 --- a/graphics/glu/buildlink3.mk +++ b/graphics/glu/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.6 2003/09/30 10:18:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/01/04 23:34:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+ -.if !empty(GLU_BUILDLINK3_MK:M\+) +.if !empty(GLU_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" MESA_REQD?= 3.4.2 @@ -62,13 +62,13 @@ MAKEFLAGS+= _NEED_GLU="${_NEED_GLU}" # If we depend on the package, depend on the latest version with a library # major number bump. # -BUILDLINK_DEPENDS.glu= glu>=5.0 -. if !empty(BUILDLINK_DEPTH:M\+) +BUILDLINK_DEPENDS.glu= glu>=5.0.2nb3 +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= glu . endif .endif -.if !empty(GLU_BUILDLINK3_MK:M\+) +.if !empty(GLU_BUILDLINK3_MK:M+) . if ${_NEED_GLU} == "YES" BUILDLINK_PACKAGES+= glu . else diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index 75ae012bf87..3af156c071c 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ -.if !empty(GLUT_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.glut?= glut>=${MESA_VERSION} -BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut -.endif # GLUT_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= glut .endif -.if !empty(GLUT_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= glut +.if !empty(GLUT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= glut +BUILDLINK_DEPENDS.glut?= glut>=${MESA_VERSION} +BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut . include "../../graphics/MesaLib/buildlink3.mk" .endif # GLUT_BUILDLINK3_MK diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk index 16649eb7959..73a01491479 100644 --- a/graphics/jpeg/buildlink3.mk +++ b/graphics/jpeg/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+ -.if !empty(JPEG_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.jpeg?= jpeg>=6b -BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg -.endif # JPEG_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= jpeg .endif -.if !empty(JPEG_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= jpeg +.if !empty(JPEG_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= jpeg +BUILDLINK_DEPENDS.jpeg?= jpeg>=6b +BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg .endif # JPEG_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk index fad48c44a93..50ce55a9daa 100644 --- a/graphics/libungif/buildlink3.mk +++ b/graphics/libungif/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+ -.if !empty(LIBUNGIF_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0 -BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif -.endif # LIBUNGIF_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libungif .endif -.if !empty(LIBUNGIF_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= libungif +.if !empty(LIBUNGIF_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libungif +BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0 +BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif .endif # LIBUNGIF_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 0b9894da10b..f82994527d8 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ -.if !empty(PNG_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.png?= png>=1.2.4 -BUILDLINK_PKGSRCDIR.png?= ../../graphics/png -.endif # PNG_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= png .endif -.if !empty(PNG_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= png +.if !empty(PNG_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= png +BUILDLINK_DEPENDS.png?= png>=1.2.4 +BUILDLINK_PKGSRCDIR.png?= ../../graphics/png . include "../../devel/zlib/buildlink3.mk" .endif # PNG_BUILDLINK3_MK diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk index 05bdfa5fdf6..20b685f60c6 100644 --- a/graphics/tiff/buildlink3.mk +++ b/graphics/tiff/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+ -.if !empty(TIFF_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 -BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff -.endif # TIFF_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= tiff .endif -.if !empty(TIFF_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= tiff +.if !empty(TIFF_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= tiff +BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 +BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff . include "../../devel/zlib/buildlink3.mk" . include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk index de74fd43b92..2a8dbed0f40 100644 --- a/graphics/xpm/buildlink3.mk +++ b/graphics/xpm/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.7 2003/09/30 10:18:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/01/04 23:34:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" -.if !empty(XPM_BUILDLINK3_MK:M\+) +.if !empty(XPM_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xpm?= xpm>=3.4k BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm .endif # XPM_BUILDLINK3_MK @@ -73,12 +73,12 @@ MAKEFLAGS+= _NEED_XPM="${_NEED_XPM}" .endif # _NEED_XPM .if ${_NEED_XPM} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= xpm . endif .endif -.if !empty(XPM_BUILDLINK3_MK:M\+) +.if !empty(XPM_BUILDLINK3_MK:M+) . if ${_NEED_XPM} == "YES" BUILDLINK_PACKAGES+= xpm . else diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk index c410f8be273..f744bcea9ba 100644 --- a/lang/libperl/buildlink3.mk +++ b/lang/libperl/buildlink3.mk @@ -1,20 +1,18 @@ -# $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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+ -.if !empty(LIBPERL_BUILDLINK3_MK:M\+) -LIBPERL5_REQD?= ${PERL5_REQD} -BUILDLINK_DEPENDS.libperl?= {libperl>=${LIBPERL5_REQD},perl>=5.8.0} -BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl -.endif # LIBPERL_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libperl .endif -.if !empty(LIBPERL_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= libperl +.if !empty(LIBPERL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libperl +BUILDLINK_DEPENDS.libperl?= {libperl>=${LIBPERL5_REQD},perl>=5.8.0} +BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl + +LIBPERL5_REQD?= ${PERL5_REQD} . include "../../lang/perl5/buildlink3.mk" .endif # LIBPERL_BUILDLINK3_MK diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index d3f9174f2bc..871d01aa92b 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,20 +1,17 @@ -# $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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ -.if !empty(OCAML_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.ocaml?= ocaml>=3.06 -BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml -BUILDLINK_DEPMETHOD.ocaml?= build -.endif # OCAML_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= ocaml .endif -.if !empty(OCAML_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= ocaml +.if !empty(OCAML_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= ocaml +BUILDLINK_DEPENDS.ocaml?= ocaml>=3.06 +BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml +BUILDLINK_DEPMETHOD.ocaml?= build .endif # OCAML_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 571476e6bc7..f21086052fc 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ -.if !empty(PERL5_BUILDLINK3_MK:M\+) +.if !empty(PERL5_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" USE_PERL5?= run @@ -17,11 +17,11 @@ BUILDLINK_DEPMETHOD.perl?= build . endif .endif # PERL5_BUILDLINK3_MK -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= perl .endif -.if !empty(PERL5_BUILDLINK3_MK:M\+) +.if !empty(PERL5_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= perl _PERL5_SITEVARS= \ diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index f07d0b27dd9..c8e3a572f7b 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,19 +1,17 @@ -# $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:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+ -.if !empty(TCL_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.tcl?= tcl>=8.3.4 -BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl -.endif # TCL_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= tcl .endif -.if !empty(TCL_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= tcl +.if !empty(TCL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= tcl +BUILDLINK_DEPENDS.tcl?= tcl>=8.3.4 +BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl + BUILDLINK_FILES.tcl= bin/tclsh* # # Make "-ltcl" resolve into "-ltcl83", so that we don't need to patch so diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index 7ff95f37034..b7407355562 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/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:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ -.if !empty(LIBPCAP_BUILDLINK3_MK:M\+) +.if !empty(LIBPCAP_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.libpcap?= libpcap>=0.7.2 @@ -33,12 +33,12 @@ MAKEFLAGS+= _NEED_LIBPCAP="${_NEED_LIBPCAP}" .endif .if ${_NEED_LIBPCAP} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libpcap . endif .endif -.if !empty(LIBPCAP_BUILDLINK3_MK:M\+) +.if !empty(LIBPCAP_BUILDLINK3_MK:M+) . if ${_NEED_LIBPCAP} == "YES" BUILDLINK_PACKAGES+= libpcap . else diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk index 3bdee1a3154..9d262783f68 100644 --- a/net/openslp/buildlink3.mk +++ b/net/openslp/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:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+ -.if !empty(OPENSLP_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.openslp?= openslp>=1.0.1 -BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp -.endif # OPENSLP_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= openslp .endif -.if !empty(OPENSLP_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= openslp +.if !empty(OPENSLP_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= openslp +BUILDLINK_DEPENDS.openslp?= openslp>=1.0.1 +BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp .endif # OPENSLP_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk index 1b6d11de656..59880886b5e 100644 --- a/net/socks4/buildlink3.mk +++ b/net/socks4/buildlink3.mk @@ -1,19 +1,17 @@ -# $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:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+ -.if !empty(SOCKS4_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.socks4?= socks4>=2.2 -BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4 -.endif # SOCKS4_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= socks4 .endif -.if !empty(SOCKS4_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= socks4 +.if !empty(SOCKS4_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= socks4 +BUILDLINK_DEPENDS.socks4?= socks4>=2.2 +BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4 + BUILDLINK_TRANSFORM+= l:socks:socks4 .endif # SOCKS4_BUILDLINK3_MK diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk index 99da0a1c2e9..ab2477fed16 100644 --- a/net/socks5/buildlink3.mk +++ b/net/socks5/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+ -.if !empty(SOCKS5_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2 -BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5 -.endif # SOCKS5_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= socks5 .endif -.if !empty(SOCKS5_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= socks5 +.if !empty(SOCKS5_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= socks5 +BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2 +BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5 .endif # SOCKS5_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk index 1047dec0ff9..383781b1331 100644 --- a/pkgtools/libnbcompat/buildlink3.mk +++ b/pkgtools/libnbcompat/buildlink3.mk @@ -1,21 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+ -.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030830 -BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat -BUILDLINK_DEPMETHOD.libnbcompat?= build -.endif # LIBNBCOMPAT_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libnbcompat .endif -.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= libnbcompat -BUILDLINK_LDADD.libnbcompat= -lnbcompat +.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libnbcompat +BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030830 +BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat +BUILDLINK_DEPMETHOD.libnbcompat?= build +BUILDLINK_LDADD.libnbcompat= -lnbcompat . if defined(GNU_CONFIGURE) LIBS+= ${BUILDLINK_LDADD.libnbcompat} diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk index b7c545d2307..3975a262d55 100644 --- a/print/cups/buildlink3.mk +++ b/print/cups/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+ -.if !empty(CUPS_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.cups?= cups>=1.1.14nb1 -BUILDLINK_PKGSRCDIR.cups?= ../../print/cups -.endif # CUPS_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= cups .endif -.if !empty(CUPS_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= cups +.if !empty(CUPS_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= cups +BUILDLINK_DEPENDS.cups?= cups>=1.1.14nb1 +BUILDLINK_PKGSRCDIR.cups?= ../../print/cups . include "../../graphics/png/buildlink3.mk" . include "../../graphics/tiff/buildlink3.mk" diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk index 393cb0a66f9..1866c8f0be9 100644 --- a/security/PAM/buildlink3.mk +++ b/security/PAM/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ -.if !empty(PAM_BUILDLINK3_MK:M\+) +.if !empty(PAM_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.pam?= PAM>=0.75 @@ -33,12 +33,12 @@ MAKEFLAGS+= _NEED_PAM="${_NEED_PAM}" .endif .if ${_NEED_PAM} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pam . endif .endif -.if !empty(PAM_BUILDLINK3_MK:M\+) +.if !empty(PAM_BUILDLINK3_MK:M+) . if ${_NEED_PAM} == "YES" BUILDLINK_PACKAGES+= pam . else diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk index b4db1364cff..479255e3449 100644 --- a/security/cyrus-sasl2/buildlink3.mk +++ b/security/cyrus-sasl2/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+ -.if !empty(CYRUS_SASL_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.cyrus-sasl?= cyrus-sasl>=2.1.12 -BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl2 -.endif # CYRUS_SASL_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= cyrus-sasl .endif -.if !empty(CYRUS_SASL_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= cyrus-sasl +.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= cyrus-sasl +BUILDLINK_DEPENDS.cyrus-sasl?= cyrus-sasl>=2.1.12 +BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl2 .endif # CYRUS_SASL_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk index c5f444d3736..61a3f4c2f1b 100644 --- a/security/libcrack/buildlink3.mk +++ b/security/libcrack/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBCRACK_BUILDLINK3_MK:= ${LIBCRACK_BUILDLINK3_MK}+ -.if !empty(LIBCRACK_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.libcrack?= libcrack>=2.7 -BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack -.endif # LIBCRACK_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= libcrack .endif -.if !empty(LIBCRACK_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= libcrack +.if !empty(LIBCRACK_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libcrack +BUILDLINK_DEPENDS.libcrack?= libcrack>=2.7 +BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack .endif # LIBCRACK_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 9ae9ba3a0f3..b8032279454 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ -.if !empty(OPENSSL_BUILDLINK3_MK:M\+) +.if !empty(OPENSSL_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" # This is the ${PKGNAME} of the version of the OpenSSL package installed @@ -129,12 +129,12 @@ PKG_SKIP_REASON= "Unable to satisfy dependency: ${BUILDLINK_DEPENDS.openssl}" .endif .if ${_NEED_OPENSSL} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= openssl . endif .endif -.if !empty(OPENSSL_BUILDLINK3_MK:M\+) +.if !empty(OPENSSL_BUILDLINK3_MK:M+) . if ${_NEED_OPENSSL} == "NO" BUILDLINK_PREFIX.openssl= /usr . endif diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk index 812464aee64..71e5b4de9fa 100644 --- a/security/rsaref/buildlink3.mk +++ b/security/rsaref/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RSAREF_BUILDLINK3_MK:= ${RSAREF_BUILDLINK3_MK}+ -.if !empty(RSAREF_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.rsaref?= rsaref-2.0p3 -BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref -.endif # RSAREF_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= rsaref .endif -.if !empty(RSAREF_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= rsaref +.if !empty(RSAREF_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= rsaref +BUILDLINK_DEPENDS.rsaref?= rsaref-2.0p3 +BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref .endif # RSAREF_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk index b4dd96870ee..9f8480e8573 100644 --- a/security/tcp_wrappers/buildlink3.mk +++ b/security/tcp_wrappers/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TCP_WRAPPERS_BUILDLINK3_MK:= ${TCP_WRAPPERS_BUILDLINK3_MK}+ -.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M\+) +.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.tcp_wrappers?= tcp_wrappers>=7.6.1nb1 @@ -33,12 +33,12 @@ MAKEFLAGS+= _NEED_TCP_WRAPPERS="${_NEED_TCP_WRAPPERS}" .endif .if ${_NEED_TCP_WRAPPERS} == "YES" -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= tcp_wrappers . endif .endif -.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M\+) +.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+) . if ${_NEED_TCP_WRAPPERS} == "YES" BUILDLINK_PACKAGES+= tcp_wrappers . else diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index 6a49f030bf8..80d2a9f64dc 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,19 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+ -.if !empty(EXPAT_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.expat?= expat>=1.95.4 -BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat -.endif # EXPAT_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= expat .endif -.if !empty(EXPAT_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= expat +.if !empty(EXPAT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= expat +BUILDLINK_DEPENDS.expat?= expat>=1.95.4 +BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat .endif # EXPAT_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk index 4662bba775f..2ed238ec748 100644 --- a/www/apache/buildlink3.mk +++ b/www/apache/buildlink3.mk @@ -1,9 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ -.if !empty(APACHE_BUILDLINK3_MK:M\+) +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= apache +.endif + +.if !empty(APACHE_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= apache BUILDLINK_DEPENDS.apache?= apache{,6}-1.3.* BUILDLINK_PKGSRCDIR.apache?= ../../lang/apache . if defined(APACHE_MODULE) @@ -11,16 +16,10 @@ BUILDLINK_DEPMETHOD.apache+= full . else BUILDLINK_DEPMETHOD.apache?= build . endif -.endif # APACHE_BUILDLINK3_MK -.if !empty(BUILDLINK_DEPTH:M\+) -BUILDLINK_DEPENDS+= apache -USE_PERL5?= build # for "apxs" -.endif +USE_PERL5?= build # for "apxs" +APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs -.if !empty(APACHE_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= apache -APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs="${APXS}" . endif diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index 4c15b9a7df2..72f77f59eae 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,22 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/04 14:40:40 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ -.if !empty(XRANDR_BUILDLINK3_MK:M\+) -. include "../../mk/bsd.prefs.mk" +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= Xrandr +.endif + +BUILDLINK_IS_BUILTIN.Xrender?= no +.if !empty(XRANDR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.Xrandr?= Xrandr>=1.0.1 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr BUILDLINK_PACKAGES+= Xrandr .endif # XRANDR_BUILDLINK3_MK -.if !defined(BUILDLINK_IS_BUILTIN.Xrender) -BUILDLINK_IS_BUILTIN.Xrender= NO -.endif - -.if !empty(BUILDLINK_DEPTH:M\+) -BUILDLINK_DEPENDS+= Xrandr -.endif - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 74fc0bdcdc3..e7961f3de26 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.8 2003/11/10 02:26:53 fredb Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ -.if !empty(XRENDER_BUILDLINK3_MK:M\+) +.if !empty(XRENDER_BUILDLINK3_MK:M+) . include "../../mk/bsd.prefs.mk" BUILDLINK_DEPENDS.Xrender?= Xrender>=0.2 @@ -65,12 +65,12 @@ MAKEFLAGS+= _NEED_XRENDER="${_NEED_XRENDER}" # minor number bump. # BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2 -. if !empty(BUILDLINK_DEPTH:M\+) +. if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= Xrender . endif .endif -.if !empty(XRENDER_BUILDLINK3_MK:M\+) +.if !empty(XRENDER_BUILDLINK3_MK:M+) . if ${_NEED_XRENDER} == "YES" BUILDLINK_PACKAGES+= Xrender . else diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index ca5fbe0a6ed..1c45f1c3763 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,21 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ -.if !empty(GTK_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10nb5 -BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk -.endif # GTK_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= gtk .endif -.if !empty(GTK_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= gtk +.if !empty(GTK_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gtk +BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10nb5 +BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk -USE_X11= YES +USE_X11= YES . include "../../devel/gettext-lib/buildlink3.mk" . include "../../devel/glib/buildlink3.mk" diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index 873256e5c51..77ed49eb9b7 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,19 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ -.if !empty(TK_BUILDLINK3_MK:M\+) -BUILDLINK_DEPENDS.tk?= tk>=8.3.4 -BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk -.endif # TK_BUILDLINK3_MK - -.if !empty(BUILDLINK_DEPTH:M\+) +.if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= tk .endif -.if !empty(TK_BUILDLINK3_MK:M\+) -BUILDLINK_PACKAGES+= tk +.if !empty(TK_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= tk +BUILDLINK_DEPENDS.tk?= tk>=8.3.4 +BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk + BUILDLINK_FILES.tk= bin/wish* # # Make "-ltk" resolve into "-ltk83", so that we don't need to patch so diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 2baca37f61f..fcc51afb4aa 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,20 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/16 08:51:42 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ -.if !empty(XCURSOR_BUILDLINK3_MK:M\+) -. include "../../mk/bsd.prefs.mk" +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= xcursor +.endif + +BUILDLINK_IS_BUILTIN.xcursor?= no +.if !empty(XCURSOR_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.xcursor?= xcursor>=1.1.1 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor BUILDLINK_PACKAGES+= xcursor .endif # XCURSOR_BUILDLINK3_MK -BUILDLINK_IS_BUILTIN.xcursor= NO - -.if !empty(BUILDLINK_DEPTH:M\+) -BUILDLINK_DEPENDS+= xcursor -.endif - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} |