From nobody@FreeBSD.org  Sun Jan 20 16:53:44 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 066AF16A417
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jan 2008 16:53:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 00A0D13C459
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jan 2008 16:53:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0KGqGTi038386
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 20 Jan 2008 16:52:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m0KGqGUq038385;
	Sun, 20 Jan 2008 16:52:16 GMT
	(envelope-from nobody)
Message-Id: <200801201652.m0KGqGUq038385@www.freebsd.org>
Date: Sun, 20 Jan 2008 16:52:16 GMT
From: Matthias Sund <m.sund@arcor.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [games/pokerth]: update to version 0.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: relaxbsd@gmail.com

>Number:         119829
>Category:       ports
>Synopsis:       games/pokerth: update to version 0.6
>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:   Sun Jan 20 17:00:05 UTC 2008
>Closed-Date:    Sat Feb 16 10:47:26 UTC 2008
>Last-Modified:  Sat Feb 16 10:50:00 UTC 2008
>Originator:     Matthias Sund
>Release:        FreeBSD 7
>Organization:
>Environment:
FreeBSD travelmate 7.0-BETA4 FreeBSD 7.0-BETA4 #6: Mon Dec 17 13:19:45 CET 2007     masu@travelmate:/usr/obj/usr/src/sys/TRAVELMATE  i386
>Description:
- update to version 0.6 (GUI changes and better networking support)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN pokerth.orig/Makefile pokerth/Makefile
--- pokerth.orig/Makefile	2008-01-20 16:16:49.000000000 +0100
+++ pokerth/Makefile	2008-01-20 16:12:49.000000000 +0100
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	pokerth
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.6
+#PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	PokerTH-${PORTVERSION}-src
+DISTNAME=	PokerTH-${PORTVERSION}-1.src
 
 MAINTAINER=	relaxbsd@gmail.com
 COMMENT=	A poker game written in C++/QT4
@@ -21,6 +21,7 @@
 
 MANUAL_PACKAGE_BUILD=	requires large memory to build
 
+USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
@@ -29,10 +30,14 @@
 
 WRKSRC=		${WRKDIR}/PokerTH-${PORTVERSION}
 
-PLIST_FILES=	bin/pokerth share/pixmaps/pokerth.png
+PLIST_FILES=	bin/pokerth %%DATADIR%%/pokerth share/pixmaps/pokerth.png
 
 PORTDOCS=	COPYING ChangeLog INSTALL TODO
 
+PORTDATA=	data
+
+MAN1=		pokerth.1
+
 DESKTOP_ENTRIES=	"PokerTH" \
 			"A poker game written in C++/Qt 4" \
 			"pokerth.png" \
@@ -43,16 +48,23 @@
 MAKE_ENV+=	QTDIR="${QT_PREFIX}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}|g' \
-		-e 's|boost_thread-mt|boost_thread|g' \
-		${WRKSRC}/pokerth.pro
+	@${REINPLACE_CMD} -E \
+		-e 's|/usr/([a-z|/]+)|${LOCALBASE}/\1|g' \
+		-e 's|(-lcrypto)|\1 -liconv|g' \
+		-e 's:boost_([a-z]+)-[-|a-z|0-9|_]*:boost_\1:g' \
+		${WRKSRC}/*.pro
 
 do-configure:
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -unix pokerth.pro
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/pokerth ${PREFIX}/bin/pokerth
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/pokerth ${DATADIR}/pokerth
+	@${CP} -R ${WRKSRC}/${PORTDATA} ${DATADIR}
+	@${ECHO_CMD} "exec ${DATADIR}/pokerth" > ${WRKSRC}/pokerth.sh
+	@${INSTALL_SCRIPT} ${WRKSRC}/pokerth.sh ${PREFIX}/bin/pokerth
 	@${INSTALL_DATA} ${WRKSRC}/pokerth.png ${PREFIX}/share/pixmaps/pokerth.png
+	@${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MANPREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
diff -ruN pokerth.orig/distinfo pokerth/distinfo
--- pokerth.orig/distinfo	2008-01-20 16:16:49.000000000 +0100
+++ pokerth/distinfo	2008-01-19 20:55:30.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (PokerTH-0.5-src.tar.bz2) = 1009e927b5d26b4eeb89d00cd4b624f7
-SHA256 (PokerTH-0.5-src.tar.bz2) = a521aa9f4e47741c132ce5023b07e594ee267d1b3d99fa9b5e0d78b39502239d
-SIZE (PokerTH-0.5-src.tar.bz2) = 4123606
+MD5 (PokerTH-0.6-1.src.tar.bz2) = a30a19487319a61e033dd7be94b29e7d
+SHA256 (PokerTH-0.6-1.src.tar.bz2) = e2f8f84887d59de507425ad9e98c43d9e3f0f60c255e111b35cdeb9845a39086
+SIZE (PokerTH-0.6-1.src.tar.bz2) = 4276017
diff -ruN pokerth.orig/files/patch-src-core-linux-convhelper.cpp pokerth/files/patch-src-core-linux-convhelper.cpp
--- pokerth.orig/files/patch-src-core-linux-convhelper.cpp	1970-01-01 01:00:00.000000000 +0100
+++ pokerth/files/patch-src-core-linux-convhelper.cpp	2008-01-20 13:34:46.000000000 +0100
@@ -0,0 +1,20 @@
+--- src/core/linux/convhelper.cpp.orig	2008-01-20 13:32:07.000000000 +0100
++++ src/core/linux/convhelper.cpp	2008-01-20 12:56:03.000000000 +0100
+@@ -39,7 +39,7 @@
+ #ifdef __APPLE__
+ 	const char *inbuf = inStr.data();
+ #else
+-	char *inbuf = const_cast<char *>(inStr.data());
++	const char *inbuf = const_cast<char *>(inStr.data());
+ #endif
+ 
+ 	const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
+@@ -74,7 +74,7 @@
+ #ifdef __APPLE__
+ 	const char *inbuf = inStr.data();
+ #else
+-	char *inbuf = const_cast<char *>(inStr.data());
++	const char *inbuf = const_cast<char *>(inStr.data());
+ #endif
+ 
+ 	const size_t c_outsize = insize;


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jan 20 17:00:11 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119829 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Feb 16 10:47:25 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/119829: commit references a PR
Date: Sat, 16 Feb 2008 10:47:22 +0000 (UTC)

 miwi        2008-02-16 10:47:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/pokerth        Makefile distinfo 
   Added files:
     games/pokerth/files  patch-src-core-linux-convhelper.cpp 
   Log:
   - Update to 0.6
   
   PR:             119829
   Submitted by:   Matthias Sund <m.sund@arcor.de>
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.4       +20 -10    ports/games/pokerth/Makefile
   1.2       +3 -3      ports/games/pokerth/distinfo
   1.1       +20 -0     ports/games/pokerth/files/patch-src-core-linux-convhelper.cpp (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:
