From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 2 18:10:04 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9BA71237 for ; Sun, 2 Jun 2013 18:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 844351215 for ; Sun, 2 Jun 2013 18:10:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r52IA4jO099521 for ; Sun, 2 Jun 2013 18:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r52IA4AS099520; Sun, 2 Jun 2013 18:10:04 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jun 2013 18:10:04 GMT Resent-Message-Id: <201306021810.r52IA4AS099520@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2F832F62 for ; Sun, 2 Jun 2013 18:00:53 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id B4FF011BA for ; Sun, 2 Jun 2013 18:00:52 +0000 (UTC) Received: from localhost.localdomain (ZT029100.ppp.dion.ne.jp [59.128.29.100]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id 7730423C031 for ; Mon, 3 Jun 2013 03:00:42 +0900 (JST) Message-Id: <20130603025051.7308e0cb8edc7da8b3a0a371@yahoo.com> Date: Mon, 3 Jun 2013 02:50:51 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179220: games/qgo: Update to version 2.s764 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 18:10:04 -0000 >Number: 179220 >Category: ports >Synopsis: games/qgo: Update to version 2.s764 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 02 18:10:04 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.s764 New file: files/patch-src__listviews.cpp files/patch-src__mainwindow_settings.cpp Remove file: files/patch-src::wavfile.c files/patch-src::wavplay.c files/patch-src__mainwin.cpp files/patch-src__parser.cpp pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/qgo/Makefile games/qgo/Makefile --- /usr/ports/games/qgo/Makefile 2012-12-30 22:12:05.000000000 +0900 +++ games/qgo/Makefile 2013-06-03 00:00:00.000000000 +0900 @@ -1,35 +1,42 @@ -# ex:ts=8 -# Ports collection makefile for: qgo -# Date created: Mar 22, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD: head/games/qgo/Makefile 309662 2012-12-30 12:03:51Z beat $ -# PORTNAME= qgo -PORTVERSION= 1.5.4.3 -PORTREVISION= 3 +PORTVERSION= 2.s764 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E} +MASTER_SITES= DEBIAN +DISTNAME= ${PORTNAME}_2~svn764.orig MAINTAINER= ports@FreeBSD.org -COMMENT= A Go board and SGF editor written with the Qt library +COMMENT= Go board and SGF editor written with the Qt library -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} +WRKSRC= ${WRKDIR}/${PORTNAME} -DEPRECATED= Depends on QT3; unmaintained -EXPIRATION_DATE= 2013-07-01 +USE_BZIP2= yes +USES= desktop-file-utils +USE_QT4= gui network qtestlib moc_build qmake_build rcc_build uic_build +MAKE_JOBS_SAFE= yes -USE_XORG= x11 ice xext -USE_QT_VER= 3 -USE_GMAKE= yes -GNU_CONFIGURE= yes +PLIST_FILES= bin/qgo share/applications/qgo.desktop share/pixmaps/qgo.png +PLIST_DIRSTRY= share/applications post-patch: - @${REINPLACE_CMD} -e '/NOOPT/s|^CXXFLAGS=|#CXXFLAGS=|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ - 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/templates/*.desktop + '/Icon/s|=.*|=${PREFIX}/share/pixmaps/qgo.png| ; \ + /^MimeType/s|=.*|=text/sgf|' ${WRKSRC}/src/qgo.desktop + @${REINPLACE_CMD} -e \ + 's|debug|release|' ${WRKSRC}/src/src.pro + @${REINPLACE_CMD} -e \ + 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/mainwindow_settings.cpp + +do-configure: + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}) + +do-install: + (cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} qgo ${PREFIX}/bin) + @${MKDIR} ${DESKTOPDIR} + (cd ${WRKSRC}/src && ${INSTALL_DATA} qgo.desktop ${DESKTOPDIR}) + (cd ${WRKSRC}/src/ressources/pics && ${INSTALL_DATA} qgo.png \ + ${PREFIX}/share/pixmaps) .include diff -urN /usr/ports/games/qgo/distinfo games/qgo/distinfo --- /usr/ports/games/qgo/distinfo 2012-11-08 07:32:52.000000000 +0900 +++ games/qgo/distinfo 2013-06-03 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (qgo-1.5.4-r3.tar.gz) = ddfb66ada7027b844838895061f266bda03b327e8dfec2ee2782e14748bac104 -SIZE (qgo-1.5.4-r3.tar.gz) = 2490737 +SHA256 (qgo_2~svn764.orig.tar.bz2) = 07620bf2d08def7630aab69338ce345451d36e1c19acde649ec44be500102205 +SIZE (qgo_2~svn764.orig.tar.bz2) = 2491726 diff -urN /usr/ports/games/qgo/files/patch-src::wavfile.c games/qgo/files/patch-src::wavfile.c --- /usr/ports/games/qgo/files/patch-src::wavfile.c 2012-11-08 07:32:52.000000000 +0900 +++ games/qgo/files/patch-src::wavfile.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,34 +0,0 @@ ---- src/wavfile.c.orig Sun Oct 31 08:36:45 2004 -+++ src/wavfile.c Thu Dec 16 01:18:54 2004 -@@ -41,7 +41,7 @@ - * wavplay project. - */ - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - - static const char rcsid[] = "@(#)wavfile.c $Revision: 1.6 $"; - -@@ -52,7 +52,9 @@ - #include - #include - #include -+#if defined(__linux__) - #include -+#endif - #include - #include - #include -@@ -60,7 +62,12 @@ - #include - #include - #include -+#if defined(__linux__) - #include -+#endif -+#if defined(__FreeBSD__) -+#include -+#endif - - - diff -urN /usr/ports/games/qgo/files/patch-src::wavplay.c games/qgo/files/patch-src::wavplay.c --- /usr/ports/games/qgo/files/patch-src::wavplay.c 2012-11-08 07:32:52.000000000 +0900 +++ games/qgo/files/patch-src::wavplay.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,30 +0,0 @@ ---- src/wavplay.c.orig Sun Oct 31 08:35:00 2004 -+++ src/wavplay.c Tue Dec 14 19:32:31 2004 -@@ -54,19 +54,26 @@ - * - */ - --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - - static const char rcsid[] = "@(#)recplay.c $Revision: 1.8 $"; - - #include - #include - #include -+#if defined(__linux__) - #include -+#endif - #include - #include - #include - #include -+#if defined(__linux__) - #include -+#endif -+#if defined(__FreeBSD__) -+#include -+#endif - #include "wavplay.h" - /*/#include "server.h"*/ - diff -urN /usr/ports/games/qgo/files/patch-src__listviews.cpp games/qgo/files/patch-src__listviews.cpp --- /usr/ports/games/qgo/files/patch-src__listviews.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/qgo/files/patch-src__listviews.cpp 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- src/listviews.cpp.orig ++++ src/listviews.cpp +@@ -342,7 +342,7 @@ + { + for(int i = 0; i < items.count(); i++) + { +- GamesListItem * const item = static_cast(items[i]); ++ const GamesListItem * item = static_cast(items[i]); + if(item->getListing() == l) + { + /* Really this is supposed to be not QModelIndex() but the diff -urN /usr/ports/games/qgo/files/patch-src__mainwin.cpp games/qgo/files/patch-src__mainwin.cpp --- /usr/ports/games/qgo/files/patch-src__mainwin.cpp 2012-11-08 07:32:52.000000000 +0900 +++ games/qgo/files/patch-src__mainwin.cpp 1970-01-01 09:00:00.000000000 +0900 @@ -1,16 +0,0 @@ ---- src/mainwin.cpp.orig Mon Mar 27 06:37:41 2006 -+++ src/mainwin.cpp Wed Apr 12 13:36:58 2006 -@@ -1589,11 +1589,11 @@ - //set the params of "who command" - if ((whoBox1->currentItem() >1) || (whoBox2->currentItem() >1)) - { -- wparam.append(whoBox1->currentItem()==1 ? "9p" : whoBox1->currentText()); -+ wparam.append(whoBox1->currentItem()==1 ? QString("9p") : whoBox1->currentText()); - if ((whoBox1->currentItem()) && (whoBox2->currentItem())) - wparam.append("-"); - -- wparam.append(whoBox2->currentItem()==1 ? "9p" : whoBox2->currentText()); -+ wparam.append(whoBox2->currentItem()==1 ? QString("9p") : whoBox2->currentText()); - } - else if ((whoBox1->currentItem()) || (whoBox2->currentItem())) - wparam.append("1p-9p"); diff -urN /usr/ports/games/qgo/files/patch-src__mainwindow_settings.cpp games/qgo/files/patch-src__mainwindow_settings.cpp --- /usr/ports/games/qgo/files/patch-src__mainwindow_settings.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/qgo/files/patch-src__mainwindow_settings.cpp 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,17 @@ +--- src/mainwindow_settings.cpp.orig ++++ src/mainwindow_settings.cpp +@@ -269,7 +269,13 @@ + QVariant var; + + ui.comboBox_language->setCurrentIndex (settings.value("LANGUAGE").toInt()); +- ui.LineEdit_computer->setText(settings.value("COMPUTER_PATH").toString()); ++ QString computer_path = settings.value("COMPUTER_PATH").toString(); ++ qDebug() << "COMPUTER_PATH" << computer_path; ++ if (computer_path == "") { ++ computer_path = "%%LOCALBASE%%/bin/gnugo"; ++ settings.setValue("COMPUTER_PATH", computer_path); ++ } ++ ui.LineEdit_computer->setText(computer_path); + if(settings.value("COMPUTER_PLAYS_WHITE").toBool()) + ui.computerPlaysWhite->setChecked(TRUE); + else diff -urN /usr/ports/games/qgo/files/patch-src__parser.cpp games/qgo/files/patch-src__parser.cpp --- /usr/ports/games/qgo/files/patch-src__parser.cpp 2012-11-08 07:32:52.000000000 +0900 +++ games/qgo/files/patch-src__parser.cpp 1970-01-01 09:00:00.000000000 +0900 @@ -1,18 +0,0 @@ ---- src/parser.cpp.orig Tue Dec 27 17:49:01 2005 -+++ src/parser.cpp Wed Jan 18 03:20:10 2006 -@@ -1176,13 +1176,13 @@ - { - aGameInfo->wname = element(line, 1, ":","("); - aGameInfo->wtime = (time1.toInt()==0 ? time2 : time1); -- aGameInfo->wstones = (time1.toInt()==0 ?stones: "-1") ; -+ aGameInfo->wstones = (time1.toInt()==0 ? stones : QString("-1")) ; - } - else if (line.contains("(B)")) - { - aGameInfo->bname = element(line, 1, ":","("); - aGameInfo->btime = (time1.toInt()==0 ? time2 : time1); -- aGameInfo->bstones = (time1.toInt()==0 ? stones:"-1") ; -+ aGameInfo->bstones = (time1.toInt()==0 ? stones : QString("-1")) ; - } - else //never know with IGS ... - return IT_OTHER; diff -urN /usr/ports/games/qgo/pkg-plist games/qgo/pkg-plist --- /usr/ports/games/qgo/pkg-plist 2012-11-08 07:32:53.000000000 +0900 +++ games/qgo/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,47 +0,0 @@ -bin/qgo -share/applnk/Games/qgo.desktop -share/mimelnk/text/sgf.desktop -share/qGo/pics/Bowl.png -share/qGo/pics/barcelona_cherry.jpg -share/qGo/pics/birch.jpg -share/qGo/pics/eurobeech.jpg -share/qGo/pics/goldenbeech.jpg -share/qGo/pics/kaya.png -share/qGo/pics/lemontree.jpg -share/qGo/pics/manitoba.jpg -share/qGo/pics/maple.jpg -share/qGo/pics/plain.png -share/qGo/pics/synthetic_1.png -share/qGo/pics/synthetic_2.png -share/qGo/sounds/click.wav -share/qGo/sounds/connect.wav -share/qGo/sounds/enter.wav -share/qGo/sounds/gameend.wav -share/qGo/sounds/leave.wav -share/qGo/sounds/match.wav -share/qGo/sounds/pass.wav -share/qGo/sounds/say.wav -share/qGo/sounds/stone.wav -share/qGo/sounds/talk.wav -share/qGo/sounds/tictoc.wav -share/qGo/translations/qgo_cz.qm -share/qGo/translations/qgo_de.qm -share/qGo/translations/qgo_dk.qm -share/qGo/translations/qgo_fr.qm -share/qGo/translations/qgo_it.qm -share/qGo/translations/qgo_la.qm -share/qGo/translations/qgo_nl.qm -share/qGo/translations/qgo_pl.qm -share/qGo/translations/qgo_pt.qm -share/qGo/translations/qgo_ru.qm -share/qGo/translations/qgo_tr.qm -share/qGo/translations/qgo_zh.qm -share/qGo/translations/qgo_zh_cn.qm -@dirrm share/qGo/translations -@dirrm share/qGo/sounds -@dirrm share/qGo/pics -@dirrm share/qGo -@dirrmtry share/mimelnk/text -@dirrmtry share/mimelnk -@dirrmtry share/applnk/Games -@dirrmtry share/applnk >Release-Note: >Audit-Trail: >Unformatted: