Update to 0.2.8

ok jasper@

productivity/osmo/Makefile

@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.10 2009/12/21 21:03:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/03/23 17:24:45 pea Exp $
 
 COMMENT=	handy personal organizer
 
-DISTNAME=	osmo-0.2.2
+DISTNAME=	osmo-0.2.8
-PKGNAME=	${DISTNAME}p3
-
 CATEGORIES=	productivity
 
 HOMEPAGE=	http://clayo.org/osmo/
 
-MAINTAINER=	Pierre-Emmanuel Andre <pea@raveland.org>
+MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -22,7 +20,7 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
 		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
 		pixman-1 png pthread z dbus-1 dbus-glib-1 gio-2.0 \
-		pthread-stubs xcb
+		pthread-stubs xcb gthread-2.0
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=osmo-pim/}
 
@@ -30,9 +28,10 @@ MODULES=	devel/gettext
 
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		xml2.>=9::textproc/libxml \
-		ical::textproc/libical \
+		ical,icalss,icalvcal::textproc/libical \
 		gringotts::security/libgringotts \
-		notify.>=2::devel/libnotify 
+		notify.>=2::devel/libnotify \
+		gtkspell.>=1::textproc/gtkspell
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
@@ -44,6 +43,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		BUILD_CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=	--without-libsyncml
+CFLAGS+=       -I${LOCALBASE}/include/libical/
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/po/Makefile.in

productivity/osmo/distinfo

@@ -1,5 +1,5 @@
-MD5 (osmo-0.2.2.tar.gz) = 15DCBA/aVBdlp9sqaCdnPA==
+MD5 (osmo-0.2.8.tar.gz) = f6g+/SfNPsxU5z8OxOkdgQ==
-RMD160 (osmo-0.2.2.tar.gz) = cA9Roi5PgDM+inYS5zM0gw694rE=
+RMD160 (osmo-0.2.8.tar.gz) = mWUVPn+30FiQfJarNe8Th9iN6G4=
-SHA1 (osmo-0.2.2.tar.gz) = 1wDLdzcKO6gGs1l/VtRpiyGkdhc=
+SHA1 (osmo-0.2.8.tar.gz) = SbL5I0ZhjPHrv20BnG0LqkqO4jo=
-SHA256 (osmo-0.2.2.tar.gz) = 86ocq5ggSOE72zt6mZL0Od2kiDybpSi4jIkHJPblxYY=
+SHA256 (osmo-0.2.8.tar.gz) = bS/jZyp7b74zTtXy2ZuwNgV8JYTBziuDZ4Kt7/bG+BY=
-SIZE (osmo-0.2.2.tar.gz) = 517147
+SIZE (osmo-0.2.8.tar.gz) = 787611

productivity/osmo/patches/patch-configure

@@ -1,38 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/08/25 14:48:42 ajacoutot Exp $
---- configure.orig	Wed Jul 30 17:02:19 2008
-+++ configure	Wed Jul 30 17:03:05 2008
-@@ -5397,13 +5397,13 @@ else
-   use_ical=1
- fi
- 
--{ echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_attr_init in -pthread" >&5
-+echo $ECHO_N "checking for pthread_attr_init in -pthread... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5465,7 +5465,7 @@ else
- fi
- 
- if test "$lib" = "yes" && test "$use_ical" = "1"; then
--    LDFLAGS="${LDFLAGS} -lpthread"
-+    LDFLAGS="${LDFLAGS} -pthread"
-     { echo "$as_me:$LINENO: checking for icalparser_new in -lical" >&5
- echo $ECHO_N "checking for icalparser_new in -lical... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ical_icalparser_new+set}" = set; then
-@@ -5534,7 +5534,7 @@ else
- fi
- 
-     if test "$lib" = "yes"; then
--        ical_LIBS="-lical -lpthread"
-+        ical_LIBS="-lical -pthread"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBICAL 1

productivity/osmo/patches/patch-po_Makefile_in

@@ -1,16 +1,23 @@
-$OpenBSD: patch-po_Makefile_in,v 1.2 2008/08/25 14:48:42 ajacoutot Exp $
+$OpenBSD: patch-po_Makefile_in,v 1.3 2010/03/23 17:24:45 pea Exp $
---- po/Makefile.in.orig	Tue Jul 22 14:45:54 2008
+--- po/Makefile.in.orig	Fri Aug 21 14:52:23 2009
-+++ po/Makefile.in	Mon Aug 25 15:25:51 2008
++++ po/Makefile.in	Thu Dec 17 13:41:56 2009
-@@ -141,9 +141,9 @@ top_builddir = @top_builddir@
+@@ -89,7 +89,7 @@ LIBSYNCML_LIBS = @LIBSYNCML_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+-MSGFMT = /usr/bin/msgfmt
++MSGFMT = ${LOCALBASE}/bin/msgfmt
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -154,8 +154,8 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  DOMAIN = osmo
  POTFILES = $(wildcard ../src/*.c ../src/*.h)
--MSGFMT = /usr/bin/msgfmt
 -XGETTEXT = /usr/bin/xgettext
 -MSGMERGE = /usr/bin/msgmerge
-+MSGFMT = ${LOCALBASE}/bin/msgfmt
 +XGETTEXT = ${LOCALBASE}/bin/xgettext
 +MSGMERGE = ${LOCALBASE}/bin/msgmerge
  XGETTEXT_OPTS = --keyword=_ --keyword=N_ --keyword=X_ --add-comments=TRANSLATORS: --no-location
- POFILES = cs.po de.po es.po fr.po hu.po it.po lt.po nl.po pl.po pt.po ru.po zh.po
+ POFILES = ca.po cs.po de.po el.po es.po fi.po fr.po hu.po it.po ja.po lt.po nl.po pl.po pt.po ru.po sv.po tr.po uk.po zh_CN.po
  MOFILES = $(POFILES:.po=.mo)

productivity/osmo/pkg/PLIST

@@ -1,13 +1,37 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/12/21 21:03:56 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/03/23 17:24:45 pea Exp $
 @bin bin/osmo
 @man man/man1/osmo.1
 share/applications/osmo.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/apps/
+share/icons/hicolor/16x16/apps/osmo.png
+share/icons/hicolor/22x22/
+share/icons/hicolor/22x22/apps/
+share/icons/hicolor/22x22/apps/osmo.png
+share/icons/hicolor/24x24/
+share/icons/hicolor/24x24/apps/
+share/icons/hicolor/24x24/apps/osmo.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/osmo.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/osmo.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/osmo.svg
+share/locale/ca/LC_MESSAGES/osmo.mo
 share/locale/cs/LC_MESSAGES/osmo.mo
 share/locale/de/LC_MESSAGES/osmo.mo
+share/locale/el/LC_MESSAGES/osmo.mo
 share/locale/es/LC_MESSAGES/osmo.mo
+share/locale/fi/LC_MESSAGES/osmo.mo
 share/locale/fr/LC_MESSAGES/osmo.mo
 share/locale/hu/LC_MESSAGES/osmo.mo
 share/locale/it/LC_MESSAGES/osmo.mo
+share/locale/ja/LC_MESSAGES/osmo.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/osmo.mo
@@ -15,11 +39,16 @@ share/locale/nl/LC_MESSAGES/osmo.mo
 share/locale/pl/LC_MESSAGES/osmo.mo
 share/locale/pt/LC_MESSAGES/osmo.mo
 share/locale/ru/LC_MESSAGES/osmo.mo
-share/locale/zh/
+share/locale/sv/LC_MESSAGES/osmo.mo
-share/locale/zh/LC_MESSAGES/
+share/locale/tr/LC_MESSAGES/osmo.mo
-share/locale/zh/LC_MESSAGES/osmo.mo
+share/locale/uk/LC_MESSAGES/osmo.mo
+share/locale/zh_CN/LC_MESSAGES/osmo.mo
 share/pixmaps/
 share/pixmaps/osmo.png
-share/pixmaps/osmo.svg
+share/sounds/
+share/sounds/osmo/
+share/sounds/osmo/alarm.wav
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true