diff options
author | snj <snj> | 2004-05-03 20:49:33 +0000 |
---|---|---|
committer | snj <snj> | 2004-05-03 20:49:33 +0000 |
commit | 419de4fb539c3e2e48d1e8615c41a56b5c849429 (patch) | |
tree | 9956513a2c22f28f3884cb128c4e74dfa36a2a6e | |
parent | fbf523440d2568964bd0c90709908101f14fd5c6 (diff) | |
download | pkgsrc-419de4fb539c3e2e48d1e8615c41a56b5c849429.tar.gz |
Convert to buildlink3.
-rw-r--r-- | cad/gwave/Makefile | 8 | ||||
-rw-r--r-- | devel/gtl/Makefile | 4 | ||||
-rw-r--r-- | devel/gtl/buildlink2.mk | 22 | ||||
-rw-r--r-- | devel/gtl/buildlink3.mk | 18 | ||||
-rw-r--r-- | devel/guile-gtk/buildlink2.mk | 22 | ||||
-rw-r--r-- | lang/guile14/buildlink2.mk | 58 | ||||
-rw-r--r-- | math/cassowary/Makefile | 8 | ||||
-rw-r--r-- | print/lilypond/Makefile | 8 |
8 files changed, 32 insertions, 116 deletions
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile index bda8bd4e9c7..3ecc4f1a6a3 100644 --- a/cad/gwave/Makefile +++ b/cad/gwave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/11/05 22:31:43 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.19 2004/05/03 20:49:33 snj Exp $ # DISTNAME= gwave-20030804 @@ -9,7 +9,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.cs.unc.edu/~tell/gwave/ COMMENT= Viewer for spice-like simulator output and other analog data -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES EVAL_PREFIX+= GRAPHDIR=plotutils @@ -19,6 +19,6 @@ CONFIGURE_ENV+= GRAPH=${GRAPHDIR}/bin/graph post-extract: ${RM} ${WRKSRC}/src/init_scheme_string.c -.include "../../devel/guile-gtk/buildlink2.mk" -.include "../../graphics/plotutils/buildlink2.mk" +.include "../../devel/guile-gtk/buildlink3.mk" +.include "../../graphics/plotutils/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile index b204df8137c..13bba844857 100644 --- a/devel/gtl/Makefile +++ b/devel/gtl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/04/24 22:46:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2004/05/03 20:49:33 snj Exp $ DISTNAME= GTL-0.3.3 PKGNAME= gtl-0.3.3 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.fmi.uni-passau.de/Graphlet/GTL/ COMMENT= C++ graph data structure library based on the STL USE_LIBTOOL= # defined -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_LANGUAGES= c c++ LICENSE= no-commercial-use diff --git a/devel/gtl/buildlink2.mk b/devel/gtl/buildlink2.mk deleted file mode 100644 index ae061fe57c8..00000000000 --- a/devel/gtl/buildlink2.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.2 2003/01/07 13:20:38 wiz Exp $ -# -# This Makefile fragment is included by packages that use gtl. -# - -.if !defined(GTL_BUILDLINK2_MK) -GTL_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= gtl -BUILDLINK_DEPENDS.gtl?= gtl>=0.3.3 -BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl - -EVAL_PREFIX+= BUILDLINK_PREFIX.gtl=gtl -BUILDLINK_PREFIX.gtl_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.gtl+= include/GTL/* -BUILDLINK_FILES.gtl+= lib/libGTL.* - -BUILDLINK_TARGETS+= gtl-buildlink - -gtl-buildlink: _BUILDLINK_USE - -.endif # GTL_BUILDLINK2_MK diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk new file mode 100644 index 00000000000..f833d6b0656 --- /dev/null +++ b/devel/gtl/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 20:49:33 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GTL_BUILDLINK3_MK:= ${GTL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gtl +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtl} +BUILDLINK_PACKAGES+= gtl + +.if !empty(GTL_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gtl+= gtl>=0.3.3 +BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl +.endif # GTL_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/guile-gtk/buildlink2.mk b/devel/guile-gtk/buildlink2.mk deleted file mode 100644 index 10924519958..00000000000 --- a/devel/guile-gtk/buildlink2.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:51:14 wiz Exp $ - -.if !defined(GUILE_GTK_BUILDLINK2_MK) -GUILE_GTK_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= guile-gtk -BUILDLINK_DEPENDS.guile-gtk?= guile-gtk>=0.19nb4 -BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk - -EVAL_PREFIX+= BUILDLINK_PREFIX.guile-gtk=guile-gtk -BUILDLINK_PREFIX.guile-gtk_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.guile-gtk+= include/guile-gtk.h -BUILDLINK_FILES.guile-gtk+= lib/libguilegtk-1.2.* - -.include "../../lang/guile14/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" - -BUILDLINK_TARGETS+= guile-gtk-buildlink - -guile-gtk-buildlink: _BUILDLINK_USE - -.endif # GUILE_GTK_BUILDLINK2_MK diff --git a/lang/guile14/buildlink2.mk b/lang/guile14/buildlink2.mk deleted file mode 100644 index 4e895f22e16..00000000000 --- a/lang/guile14/buildlink2.mk +++ /dev/null @@ -1,58 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.10 2003/07/13 13:52:21 wiz Exp $ - -.if !defined(GUILE14_BUILDLINK2_MK) -GUILE14_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= guile14 -BUILDLINK_DEPENDS.guile14?= guile14>=1.4.1nb4 -BUILDLINK_PKGSRCDIR.guile14?= ../../lang/guile14 - -EVAL_PREFIX+= GUILE14_PREFIX=guile14 -GUILE14_PREFIX_DEFAULT= ${LOCALBASE}/guile/1.4 -BUILDLINK_PREFIX.guile14= ${LOCALBASE} -GUILE14_SUBDIR= ${GUILE14_PREFIX:S/^${BUILDLINK_PREFIX.guile14}\///} -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/include/libguile.* -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/include/guile/* -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/include/guile-readline/* -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/include/libguile/* -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/lib/libguile.* -BUILDLINK_FILES.guile14+= ${GUILE14_SUBDIR}/lib/libguilereadline.* - -USE_GNU_READLINE= # defined - -.include "../../devel/libtool/buildlink2.mk" # For libltdl -.include "../../devel/readline/buildlink2.mk" - -BUILDLINK_TARGETS+= guile14-buildlink -BUILDLINK_TARGETS+= guile14-buildlink-bin -BUILDLINK_TARGETS+= guile14-buildlink-la - -GUILE14= ${GUILE14_PREFIX}/bin/guile -GUILE14_CONFIG= ${GUILE14_PREFIX}/bin/guile-config -GUILE14_SNARF= ${GUILE14_PREFIX}/bin/guile-snarf - -guile14-buildlink: _BUILDLINK_USE - -# Put only bin/guile, bin/guile-config, and bin/guile-snarf into -# ${BUILDLINK_DIR}/bin. Other files (headers/libraries) are put in -# ${BUILDLINK_DIR}/guile/1.4/... -# -guile14-buildlink-bin: - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO_BUILDLINK_MSG} "Linking Guile executables." - ${_PKG_SILENT}${_PKG_DEBUG}${LN} -s ${GUILE14_PREFIX}/bin/guile* ${BUILDLINK_DIR}/bin - -REPLACE_BUILDLINK_SED+= \ - -e "s|${BUILDLINK_DIR}/bin/guile|${GUILE14_PREFIX}/bin/guile|g" - -guile14-buildlink-la: - ${_PKG_SILENT}${_PKG_DEBUG} \ - for file in libguile.la libguilereadline.la; do \ - src="${GUILE14_PREFIX}/lib/$$file"; \ - dest="${BUILDLINK_DIR}/lib/$$file"; \ - if [ -f $$src ]; then \ - ${ECHO_BUILDLINK_MSG} "Linking $$src to $$dest."; \ - ${LN} -sf $$src $$dest; \ - fi; \ - done - -.endif # GUILE14_BUILDLINK2_MK diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile index 315028c51e8..b1b696e1e06 100644 --- a/math/cassowary/Makefile +++ b/math/cassowary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:44 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2004/05/03 20:49:34 snj Exp $ # DISTNAME= cassowary-0.60 @@ -12,7 +12,7 @@ COMMENT= Constraint-solving toolkit for linear equalities and inequalities BUILD_DEPENDS+= bison>=1.34:../../devel/bison -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= # defined @@ -36,6 +36,6 @@ MAKE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ post-install: cd ${PREFIX}/lib/cassowary && ${RMDIR} -p bench -.include "../../devel/gtl/buildlink2.mk" -.include "../../lang/guile14/buildlink2.mk" +.include "../../devel/gtl/buildlink3.mk" +.include "../../lang/guile14/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 601e36f75b3..d9edff8b41b 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/26 02:27:51 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2004/05/03 20:49:34 snj Exp $ # DISTNAME= lilypond-1.4.13 @@ -13,7 +13,7 @@ COMMENT= GNU Music Typesetter BUILD_DEPENDS+= bison>=1.875nb1:../../devel/bison GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make MAKEFILE= GNUmakefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+=--disable-optimising CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PYTHON_VERSIONS_ACCEPTED= 20 21 # 22 has some regular expression problem -.include "../../lang/guile14/buildlink2.mk" +.include "../../lang/guile14/buildlink3.mk" .include "../../lang/python/application.mk" -.include "../../print/teTeX-bin/kpathsea.buildlink2.mk" +.include "../../print/teTeX-bin/kpathsea.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |