6 files changed, 40 insertions, 66 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 873bb82ab711..6a783a208ef2 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -7,46 +7,32 @@
 #
 
 PORTNAME=	poedit
-PORTVERSION=	1.1.8
-PORTREVISION=	3
+PORTVERSION=	1.1.10
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-#PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	poedit-1.1.5-wxwin-2.3.1.patch
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
-		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
-		db3.3:${PORTSDIR}/databases/db3
+LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
+		intl.4:${PORTSDIR}/devel/gettext \
+		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 
-PATCH_DIST_ARGS=	-d ${PATCH_WRKSRC} -E ${PATCH_DIST_STRIP} -p1
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=	poedit.1
-
-.include <bsd.port.pre.mk>
+CPPFLAGS=	-I${LOCALBASE}/include/db3 -I${LOCALBASE}/include \
+		${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
-.else
-CONFIGURE_ARGS+=	--without-gnome
-.endif
+MAN1=	poedit.1
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
+post-patch:
+	@${REINPLACE_CMD} -e 's|db-3.1;|db-3.1 db3;|g ; \
+		 s|-O3||g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index 7a39cd5ab6be..af3b5f4d68cd 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1 +1 @@
-MD5 (poedit-1.1.8.tar.gz) = 71436c17916194cfb291f3097ffe7482
+MD5 (poedit-1.1.10.tar.gz) = d4ef0222f6932f1e4028041c375e7f69
diff --git a/editors/poedit/files/patch-Makefile.in b/editors/poedit/files/patch-Makefile.in
new file mode 100644
index 000000000000..d9a1b3f35501
--- /dev/null
+++ b/editors/poedit/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Sep 11 18:20:10 2002
++++ Makefile.in	Tue Sep 17 19:51:27 2002
+@@ -93,7 +93,7 @@
+ WX_LIBS_STATIC = @WX_LIBS_STATIC@
+ WX_VERSION = @WX_VERSION@
+ 
+-SUBDIRS = extras src docs install locales
++SUBDIRS = extras src docs locales
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
diff --git a/editors/poedit/files/patch-configure b/editors/poedit/files/patch-configure
deleted file mode 100644
index 8f1514cbf005..000000000000
--- a/editors/poedit/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Feb 26 15:09:09 2002
-+++ configure	Tue Feb 26 15:09:22 2002
-@@ -1996,7 +1996,7 @@
-   cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_db_create" = "no" && for i in db-3.6 db-3.5 db-3.4 db-3.3 db-3.2 db-3.1 db; do
-+test "$ac_cv_search_db_create" = "no" && for i in db-3.6 db-3.5 db-3.4 db-3.3 db-3.2 db-3.1 db3; do
- LIBS="-l$i  $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2003 "configure"
diff --git a/editors/poedit/files/patch-install::Makefile.in b/editors/poedit/files/patch-install::Makefile.in
deleted file mode 100644
index 70dc029866b7..000000000000
--- a/editors/poedit/files/patch-install::Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- install/Makefile.in.orig	Sun Nov 25 01:15:33 2001
-+++ install/Makefile.in	Sun Nov 25 01:16:56 2001
-@@ -206,13 +206,13 @@
- 
- @USE_GNOME_TRUE@install-gnome:
- @USE_GNOME_TRUE@	mkdir -p $(GNOME_DATA_DIR)/pixmaps
--@USE_GNOME_TRUE@	mkdir -p $(GNOME_DATA_DIR)/gnome/apps/Development
-+@USE_GNOME_TRUE@	mkdir -p $(GNOME_DATA_DIR)/apps/Development
- @USE_GNOME_TRUE@	mkdir -p $(GNOME_DATA_DIR)/mime-info
- @USE_GNOME_TRUE@	if test -w $(GNOME_DATA_DIR)/pixmaps ; then \
- @USE_GNOME_TRUE@	  install -m 644 $(top_srcdir)/src/appicon.xpm $(GNOME_DATA_DIR)/pixmaps/poedit.xpm; \
- @USE_GNOME_TRUE@	fi
--@USE_GNOME_TRUE@	if test -w $(GNOME_DATA_DIR)/gnome/apps/Development ; then \
--@USE_GNOME_TRUE@	  install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/gnome/apps/Development; \
-+@USE_GNOME_TRUE@	if test -w $(GNOME_DATA_DIR)/apps/Development ; then \
-+@USE_GNOME_TRUE@	  install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/apps/Development; \
- @USE_GNOME_TRUE@	fi
- @USE_GNOME_TRUE@	if test -w $(GNOME_DATA_DIR)/mime-info ; then \
- @USE_GNOME_TRUE@	  install -m 644 $(srcdir)/poedit.mime $(GNOME_DATA_DIR)/mime-info; \
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index d8983f87e7a5..0b7f4bea44e3 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -1,10 +1,17 @@
 bin/poedit
+share/locale/cs/LC_MESSAGES/poedit.mo
+share/locale/de/LC_MESSAGES/poedit.mo
+share/locale/et/LC_MESSAGES/poedit.mo
+share/locale/fr/LC_MESSAGES/poedit.mo
+share/locale/hr/LC_MESSAGES/poedit.mo
+share/locale/it/LC_MESSAGES/poedit.mo
+share/locale/nl/LC_MESSAGES/poedit.mo
+share/locale/nn/LC_MESSAGES/poedit.mo
+share/locale/pl/LC_MESSAGES/poedit.mo
+share/locale/tr/LC_MESSAGES/poedit.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/poedit.mo
+share/poedit/help-gettext.zip
+share/poedit/help-hr.zip
 share/poedit/help.zip
 share/poedit/resources.zip
 @dirrm share/poedit
-share/locale/cs/LC_MESSAGES/poedit.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/poedit.mo
-%%GNOME:%%share/gnome/apps/Development/poedit.desktop
-%%GNOME:%%share/gnome/mime-info/poedit.keys
-%%GNOME:%%share/gnome/mime-info/poedit.mime
-%%GNOME:%%share/gnome/pixmaps/poedit.xpm