Update to 3.0.4

* Switch to gtk3 and vte 0.29 series

Changelog:
unknown

4 files changed, 21 insertions, 15 deletions

diff --git a/x11/sakura/Makefile b/x11/sakura/Makefile
index a99a943dfd2..f3a45c355ec 100644
--- a/x11/sakura/Makefile
+++ b/x11/sakura/Makefile
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2012/03/03 00:14:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 13:54:14 ryoon Exp $
 #
 
-DISTNAME=	sakura-2.4.2
-PKGREVISION=	3
+DISTNAME=	sakura-${SAKURA_VER}
+SAKURA_VER=	3.0.4
 CATEGORIES=	x11
-MASTER_SITES=	http://launchpad.net/sakura/trunk/2.4.2/+download/
+MASTER_SITES=	http://launchpad.net/sakura/trunk/${SAKURA_VER}/+download/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://www.pleyades.net/david/projects/sakura
 COMMENT=	Sakura is a terminal emulator based on GTK and VTE that supports tab
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# Force using "curl" for fetching the distribution file. It is only available
+# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
+FETCH_USING=	curl
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config pod2man xgettext
 USE_CMAKE=	yes
@@ -27,9 +30,9 @@ SUBST_SED.fix-man-path=		-e 's,share/man/man1,${PKGMANDIR}/man1,g'
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.20.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.16.0
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.vte+=	vte>=0.26
-.include "../../x11/vte/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.0
+.include "../../x11/gtk3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.vte029+=	vte029>=0.28
+.include "../../x11/vte029/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/sakura/PLIST b/x11/sakura/PLIST
index 8c0f6232b3d..1256e736fc1 100644
--- a/x11/sakura/PLIST
+++ b/x11/sakura/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/14 18:06:30 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/08/10 13:54:14 ryoon Exp $
 bin/sakura
 man/man1/sakura.1
 share/applications/sakura.desktop
@@ -16,5 +16,6 @@ share/locale/ko/LC_MESSAGES/sakura.mo
 share/locale/pl/LC_MESSAGES/sakura.mo
 share/locale/pt_BR/LC_MESSAGES/sakura.mo
 share/locale/ru/LC_MESSAGES/sakura.mo
+share/locale/uk/LC_MESSAGES/sakura.mo
 share/locale/zh_CN/LC_MESSAGES/sakura.mo
 share/pixmaps/terminal-tango.svg
diff --git a/x11/sakura/distinfo b/x11/sakura/distinfo
index 77c2cad989f..99de757c3ae 100644
--- a/x11/sakura/distinfo
+++ b/x11/sakura/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/02/16 20:19:56 hans Exp $
+$NetBSD: distinfo,v 1.3 2012/08/10 13:54:14 ryoon Exp $
 
-SHA1 (sakura-2.4.2.tar.bz2) = 24b98c42c057da39f57c281a4726901952774641
-RMD160 (sakura-2.4.2.tar.bz2) = 487c148b9ebd0da74908e4241004acc2e8db40f1
-Size (sakura-2.4.2.tar.bz2) = 42082 bytes
-SHA1 (patch-CMakeLists.txt) = 297c578eef8d021895b0795396667cfe0f9567cf
+SHA1 (sakura-3.0.4.tar.bz2) = e4d3a7fce9600cbdec9fda1e6fd20f38ebb4655e
+RMD160 (sakura-3.0.4.tar.bz2) = 836114966d4edfa5d0dd37a6f0029a5013ba2a75
+Size (sakura-3.0.4.tar.bz2) = 45418 bytes
+SHA1 (patch-CMakeLists.txt) = 2832357b5529db60b30683762d2d81c9c07910de
diff --git a/x11/sakura/patches/patch-CMakeLists.txt b/x11/sakura/patches/patch-CMakeLists.txt
index 0d01af4f962..f015ede8e36 100644
--- a/x11/sakura/patches/patch-CMakeLists.txt
+++ b/x11/sakura/patches/patch-CMakeLists.txt
@@ -1,3 +1,5 @@
+$NetBSD: patch-CMakeLists.txt,v 1.2 2012/08/10 13:54:14 ryoon Exp $
+
 --- CMakeLists.txt.orig	2012-01-27 11:52:46.987517960 +0100
 +++ CMakeLists.txt	2012-01-27 11:55:28.028774190 +0100
 @@ -70,5 +70,5 @@ ADD_CUSTOM_TARGET (distclean