ports/131085: Maintainer Update: games/pykawari to 8.2.8

[UMENO Takashi]

>Number:         131085
>Category:       ports
>Synopsis:       Maintainer Update: games/pykawari to 8.2.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 28 18:00:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     UMENO Takashi
>Release:        FreeBSD 7.1-RELEASE i386
>Organization:
individual
>Environment:
System: FreeBSD belldandy.unnumbered.net 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan 1 14:37:25 UTC 2009 root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Maintainer Update: games/pykawari to 8.2.8
and USE_GCC= 3.4 if OSVERSION >= 700042
>How-To-Repeat:
	
>Fix:

	


diff -urN pykawari.orig/Makefile pykawari/Makefile
--- pykawari.orig/Makefile	2008-06-07 06:44:44.000000000 +0900
+++ pykawari/Makefile	2009-01-29 01:42:12.000000000 +0900
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	pykawari
-PORTVERSION=	8.2.4
-PORTREVISION=	2
+PORTVERSION=	8.2.8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kawari
 DISTNAME=	kawari-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	umeno at rr.iij4u.or.jp
 COMMENT=	A real kawari8 module for ninix-aya
@@ -28,6 +26,7 @@
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/kawari-${PORTVERSION:S/.//g}
 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
@@ -35,7 +34,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
+USE_GCC=	3.4
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
diff -urN pykawari.orig/distinfo pykawari/distinfo
--- pykawari.orig/distinfo	2006-01-22 22:25:20.000000000 +0900
+++ pykawari/distinfo	2009-01-29 01:40:50.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (kawari-824.zip) = 28bf746386e15e343f8445b83f53edb3
-SHA256 (kawari-824.zip) = ef4904650bcc502d916d18dd342373001e9524e18d4c00262469f0c41d424a52
-SIZE (kawari-824.zip) = 1251826
+MD5 (kawari-828.zip) = 2bee28909bdeaa8989662ba997c30c7a
+SHA256 (kawari-828.zip) = 32416386aca63b94842120808d501838f812efdf6ea5f9dd1659c1bff848ab02
+SIZE (kawari-828.zip) = 1279146
diff -urN pykawari.orig/files/patch-build_src_gcc.mak pykawari/files/patch-build_src_gcc.mak
--- pykawari.orig/files/patch-build_src_gcc.mak	2005-11-06 07:30:21.000000000 +0900
+++ pykawari/files/patch-build_src_gcc.mak	2009-01-29 01:38:54.000000000 +0900
@@ -1,5 +1,5 @@
---- build/src/gcc.mak.orig	Tue Jun 21 22:28:54 2005
-+++ build/src/gcc.mak	Wed Sep 14 10:00:26 2005
+--- build/src/gcc.mak.orig	2008-01-20 17:13:34.000000000 +0900
++++ build/src/gcc.mak	2009-01-29 01:34:48.000000000 +0900
 @@ -8,14 +8,14 @@
  #==========================================================================
  
@@ -32,13 +32,22 @@
 +SHIORI_PYTHON = yes
  
  ## Global options
--CFLAGS  = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
+-CFLAGS  = -O1 -I. -DNDEBUG -Wall -fomit-frame-pointer
 -LDFLAGS = -s
 +CFLAGS  += -Os -I. -DNDEBUG -Wall -fomit-frame-pointer
 +LDFLAGS += -s
  
  #==========================================================================
  # Directories
+@@ -70,7 +70,7 @@
+ ifeq ($(STLport),yes)
+ 	CFLAGS  := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS)
+ 	LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP)
+-	LIBS    := $(LIBS) $(LIBS_STLP)
++	LIBS    := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION}
+ endif
+ 
+ ifeq ($(SAORI_NATIVE),yes)
 @@ -104,7 +104,7 @@
  	ifndef CFLAGS_PYTHON
  		CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]")
@@ -53,7 +62,7 @@
  .PHONY: clean cleanall depend upx
  
 -all : $(ALLTARGET) upx
-+#all : $(ALLTARGET) 
++#all : $(ALLTARGET) upx
 +all : $(ALLTARGET) $(UPX)
  
  $(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB)
>Release-Note:
>Audit-Trail:
>Unformatted: