From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 2 13:00:12 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF99F16A5B9 for ; Fri, 2 Mar 2007 13:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 8809A13C461 for ; Fri, 2 Mar 2007 13:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l22D0C5K034089 for ; Fri, 2 Mar 2007 13:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l22D0CHP034088; Fri, 2 Mar 2007 13:00:12 GMT (envelope-from gnats) Resent-Date: Fri, 2 Mar 2007 13:00:12 GMT Resent-Message-Id: <200703021300.l22D0CHP034088@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, Marcus von Appen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2212616A4D5 for ; Fri, 2 Mar 2007 12:54:43 +0000 (UTC) (envelope-from mail@sysfault.org) Received: from smtprelay08.ispgateway.de (smtprelay08.ispgateway.de [80.67.29.8]) by mx1.freebsd.org (Postfix) with ESMTP id 6C2F713C481 for ; Fri, 2 Mar 2007 12:54:42 +0000 (UTC) (envelope-from mail@sysfault.org) Received: (qmail 25292 invoked from network); 2 Mar 2007 12:54:40 -0000 Received: from unknown (HELO medusa.sysfault.org) (936934@[81.14.191.220]) (envelope-sender ) by smtprelay08.ispgateway.de (qmail-ldap-1.03) with AES256-SHA encrypted SMTP for ; 2 Mar 2007 12:54:40 -0000 Received: from localhost ([127.0.0.1] helo=medusa.sysfault.org) by medusa.sysfault.org with esmtp (Exim 4.66 (FreeBSD)) (envelope-from ) id 1HN7HS-000Aue-Ih for FreeBSD-gnats-submit@freebsd.org; Fri, 02 Mar 2007 13:54:39 +0100 Received: (from marcus@localhost) by medusa.sysfault.org (8.13.1/8.13.1/Submit) id l22CsbvD041951; Fri, 2 Mar 2007 13:54:37 +0100 (CET) (envelope-from marcus) Message-Id: <200703021254.l22CsbvD041951@medusa.sysfault.org> Date: Fri, 2 Mar 2007 13:54:37 +0100 (CET) From: Marcus von Appen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109752: [Maintainer-update]: games/tmw version update to 0.0.22.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus von Appen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Mar 2007 13:00:12 -0000 >Number: 109752 >Category: ports >Synopsis: [Maintainer-update]: games/tmw version update to 0.0.22.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Mar 02 13:00:11 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Marcus von Appen >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD medusa.sysfault.org 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 14 17:09:03 CET 2007 root@medusa.sysfault.org:/usr/obj/usr/src/sys/MEDUSA i386 >Description: The ManaWorld version update to 0.0.22.2 and music addon patch. Note to commiter: The files/patch-shoplistbox.cpp patch can be removed (as well as the complete files/ directory). >How-To-Repeat: >Fix: diff -Nur tmw/Makefile tmw.new/Makefile --- tmw/Makefile Sat Feb 3 10:49:33 2007 +++ tmw.new/Makefile Fri Mar 2 13:35:42 2007 @@ -6,10 +6,11 @@ # PORTNAME= tmw -PORTVERSION= 0.0.22.1 +PORTVERSION= 0.0.22.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= themanaworld +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= mva@sysfault.org COMMENT= A free open source 2D MMORPG in development @@ -31,9 +32,28 @@ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +OPTIONS= MUSIC "Install additional music" On + .include +.if !defined(WITHOUT_MUSIC) +MUSICNAME= tmwmusic-0.0.20 +MUSICSUBDIR= data/music +DISTFILES+= ${MUSICNAME}.tar.gz +MUSICDIR= ${WRKDIR}/${MUSICNAME}/${MUSICSUBDIR} +PLIST_SUB+= MUSICADDON="" +.else +PLIST_SUB+= MUSICADDON="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + +post-install: +.if !defined(WITHOUT_MUSIC) + ${MKDIR} ${DATADIR}/data/music + ${FIND} -E ${MUSICDIR} -type f -iregex ".*\.ogg" \ + -exec ${INSTALL_DATA} "{}" "${DATADIR}/${MUSICSUBDIR}" \; +.endif .include diff -Nur tmw/distinfo tmw.new/distinfo --- tmw/distinfo Sat Feb 3 10:49:33 2007 +++ tmw.new/distinfo Fri Mar 2 13:13:01 2007 @@ -1,3 +1,6 @@ -MD5 (tmw-0.0.22.1.tar.gz) = 0ebcd26b40eddd1e5acf4b59009a604b -SHA256 (tmw-0.0.22.1.tar.gz) = ecf1f85738187dfb191572af0978467bf7d1f311fcec9eb4b0b98fee740d3604 -SIZE (tmw-0.0.22.1.tar.gz) = 3563351 +MD5 (tmw-0.0.22.2.tar.gz) = c799a59487284b6812aae42c431b7103 +SHA256 (tmw-0.0.22.2.tar.gz) = c427e3cb9caa03a3f371e89df162846903b1ca0a946e251f7465aac92b71375e +SIZE (tmw-0.0.22.2.tar.gz) = 3043675 +MD5 (tmwmusic-0.0.20.tar.gz) = eec5e7d6c8ddb8938209815dbf5da812 +SHA256 (tmwmusic-0.0.20.tar.gz) = 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939 +SIZE (tmwmusic-0.0.20.tar.gz) = 9259802 diff -Nur tmw/files/patch-shoplistbox.cpp tmw.new/files/patch-shoplistbox.cpp --- tmw/files/patch-shoplistbox.cpp Sat Feb 3 10:49:33 2007 +++ tmw.new/files/patch-shoplistbox.cpp Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- src/gui/shoplistbox.cpp Fri Jan 26 14:07:54 2007 -+++ src/gui/shoplistbox.cpp Fri Jan 26 14:03:21 2007 -@@ -112,7 +112,7 @@ - mSelected = std::min(mListModel->getNumberOfElements() - 1, - std::max(-1, selected)); - -- gcn::BasicContainer *parent = getParent(); -+ gcn::Widget *parent = getParent(); - if (parent) - { - gcn::Rectangle scroll; - diff -Nur tmw/pkg-plist tmw.new/pkg-plist --- tmw/pkg-plist Sat Feb 3 10:49:33 2007 +++ tmw.new/pkg-plist Fri Mar 2 13:38:49 2007 @@ -48,91 +48,6 @@ %%DATADIR%%/data/graphics/images/ambient/night.png %%DATADIR%%/data/graphics/images/ambient/sandstorm.png %%DATADIR%%/data/graphics/images/ambient/spotlight.png -%%DATADIR%%/data/graphics/sprites/chest-cotton-male.xml -%%DATADIR%%/data/graphics/sprites/chest-cotton-male.png -%%DATADIR%%/data/graphics/sprites/chest-cotton-female.xml -%%DATADIR%%/data/graphics/sprites/chest-cotton-female.png -%%DATADIR%%/data/graphics/sprites/chest-leather-male.png -%%DATADIR%%/data/graphics/sprites/chest-leather-male.xml -%%DATADIR%%/data/graphics/sprites/chest-leather-female.png -%%DATADIR%%/data/graphics/sprites/chest-leather-female.xml -%%DATADIR%%/data/graphics/sprites/chest-tnecksweater-male.png -%%DATADIR%%/data/graphics/sprites/chest-tnecksweater-male.xml -%%DATADIR%%/data/graphics/sprites/chest-tnecksweater-female.png -%%DATADIR%%/data/graphics/sprites/chest-tnecksweater-female.xml -%%DATADIR%%/data/graphics/sprites/chest-vnecksweater-male.png -%%DATADIR%%/data/graphics/sprites/chest-vnecksweater-male.xml -%%DATADIR%%/data/graphics/sprites/chest-vnecksweater-female.png -%%DATADIR%%/data/graphics/sprites/chest-vnecksweater-female.xml -%%DATADIR%%/data/graphics/sprites/emotions.png -%%DATADIR%%/data/graphics/sprites/error.xml -%%DATADIR%%/data/graphics/sprites/hairstyle1.png -%%DATADIR%%/data/graphics/sprites/hairstyle1.xml -%%DATADIR%%/data/graphics/sprites/hairstyle2.png -%%DATADIR%%/data/graphics/sprites/hairstyle2.xml -%%DATADIR%%/data/graphics/sprites/hairstyle3.png -%%DATADIR%%/data/graphics/sprites/hairstyle3.xml -%%DATADIR%%/data/graphics/sprites/hairstyle4.png -%%DATADIR%%/data/graphics/sprites/hairstyle4.xml -%%DATADIR%%/data/graphics/sprites/hairstyle5.png -%%DATADIR%%/data/graphics/sprites/hairstyle5.xml -%%DATADIR%%/data/graphics/sprites/hairstyle6.png -%%DATADIR%%/data/graphics/sprites/hairstyle6.xml -%%DATADIR%%/data/graphics/sprites/hairstyle7.png -%%DATADIR%%/data/graphics/sprites/hairstyle7.xml -%%DATADIR%%/data/graphics/sprites/head-antlerhat.png -%%DATADIR%%/data/graphics/sprites/head-antlerhat.xml -%%DATADIR%%/data/graphics/sprites/head-christmastree.xml -%%DATADIR%%/data/graphics/sprites/head-christmastreehat.png -%%DATADIR%%/data/graphics/sprites/head-rangerhat.png -%%DATADIR%%/data/graphics/sprites/head-rangerhat.xml -%%DATADIR%%/data/graphics/sprites/head-santabeardhat.png -%%DATADIR%%/data/graphics/sprites/head-santabeardhat.xml -%%DATADIR%%/data/graphics/sprites/item002.png -%%DATADIR%%/data/graphics/sprites/item002.xml -%%DATADIR%%/data/graphics/sprites/item004.png -%%DATADIR%%/data/graphics/sprites/item004.xml -%%DATADIR%%/data/graphics/sprites/item005.png -%%DATADIR%%/data/graphics/sprites/item005.xml -%%DATADIR%%/data/graphics/sprites/item006.png -%%DATADIR%%/data/graphics/sprites/item006.xml -%%DATADIR%%/data/graphics/sprites/item007.png -%%DATADIR%%/data/graphics/sprites/item007.xml -%%DATADIR%%/data/graphics/sprites/item008.png -%%DATADIR%%/data/graphics/sprites/item008.xml -%%DATADIR%%/data/graphics/sprites/item009.png -%%DATADIR%%/data/graphics/sprites/item009.xml -%%DATADIR%%/data/graphics/sprites/item010.png -%%DATADIR%%/data/graphics/sprites/item010.xml -%%DATADIR%%/data/graphics/sprites/item011.png -%%DATADIR%%/data/graphics/sprites/item011.xml -%%DATADIR%%/data/graphics/sprites/item012.png -%%DATADIR%%/data/graphics/sprites/item012.xml -%%DATADIR%%/data/graphics/sprites/item013.png -%%DATADIR%%/data/graphics/sprites/item013.xml -%%DATADIR%%/data/graphics/sprites/item014.png -%%DATADIR%%/data/graphics/sprites/item014.xml -%%DATADIR%%/data/graphics/sprites/item015.png -%%DATADIR%%/data/graphics/sprites/item015.xml -%%DATADIR%%/data/graphics/sprites/item016.png -%%DATADIR%%/data/graphics/sprites/item016.xml -%%DATADIR%%/data/graphics/sprites/item017.png -%%DATADIR%%/data/graphics/sprites/item017.xml -%%DATADIR%%/data/graphics/sprites/item018.png -%%DATADIR%%/data/graphics/sprites/item018.xml -%%DATADIR%%/data/graphics/sprites/npcs.png -%%DATADIR%%/data/graphics/sprites/npc.xml -%%DATADIR%%/data/graphics/sprites/player_female_base.png -%%DATADIR%%/data/graphics/sprites/player_female_base.xml -%%DATADIR%%/data/graphics/sprites/player_male_base.xml -%%DATADIR%%/data/graphics/sprites/player_male_base.png -%%DATADIR%%/data/graphics/sprites/weapon0.png -%%DATADIR%%/data/graphics/sprites/weapon1.png -%%DATADIR%%/data/graphics/sprites/weapon2.png -%%DATADIR%%/data/graphics/sprites/weapon-bow.xml -%%DATADIR%%/data/graphics/sprites/weapon-fist.xml -%%DATADIR%%/data/graphics/sprites/weapon-dagger.xml -%%DATADIR%%/data/graphics/sprites/weapon-scythe.xml %%DATADIR%%/data/graphics/tiles/Woodland_ground.png %%DATADIR%%/data/graphics/tiles/Woodland_village.png %%DATADIR%%/data/graphics/tiles/Woodland_village_x2.png @@ -164,10 +79,16 @@ %%DATADIR%%/data/icons/tmw-icon.ico %%DATADIR%%/data/icons/tmw-icon.png %%DATADIR%%/data/icons/tmw-icon.xpm +%%MUSICADDON%%%%DATADIR%%/data/music/Faith.ogg +%%MUSICADDON%%%%DATADIR%%/data/music/Magick - Casino.ogg +%%MUSICADDON%%%%DATADIR%%/data/music/Magick - Real.ogg +%%MUSICADDON%%%%DATADIR%%/data/music/Magick - Small grass.ogg +%%MUSICADDON%%%%DATADIR%%/data/music/Magick - Snow.ogg +%%MUSICADDON%%%%DATADIR%%/data/music/finalman_and_yakslem-cavesong.ogg +%%MUSICADDON%%@dirrm %%DATADIR%%/data/music @dirrm %%DATADIR%%/data/icons @dirrm %%DATADIR%%/data/help @dirrm %%DATADIR%%/data/graphics/tiles -@dirrm %%DATADIR%%/data/graphics/sprites @dirrm %%DATADIR%%/data/graphics/images/ambient @dirrm %%DATADIR%%/data/graphics/images @dirrm %%DATADIR%%/data/graphics/gui >Release-Note: >Audit-Trail: >Unformatted: