From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 21 12:10:06 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88F231065679 for ; Sat, 21 Jun 2008 12:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 614338FC16 for ; Sat, 21 Jun 2008 12:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5LCA62R044061 for ; Sat, 21 Jun 2008 12:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5LCA6UU044060; Sat, 21 Jun 2008 12:10:06 GMT (envelope-from gnats) Resent-Date: Sat, 21 Jun 2008 12:10:06 GMT Resent-Message-Id: <200806211210.m5LCA6UU044060@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, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E18591065931 for ; Sat, 21 Jun 2008 12:00:29 +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 CB1178FC12 for ; Sat, 21 Jun 2008 12:00:29 +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 m5LC0TkJ088687 for ; Sat, 21 Jun 2008 12:00:29 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m5LC0T1Z088686; Sat, 21 Jun 2008 12:00:29 GMT (envelope-from nobody) Message-Id: <200806211200.m5LC0T1Z088686@www.freebsd.org> Date: Sat, 21 Jun 2008 12:00:29 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/124821: games/quackle - use QT_COMPONENTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 12:10:06 -0000 >Number: 124821 >Category: ports >Synopsis: games/quackle - use QT_COMPONENTS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jun 21 12:10:06 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Sun Jun 8 18:13:48 MSD 2008 root@luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA i386 >Description: 1) use QT_COMPONENTS 2) install data to ${DATADIR} (adjust pkg-plist in accordance) 3) use COPYTREE_SHARE macro 4) other minor changes tested with tinderbox >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN --exclude=CVS /usr/ports/games/quackle/Makefile /home/makc/porting/ports/games/quackle/Makefile --- /usr/ports/games/quackle/Makefile 2008-06-06 17:31:42.000000000 +0400 +++ /home/makc/porting/ports/games/quackle/Makefile 2008-06-21 14:20:20.000000000 +0400 @@ -7,7 +7,7 @@ PORTNAME= quackle PORTVERSION= 0.95 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://web.mit.edu/jasonkb/www/quackle/downloads/${PORTNAME}-${PORTVERSION}/ DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tar.gz @@ -17,19 +17,19 @@ USE_SCONS= yes USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build gui USE_GMAKE= yes +QMAKE_ARGS= -unix -spec ${QMAKESPEC} pre-patch: - @${REINPLACE_CMD} -e 's|if (QFile::exists("data"))|if (QFile::exists("${PREFIX}/lib/quackle"))|' ${WRKSRC}/quacker/settings.cpp - @${REINPLACE_CMD} -e 's|QUACKLE_DATAMANAGER->setDataDirectory("data");|QUACKLE_DATAMANAGER->setDataDirectory("${PREFIX}/lib/quackle");|' ${WRKSRC}/quacker/settings.cpp + @${REINPLACE_CMD} -e 's|if (QFile::exists("data"))|if (QFile::exists("${DATADIR}"))|' ${WRKSRC}/quacker/settings.cpp + @${REINPLACE_CMD} -e 's|QUACKLE_DATAMANAGER->setDataDirectory("data");|QUACKLE_DATAMANAGER->setDataDirectory("${DATADIR}");|' ${WRKSRC}/quacker/settings.cpp post-build: - @(cd ${WRKSRC}/quackleio && qmake-qt4 -unix -spec freebsd-g++ -o Makefile quackleio.pro && ${GMAKE} && cd ${WRKSRC}/quacker && qmake-qt4 -unix -spec freebsd-g++ -o Makefile quacker.pro && ${GMAKE}) + @(cd ${WRKSRC}/quackleio && ${QMAKE} ${QMAKE_ARGS} -o Makefile quackleio.pro && ${SETENV} ${MAKE_ENV} ${GMAKE} && cd ${WRKSRC}/quacker && ${QMAKE} ${QMAKE_ARGS} -o Makefile quacker.pro && ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: - @(${MKDIR} -m 555 ${PREFIX}/lib/quackle; cd ${WRKSRC}/data && ${PAX} -rw ./ ${PREFIX}/lib/quackle) - @${FIND} ${PREFIX}/lib/quackle -type directory -exec ${CHMOD} 555 {} \; - @${FIND} ${PREFIX}/lib/quackle -type file -exec ${CHMOD} 444 {} \; - @${INSTALL} -m 0555 ${WRKSRC}/quacker/quacker ${PREFIX}/bin/quackle + @${INSTALL_PROGRAM} ${WRKSRC}/quacker/quacker ${PREFIX}/bin/quackle + @(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}) .include diff -ruN --exclude=CVS /usr/ports/games/quackle/pkg-plist /home/makc/porting/ports/games/quackle/pkg-plist --- /usr/ports/games/quackle/pkg-plist 2008-04-25 21:22:38.000000000 +0400 +++ /home/makc/porting/ports/games/quackle/pkg-plist 2008-06-21 13:55:48.000000000 +0400 @@ -1,47 +1,47 @@ bin/quackle -lib/quackle/alphabets/english.quackle_alphabet -lib/quackle/alphabets/english_super.quackle_alphabet -lib/quackle/alphabets/english_wild.quackle_alphabet -lib/quackle/alphabets/french.quackle_alphabet -lib/quackle/alphabets/korean.quackle_alphabet -lib/quackle/alphabets/russian.quackle_alphabet -lib/quackle/alphabets/tuvan.quackle_alphabet -lib/quackle/lexica/cswfeb07.gaddag -lib/quackle/lexica/korean.dawg -lib/quackle/lexica/ods4.gaddag -lib/quackle/lexica/russian.dawg -lib/quackle/lexica/sowpods.gaddag -lib/quackle/lexica/tuvan.dawg -lib/quackle/lexica/twl06.gaddag -lib/quackle/lexica/twl06_wild.dawg -lib/quackle/lexica/twl98.dawg -lib/quackle/strategy/cswfeb07/superleaves -lib/quackle/strategy/korean/superleaves -lib/quackle/strategy/korean/syn2 -lib/quackle/strategy/korean/worths -lib/quackle/strategy/ods4/superleaves -lib/quackle/strategy/ods4/worths -lib/quackle/strategy/russian/superleaves -lib/quackle/strategy/russian/syn2 -lib/quackle/strategy/russian/worths -lib/quackle/strategy/tuvan/superleaves -lib/quackle/strategy/tuvan/syn2 -lib/quackle/strategy/tuvan/worths -lib/quackle/strategy/twl06/bogowin -lib/quackle/strategy/twl06/superleaves -lib/quackle/strategy/twl06/syn2 -lib/quackle/strategy/twl06/vcplace -lib/quackle/strategy/twl06/worths -lib/quackle/strategy/twl98/worths -@dirrm lib/quackle/alphabets -@dirrm lib/quackle/lexica -@dirrm lib/quackle/strategy/cswfeb07/ -@dirrm lib/quackle/strategy/korean/ -@dirrm lib/quackle/strategy/ods4/ -@dirrm lib/quackle/strategy/russian/ -@dirrm lib/quackle/strategy/sowpods/ -@dirrm lib/quackle/strategy/tuvan/ -@dirrm lib/quackle/strategy/twl06/ -@dirrm lib/quackle/strategy/twl98/ -@dirrm lib/quackle/strategy/ -@dirrm lib/quackle +%%DATADIR%%/alphabets/english.quackle_alphabet +%%DATADIR%%/alphabets/english_super.quackle_alphabet +%%DATADIR%%/alphabets/english_wild.quackle_alphabet +%%DATADIR%%/alphabets/french.quackle_alphabet +%%DATADIR%%/alphabets/korean.quackle_alphabet +%%DATADIR%%/alphabets/russian.quackle_alphabet +%%DATADIR%%/alphabets/tuvan.quackle_alphabet +%%DATADIR%%/lexica/cswfeb07.gaddag +%%DATADIR%%/lexica/korean.dawg +%%DATADIR%%/lexica/ods4.gaddag +%%DATADIR%%/lexica/russian.dawg +%%DATADIR%%/lexica/sowpods.gaddag +%%DATADIR%%/lexica/tuvan.dawg +%%DATADIR%%/lexica/twl06.gaddag +%%DATADIR%%/lexica/twl06_wild.dawg +%%DATADIR%%/lexica/twl98.dawg +%%DATADIR%%/strategy/cswfeb07/superleaves +%%DATADIR%%/strategy/korean/superleaves +%%DATADIR%%/strategy/korean/syn2 +%%DATADIR%%/strategy/korean/worths +%%DATADIR%%/strategy/ods4/superleaves +%%DATADIR%%/strategy/ods4/worths +%%DATADIR%%/strategy/russian/superleaves +%%DATADIR%%/strategy/russian/syn2 +%%DATADIR%%/strategy/russian/worths +%%DATADIR%%/strategy/tuvan/superleaves +%%DATADIR%%/strategy/tuvan/syn2 +%%DATADIR%%/strategy/tuvan/worths +%%DATADIR%%/strategy/twl06/bogowin +%%DATADIR%%/strategy/twl06/superleaves +%%DATADIR%%/strategy/twl06/syn2 +%%DATADIR%%/strategy/twl06/vcplace +%%DATADIR%%/strategy/twl06/worths +%%DATADIR%%/strategy/twl98/worths +@dirrm %%DATADIR%%/alphabets +@dirrm %%DATADIR%%/lexica +@dirrm %%DATADIR%%/strategy/cswfeb07/ +@dirrm %%DATADIR%%/strategy/korean/ +@dirrm %%DATADIR%%/strategy/ods4/ +@dirrm %%DATADIR%%/strategy/russian/ +@dirrm %%DATADIR%%/strategy/sowpods/ +@dirrm %%DATADIR%%/strategy/tuvan/ +@dirrm %%DATADIR%%/strategy/twl06/ +@dirrm %%DATADIR%%/strategy/twl98/ +@dirrm %%DATADIR%%/strategy/ +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: