From umeno@belldandy.unnumbered.net  Sun Oct  9 06:55:35 2005
Return-Path: <umeno@belldandy.unnumbered.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D3F516A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Oct 2005 06:55:35 +0000 (GMT)
	(envelope-from umeno@belldandy.unnumbered.net)
Received: from belldandy.unnumbered.net (gateway.unnumbered.net [61.197.240.129])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C7A3143D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Oct 2005 06:55:34 +0000 (GMT)
	(envelope-from umeno@belldandy.unnumbered.net)
Received: from belldandy.unnumbered.net (localhost [127.0.0.1])
	by belldandy.unnumbered.net (8.13.4/8.13.4) with ESMTP id j996tWHF097666
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 9 Oct 2005 15:55:32 +0900 (JST)
	(envelope-from umeno@belldandy.unnumbered.net)
Received: (from umeno@localhost)
	by belldandy.unnumbered.net (8.13.4/8.13.4/Submit) id j996tVQg097665;
	Sun, 9 Oct 2005 15:55:31 +0900 (JST)
	(envelope-from umeno)
Message-Id: <200510090655.j996tVQg097665@belldandy.unnumbered.net>
Date: Sun, 9 Oct 2005 15:55:31 +0900 (JST)
From: UMENO Takashi <umeno@rr.iij4u.or.jp>
Reply-To: UMENO Takashi <umeno@rr.iij4u.or.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer Update: games/gbottler to 0.1.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         87154
>Category:       ports
>Synopsis:       Maintainer Update: games/gbottler to 0.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    az
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 09 07:00:31 GMT 2005
>Closed-Date:    Sun Oct 09 09:15:58 GMT 2005
>Last-Modified:  Sun Oct 09 09:15:58 GMT 2005
>Originator:     UMENO Takashi
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
individual
>Environment:
System: FreeBSD belldandy.unnumbered.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Tue Aug 30 01:30:36 JST 2005 root@belldandy.unnumbered.net:/usr/obj/usr/src/sys/MISUZU1 i386


	
>Description:
Maintainer Update: games/gbottler to 0.1.5
and, japanese/pycodec is removed from RUN_DEPENDS if python2.4 is used.
>How-To-Repeat:
N/A
>Fix:

diff -urN gbottler.orig/Makefile gbottler/Makefile
--- gbottler.orig/Makefile	Mon Apr  4 23:32:51 2005
+++ gbottler/Makefile	Sun Oct  9 15:08:13 2005
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	gbottler
-PORTVERSION=	0.1.4
-PORTREVISION=	2
+PORTVERSION=	0.1.5
+PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	gbottler/12381
+MASTER_SITE_SUBDIR=	gbottler/16706
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	SSTP Bottle client
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec \
 		${PYTHON_SITELIBDIR}/_xmlplus/sax/saxutils.py:${PORTSDIR}/textproc/py-xml
+
+PYVERSION=	${PYTHON_VERSION:S/^python//}
+.if defined(PYTHON_VERSION) && ${PYVERSION:S/.//} < 24
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec
+.endif # defined(PYVERSION) && ${PYVERSION:S/.//} < 24
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff -urN gbottler.orig/distinfo gbottler/distinfo
--- gbottler.orig/distinfo	Wed Dec  1 23:03:26 2004
+++ gbottler/distinfo	Sun Oct  9 15:09:50 2005
@@ -1,2 +1,2 @@
-MD5 (gbottler-0.1.4.tar.gz) = b8128a46f89226a2e31e04d58a3725c0
-SIZE (gbottler-0.1.4.tar.gz) = 100552
+MD5 (gbottler-0.1.5.tar.gz) = c874b523ff8e91c6d84f8dd1df9fc685
+SIZE (gbottler-0.1.5.tar.gz) = 109931
diff -urN gbottler.orig/pkg-plist gbottler/pkg-plist
--- gbottler.orig/pkg-plist	Tue Oct 12 23:24:16 2004
+++ gbottler/pkg-plist	Sun Oct  9 15:13:49 2005
@@ -8,6 +8,9 @@
 lib/gbottler-%%VERSION%%/channeldialog.py
 lib/gbottler-%%VERSION%%/channeldialog.pyc
 lib/gbottler-%%VERSION%%/channeldialog.pyo
+lib/gbottler-%%VERSION%%/config.py
+lib/gbottler-%%VERSION%%/config.pyc
+lib/gbottler-%%VERSION%%/config.pyo
 lib/gbottler-%%VERSION%%/client.py
 lib/gbottler-%%VERSION%%/client.pyc
 lib/gbottler-%%VERSION%%/client.pyo
@@ -50,12 +53,12 @@
 lib/gbottler-%%VERSION%%/messagesender.py
 lib/gbottler-%%VERSION%%/messagesender.pyc
 lib/gbottler-%%VERSION%%/messagesender.pyo
-lib/gbottler-%%VERSION%%/phrases.py
-lib/gbottler-%%VERSION%%/phrases.pyc
-lib/gbottler-%%VERSION%%/phrases.pyo
-lib/gbottler-%%VERSION%%/prefs.py
-lib/gbottler-%%VERSION%%/prefs.pyc
-lib/gbottler-%%VERSION%%/prefs.pyo
+lib/gbottler-%%VERSION%%/phrasemanager.py
+lib/gbottler-%%VERSION%%/phrasemanager.pyc
+lib/gbottler-%%VERSION%%/phrasemanager.pyo
+lib/gbottler-%%VERSION%%/preferences.py
+lib/gbottler-%%VERSION%%/preferences.pyc
+lib/gbottler-%%VERSION%%/preferences.pyo
 lib/gbottler-%%VERSION%%/queryluid.py
 lib/gbottler-%%VERSION%%/queryluid.pyc
 lib/gbottler-%%VERSION%%/queryluid.pyo



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->az 
Responsible-Changed-By: az 
Responsible-Changed-When: Sun Oct 9 07:31:22 GMT 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87154 
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sun Oct 9 09:15:42 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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