update to 2.0 and move to GTK3

math/galculator/Makefile

@@ -1,44 +1,43 @@
-# $OpenBSD: Makefile,v 1.40 2012/08/06 12:21:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.41 2012/10/16 18:55:01 naddy Exp $
 
-COMMENT=	GTK2-based scientific calculator
+COMMENT=	GTK-based scientific calculator
 
-DISTNAME=	galculator-1.3.4
+DISTNAME=	galculator-2.0
-REVISION=	4
 CATEGORIES=	math
 HOMEPAGE=	http://galculator.sourceforge.net/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galculator/}
-		Xi Xinerama Xrandr Xrender Xxf86vm \
+EXTRACT_SUFX=	.tar.bz2
-		atk-1.0 c cairo drm expat ffi fontconfig \
+
-		freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
+WANTLIB=	GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
-		gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m \
+		Xfixes Xi Xinerama Xrandr Xrender Xxf86vm \
-		pango-1.0 xml2 z pangocairo-1.0 pcre png \
+		atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 \
+		drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 \
+		gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 \
+		harfbuzz icudata icule icuuc m \
+		pango-1.0 z pangocairo-1.0 pcre png \
 		pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ xcb \
 		xcb-render xcb-shm
 
 MODULES=	devel/gettext \
 		textproc/intltool
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galculator/}
-EXTRACT_SUFX=	.tar.bz2
-
 RUN_DEPENDS=	devel/desktop-file-utils
-LIB_DEPENDS=	devel/libglade2
+LIB_DEPENDS=	x11/gtk+3
-WANTLIB +=	glade-2.0
 
 SEPARATE_BUILD=	Yes
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>

math/galculator/distinfo

@@ -1,5 +1,2 @@
-MD5 (galculator-1.3.4.tar.bz2) = 0w5vv1lHuxyHO8nVohBG8Q==
+SHA256 (galculator-2.0.tar.bz2) = x1s3ByTozQGkHNKNVYsed0k7szXMVjWbpZ+L7c9v/h4=
-RMD160 (galculator-1.3.4.tar.bz2) = 54noe3jJtA9V8qWb0OLw672mc4w=
+SIZE (galculator-2.0.tar.bz2) = 397807
-SHA1 (galculator-1.3.4.tar.bz2) = hbo68svhE35umLi7VWZr3Y8jywc=
-SHA256 (galculator-1.3.4.tar.bz2) = nWxvE9kklxnRr3H0X5f2TXCu+5WdO/4s03XgdtTFlD0=
-SIZE (galculator-1.3.4.tar.bz2) = 393759

math/galculator/pkg/PLIST

@@ -1,36 +1,51 @@
-@comment $OpenBSD: PLIST,v 1.14 2009/12/21 22:07:57 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.15 2012/10/16 18:55:01 naddy Exp $
 @bin bin/galculator
 @man man/man1/galculator.1
 share/applications/galculator.desktop
 share/galculator/
-share/galculator/glade/
+share/galculator/ui/
-share/galculator/glade/about.glade
+share/galculator/ui/about.ui
-share/galculator/glade/basic_buttons.glade
+share/galculator/ui/basic_buttons.ui
-share/galculator/glade/classic_view.glade
+share/galculator/ui/classic_view.ui
-share/galculator/glade/dispctrl_bottom.glade
+share/galculator/ui/dispctrl_bottom.ui
-share/galculator/glade/dispctrl_right.glade
+share/galculator/ui/dispctrl_right.ui
-share/galculator/glade/dispctrl_right_vertical.glade
+share/galculator/ui/dispctrl_right_vertical.ui
-share/galculator/glade/main_frame.glade
+share/galculator/ui/main_frame.ui
-share/galculator/glade/main_frame_hildon.glade
+share/galculator/ui/main_frame_hildon.ui
-share/galculator/glade/paper_view.glade
+share/galculator/ui/paper_view.ui
-share/galculator/glade/prefs-ume.glade
+share/galculator/ui/prefs-ume.ui
-share/galculator/glade/prefs.glade
+share/galculator/ui/prefs.ui
-share/galculator/glade/scientific_buttons.glade
+share/galculator/ui/scientific_buttons.ui
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/galculator.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/galculator.svg
+share/locale/da_DK/
+share/locale/da_DK/LC_MESSAGES/
+share/locale/da_DK/LC_MESSAGES/galculator.mo
 share/locale/de/LC_MESSAGES/galculator.mo
 share/locale/es_MX/
 share/locale/es_MX/LC_MESSAGES/
 share/locale/es_MX/LC_MESSAGES/galculator.mo
 share/locale/fr/LC_MESSAGES/galculator.mo
 share/locale/ja/LC_MESSAGES/galculator.mo
+share/locale/kk_KZ/
+share/locale/kk_KZ/LC_MESSAGES/
+share/locale/kk_KZ/LC_MESSAGES/galculator.mo
 share/locale/pl/LC_MESSAGES/galculator.mo
 share/locale/pt/LC_MESSAGES/galculator.mo
 share/locale/pt_BR/LC_MESSAGES/galculator.mo
 share/locale/ro/LC_MESSAGES/galculator.mo
 share/locale/ru/LC_MESSAGES/galculator.mo
 share/locale/sk/LC_MESSAGES/galculator.mo
+share/locale/sv/LC_MESSAGES/galculator.mo
+share/locale/zh_CN/LC_MESSAGES/galculator.mo
+share/locale/zh_TW/LC_MESSAGES/galculator.mo
 share/pixmaps/
-share/pixmaps/galculator.png
-share/pixmaps/galculator.svg
 share/pixmaps/galculator.xpm
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database