Changes 1.4.6:

* OS X: fixed TM configuration tab to show languages list
* fixed bug introduced in 1.4.3 that caused "Update from POT file"
  to clear metadata in catalog header
* added Kazakh translation

Changes 1.4.5:
* OS X: fixed Find to actually show hits in text control
* OS X: fixed "Check for updates" preference broken by 1.4.4

Changes 1.4.4:
* sort catalogs in the manager alphabetically
* fixed escaping of quotes in catalog headers
* fixed reformatting of obsolete entries in catalogs
* fixed list selection visibility on Windows 7
* Windows: automatically check for available updates

Changes 1.4.3:
* Unix: fixed crash with Zemberek spell-checker backend installed
* fixed parsing of catalogs produced with xgettext --indent
* fixed TM updating broken in 1.3.5
* support GNOME's xml2po file references
* fixed handling of "%" in filenames
* added more translations:

4 files changed, 47 insertions, 12 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 9c4bd4d8d09..c86e3863db0 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:58:48 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.28 2010/06/02 12:32:18 adam Exp $
 
-DISTNAME=	poedit-1.4.2
-PKGREVISION=	2
+DISTNAME=	poedit-1.4.6.1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
@@ -14,14 +12,17 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
-GNU_CONFIGURE=		yes
+BDB_ACCEPTED=		db4 db5
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		BDB_TYPE="${BDB_TYPE}"
 CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/PLIST b/editors/poedit/PLIST
index b02d2d8352b..752044befab 100644
--- a/editors/poedit/PLIST
+++ b/editors/poedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/08/06 20:46:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/06/02 12:32:18 adam Exp $
 bin/poedit
 man/man1/poedit.1
 share/applications/poedit.desktop
@@ -16,6 +16,7 @@ share/locale/bg/LC_MESSAGES/poedit.mo
 share/locale/bn/LC_MESSAGES/poedit.mo
 share/locale/br/LC_MESSAGES/poedit.mo
 share/locale/ca/LC_MESSAGES/poedit.mo
+share/locale/ca@valencia/LC_MESSAGES/poedit.mo
 share/locale/cs/LC_MESSAGES/poedit.mo
 share/locale/da/LC_MESSAGES/poedit.mo
 share/locale/de/LC_MESSAGES/poedit.mo
@@ -40,6 +41,7 @@ share/locale/is/LC_MESSAGES/poedit.mo
 share/locale/it/LC_MESSAGES/poedit.mo
 share/locale/ja/LC_MESSAGES/poedit.mo
 share/locale/ka/LC_MESSAGES/poedit.mo
+share/locale/kk/LC_MESSAGES/poedit.mo
 share/locale/ko/LC_MESSAGES/poedit.mo
 share/locale/ku/LC_MESSAGES/poedit.mo
 share/locale/ky/LC_MESSAGES/poedit.mo
@@ -69,6 +71,8 @@ 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/uz/LC_MESSAGES/poedit.mo
+share/locale/vi/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
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index df250e52847..bd903e5673c 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/08/06 20:46:53 joerg Exp $
+$NetBSD: distinfo,v 1.7 2010/06/02 12:32:18 adam Exp $
 
-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
+SHA1 (poedit-1.4.6.1.tar.gz) = 8c4d61aef7695aa48607e9367df4c5899ad3bf83
+RMD160 (poedit-1.4.6.1.tar.gz) = 7b4fbb3f4632b53a46382f9f4b875d375c5c54b8
+Size (poedit-1.4.6.1.tar.gz) = 1585949 bytes
+SHA1 (patch-aa) = d0acac229545a35e43c774329c03714fc7affcab
diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa
new file mode 100644
index 00000000000..864b25276b4
--- /dev/null
+++ b/editors/poedit/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.3 2010/06/02 12:32:18 adam Exp $
+
+--- configure.orig	2010-06-01 09:19:56.000000000 +0000
++++ configure
+@@ -6057,15 +6057,9 @@ $as_echo_n "checking for Berkeley DB... 
+ $as_echo_n "checking for Berkeley DB >= $minversion... " >&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
+ 
+-    if test -z $version ; then
+-        db_lib="-ldb"
+-        try_headers="db.h"
+-    else
+-        db_lib="-ldb-$version"
+-        try_headers="db$version/db.h db`echo $version | sed -e 's,\..*,,g'`/db.h"
+-    fi
++    db_lib="-l${BDB_TYPE}"
++    try_headers="${BDB_TYPE}/db.h"
+ 
+     LIBS="$old_LIBS $db_lib"
+ 
+@@ -6140,7 +6134,6 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+         fi
+     done
+-  done
+ 
+   LIBS="$old_LIBS"
+