Update poedit to 1.3.4.

Changes since 1.2.5:
- build with wxGTK-2.6
- use standard accelerators for Close command
- added ability to create bookmarks (Olivier Sannier)
- improved status icons (Olivier Sannier)
- more robust parsing of catalog headers
- saving into read-only file now fails as expected
- added "New catalog from POT file" feature
- added ability to display automatic comments in the UI
- added ability to search comments
- added checking of input files' correctness
- plural forms support
- fixed catalog I/O to correctly handle automatic comments
- usability improvements
- added more translations
- many bug fixes

5 files changed, 83 insertions, 53 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 1368ee00461..322061c7865 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/08/07 11:29:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/10/09 18:33:17 minskim Exp $
 #
 
-DISTNAME=	poedit-1.2.5
-PKGREVISION=	3
+DISTNAME=	poedit-1.3.4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
@@ -13,11 +12,13 @@ COMMENT=	Cross-platform gettext catalogs (.po files) editor
 DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.2 gnome2-1.5
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-CONFIGURE_ENV+=		WX_CONFIG_NAME=${LOCALBASE}/bin/wx24-config
+USE_TOOLS+=		gmake pkg-config
+CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK}/bin/wx-config
 
 .include "../../databases/db4/buildlink3.mk"
-.include "../../x11/wxGTK24/buildlink3.mk"
+.include "../../textproc/gtkspell/buildlink3.mk"
+.include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/PLIST b/editors/poedit/PLIST
index d1d0059f0c0..d7ebe4d9209 100644
--- a/editors/poedit/PLIST
+++ b/editors/poedit/PLIST
@@ -1,29 +1,48 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/30 23:20:37 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/09 18:33:17 minskim Exp $
 bin/poedit
 man/man1/poedit.1
+share/gnome/apps/Development/poedit.desktop
 ${PKGLOCALEDIR}/locale/af_ZA/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/am_ET/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/ast/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/es_PR/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/fur/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/ka/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/ky/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/poedit.mo
@@ -31,14 +50,43 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/sq_AL/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/tt/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/poedit.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/poedit.mo
 ${PKGLOCALEDIR}/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
 @dirrm share/poedit
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/mime-info
+@dirrm ${PKGLOCALEDIR}/locale/tt/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/tt
+@dirrm ${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/sv_SE
+@dirrm ${PKGLOCALEDIR}/locale/ky/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/ky
+@dirrm ${PKGLOCALEDIR}/locale/fur/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/fur
+@dirrm ${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/fa_IR
+@dirrm ${PKGLOCALEDIR}/locale/es_PR/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/es_PR
+@dirrm ${PKGLOCALEDIR}/locale/ast/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/ast
+@dirrm ${PKGLOCALEDIR}/locale/am_ET/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/am_ET
+@dirrm ${PKGLOCALEDIR}/locale/af_ZA/LC_MESSAGES
+@dirrm ${PKGLOCALEDIR}/locale/af_ZA
+@comment in gnome2-dirs: @dirrm share/gnome/apps/Development
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index ec2e994e78e..9bee7d6dc48 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:15:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/10/09 18:33:17 minskim Exp $
 
-SHA1 (poedit-1.2.5.tar.gz) = 3bcb1009c8687887ae5c53ebebe186bc6c98fb3a
-RMD160 (poedit-1.2.5.tar.gz) = 898572284114f8eb5e2799145824dad380477978
-Size (poedit-1.2.5.tar.gz) = 1313243 bytes
-SHA1 (patch-aa) = b581d7d9c0f8a7e9503da04a4574e9b04a235cb3
-SHA1 (patch-ab) = dade8088c126722a4f83bf92b8db96c6410ed690
+SHA1 (poedit-1.3.4.tar.gz) = df3508c93f6c4cbc40c82c46473f129f34225bbe
+RMD160 (poedit-1.3.4.tar.gz) = a67566d85a2d600be8d33251dd3b7bc733742ec9
+Size (poedit-1.3.4.tar.gz) = 2092161 bytes
+SHA1 (patch-ab) = 659363d03358dc4e72f53faf90e950275e9781a8
diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa
deleted file mode 100644
index 4fd7d92f27e..00000000000
--- a/editors/poedit/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
-
---- configure.in.orig	Sun Jan 25 22:16:53 2004
-+++ configure.in
-@@ -12,19 +12,19 @@ AC_CANONICAL_TARGET
- 
- dnl cross-compiling support: we're cross compiling if the build system is
- dnl different from the target one (assume host and target be always the same)
--if test "$build" != "$host" ; then
--    CC=$host_alias-gcc
--    CXX=$host_alias-c++
--    AR=$host_alias-ar
--    RANLIB=$host_alias-ranlib
--    DLLTOOL=$host_alias-dlltool
--    RESCOMP=$host_alias-windres
--    LD=$host_alias-ld
--    NM=$host_alias-nm
--    STRIP=$host_alias-strip
--else
-+#if test "$build" != "$host" ; then
-+#    CC=$host_alias-gcc
-+#    CXX=$host_alias-c++
-+#    AR=$host_alias-ar
-+#    RANLIB=$host_alias-ranlib
-+#    DLLTOOL=$host_alias-dlltool
-+#    RESCOMP=$host_alias-windres
-+#    LD=$host_alias-ld
-+#    NM=$host_alias-nm
-+#    STRIP=$host_alias-strip
-+#else
-     RESCOMP=windres
--fi
-+#fi
- 
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
diff --git a/editors/poedit/patches/patch-ab b/editors/poedit/patches/patch-ab
index 7a0eb6dc28c..96da8f8e4df 100644
--- a/editors/poedit/patches/patch-ab
+++ b/editors/poedit/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/09 18:33:17 minskim Exp $
 
---- configure.orig	Sun Jan 25 22:17:58 2004
+--- configure.orig	2005-10-02 16:03:35.000000000 -0700
 +++ configure
-@@ -1460,19 +1460,19 @@ test -n "$target_alias" &&
+@@ -1436,19 +1436,19 @@ test -n "$target_alias" &&
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
@@ -32,5 +32,23 @@ $NetBSD: patch-ab,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
 -fi
 +#fi
  
- am__api_version="1.7"
+ am__api_version="1.8"
  # Find a good install program.  We prefer a C program (faster),
+@@ -4677,7 +4677,7 @@ fi
+ 
+   echo "$as_me:$LINENO: checking for GNOME data directory" >&5
+ echo $ECHO_N "checking for GNOME data directory... $ECHO_C" >&6
+-  GNOME_DATA_DIR=`gnome-config --datadir 2>/dev/null`
++  GNOME_DATA_DIR=$prefix/share
+   if test x$GNOME_DATA_DIR = x ; then
+      echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+@@ -4736,7 +4736,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"