diff options
Diffstat (limited to 'devel/g-wrap')
-rw-r--r-- | devel/g-wrap/Makefile | 16 | ||||
-rw-r--r-- | devel/g-wrap/buildlink3.mk | 22 | ||||
-rw-r--r-- | devel/g-wrap/distinfo | 4 | ||||
-rw-r--r-- | devel/g-wrap/patches/patch-ac | 13 |
4 files changed, 39 insertions, 16 deletions
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index ed15a5de6e5..2e69d1a9b18 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -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 @@ COMMENT= Tool for importing types, functions, and constants into guile 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 --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk new file mode 100644 index 00000000000..b118a77bc3a --- /dev/null +++ b/devel/g-wrap/buildlink3.mk @@ -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 --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo index 30d5687ea50..47dffd381d4 100644 --- a/devel/g-wrap/distinfo +++ b/devel/g-wrap/distinfo @@ -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 --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac index 94e73c31313..6b7067c9277 100644 --- a/devel/g-wrap/patches/patch-ac +++ b/devel/g-wrap/patches/patch-ac @@ -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' \ |