From amdmi3@amdmi3.ru  Thu Mar 29 13:10:25 2007
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1481416A400
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Mar 2007 13:10:25 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from cp65.agava.net (cp65.agava.net [89.108.66.215])
	by mx1.freebsd.org (Postfix) with ESMTP id 18E2A13C44C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Mar 2007 13:10:22 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from clamav by cp65.agava.net with drweb-scanned (Exim 4.44 (FreeBSD))
	id 1HWuO6-000Oi5-LT
	for FreeBSD-gnats-submit@freebsd.org; Thu, 29 Mar 2007 17:09:58 +0400
Received: from [213.148.29.33] (helo=nexii.panopticon)
	by cp65.agava.net with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.44 (FreeBSD))
	id 1HWuO6-000Ohp-GK
	for FreeBSD-gnats-submit@freebsd.org; Thu, 29 Mar 2007 17:09:58 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.2])
	by nexii.panopticon (Postfix) with ESMTP id E5FF217056
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Mar 2007 17:09:45 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 719C74054; Thu, 29 Mar 2007 17:09:54 +0400 (MSD)
Message-Id: <20070329130954.719C74054@hades.panopticon>
Date: Thu, 29 Mar 2007 17:09:54 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Reply-To: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] games/cavezofphear: update to 0.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify: tlp@liquidx.org

>Number:         111009
>Category:       ports
>Synopsis:       [PATCH] games/cavezofphear: update to 0.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 29 13:20:03 GMT 2007
>Closed-Date:    Thu Mar 29 16:03:44 GMT 2007
>Last-Modified:  Thu Mar 29 16:10:06 GMT 2007
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Update to 0.5
* Generally tidy up the port
* Mirror the distfile
>How-To-Repeat:
>Fix:

--- cavezofphear-0.5.patch begins here ---
diff -ruN cavezofphear.orig/Makefile cavezofphear/Makefile
--- cavezofphear.orig/Makefile	Thu Mar 29 17:07:22 2007
+++ cavezofphear/Makefile	Thu Mar 29 17:07:21 2007
@@ -6,63 +6,37 @@
 #
 
 PORTNAME=	cavezofphear
-PORTVERSION=	0.1
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	http://www.x86.no/cavezofphear/
+MASTER_SITES=	http://www.x86.no/cavezofphear/ \
+		http://www.amdmi3.ru/distfiles
 DISTNAME=	phear-${PORTVERSION}
 
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	Boulder Dash / Digger-like game written using ncurses
 
-WRKSRC=		${WRKDIR}/phear-${PORTVERSION}/src
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
-PLIST_DIRS=	share/${PORTNAME}/levels share/${PORTNAME}
+PORTDOCS=	ChangeLog README README-EDITOR TODO
 
-PLIST_FILES=	bin/phear bin/phear-editor \
-		share/${PORTNAME}/gover share/${PORTNAME}/htext \
-		share/${PORTNAME}/spgraf share/${PORTNAME}/tdesc \
-		share/${PORTNAME}/levels/01 share/${PORTNAME}/levels/02 \
-		share/${PORTNAME}/levels/03 share/${PORTNAME}/levels/04 \
-		share/${PORTNAME}/levels/05
-
-PORTDOCS=	AUTHORS ChangeLog README README-EDITOR TODO
-
-FIXME=		chk.c main.c splash.c
-
-pre-build:
-.for i in ${FIXME}
-	${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/${i}
-.endfor
-	@${REINPLACE_CMD} -e 's|usage: editor|usage: phear-editor|' \
-	${WRKSRC}/editor.c
-	@${REINPLACE_CMD} -e 's|./editor|phear-editor|' \
-	${WRKSRC}/../README-EDITOR
-	@${REINPLACE_CMD} -e 's|./phear|phear|' \
-	${WRKSRC}/../README-EDITOR
+post-patch:
+	@${REINPLACE_CMD} -e 's|\./data|${DATADIR}/data|' ${WRKSRC}/src/chk.c
+	@${REINPLACE_CMD} -e 's|\./phear|phear|' ${WRKSRC}/README-EDITOR
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/levels
-	${INSTALL_DATA} ${WRKSRC}/../data/gover ${DATADIR}/gover
-	${INSTALL_DATA} ${WRKSRC}/../data/htext ${DATADIR}/htext
-	${INSTALL_DATA} ${WRKSRC}/../data/spgraf ${DATADIR}/spgraf
-	${INSTALL_DATA} ${WRKSRC}/../data/tdesc ${DATADIR}/tdesc
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/01 ${DATADIR}/levels/01
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/02 ${DATADIR}/levels/02
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/03 ${DATADIR}/levels/03
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/04 ${DATADIR}/levels/04
-	${INSTALL_DATA} ${WRKSRC}/../data/levels/05 ${DATADIR}/levels/05
-	${INSTALL_PROGRAM} ${WRKSRC}/../phear ${PREFIX}/bin/phear
-	${INSTALL_PROGRAM} ${WRKSRC}/../editor ${PREFIX}/bin/phear-editor
+	${INSTALL_PROGRAM} ${WRKSRC}/phear ${PREFIX}/bin
+	@(cd ${WRKSRC}; ${COPYTREE_SHARE} data ${DATADIR})
+
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../AUTHORS ${DOCSDIR}/AUTHORS
-	${INSTALL_DATA} ${WRKSRC}/../ChangeLog ${DOCSDIR}/ChangeLog
-	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/../README-EDITOR ${DOCSDIR}/README-EDITOR
-	${INSTALL_DATA} ${WRKSRC}/../TODO ${DOCSDIR}/TODO
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff -ruN cavezofphear.orig/distinfo cavezofphear/distinfo
--- cavezofphear.orig/distinfo	Thu Mar 29 17:07:22 2007
+++ cavezofphear/distinfo	Thu Mar 29 17:07:21 2007
@@ -1,3 +1,3 @@
-MD5 (phear-0.1.tar.bz2) = 10875ba2d574e7e3cb293129876ee95d
-SHA256 (phear-0.1.tar.bz2) = 6512b894597bfa685b38b5b2cd8023af2441c08c81b38790eadd0148f36d621d
-SIZE (phear-0.1.tar.bz2) = 16858
+MD5 (phear-0.5.tar.bz2) = 232f6f34d2a5aede7af70eb6e3d8d49f
+SHA256 (phear-0.5.tar.bz2) = 1087c04347ff60d153ffceb91363a31643337ed71b4a40b68160392d32d68bb7
+SIZE (phear-0.5.tar.bz2) = 20502
diff -ruN cavezofphear.orig/files/patch-isready.c cavezofphear/files/patch-isready.c
--- cavezofphear.orig/files/patch-isready.c	Thu Mar 29 17:07:21 2007
+++ cavezofphear/files/patch-isready.c	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- isready.c.orig	Wed Nov  5 16:00:45 2003
-+++ isready.c	Tue Sep 20 23:43:45 2005
-@@ -1,6 +1,9 @@
- #include <stdio.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
- #include <sys/select.h>
- #include <sys/time.h>
-+#include <string.h>
- 
- int isready(int fd);
- 
diff -ruN cavezofphear.orig/pkg-plist cavezofphear/pkg-plist
--- cavezofphear.orig/pkg-plist	Thu Jan  1 03:00:00 1970
+++ cavezofphear/pkg-plist	Thu Mar 29 17:07:21 2007
@@ -0,0 +1,19 @@
+bin/phear
+%%DATADIR%%/data/gover
+%%DATADIR%%/data/htext
+%%DATADIR%%/data/levels/01
+%%DATADIR%%/data/levels/02
+%%DATADIR%%/data/levels/03
+%%DATADIR%%/data/levels/04
+%%DATADIR%%/data/levels/05
+%%DATADIR%%/data/levels/06
+%%DATADIR%%/data/levels/07
+%%DATADIR%%/data/levels/08
+%%DATADIR%%/data/levels/09
+%%DATADIR%%/data/levels/10
+%%DATADIR%%/data/levels/11
+%%DATADIR%%/data/spgraf
+%%DATADIR%%/data/tdesc
+@dirrm %%DATADIR%%/data/levels
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
--- cavezofphear-0.5.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Mar 29 13:20:12 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111009 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 29 13:22:24 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Travis Poppe <tlp@LiquidX.org>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/111009: [PATCH] games/cavezofphear: update to 0.5
Date: Thu, 29 Mar 2007 09:29:56 -0600

 On Thu, Mar 29, 2007 at 01:20:09PM +0000, Edwin Groothuis wrote:
 > Maintainer of games/cavezofphear,
 > 
 > Please note that PR ports/111009 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 
 This is fine.
 -- 
 Travis Poppe
 IRC: tlp @ irc.freenode.net
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Mar 29 16:03:40 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111009: commit references a PR
Date: Thu, 29 Mar 2007 16:03:08 +0000 (UTC)

 miwi        2007-03-29 16:02:59 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/cavezofphear   Makefile distinfo 
   Added files:
     games/cavezofphear   pkg-plist 
   Removed files:
     games/cavezofphear/files patch-isready.c 
   Log:
   - Update to 0.5
   
   PR:             111009
   Submitted by:   Dmitry Marakasov <amdmi3@amdmi3.ru>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.3       +16 -42    ports/games/cavezofphear/Makefile
   1.3       +3 -3      ports/games/cavezofphear/distinfo
   1.2       +0 -12     ports/games/cavezofphear/files/patch-isready.c (dead)
   1.1       +19 -0     ports/games/cavezofphear/pkg-plist (new)
 _______________________________________________
 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:
