From tkato432@yahoo.com  Sun Dec 20 18:01:11 2009
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88147106568D
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 20 Dec 2009 18:01:11 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id 510D38FC44
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 20 Dec 2009 18:01:11 +0000 (UTC)
Received: from localhost.localdomain (ZT046205.ppp.dion.ne.jp [59.128.46.205])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id 272BF4AC037
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 21 Dec 2009 03:01:04 +0900 (JST)
Message-Id: <20091221030017.abde2239.tkato432@yahoo.com>
Date: Mon, 21 Dec 2009 03:00:17 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: games/toppler to 1.1.4

>Number:         141815
>Category:       ports
>Synopsis:       Update port: games/toppler to 1.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 20 18:10:03 UTC 2009
>Closed-Date:    Tue Dec 22 11:25:21 UTC 2009
>Last-Modified:  Tue Dec 22 11:30:12 UTC 2009
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.4

New file
files/patch-highscore.cc

Remove file:
pkg-install

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/toppler/Makefile games/toppler/Makefile
--- /usr/ports/games/toppler/Makefile	2008-06-07 00:22:57.000000000 +0900
+++ games/toppler/Makefile	2009-11-16 01:11:43.000000000 +0900
@@ -6,39 +6,39 @@
 #
 
 PORTNAME=	toppler
-PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTVERSION=	1.1.4
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A game where you have to climb the tower and avoid the monsters
 
-USE_GNOME=	gnometarget
 USE_SDL=	mixer sdl
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"  \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--localstatedir=/var/games
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share
 
-MAN6=		toppler.6
+MAN6=		${PORTNAME}.6
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|DATA install-dist_pkgdocDATA|DATA|g' ${WRKSRC}/Makefile.in
 
 post-install:
+	@${CHMOD} 2755 ${PREFIX}/bin/${PORTNAME}
+	@${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
+	@${CHMOD} 0664 ${DATADIR}/${PORTNAME}.hsc
+	@${CHOWN} root:games ${DATADIR}/${PORTNAME}.hsc
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@${CHOWN} root:games ${PREFIX}/bin/toppler
-	@${CHMOD} g+s ${PREFIX}/bin/toppler
-	@${SETENV} "PKG_PREFIX=${PREFIX}" \
-		${SH} pkg-install ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/toppler/distinfo games/toppler/distinfo
--- /usr/ports/games/toppler/distinfo	2007-10-28 14:09:21.000000000 +0900
+++ games/toppler/distinfo	2009-11-15 23:44:18.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (toppler-1.1.3.tar.gz) = 15ee44094e6a4e2a4f5f9b661f3fb617
-SHA256 (toppler-1.1.3.tar.gz) = 5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b
-SIZE (toppler-1.1.3.tar.gz) = 2085343
+MD5 (toppler-1.1.4.tar.gz) = 6420ae91afdb75d8c6191d4de6e90e88
+SHA256 (toppler-1.1.4.tar.gz) = b6ddb217ab8e5681d5590b4e0aab555e834c512a5700313e056adec6e456da93
+SIZE (toppler-1.1.4.tar.gz) = 2681258
diff -urN /usr/ports/games/toppler/files/patch-highscore.cc games/toppler/files/patch-highscore.cc
--- /usr/ports/games/toppler/files/patch-highscore.cc	1970-01-01 09:00:00.000000000 +0900
+++ games/toppler/files/patch-highscore.cc	2009-11-16 01:10:09.000000000 +0900
@@ -0,0 +1,10 @@
+--- highscore.cc.orig	2009-10-11 08:46:06.000000000 +0900
++++ highscore.cc	2009-11-16 01:09:40.000000000 +0900
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ 
+ #ifdef __QNXNTO__
diff -urN /usr/ports/games/toppler/pkg-install games/toppler/pkg-install
--- /usr/ports/games/toppler/pkg-install	2005-03-17 06:17:36.000000000 +0900
+++ games/toppler/pkg-install	1970-01-01 09:00:00.000000000 +0900
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FILE=/var/games/toppler/toppler.hsc
-[ "$2" != "POST-INSTALL" -o -f "$FILE" ] && exit 0
-
-echo "===>   Creating initial high score file $FILE"
-[ -d `dirname $FILE` ] || install -o root -g games -m 775 -d `dirname $FILE`
-install -o root -g games -m 664 /dev/null $FILE
diff -urN /usr/ports/games/toppler/pkg-plist games/toppler/pkg-plist
--- /usr/ports/games/toppler/pkg-plist	2007-10-28 14:09:21.000000000 +0900
+++ games/toppler/pkg-plist	2009-11-15 23:40:27.000000000 +0900
@@ -22,6 +22,7 @@
 %%DATADIR%%/m2.ttm
 %%DATADIR%%/pasi2.ttm
 %%DATADIR%%/toppler.dat
+%%DATADIR%%/toppler.hsc
 %%DATADIR%%/toppler.ogg
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/cz/LC_MESSAGES
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Dec 20 18:10:27 UTC 2009 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141815 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Dec 22 11:25:20 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141815 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/141815: commit references a PR
Date: Tue, 22 Dec 2009 11:26:07 +0000 (UTC)

 miwi        2009-12-22 11:25:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/toppler        Makefile distinfo pkg-plist 
   Added files:
     games/toppler/files  patch-highscore.cc 
   Removed files:
     games/toppler        pkg-install 
   Log:
   - Update to 1.1.4
   
   PR:             141815
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.21      +11 -11    ports/games/toppler/Makefile
   1.7       +3 -3      ports/games/toppler/distinfo
   1.1       +10 -0     ports/games/toppler/files/patch-highscore.cc (new)
   1.2       +0 -8      ports/games/toppler/pkg-install (dead)
   1.5       +1 -0      ports/games/toppler/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
