From tkato@prontomail.com  Thu Oct 16 07:46:42 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8986116A4C0
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 16 Oct 2003 07:46:02 -0700 (PDT)
Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 07A9B43F3F
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 16 Oct 2003 07:46:01 -0700 (PDT)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([218.222.54.67]) by hfep02.dion.ne.jp with SMTP
          id <20031016144553226.SWTA@hfep02.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Thu, 16 Oct 2003 23:45:53 +0900
Message-Id: <20031016234512.77fd8576.tkato@prontomail.com>
Date: Thu, 16 Oct 2003 23:45:12 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: editors/poedit to 1.2.3

>Number:         58127
>Category:       ports
>Synopsis:       Update port: editors/poedit to 1.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 16 07:50:23 PDT 2003
>Closed-Date:    Sun Nov 09 15:19:10 PST 2003
>Last-Modified:  Sun Nov 09 15:19:10 PST 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.3

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/poedit/Makefile editors/poedit/Makefile
--- /usr/ports/editors/poedit/Makefile	Wed Aug 27 09:27:40 2003
+++ editors/poedit/Makefile	Tue Oct 14 22:27:38 2003
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	poedit
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,24 +16,39 @@
 COMMENT=	gettext catalogs (.po files) editor
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
 		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include/db3 -I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}
+CPPFLAGS=	-I${LOCALBASE}/include/db${USE_BDB_VER} \
+		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=	poedit.1
 
+.if defined(WITH_BDB_VER)
+USE_BDB_VER=    ${WITH_BDB_VER}
+.else
+USE_BDB_VER=	3
+.endif
+.if ${USE_BDB_VER} == 41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+.elif ${USE_BDB_VER} == 4
+LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+.elif ${USE_BDB_VER} == 3
+LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
+.else
+BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|db-3.1;|db-3.1 db3;|g ; \
+	@${REINPLACE_CMD} -e 's|db-3.1;|db-3.1 db${USE_BDB_VER};|g ; \
 		 s|-O3||g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/poedit/distinfo editors/poedit/distinfo
--- /usr/ports/editors/poedit/distinfo	Sat May 10 17:53:25 2003
+++ editors/poedit/distinfo	Mon Oct 13 21:08:55 2003
@@ -1 +1 @@
-MD5 (poedit-1.2.2.tar.gz) = c1f722c11218d31269f98d686ff73792
+MD5 (poedit-1.2.3.tar.gz) = 29180bc3e4e128bc0c6bee446b670d0f
diff -urN /usr/ports/editors/poedit/files/patch-Makefile.in editors/poedit/files/patch-Makefile.in
--- /usr/ports/editors/poedit/files/patch-Makefile.in	Wed Sep 18 02:36:41 2002
+++ editors/poedit/files/patch-Makefile.in	Mon Oct 13 21:12:28 2003
@@ -1,11 +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@
+--- Makefile.in.orig	Wed Oct  1 06:02:27 2003
++++ Makefile.in	Mon Oct 13 21:12:22 2003
+@@ -153,7 +153,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  
 -SUBDIRS = extras src docs install locales
 +SUBDIRS = extras src docs locales
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
diff -urN /usr/ports/editors/poedit/pkg-plist editors/poedit/pkg-plist
--- /usr/ports/editors/poedit/pkg-plist	Sat May 10 17:53:25 2003
+++ editors/poedit/pkg-plist	Mon Oct 13 21:43:22 2003
@@ -1,4 +1,5 @@
 bin/poedit
+share/locale/af_ZA/LC_MESSAGES/poedit.mo
 share/locale/bg/LC_MESSAGES/poedit.mo
 share/locale/ca/LC_MESSAGES/poedit.mo
 share/locale/cs/LC_MESSAGES/poedit.mo
@@ -7,20 +8,26 @@
 share/locale/el/LC_MESSAGES/poedit.mo
 share/locale/es/LC_MESSAGES/poedit.mo
 share/locale/et/LC_MESSAGES/poedit.mo
+share/locale/fa_IR/LC_MESSAGES/poedit.mo
 share/locale/fr/LC_MESSAGES/poedit.mo
 share/locale/hr/LC_MESSAGES/poedit.mo
+share/locale/hu/LC_MESSAGES/poedit.mo
 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/lt/LC_MESSAGES/poedit.mo
 share/locale/lv/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
 share/locale/pl/LC_MESSAGES/poedit.mo
 share/locale/pt_BR/LC_MESSAGES/poedit.mo
+share/locale/pt_PT/LC_MESSAGES/poedit.mo
 share/locale/ro/LC_MESSAGES/poedit.mo
 share/locale/ru/LC_MESSAGES/poedit.mo
+share/locale/sl/LC_MESSAGES/poedit.mo
+share/locale/sr/LC_MESSAGES/poedit.mo
 share/locale/sk/LC_MESSAGES/poedit.mo
 share/locale/sv_SE/LC_MESSAGES/poedit.mo
 share/locale/ta/LC_MESSAGES/poedit.mo
>Release-Note:
>Audit-Trail:

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/58127: Update port: editors/poedit to 1.2.3
Date: Wed, 5 Nov 2003 22:30:23 +0900

 Here is an up-to-date patch.
 
 diff -urN /usr/ports/editors/poedit/Makefile editors/poedit/Makefile
 --- /usr/ports/editors/poedit/Makefile	Wed Nov  5 20:36:01 2003
 +++ editors/poedit/Makefile	Wed Nov  5 20:46:20 2003
 @@ -7,34 +7,48 @@
  #
  
  PORTNAME=	poedit
 -PORTVERSION=	1.2.2
 -PORTREVISION=	1
 +PORTVERSION=	1.2.3
  CATEGORIES=	editors
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	gettext catalogs (.po files) editor
 +COMMENT=	Gettext catalogs (.po files) editor
  
  BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 -LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
 -		intl.5:${PORTSDIR}/devel/gettext \
 +LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
  		wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk-devel
  
  USE_X_PREFIX=	yes
  USE_REINPLACE=	yes
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
  CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
  
 -CPPFLAGS=	-I${LOCALBASE}/include/db3 -I${LOCALBASE}/include \
 -		${PTHREAD_CFLAGS}
 +CPPFLAGS=	-I${LOCALBASE}/include/db${USE_BDB_VER} \
 +		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
  LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
  
  MAN1=	poedit.1
  
 +.if defined(WITH_BDB_VER)
 +USE_BDB_VER=    ${WITH_BDB_VER}
 +.else
 +USE_BDB_VER=	3
 +.endif
 +.if ${USE_BDB_VER} == 41
 +LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 +.elif ${USE_BDB_VER} == 4
 +LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 +.elif ${USE_BDB_VER} == 3
 +LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
 +.else
 +BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
 +.endif
 +
  post-patch:
 -	@${REINPLACE_CMD} -e 's|db-3.1;|db-3.1 db3;|g ; \
 +	@${REINPLACE_CMD} -e 's|db-3.1;|db-3.1 db${USE_BDB_VER};|g ; \
  		 s|-O3||g' ${WRKSRC}/configure
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/editors/poedit/distinfo editors/poedit/distinfo
 --- /usr/ports/editors/poedit/distinfo	Sat May 10 17:53:25 2003
 +++ editors/poedit/distinfo	Mon Oct 13 21:08:55 2003
 @@ -1 +1 @@
 -MD5 (poedit-1.2.2.tar.gz) = c1f722c11218d31269f98d686ff73792
 +MD5 (poedit-1.2.3.tar.gz) = 29180bc3e4e128bc0c6bee446b670d0f
 diff -urN /usr/ports/editors/poedit/files/patch-Makefile.in editors/poedit/files/patch-Makefile.in
 --- /usr/ports/editors/poedit/files/patch-Makefile.in	Wed Sep 18 02:36:41 2002
 +++ editors/poedit/files/patch-Makefile.in	Mon Oct 13 21:12:28 2003
 @@ -1,11 +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@
 +--- Makefile.in.orig	Wed Oct  1 06:02:27 2003
 ++++ Makefile.in	Mon Oct 13 21:12:22 2003
 +@@ -153,7 +153,7 @@
 + target_os = @target_os@
 + target_vendor = @target_vendor@
   
  -SUBDIRS = extras src docs install locales
  +SUBDIRS = extras src docs locales
 + subdir = .
   ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 - CONFIG_CLEAN_FILES = 
 diff -urN /usr/ports/editors/poedit/pkg-plist editors/poedit/pkg-plist
 --- /usr/ports/editors/poedit/pkg-plist	Sat May 10 17:53:25 2003
 +++ editors/poedit/pkg-plist	Mon Oct 13 21:43:22 2003
 @@ -1,4 +1,5 @@
  bin/poedit
 +share/locale/af_ZA/LC_MESSAGES/poedit.mo
  share/locale/bg/LC_MESSAGES/poedit.mo
  share/locale/ca/LC_MESSAGES/poedit.mo
  share/locale/cs/LC_MESSAGES/poedit.mo
 @@ -7,20 +8,26 @@
  share/locale/el/LC_MESSAGES/poedit.mo
  share/locale/es/LC_MESSAGES/poedit.mo
  share/locale/et/LC_MESSAGES/poedit.mo
 +share/locale/fa_IR/LC_MESSAGES/poedit.mo
  share/locale/fr/LC_MESSAGES/poedit.mo
  share/locale/hr/LC_MESSAGES/poedit.mo
 +share/locale/hu/LC_MESSAGES/poedit.mo
  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/lt/LC_MESSAGES/poedit.mo
  share/locale/lv/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
  share/locale/pl/LC_MESSAGES/poedit.mo
  share/locale/pt_BR/LC_MESSAGES/poedit.mo
 +share/locale/pt_PT/LC_MESSAGES/poedit.mo
  share/locale/ro/LC_MESSAGES/poedit.mo
  share/locale/ru/LC_MESSAGES/poedit.mo
 +share/locale/sl/LC_MESSAGES/poedit.mo
 +share/locale/sr/LC_MESSAGES/poedit.mo
  share/locale/sk/LC_MESSAGES/poedit.mo
  share/locale/sv_SE/LC_MESSAGES/poedit.mo
  share/locale/ta/LC_MESSAGES/poedit.mo
State-Changed-From-To: open->closed 
State-Changed-By: fjoe 
State-Changed-When: Sun Nov 9 15:16:08 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58127 
>Unformatted:
