Date: Tue, 17 Sep 2002 09:53:22 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/42895: Update port: editors/poedit to 1.1.10 Message-ID: <200209171653.g8HGrM9n021222@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 42895
>Category: ports
>Synopsis: Update port: editors/poedit to 1.1.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 17 10:30:13 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.10
New file:
files/patch-Makefile.in
Remove file:
files/patch-configure
files/patch-instlal::Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/editors/poedit/Makefile editors/poedit/Makefile
--- /usr/ports/editors/poedit/Makefile Tue Sep 10 20:09:45 2002
+++ editors/poedit/Makefile Tue Sep 17 19:54:08 2002
@@ -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
+CPPFLAGS= -I${LOCALBASE}/include/db3 -I${LOCALBASE}/include \
+ ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-.include <bsd.port.pre.mk>
+MAN1= poedit.1
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
-.else
-CONFIGURE_ARGS+= --without-gnome
-.endif
-
-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 -urN /usr/ports/editors/poedit/distinfo editors/poedit/distinfo
--- /usr/ports/editors/poedit/distinfo Sun Apr 7 00:06:02 2002
+++ editors/poedit/distinfo Tue Sep 17 19:16:19 2002
@@ -1 +1 @@
-MD5 (poedit-1.1.8.tar.gz) = 71436c17916194cfb291f3097ffe7482
+MD5 (poedit-1.1.10.tar.gz) = d4ef0222f6932f1e4028041c375e7f69
diff -urN /usr/ports/editors/poedit/files/patch-Makefile.in editors/poedit/files/patch-Makefile.in
--- /usr/ports/editors/poedit/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
+++ editors/poedit/files/patch-Makefile.in Tue Sep 17 19:51:40 2002
@@ -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 -urN /usr/ports/editors/poedit/files/patch-configure editors/poedit/files/patch-configure
--- /usr/ports/editors/poedit/files/patch-configure Tue Feb 26 16:45:17 2002
+++ editors/poedit/files/patch-configure Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/editors/poedit/files/patch-install::Makefile.in editors/poedit/files/patch-install::Makefile.in
--- /usr/ports/editors/poedit/files/patch-install::Makefile.in Thu Nov 29 05:55:42 2001
+++ editors/poedit/files/patch-install::Makefile.in Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/editors/poedit/pkg-plist editors/poedit/pkg-plist
--- /usr/ports/editors/poedit/pkg-plist Thu May 9 00:33:29 2002
+++ editors/poedit/pkg-plist Tue Sep 17 20:00:19 2002
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209171653.g8HGrM9n021222>