Update to 1.5.10

3 files changed, 13 insertions, 30 deletions

diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 13adc7456c9e..05c5d8bd217e 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	guikachu
-PORTVERSION=	1.5.7
-PORTREVISION=	1
+PORTVERSION=	1.5.10
 PORTEPOCH=	2
 CATEGORIES=	devel palm gnome
 MASTER_SITES=	http://cactus.rulez.org/projects/guikachu/download/
@@ -18,9 +17,8 @@ COMMENT=	Resource editor for PalmOS(tm) systems
 LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
 		gnomevfsmm-2.6.1:${PORTSDIR}/devel/gnome-vfsmm
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4
+USE_GCC=	3.4+
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -29,9 +27,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	guikachu-form-editor.schemas guikachu-interface.schemas \
 		guikachu-mainwin.schemas
 
-post-patch:
-	@${REINPLACE_CMD} -e '/mime_packagedir/s|(mimedir)|(prefix)/share/mime|' \
-		-e '/(UPDATE_MIME)/s|(mimedir)|(prefix)/share/mime|' \
-		${WRKSRC}/data/Makefile.in
+#XXX mime vs mime-info
+#post-patch:
+#	@${REINPLACE_CMD} -e '/mime_packagedir/s|(mimedir)|(prefix)/share/mime|' \
+#		-e '/(UPDATE_MIME)/s|(mimedir)|(prefix)/share/mime|' \
+#		${WRKSRC}/data/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/guikachu/distinfo b/devel/guikachu/distinfo
index 01130bd5676e..e1f10f1387d5 100644
--- a/devel/guikachu/distinfo
+++ b/devel/guikachu/distinfo
@@ -1,3 +1,3 @@
-MD5 (guikachu-1.5.7.tar.gz) = ca53510310dbc7a3324c7c7cc7642417
-SHA256 (guikachu-1.5.7.tar.gz) = 86dc4a81eb5cd5e7b21e8f967688709da28f435df82aa94dbe1b9355c3a0bfde
-SIZE (guikachu-1.5.7.tar.gz) = 1293180
+MD5 (guikachu-1.5.10.tar.gz) = 3f5067cb92f9c9dc9affda2e66c022d5
+SHA256 (guikachu-1.5.10.tar.gz) = a6a0c133bf33cc575f33d7d013db6d0329b8d5b2be66e337f599f1f2d9878248
+SIZE (guikachu-1.5.10.tar.gz) = 1373459
diff --git a/devel/guikachu/pkg-plist b/devel/guikachu/pkg-plist
index 0ad69b466e09..82cdac32dc4b 100644
--- a/devel/guikachu/pkg-plist
+++ b/devel/guikachu/pkg-plist
@@ -2,19 +2,6 @@ bin/guikachu
 bin/guikachu2rcp
 share/gnome/application-registry/guikachu.applications
 share/gnome/applications/guikachu.desktop
-share/gnome/guikachu/fonts/bigbold.txt
-share/gnome/guikachu/fonts/bigfont.txt
-share/gnome/guikachu/fonts/boldfont.txt
-share/gnome/guikachu/fonts/ledfont.txt
-share/gnome/guikachu/fonts/stdfont.txt
-share/gnome/guikachu/fonts/symbol.txt
-share/gnome/guikachu/fonts/symbol11.txt
-share/gnome/guikachu/fonts/symbol7.txt
-share/gnome/guikachu/glade/guikachu.glade
-share/gnome/guikachu/target-defs/ebook-l.guikachu-target
-share/gnome/guikachu/target-defs/ebook-p.guikachu-target
-share/gnome/guikachu/target-defs/palm-color.guikachu-target
-share/gnome/guikachu/target-defs/palm.guikachu-target
 share/gnome/help/guikachu/C/bitmaps.html
 share/gnome/help/guikachu/C/form-editor.html
 share/gnome/help/guikachu/C/guikachu-doc-html.css
@@ -47,8 +34,6 @@ share/gnome/help/guikachu/C/resource-win.html
 share/gnome/help/guikachu/C/resources.html
 share/gnome/help/guikachu/C/using.html
 share/gnome/help/guikachu/C/widgets.html
-share/gnome/mime-info/guikachu.keys
-share/gnome/mime-info/guikachu.mime
 share/gnome/pixmaps/guikachu-96.png
 share/gnome/pixmaps/guikachu-application-x-guikachu-96.png
 share/gnome/pixmaps/guikachu.png
@@ -71,15 +56,14 @@ share/locale/sr@Latn/LC_MESSAGES/guikachu.mo
 share/locale/sv/LC_MESSAGES/guikachu.mo
 share/locale/tr/LC_MESSAGES/guikachu.mo
 share/locale/uk/LC_MESSAGES/guikachu.mo
+share/locale/vi/LC_MESSAGES/guikachu.mo
 share/locale/wa/LC_MESSAGES/guikachu.mo
 share/locale/zh_CN/LC_MESSAGES/guikachu.mo
+share/mime/guikachu.keys
+share/mime/guikachu.mime
 share/mime/packages/guikachu.mime.xml
 @dirrm share/gnome/help/guikachu/C/pictures
 @dirrm share/gnome/help/guikachu/C
 @dirrm share/gnome/help/guikachu
-@dirrm share/gnome/guikachu/target-defs
-@dirrm share/gnome/guikachu/glade
-@dirrm share/gnome/guikachu/fonts
-@dirrm share/gnome/guikachu
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime