pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Convert to buildlink3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e88a23eb68c3
branches: trunk
changeset: 474642:e88a23eb68c3
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon May 03 15:58:55 2004 +0000
description:
Convert to buildlink3.
diffstat:
databases/guile-pg/Makefile | 8 +++---
devel/g-wrap/Makefile | 16 +++++-------
devel/g-wrap/buildlink3.mk | 22 ++++++++++++++++++
devel/g-wrap/distinfo | 4 +-
devel/g-wrap/patches/patch-ac | 13 ++++++----
devel/guile-fcgi/Makefile | 8 +++---
devel/guile-gtk/Makefile | 20 ++++-----------
devel/guile-gtk/buildlink3.mk | 21 +++++++++++++++++
devel/guile-slib/Makefile | 15 ++++++-----
devel/guile-www/Makefile | 6 ++--
devel/swig/buildlink3.mk | 20 ++++++++++++++++
finance/gnucash/Makefile | 52 ++++++++++++++++++------------------------
math/guppi/Makefile | 26 ++++++++-------------
math/guppi/PLIST | 4 +--
math/guppi/buildlink3.mk | 26 +++++++++++++++++++++
misc/siag/Makefile | 14 +++++-----
misc/siag/distinfo | 3 +-
misc/siag/patches/patch-ab | 37 ++++++++++++++++++++++++++++++
www/galway/Makefile | 10 ++++----
x11/mowitz/Makefile | 8 +++---
20 files changed, 219 insertions(+), 114 deletions(-)
diffs (truncated from 620 to 300 lines):
diff -r 9c375c3760c4 -r e88a23eb68c3 databases/guile-pg/Makefile
--- a/databases/guile-pg/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/databases/guile-pg/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/03 15:58:55 wiz Exp $
#
DISTNAME= guile-pg-0.07
@@ -12,7 +12,7 @@
DEPENDS+= postgresql-lib>=7.3.1:../../databases/postgresql-lib
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
@@ -20,6 +20,6 @@
INFO_FILES= guile-pg.info
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/g-wrap/Makefile
--- a/devel/g-wrap/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/devel/g-wrap/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/05/03 15:58:55 wiz Exp $
DISTNAME= g-wrap-1.3.4
PKGREVISION= 3
@@ -11,22 +11,20 @@
DEPENDS+= guile-slib>=2.4.2:../../devel/guile-slib
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
+MAKE_ENV+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
USE_MAKEINFO= YES
INFO_FILES= g-wrap.info
-CONFIGURE_ARGS+= --with-modules-dir=${GUILE14_PREFIX}/share/guile
-CONFIGURE_ENV+= GUILE=${GUILE14}
-CONFIGURE_ENV+= BUILD_GUILE=${GUILE14_CONFIG}
+CONFIGURE_ARGS+= --with-modules-dir=${PREFIX}/${GUILE14_SUBDIR}/share/guile
CONFIGURE_ENV+= ac_cv_path_RSCHEME="nope"
-CONFIGURE_ENV+= ac_cv_path_GUILE="${LOCALBASE}/guile/1.4/bin/guile"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../devel/guile-gtk/buildlink2.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../devel/guile-gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/g-wrap/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/g-wrap/buildlink3.mk Mon May 03 15:58:55 2004 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= g-wrap
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap}
+BUILDLINK_PACKAGES+= g-wrap
+
+.if !empty(G_WRAP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.g-wrap+= g-wrap>=1.3.4nb3
+BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap
+.endif # G_WRAP_BUILDLINK3_MK
+
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../devel/guile-gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/g-wrap/distinfo
--- a/devel/g-wrap/distinfo Mon May 03 15:58:20 2004 +0000
+++ b/devel/g-wrap/distinfo Mon May 03 15:58:55 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/06/24 14:39:16 seb Exp $
+$NetBSD: distinfo,v 1.7 2004/05/03 15:58:55 wiz Exp $
SHA1 (g-wrap-1.3.4.tar.gz) = 764f1c878e18341bf437f3e1ddc5f8618019bfc2
Size (g-wrap-1.3.4.tar.gz) = 403570 bytes
SHA1 (patch-aa) = 284e62e9a3456ab03a8337298fde587b2729c786
SHA1 (patch-ab) = 92f8e1ed55a3ba563837b36e2f39888734aebefe
-SHA1 (patch-ac) = 098bb2e6c239b38afa40d28362cc553982ac3e38
+SHA1 (patch-ac) = 7bd1543e1941668d71507d8ee6e1c5f1614f6472
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/g-wrap/patches/patch-ac
--- a/devel/g-wrap/patches/patch-ac Mon May 03 15:58:20 2004 +0000
+++ b/devel/g-wrap/patches/patch-ac Mon May 03 15:58:55 2004 +0000
@@ -1,10 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/02/24 20:50:19 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2004/05/03 15:58:55 wiz Exp $
---- bin/Makefile.in.orig Thu Apr 12 05:14:14 2001
-+++ bin/Makefile.in Sun Jul 1 16:16:37 2001
-@@ -232,7 +232,7 @@
+--- bin/Makefile.in.orig 2002-11-08 05:40:46.000000000 +0100
++++ bin/Makefile.in
+@@ -333,9 +333,9 @@ g-wrap: g-wrap.in Makefile
+ g-wrap-config: g-wrap-config.in
+ rm -f $@.tmp
sed < $@.in > $@.tmp \
- -e 's:@-GUILE-@:${GUILE}:' \
+- -e 's:@-GUILE-@:${GUILE}:' \
++ -e 's:@-GUILE-@:${PREFIX}/${GUILE14_SUBDIR}/bin/guile:' \
-e 's:@-VERSION-@:${VERSION}:' \
- -e 's:@-libdir-@:${libdir}:' \
+ -e 's:@-libdir-@:${libdir}:g' \
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/guile-fcgi/Makefile
--- a/devel/guile-fcgi/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/devel/guile-fcgi/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/03 15:58:55 wiz Exp $
DISTNAME= guile-fcgi-0.1
PKGREVISION= 3
@@ -9,7 +9,7 @@
HOMEPAGE= http://www.bgu.ru/%7Edsa/guilefcgi.html
COMMENT= Guile interface to FastCGI
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-fcgi-includes=${BUILDLINK_PREFIX.fcgi}/include
@@ -19,6 +19,6 @@
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} guile-fcgi.x
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../www/fcgi/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../www/fcgi/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/guile-gtk/Makefile
--- a/devel/guile-gtk/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/devel/guile-gtk/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/21 06:51:42 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/03 15:58:55 wiz Exp $
#
DISTNAME= guile-gtk-0.19
@@ -13,23 +13,15 @@
HOMEPAGE= http://www.ping.de/sites/zagadka/guile-gtk/
COMMENT= Library to make GTK accessible from guile
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= # defined
USE_X11= # defined
USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --datadir=${GUILE14_PREFIX}/share
-PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR}
+CONFIGURE_ARGS+= --datadir=${PREFIX}/${GUILE14_SUBDIR}/share
+PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
-pre-build:
- cd ${WRKSRC}; for file in build-guile-gtk; do \
- ${SED} -e "s,^exec guile,exec ${GUILE14}," \
- $$file > $$file.new; \
- ${MV} -f $$file.new $$file; \
- done
-
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/guile-gtk/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/guile-gtk/buildlink3.mk Mon May 03 15:58:55 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= guile-gtk
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk}
+BUILDLINK_PACKAGES+= guile-gtk
+
+.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.guile-gtk+= guile-gtk>=0.19nb4
+BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk
+.endif # GUILE_GTK_BUILDLINK3_MK
+
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/guile-slib/Makefile
--- a/devel/guile-slib/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/devel/guile-slib/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/03 15:58:55 wiz Exp $
DISTNAME= guile-slib-2.4.2
PKGREVISION= 3
@@ -12,17 +12,18 @@
DEPENDS+= slib>=2.4.2:../../devel/slib
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_BUILD= yes
-PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR}
+PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
do-install:
- ${LN} -sf ${PREFIX}/share/slib ${GUILE14_PREFIX}/share/guile/slib
- cd ${GUILE14_PREFIX}/share/guile/slib; \
- ${GUILE14} -q -s ${FILESDIR}/gencat.scm
+ ${LN} -sf ${PREFIX}/share/slib ${PREFIX}/${GUILE14_SUBDIR}/share/guile/slib
+ cd ${PREFIX}/${GUILE14_SUBDIR}/share/guile/slib; \
+ ${PREFIX}/${GUILE14_SUBDIR}/bin/guile -q -s \
+ ${FILESDIR}/gencat.scm
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/guile-www/Makefile
--- a/devel/guile-www/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/devel/guile-www/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 10:44:43 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/03 15:58:55 wiz Exp $
DISTNAME= guile-www-1.0.1
PKGREVISION= 2
@@ -9,9 +9,9 @@
HOMEPAGE= http://www.gnu.org/software/guile/
COMMENT= Guile WWW module
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
INFO_FILES= guile-www.info
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile14/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c375c3760c4 -r e88a23eb68c3 devel/swig/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/swig/buildlink3.mk Mon May 03 15:58:55 2004 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+SWIG_BUILDLINK3_MK:= ${SWIG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= swig
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig}
+BUILDLINK_PACKAGES+= swig
+
+.if !empty(SWIG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.swig+= swig>=1.1p5nb1
+BUILDLINK_PKGSRCDIR.swig?= ../../devel/swig
+# only contains a static library
+BUILDLINK_DEPMETHOD.swig?= build
+.endif # SWIG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 9c375c3760c4 -r e88a23eb68c3 finance/gnucash/Makefile
--- a/finance/gnucash/Makefile Mon May 03 15:58:20 2004 +0000
+++ b/finance/gnucash/Makefile Mon May 03 15:58:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/04/25 04:16:43 xtraeme Exp $
Home |
Main Index |
Thread Index |
Old Index