summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2008-10-24 20:23:50 +0000
committerwiz <wiz>2008-10-24 20:23:50 +0000
commitf87e600ddff17409c015a23df7636a5076443ef4 (patch)
treed75d472bec4700f95cb7c38d95f1ffa955b6ea4a
parent7dbdb72b58f363b6e70dd5bac96413900e9a3321 (diff)
downloadpkgsrc-f87e600ddff17409c015a23df7636a5076443ef4.tar.gz
Remove bogus libzvt dependency -- not supported by vte since 0.13.0
sometime in 2006. Bump PKGREVISION. While here, add a build fix for NetBSD-current/amd64.
-rw-r--r--x11/vte/Makefile4
-rw-r--r--x11/vte/buildlink3.mk4
-rw-r--r--x11/vte/distinfo3
-rw-r--r--x11/vte/patches/patch-ab9
4 files changed, 15 insertions, 5 deletions
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 294b503a19e..842226b2601 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2008/10/16 13:35:12 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2008/10/24 20:23:50 wiz Exp $
#
DISTNAME= vte-0.17.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.17/}
EXTRACT_SUFX= .tar.bz2
@@ -37,5 +38,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libzvt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 47599108204..ff4c964702c 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/09/15 15:16:42 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2008/10/24 20:23:50 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+
@@ -13,12 +13,12 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vte
.if !empty(VTE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.vte+= vte>=0.14.0
+BUILDLINK_ABI_DEPENDS.vte?= vte>=0.17.4nb1
BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte
.endif # VTE_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libzvt/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index 907ce2b6c4f..3c6656cc530 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.31 2008/10/16 13:35:12 drochner Exp $
+$NetBSD: distinfo,v 1.32 2008/10/24 20:23:50 wiz Exp $
SHA1 (vte-0.17.4.tar.bz2) = fe4a3ec476c97d0f385249ee60edb12887b69575
RMD160 (vte-0.17.4.tar.bz2) = 8fa3ccc35bc9ef8c204b058b180f532ba6fe7a1a
Size (vte-0.17.4.tar.bz2) = 1084847 bytes
SHA1 (patch-aa) = 6b722ecbbd9face7152feca39f1d323870d2a69a
+SHA1 (patch-ab) = 93146997c7fcb992db190c4c634fb98b05e61ec9
SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
diff --git a/x11/vte/patches/patch-ab b/x11/vte/patches/patch-ab
new file mode 100644
index 00000000000..8d70cccce62
--- /dev/null
+++ b/x11/vte/patches/patch-ab
@@ -0,0 +1,9 @@
+$NetBSD: patch-ab,v 1.3 2008/10/24 20:23:50 wiz Exp $
+
+--- src/marshal.c.orig 2008-09-07 17:47:29.000000000 +0000
++++ src/marshal.c
+@@ -1,3 +1,4 @@
++#include "marshal.h"
+
+ #include <glib-object.h>
+