Update to poedit-1.4.2. It compiles and doesn't immediately crash, so it

is a huge improvement over the old version.

4 files changed, 90 insertions, 49 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 1742993e3af..885bf930ea2 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/08/06 20:46:52 joerg Exp $
 #
 
-DISTNAME=	poedit-1.3.6
-PKGREVISION=	4
+DISTNAME=	poedit-1.4.2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
@@ -10,18 +9,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.poedit.net/
 COMMENT=	Cross-platform gettext catalogs (.po files) editor
 
-DEPENDS+=	zip-[0-9]*:../../archivers/zip
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-BROKEN=		Requires Unicode version of wxGTK
+DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
-CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK}/bin/wx-config
+CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/PLIST b/editors/poedit/PLIST
index 8eee6ad09c0..b02d2d8352b 100644
--- a/editors/poedit/PLIST
+++ b/editors/poedit/PLIST
@@ -1,11 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:50:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/08/06 20:46:52 joerg Exp $
 bin/poedit
 man/man1/poedit.1
-share/gnome/apps/Development/poedit.desktop
+share/applications/poedit.desktop
+share/icons/hicolor/16x16/apps/poedit.png
+share/icons/hicolor/32x32/apps/poedit.png
+share/icons/hicolor/48x48/apps/poedit.png
+share/icons/hicolor/scalable/apps/poedit.svg
 share/locale/af_ZA/LC_MESSAGES/poedit.mo
-share/locale/am_ET/LC_MESSAGES/poedit.mo
+share/locale/am/LC_MESSAGES/poedit.mo
+share/locale/ar/LC_MESSAGES/poedit.mo
 share/locale/ast/LC_MESSAGES/poedit.mo
 share/locale/be/LC_MESSAGES/poedit.mo
+share/locale/be@latin/LC_MESSAGES/poedit.mo
 share/locale/bg/LC_MESSAGES/poedit.mo
 share/locale/bn/LC_MESSAGES/poedit.mo
 share/locale/br/LC_MESSAGES/poedit.mo
@@ -23,6 +29,7 @@ share/locale/fa_IR/LC_MESSAGES/poedit.mo
 share/locale/fi/LC_MESSAGES/poedit.mo
 share/locale/fr/LC_MESSAGES/poedit.mo
 share/locale/fur/LC_MESSAGES/poedit.mo
+share/locale/ga/LC_MESSAGES/poedit.mo
 share/locale/gl/LC_MESSAGES/poedit.mo
 share/locale/he/LC_MESSAGES/poedit.mo
 share/locale/hi/LC_MESSAGES/poedit.mo
@@ -38,7 +45,9 @@ share/locale/ku/LC_MESSAGES/poedit.mo
 share/locale/ky/LC_MESSAGES/poedit.mo
 share/locale/lt/LC_MESSAGES/poedit.mo
 share/locale/lv/LC_MESSAGES/poedit.mo
+share/locale/mk/LC_MESSAGES/poedit.mo
 share/locale/mn/LC_MESSAGES/poedit.mo
+share/locale/ms/LC_MESSAGES/poedit.mo
 share/locale/nb/LC_MESSAGES/poedit.mo
 share/locale/nl/LC_MESSAGES/poedit.mo
 share/locale/nn/LC_MESSAGES/poedit.mo
@@ -52,19 +61,79 @@ share/locale/sk/LC_MESSAGES/poedit.mo
 share/locale/sl/LC_MESSAGES/poedit.mo
 share/locale/sq_AL/LC_MESSAGES/poedit.mo
 share/locale/sr/LC_MESSAGES/poedit.mo
-share/locale/sv_SE/LC_MESSAGES/poedit.mo
+share/locale/sv/LC_MESSAGES/poedit.mo
 share/locale/ta/LC_MESSAGES/poedit.mo
+share/locale/th/LC_MESSAGES/poedit.mo
 share/locale/tr/LC_MESSAGES/poedit.mo
 share/locale/tt/LC_MESSAGES/poedit.mo
+share/locale/ug/LC_MESSAGES/poedit.mo
 share/locale/uk/LC_MESSAGES/poedit.mo
+share/locale/ur/LC_MESSAGES/poedit.mo
 share/locale/wa/LC_MESSAGES/poedit.mo
 share/locale/zh_CN/LC_MESSAGES/poedit.mo
 share/locale/zh_TW/LC_MESSAGES/poedit.mo
-share/mime-info/poedit.keys
-share/mime-info/poedit.mime
 share/pixmaps/poedit.png
-share/pixmaps/poedit.xpm
-share/poedit/help-gettext.zip
-share/poedit/help-hr.zip
-share/poedit/help.zip
-share/poedit/resources.zip
+share/poedit/help/common/comment.gif
+share/poedit/help/common/fileopen.gif
+share/poedit/help/common/filesave.gif
+share/poedit/help/common/fullscreen.gif
+share/poedit/help/common/fuzzy.gif
+share/poedit/help/common/poedit.css
+share/poedit/help/common/quotes.gif
+share/poedit/help/common/update.gif
+share/poedit/help/en/basics.html
+share/poedit/help/en/gettext/gettext.hhc
+share/poedit/help/en/gettext/gettext.hhp
+share/poedit/help/en/gettext/gettext_1.html
+share/poedit/help/en/gettext/gettext_10.html
+share/poedit/help/en/gettext/gettext_11.html
+share/poedit/help/en/gettext/gettext_12.html
+share/poedit/help/en/gettext/gettext_2.html
+share/poedit/help/en/gettext/gettext_3.html
+share/poedit/help/en/gettext/gettext_4.html
+share/poedit/help/en/gettext/gettext_5.html
+share/poedit/help/en/gettext/gettext_6.html
+share/poedit/help/en/gettext/gettext_7.html
+share/poedit/help/en/gettext/gettext_8.html
+share/poedit/help/en/gettext/gettext_9.html
+share/poedit/help/en/gettext/gettext_foot.html
+share/poedit/help/en/gettext/gettext_toc.html
+share/poedit/help/en/gettext/index.html
+share/poedit/help/en/index.html
+share/poedit/help/en/manager.html
+share/poedit/help/en/menu.html
+share/poedit/help/en/poedit.hhc
+share/poedit/help/en/poedit.hhp
+share/poedit/help/en/settings.html
+share/poedit/help/en/tm.html
+share/poedit/help/en/ui.html
+share/poedit/help/en/update.html
+share/poedit/help/hr/basics.html
+share/poedit/help/hr/index.html
+share/poedit/help/hr/manager.html
+share/poedit/help/hr/menu.html
+share/poedit/help/hr/poedit.hhc
+share/poedit/help/hr/poedit.hhp
+share/poedit/help/hr/settings.html
+share/poedit/help/hr/tm.html
+share/poedit/help/hr/ui.html
+share/poedit/help/hr/update.html
+share/poedit/icons/README
+share/poedit/icons/document-new.png
+share/poedit/icons/document-open.png
+share/poedit/icons/document-properties.png
+share/poedit/icons/document-save.png
+share/poedit/icons/edit-delete.png
+share/poedit/icons/help-browser.png
+share/poedit/icons/poedit-comment.png
+share/poedit/icons/poedit-fuzzy.png
+share/poedit/icons/poedit-status-automatic.png
+share/poedit/icons/poedit-status-cat-mid.png
+share/poedit/icons/poedit-status-cat-no.png
+share/poedit/icons/poedit-status-cat-ok.png
+share/poedit/icons/poedit-status-comment-modif.png
+share/poedit/icons/poedit-status-comment.png
+share/poedit/icons/poedit-status-modified.png
+share/poedit/icons/poedit-status-nothing.png
+share/poedit/icons/poedit-update.png
+share/poedit/icons/view-fullscreen.png
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index ea80d8ce288..df250e52847 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/02/15 14:28:40 rillig Exp $
+$NetBSD: distinfo,v 1.6 2009/08/06 20:46:53 joerg Exp $
 
-SHA1 (poedit-1.3.6.tar.gz) = 41b92160aa38bacbc6a0dc013a5d89dd71d3fb19
-RMD160 (poedit-1.3.6.tar.gz) = d49dce9401def566f9e2f04262e78e48a34c5e25
-Size (poedit-1.3.6.tar.gz) = 2606278 bytes
+SHA1 (poedit-1.4.2.tar.gz) = 9c509077df2d58a32093063886a670ec7dfab9b8
+RMD160 (poedit-1.4.2.tar.gz) = dc29d626b5166675da83c032b90479bd7ebffe59
+Size (poedit-1.4.2.tar.gz) = 1546955 bytes
 SHA1 (patch-ab) = 30ce91260be6e0248da16cf2063032778a9d0ba1
diff --git a/editors/poedit/patches/patch-ab b/editors/poedit/patches/patch-ab
deleted file mode 100644
index 5a497303620..00000000000
--- a/editors/poedit/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/02/15 14:28:40 rillig Exp $
-
-Tags: for-upstream
-
-- Assume we are never crosscompiling.
-- Don't know why the DB version "4" is explicitly needed.
-
---- configure.orig	2006-10-29 19:38:07.000000000 +0100
-+++ configure	2007-01-12 04:49:50.000000000 +0100
-@@ -1906,7 +1906,7 @@ test -n "$target_alias" &&
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
- 
--if test "$build" != "$host" ; then
-+if false; then
-     CC=$host_alias-gcc
-     CXX=$host_alias-c++
-     AR=$host_alias-ar
-@@ -5321,7 +5321,7 @@ echo $ECHO_N "checking for Berkeley DB..
- echo $ECHO_N "checking for Berkeley DB >= $minversion... $ECHO_C" >&6; }
-   fi
- 
--  for version in "" 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 ; do
-+  for version in "" 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0   4   3.6 3.5 3.4 3.3 3.2 3.1 ; do
- 
-     if test -z $version ; then
-         db_lib="-ldb"