From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 18 23:30:05 2006 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5234816A41F for ; Wed, 18 Jan 2006 23:30:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1E5743D49 for ; Wed, 18 Jan 2006 23:30:04 +0000 (GMT) (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 k0INU4X9034304 for ; Wed, 18 Jan 2006 23:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0INU4bJ034303; Wed, 18 Jan 2006 23:30:04 GMT (envelope-from gnats) Resent-Date: Wed, 18 Jan 2006 23:30:04 GMT Resent-Message-Id: <200601182330.k0INU4bJ034303@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, Lars Engels Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FB5C16A41F for ; Wed, 18 Jan 2006 23:22:59 +0000 (GMT) (envelope-from lars@bsd-geek.de) Received: from mail.0x20.net (mail.0x20.net [217.69.67.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB8943D48 for ; Wed, 18 Jan 2006 23:22:58 +0000 (GMT) (envelope-from lars@bsd-geek.de) Received: from krusty.bsd-geek.de (dslb-084-063-012-142.pools.arcor-ip.net [84.63.12.142]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.0x20.net (Postfix) with ESMTP id C60DF33C2D for ; Thu, 19 Jan 2006 00:22:54 +0100 (CET) Received: from krusty.bsd-geek.de (krusty.bsd-geek.de [127.0.0.1]) by krusty.bsd-geek.de (8.13.4/8.13.4) with ESMTP id k0INMew6050685 for ; Thu, 19 Jan 2006 00:22:40 +0100 (CET) (envelope-from lars@krusty.bsd-geek.de) Received: (from root@localhost) by krusty.bsd-geek.de (8.13.4/8.13.4/Submit) id k0INMe3l050684; Thu, 19 Jan 2006 00:22:40 +0100 (CET) (envelope-from lars) Message-Id: <200601182322.k0INMe3l050684@krusty.bsd-geek.de> Date: Thu, 19 Jan 2006 00:22:40 +0100 (CET) From: Lars Engels To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91978: [Maintainer Update] Update games/hattrickorganizer to 1.38 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lars Engels List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2006 23:30:05 -0000 >Number: 91978 >Category: ports >Synopsis: [Maintainer Update] Update games/hattrickorganizer to 1.38 >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: Wed Jan 18 23:30:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Lars Engels >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD krusty.bsd-geek.de 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 3 03:05:43 CET 2005 lars@krusty.bsd-geek.de:/usr/obj/usr/src/sys/KRUSTY i386 >Description: Update Hattrick Organizer to version 1.38 Changelog available at: http://www.wow-auctions.net/ho/english/index.htm >How-To-Repeat: >Fix: --- hattrickorganizer-1.38.diff begins here --- diff -Nur games/hattrickorganizer/Makefile games/hattrickorganizer-138/Makefile --- games/hattrickorganizer/Makefile Wed Dec 14 18:14:19 2005 +++ games/hattrickorganizer-138/Makefile Thu Jan 19 00:15:23 2006 @@ -6,7 +6,7 @@ # PORTNAME= hattrickorganizer -PORTVERSION= 1.36 +PORTVERSION= 1.38 CATEGORIES= games java MASTER_SITES= http://www.wow-auctions.net/ho/download/ \ http://www.bsd-geek.de/FreeBSD/distfiles/ @@ -17,16 +17,19 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USE_ZIP= yes -NO_BUILD= yes -USE_JAVA= yes -JAVA_VERSION= 1.4+ +USE_ZIP= yes +NO_BUILD= yes +USE_JAVA= yes +JAVA_VERSION= 1.4+ +USE_REINPLACE= yes -SUB_FILES= hattrickorganizer.sh +SUB_FILES= hattrickorganizer.sh do-install: cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \; cd ${WRKSRC} && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \; - ${INSTALL_SCRIPT} ${WRKDIR}/hattrickorganizer.sh ${PREFIX}/bin/hattrickorganizer + ${REINPLACE_CMD} -e 's|HODIR=`pwd`|HODIR=${DATADIR}|' ${WRKSRC}/HO.sh + ${REINPLACE_CMD} 's|^HOHOME=.*|HOHOME=~/\.hattrickorganizer|' ${WRKSRC}/HO.sh + ${INSTALL_SCRIPT} ${WRKSRC}/HO.sh ${PREFIX}/bin/hattrickorganizer .include diff -Nur games/hattrickorganizer/distinfo games/hattrickorganizer-138/distinfo --- games/hattrickorganizer/distinfo Wed Dec 14 18:14:19 2005 +++ games/hattrickorganizer-138/distinfo Wed Jan 18 23:07:11 2006 @@ -1,3 +1,2 @@ -MD5 (ho_136.zip) = b79026fba1fb9c596d70b23cd1119ebd -SHA256 (ho_136.zip) = a10968f0596bba1d71e6fcc3b1eb08d3cc671c202afcd3623c64a0d4db5f721a -SIZE (ho_136.zip) = 4166641 +MD5 (ho_138.zip) = c50f39d307dce8b4821f11b37abd092c +SIZE (ho_138.zip) = 4224238 diff -Nur games/hattrickorganizer/files/hattrickorganizer.sh.in games/hattrickorganizer-138/files/hattrickorganizer.sh.in --- games/hattrickorganizer/files/hattrickorganizer.sh.in Wed Dec 14 18:14:19 2005 +++ games/hattrickorganizer-138/files/hattrickorganizer.sh.in Wed Jan 18 23:32:36 2006 @@ -1,11 +1,13 @@ #!/bin/sh # -# Start script for Hattrick Organizer v0.3 +# Start script for Hattrick Organizer v0.31 # Originally created by patta, RAGtime and others # Last Change (2005-08-07) by Lars Engels (lars@bsd-geek.de) # # List of changes: # +# 0.31 - configurable java memory (-m or $MAX_MEMORY) +# # 0.3 - Introduce the bourne shell as standard shell # - Make HO! multi-user capable # - Several layout changes to the script @@ -27,7 +29,7 @@ # - edit the HODIR variable to this new directory (without the ``) # # and HOHOME to any user writable directory! # # # -# - start HO! out of a terminal via e.g. 'hattrickorganizer' # +# - start HO! out of a terminal via e.g. 'ho' # # # # - manage your team :) # # # @@ -42,7 +44,7 @@ # #HODIR=`pwd` -HODIR="%%DATADIR%%" +HODIR=`pwd` # Next comes HO!'s directory to store its user data. # This directory must be writable by the user, @@ -56,14 +58,14 @@ # #HOHOME=~/.hattrickorganizer -HOHOME=~/.hattrickorganizer +HOHOME=$HODIR # Where can I find java? # Default is just looking at $PATH # (remember option -j) #JAVA=`which java` -JAVA="%%LOCALBASE%%/bin/java" +JAVA=`which java` # Enter the maximum amount of backups you do want to store. # Default is 5 @@ -72,6 +74,13 @@ MAX_BACKUPS=5 +# Enter the maximum amount of memory available to the java VM. +# Default is 256 MegaBytes! +# +#MAX_MEMORY=256m + +MAX_MEMORY=256m + ######################################################################## # DO NOT EDIT ANY MORE UNTIL YOU KNOW WHAT YOU'RE DOING! # ######################################################################## @@ -113,8 +122,6 @@ # Which database files and name of backup file? -# Which database files and name of backup file? - BACKUPLIST="database.data database.script database.backup database.properties" PREFIX=database @@ -126,9 +133,10 @@ CHECK=true -# Perform backup by default? +# Perform NO backup by default (because HO does this now internally! +# For old behavoir edit or start with option --backup/-b) -BACKUP=true +BACKUP=false # Restore by default? # IMPORTANT! This is just for initialisation! @@ -155,15 +163,17 @@ Usage: $HONAME [option] Options: - -h --help This help text - -v --version Show HO! version - -f --force Start without checking java-version - -nb --nobackup Start without backup - -j --java Use this java - -r --restore Restore the last backup-file - -rd --restoredate - Restore the backup-file from - -bd --backupdir Use this as the backup directory + -h --help This help text + -v --version Show HO! version + -f --force Start without checking java-version + -j --java Use this java + -m --memory Max. size of memory allocation pool for java + -b --backup Do a database backup before HO starts + -nb --nobackup Start without backup (by script) + -r --restore Restore the last backup-file + -rd --restoredate + Restore the backup-file from + -bd --backupdir Use this as the backup directory EOF exit 1 } @@ -171,22 +181,24 @@ # Start HO! start(){ - echo "Starting HO from $HOHOME..." cd $HOHOME - JAVA_VERSION="%%JAVA_VERSION%%" "${JAVA}" -jar $HODIR/hocoded.jar + echo "Starting HO from $HOHOME..." + + $JAVA -classpath $HODIR HOLauncher + $JAVA -Xmx$MAX_MEMORY -jar $HODIR/hocoded.jar - # check database and print warning - if [ `grep modified $DATABASEDIR/database.properties | \ + # check database and print warning + if [ `grep modified $DATABASEDIR/database.properties | \ cut -d= -f2` = "no" ] - then + then echo "Database OK!" - else + else cat <<-EOF >&2 Database was not relased correctly! Probably next time you will have problems starting HO... ... but you can restore a backup with switches -r or -rd. :-) EOF - fi + fi } # Backup @@ -286,7 +298,7 @@ ### MAIN -# Run throuh the params +# Run through the params until [ -z "$1" ] do @@ -300,6 +312,15 @@ fi shift ;; + -m|--memory) + MAX_MEMORY=$2; + if [ -z $MAX_MEMORY ] + then + echo "Option m or memory needs a parameter!" >&2 + exit 1 + fi + shift + ;; -v|--version) echo "This is HO! version $HOVERSION"; exit 0 @@ -307,6 +328,9 @@ -nb|--nobackup) BACKUP=false ;; + -b|--backup) + BACKUP=true + ;; -f|--force) CHECK=false ;; @@ -378,6 +402,18 @@ cp -r $HODIR/sprache $HOHOME fi +# copy needed parameter files if not already there + +if [ ! -e $HOHOME/ratings.dat ] +then + cp $HODIR/ratings.dat $HOHOME/ratings.dat +fi +if [ ! -e $HOHOME/epv.dat ] +then + cp $HODIR/epv.dat $HOHOME/epv.dat +fi + + # Perform backups or restore only if $DATABASEDIR exists if [ -d $DATABASEDIR ] @@ -385,11 +421,10 @@ `$BACKUP` && backup `$RESTORE` && restore else - echo -e "No directory $DATABASEDIR found. \n - This is your first HO!-Session, isn't it? Have fun!" + echo -e "No directory $DATABASEDIR found. \n This is your first HO!-Session, isn't it? Have fun!" fi -# Start HO! +# Start HO! (or the Launcher) start diff -Nur games/hattrickorganizer/pkg-plist games/hattrickorganizer-138/pkg-plist --- games/hattrickorganizer/pkg-plist Wed Dec 14 18:14:19 2005 +++ games/hattrickorganizer-138/pkg-plist Wed Jan 18 23:07:26 2006 @@ -190,6 +190,8 @@ %%DATADIR%%/hoplugins/commons/ui/info/clearthought/layout/TableLayout.class %%DATADIR%%/hoplugins/commons/ui/info/clearthought/layout/TableLayoutConstants.class %%DATADIR%%/hoplugins/commons/ui/info/clearthought/layout/TableLayoutConstraints.class +%%DATADIR%%/hoplugins/commons/ui/renderer/HtmlCellRenderer.class +%%DATADIR%%/hoplugins/commons/ui/renderer/TextAreaCellRenderer.class %%DATADIR%%/hoplugins/commons/ui/sorter/AbstractTableSorter$1.class %%DATADIR%%/hoplugins/commons/ui/sorter/AbstractTableSorter$2.class %%DATADIR%%/hoplugins/commons/ui/sorter/AbstractTableSorter.class @@ -362,6 +364,8 @@ %%DATADIR%%/hoplugins/trainingExperience/ui/TrainingRecapPanel.class %%DATADIR%%/hoplugins/trainingExperience/ui/TrainingRecapTable.class %%DATADIR%%/hoplugins/trainingExperience/ui/TrainingTable.class +%%DATADIR%%/hoplugins/trainingExperience/ui/bar/ColorBar$1.class +%%DATADIR%%/hoplugins/trainingExperience/ui/bar/ColorBar.class %%DATADIR%%/hoplugins/trainingExperience/ui/bar/ColorModus.class %%DATADIR%%/hoplugins/trainingExperience/ui/bar/StateBar.class %%DATADIR%%/hoplugins/trainingExperience/ui/bar/VerticalIndicator.class @@ -506,6 +510,7 @@ @dirrm %%DATADIR%%/hoplugins/commons/vo @dirrm %%DATADIR%%/hoplugins/commons/utils @dirrm %%DATADIR%%/hoplugins/commons/ui/sorter +@dirrm %%DATADIR%%/hoplugins/commons/ui/renderer @dirrm %%DATADIR%%/hoplugins/commons/ui/info/clearthought/layout @dirrm %%DATADIR%%/hoplugins/commons/ui/info/clearthought @dirrm %%DATADIR%%/hoplugins/commons/ui/info --- hattrickorganizer-1.38.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: