pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Re-arrange to match example buildlink3.mk file in bsd....
details: https://anonhg.NetBSD.org/pkgsrc/rev/6bcd844b0eb0
branches: trunk
changeset: 465696:6bcd844b0eb0
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Jan 04 23:34:04 2004 +0000
description:
Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.
diffstat:
archivers/bzip2/buildlink3.mk | 8 ++++----
audio/SDL_mixer/buildlink3.mk | 13 +++++--------
audio/esound/buildlink3.mk | 15 ++++++---------
audio/libaudiofile/buildlink3.mk | 17 +++++++----------
audio/libogg/buildlink3.mk | 17 +++++++----------
audio/oss/buildlink3.mk | 17 +++++++----------
converters/libiconv/buildlink3.mk | 8 ++++----
databases/db/buildlink3.mk | 8 ++++----
databases/db3/buildlink3.mk | 17 +++++++----------
databases/db4/buildlink3.mk | 17 +++++++----------
databases/mysql-client/buildlink3.mk | 17 +++++++----------
databases/openldap/buildlink3.mk | 19 ++++++++-----------
databases/p5-DBI/buildlink3.mk | 17 +++++++----------
databases/postgresql-lib/buildlink3.mk | 17 +++++++----------
devel/SDL/buildlink3.mk | 17 ++++++-----------
devel/binutils/buildlink3.mk | 8 ++++----
devel/boehm-gc/buildlink3.mk | 17 +++++++----------
devel/dlcompat/buildlink3.mk | 17 +++++++----------
devel/gettext-lib/buildlink3.mk | 8 ++++----
devel/glib/buildlink3.mk | 15 ++++++---------
devel/libgetopt/buildlink3.mk | 8 ++++----
devel/libmm/buildlink3.mk | 17 +++++++----------
devel/libslang/buildlink3.mk | 21 +++++++++------------
devel/ncurses/buildlink3.mk | 8 ++++----
devel/pcre/buildlink3.mk | 17 +++++++----------
devel/pkgconfig/buildlink3.mk | 17 +++++++----------
devel/popt/buildlink3.mk | 15 ++++++---------
devel/pth/buildlink3.mk | 17 +++++++----------
devel/readline/buildlink3.mk | 8 ++++----
devel/smpeg/buildlink3.mk | 15 ++++++---------
devel/zlib/buildlink3.mk | 8 ++++----
graphics/MesaLib/buildlink3.mk | 8 ++++----
graphics/SDL_image/buildlink3.mk | 13 +++++--------
graphics/aalib-x11/buildlink3.mk | 13 +++++--------
graphics/freetype-lib/buildlink3.mk | 15 ++++++---------
graphics/freetype2/buildlink3.mk | 11 +++++++----
graphics/gd/buildlink3.mk | 15 ++++++---------
graphics/glu/buildlink3.mk | 10 +++++-----
graphics/glut/buildlink3.mk | 15 ++++++---------
graphics/jpeg/buildlink3.mk | 17 +++++++----------
graphics/libungif/buildlink3.mk | 17 +++++++----------
graphics/png/buildlink3.mk | 15 ++++++---------
graphics/tiff/buildlink3.mk | 15 ++++++---------
graphics/xpm/buildlink3.mk | 8 ++++----
lang/libperl/buildlink3.mk | 18 ++++++++----------
lang/ocaml/buildlink3.mk | 17 +++++++----------
lang/perl5/buildlink3.mk | 8 ++++----
lang/tcl/buildlink3.mk | 16 +++++++---------
net/libpcap/buildlink3.mk | 8 ++++----
net/openslp/buildlink3.mk | 17 +++++++----------
net/socks4/buildlink3.mk | 16 +++++++---------
net/socks5/buildlink3.mk | 17 +++++++----------
pkgtools/libnbcompat/buildlink3.mk | 19 ++++++++-----------
print/cups/buildlink3.mk | 15 ++++++---------
security/PAM/buildlink3.mk | 8 ++++----
security/cyrus-sasl2/buildlink3.mk | 17 +++++++----------
security/libcrack/buildlink3.mk | 17 +++++++----------
security/openssl/buildlink3.mk | 8 ++++----
security/rsaref/buildlink3.mk | 17 +++++++----------
security/tcp_wrappers/buildlink3.mk | 8 ++++----
textproc/expat/buildlink3.mk | 17 +++++++----------
www/apache/buildlink3.mk | 19 +++++++++----------
x11/Xrandr-mixedcase/buildlink3.mk | 18 +++++++-----------
x11/Xrender/buildlink3.mk | 8 ++++----
x11/gtk/buildlink3.mk | 17 +++++++----------
x11/tk/buildlink3.mk | 16 +++++++---------
x11/xcursor/buildlink3.mk | 16 +++++++---------
67 files changed, 406 insertions(+), 543 deletions(-)
diffs (truncated from 2054 to 300 lines):
diff -r 6a6622f0fc9e -r 6bcd844b0eb0 archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 @@
.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 -r 6a6622f0fc9e -r 6bcd844b0eb0 audio/SDL_mixer/buildlink3.mk
--- a/audio/SDL_mixer/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/audio/SDL_mixer/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 -r 6a6622f0fc9e -r 6bcd844b0eb0 audio/esound/buildlink3.mk
--- a/audio/esound/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/audio/esound/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 -r 6a6622f0fc9e -r 6bcd844b0eb0 audio/libaudiofile/buildlink3.mk
--- a/audio/libaudiofile/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/audio/libaudiofile/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= audiofile
+.endif
+
+.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
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= audiofile
-.endif
-
-.if !empty(AUDIOFILE_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= audiofile
-.endif # AUDIOFILE_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff -r 6a6622f0fc9e -r 6bcd844b0eb0 audio/libogg/buildlink3.mk
--- a/audio/libogg/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/audio/libogg/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= libogg
+.endif
+
+.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
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= libogg
-.endif
-
-.if !empty(LIBOGG_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= libogg
-.endif # LIBOGG_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff -r 6a6622f0fc9e -r 6bcd844b0eb0 audio/oss/buildlink3.mk
--- a/audio/oss/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/audio/oss/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 -r 6a6622f0fc9e -r 6bcd844b0eb0 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 @@
.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 -r 6a6622f0fc9e -r 6bcd844b0eb0 databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/databases/db/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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 @@
.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 -r 6a6622f0fc9e -r 6bcd844b0eb0 databases/db3/buildlink3.mk
--- a/databases/db3/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/databases/db3/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= db3
+.endif
+
+.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
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= db3
-.endif
-
-.if !empty(DB3_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= db3
-.endif # DB3_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff -r 6a6622f0fc9e -r 6bcd844b0eb0 databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk Sun Jan 04 23:30:04 2004 +0000
+++ b/databases/db4/buildlink3.mk Sun Jan 04 23:34:04 2004 +0000
@@ -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\+)
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= db4
+.endif
+
+.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
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= db4
-.endif
-
-.if !empty(DB4_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= db4
-.endif # DB4_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff -r 6a6622f0fc9e -r 6bcd844b0eb0 databases/mysql-client/buildlink3.mk
Home |
Main Index |
Thread Index |
Old Index