Date: Fri, 22 Feb 2013 14:20:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/173335: [PATCH] games/xarchon: OptionsNG, changed Makefile, pkg-descr, Desktop entries, take maintainership Message-ID: <201302221420.r1MEK1EX028262@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/173335; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/173335: [PATCH] games/xarchon: OptionsNG, changed
Makefile, pkg-descr, Desktop entries, take maintainership
Date: Fri, 22 Feb 2013 15:13:57 +0100
--MP_/YWHeDhl9T+cRSTMy2Zqxv7P
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Removed
BUILD_DEPENDS= xpmtoppm:${PORTSDIR}/graphics/netpbm
Added in Makefile:
+ SF/nemysisfreebsdp/:icons
+DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
+DIST_SUBDIR= ${PORTNAME} <-- Because isn't good to have png in /usr/ports/distfiles
+EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
...
--MP_/YWHeDhl9T+cRSTMy2Zqxv7P
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=xarchon.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/games/xarchon/Makefile ./Makefile
--- /usr/ports/games/xarchon/Makefile 2013-01-14 17:55:24.000000000 +0100
+++ ./Makefile 2013-02-22 14:54:40.000000000 +0100
@@ -2,18 +2,25 @@
# Date created: 8 November 2002
# Whom: Marc Fonvieille <blackend@FreeBSD.org>
#
-# $FreeBSD: head/games/xarchon/Makefile 300896 2012-07-14 13:54:48Z beat $
+# $FreeBSD: ports/games/xarchon/Makefile,v 1.17 2012/01/19 10:13:17 scheidell Exp $
#
PORTNAME= xarchon
PORTVERSION= 0.50
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ftp://ftp.seul.org/pub/xarchon/ \
- http://xarchon.seul.org/
+ http://xarchon.seul.org/ \
+ SF/nemysisfreebsdp/:icons
+DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
+DIST_SUBDIR= ${PORTNAME}
+EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A chess-like strategy game with battle options
+MAINTAINER= nemysis@gmx.ch
+COMMENT= Chess-like strategy game with battle options
+
+LICENSE= GPLv2
USE_GNOME= esound gtk12
USE_GMAKE= yes
@@ -22,13 +29,31 @@
MAN6= xarchon.6
+PORTDOCS= AUTHORS ChangeLog README
+
+DESKTOP_ENTRIES="XArchon" "${COMMENT}" "${PORTNAME}" \
+ "${PORTNAME}" "Game;BoardGame;" false
+
+.include <bsd.port.options.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e '169s|^static ||' ${WRKSRC}/src/board.c
@${REINPLACE_CMD} -e 's|Xarchon_Evolution::||' \
${WRKSRC}/src/Xarchon_Genetic.hpp
+# For XArchon 0.60 that find libglade
+# @${REINPLACE_CMD} -e 's|set dummy glade|set dummy libglade-config|' ${WRKSRC}/configure
+
+post-install:
+ ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
NOT_FOR_ARCHS= sparc64
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/xarchon/distinfo ./distinfo
--- /usr/ports/games/xarchon/distinfo 2013-01-14 17:55:24.000000000 +0100
+++ ./distinfo 2013-02-22 15:06:38.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (xarchon-0.50.tar.gz) = c945c2fed2d7eb32577eb503a2935b817d2f119c37bf17bfa1adf9a4b395dcc0
-SIZE (xarchon-0.50.tar.gz) = 371299
+SHA256 (xarchon/xarchon-0.50.tar.gz) = c945c2fed2d7eb32577eb503a2935b817d2f119c37bf17bfa1adf9a4b395dcc0
+SIZE (xarchon/xarchon-0.50.tar.gz) = 371299
+SHA256 (xarchon/xarchon.png) = 00ece7cf461e259e98fcbcf6924900c40bfafa8798b804b149369f74ede81398
+SIZE (xarchon/xarchon.png) = 570
diff -ruN --exclude=CVS /usr/ports/games/xarchon/files/patch-src-Genetic.hpp ./files/patch-src-Genetic.hpp
--- /usr/ports/games/xarchon/files/patch-src-Genetic.hpp 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src-Genetic.hpp 2004-10-03 15:49:13.000000000 +0200
@@ -0,0 +1,33 @@
+--- src/Genetic.hpp.orig Fri Oct 1 10:06:20 2004
++++ src/Genetic.hpp Fri Oct 1 10:08:12 2004
+@@ -216,9 +216,9 @@
+ virtual Genetic_Operator<T> *Choose_Operator(void)
+ {
+ int max=(int)total_op_weight;
+- list<Genetic_Operator<T> *>::iterator start=operators.begin();
+- list<Genetic_Operator<T> *>::iterator end=operators.end();
+- list<Genetic_Operator<T> *>::iterator iter;
++ typename list<Genetic_Operator<T> *>::iterator start=operators.begin();
++ typename list<Genetic_Operator<T> *>::iterator end=operators.end();
++ typename list<Genetic_Operator<T> *>::iterator iter;
+ int r=rand()%max;
+ int count=0;
+ for (iter=start;iter!=end;iter++) {
+@@ -249,7 +249,7 @@
+ Genetic_Population<T> *newpop=new Genetic_Population<T>(p->size);
+ int cur_size=0;
+ while (cur_size<newpop->size) {
+- Genetic_Operator<T> *op=Choose_Operator();
++ Genetic_Operator<T> *op=this->Choose_Operator();
+ if ( (cur_size+op->NumOfResults())>newpop->size)
+ continue;
+ for (i=0;i<op->NumOfOperands();i++) {
+@@ -264,7 +264,7 @@
+ cur_size++;
+ }
+ }
+- newpop->Eval_Fitness(fit_func);
++ newpop->Eval_Fitness(this->fit_func);
+ return newpop;
+ }
+
diff -ruN --exclude=CVS /usr/ports/games/xarchon/files/patch-src-Problem.hpp ./files/patch-src-Problem.hpp
--- /usr/ports/games/xarchon/files/patch-src-Problem.hpp 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src-Problem.hpp 2004-10-03 15:49:13.000000000 +0200
@@ -0,0 +1,50 @@
+--- src/Problem.hpp.orig Fri Oct 1 10:00:09 2004
++++ src/Problem.hpp Fri Oct 1 10:05:48 2004
+@@ -306,14 +306,14 @@
+ virtual G Goal_Value(T *a)
+ {
+ if (depth==0)
+- return tester->Goal_Value(a);
++ return this->tester->Goal_Value(a);
+
+- Goal_Test<G,T> *endtester=tester;
+- tester=new Minimax_Goal_Test(depth-1,generator,other_acc,goal_acc,tester);
++ Goal_Test<G,T> *endtester=this->tester;
++ this->tester=new Minimax_Goal_Test(depth-1,this->generator,other_acc,this->goal_acc,this->tester);
+ G ret_val=Successor_Goal_Test<G,T>::Goal_Value(a);
+- delete tester;
+- tester=endtester;
+- delete next;
++ delete this->tester;
++ this->tester=endtester;
++ delete this->next;
+
+ return ret_val;
+ }
+@@ -340,19 +340,19 @@
+
+ virtual G Goal_Value(T *a)
+ {
+- Goal_Accumulator <G,T> *old=goal_acc;
++ Goal_Accumulator <G,T> *old=this->goal_acc;
+ Multi_Goal_Accumulator <G,T,greater<G> > *mga=new Multi_Goal_Accumulator<G,T,greater<G> >(branch);
+- goal_acc=mga;
++ this->goal_acc=mga;
+ Successor_Goal_Test<G,T>::Goal_Value(a);
+- goal_acc=old;
++ this->goal_acc=old;
+ for (mga->Init();!mga->IsEnd();mga->Next()) {
+ T *state=mga->Get_State();
+- Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(d-1,b,gen,other,goal_acc,tester);
++ Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(this->d-1,this->b,this->gen,other,this->goal_acc,this->tester);
+ next->Goal_Value(state);
+- goal_acc->Put(accumulator->value,acc->state,acc->op);
++ this->goal_acc->Put(this->accumulator->value,this->acc->state,this->acc->op);
+ }
+- goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
+- return goal_acc->Get_Value();
++ this->goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
++ return this->goal_acc->Get_Value();
+ }
+ };
+
diff -ruN --exclude=CVS /usr/ports/games/xarchon/files/patch-src::Genetic.hpp ./files/patch-src::Genetic.hpp
--- /usr/ports/games/xarchon/files/patch-src::Genetic.hpp 2013-01-14 17:55:24.000000000 +0100
+++ ./files/patch-src::Genetic.hpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
---- src/Genetic.hpp.orig Fri Oct 1 10:06:20 2004
-+++ src/Genetic.hpp Fri Oct 1 10:08:12 2004
-@@ -216,9 +216,9 @@
- virtual Genetic_Operator<T> *Choose_Operator(void)
- {
- int max=(int)total_op_weight;
-- list<Genetic_Operator<T> *>::iterator start=operators.begin();
-- list<Genetic_Operator<T> *>::iterator end=operators.end();
-- list<Genetic_Operator<T> *>::iterator iter;
-+ typename list<Genetic_Operator<T> *>::iterator start=operators.begin();
-+ typename list<Genetic_Operator<T> *>::iterator end=operators.end();
-+ typename list<Genetic_Operator<T> *>::iterator iter;
- int r=rand()%max;
- int count=0;
- for (iter=start;iter!=end;iter++) {
-@@ -249,7 +249,7 @@
- Genetic_Population<T> *newpop=new Genetic_Population<T>(p->size);
- int cur_size=0;
- while (cur_size<newpop->size) {
-- Genetic_Operator<T> *op=Choose_Operator();
-+ Genetic_Operator<T> *op=this->Choose_Operator();
- if ( (cur_size+op->NumOfResults())>newpop->size)
- continue;
- for (i=0;i<op->NumOfOperands();i++) {
-@@ -264,7 +264,7 @@
- cur_size++;
- }
- }
-- newpop->Eval_Fitness(fit_func);
-+ newpop->Eval_Fitness(this->fit_func);
- return newpop;
- }
-
diff -ruN --exclude=CVS /usr/ports/games/xarchon/files/patch-src::Problem.hpp ./files/patch-src::Problem.hpp
--- /usr/ports/games/xarchon/files/patch-src::Problem.hpp 2013-01-14 17:55:24.000000000 +0100
+++ ./files/patch-src::Problem.hpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
---- src/Problem.hpp.orig Fri Oct 1 10:00:09 2004
-+++ src/Problem.hpp Fri Oct 1 10:05:48 2004
-@@ -306,14 +306,14 @@
- virtual G Goal_Value(T *a)
- {
- if (depth==0)
-- return tester->Goal_Value(a);
-+ return this->tester->Goal_Value(a);
-
-- Goal_Test<G,T> *endtester=tester;
-- tester=new Minimax_Goal_Test(depth-1,generator,other_acc,goal_acc,tester);
-+ Goal_Test<G,T> *endtester=this->tester;
-+ this->tester=new Minimax_Goal_Test(depth-1,this->generator,other_acc,this->goal_acc,this->tester);
- G ret_val=Successor_Goal_Test<G,T>::Goal_Value(a);
-- delete tester;
-- tester=endtester;
-- delete next;
-+ delete this->tester;
-+ this->tester=endtester;
-+ delete this->next;
-
- return ret_val;
- }
-@@ -340,19 +340,19 @@
-
- virtual G Goal_Value(T *a)
- {
-- Goal_Accumulator <G,T> *old=goal_acc;
-+ Goal_Accumulator <G,T> *old=this->goal_acc;
- Multi_Goal_Accumulator <G,T,greater<G> > *mga=new Multi_Goal_Accumulator<G,T,greater<G> >(branch);
-- goal_acc=mga;
-+ this->goal_acc=mga;
- Successor_Goal_Test<G,T>::Goal_Value(a);
-- goal_acc=old;
-+ this->goal_acc=old;
- for (mga->Init();!mga->IsEnd();mga->Next()) {
- T *state=mga->Get_State();
-- Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(d-1,b,gen,other,goal_acc,tester);
-+ Multi_Minimax_Goal_Test *next=new Multi_Minimax_Goal_Test(this->d-1,this->b,this->gen,other,this->goal_acc,this->tester);
- next->Goal_Value(state);
-- goal_acc->Put(accumulator->value,acc->state,acc->op);
-+ this->goal_acc->Put(this->accumulator->value,this->acc->state,this->acc->op);
- }
-- goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
-- return goal_acc->Get_Value();
-+ this->goal_acc->Put(mga->Get_State(),mga->Get_Operator(),mga->Get_Result());
-+ return this->goal_acc->Get_Value();
- }
- };
-
diff -ruN --exclude=CVS /usr/ports/games/xarchon/pkg-descr ./pkg-descr
--- /usr/ports/games/xarchon/pkg-descr 2013-01-14 17:55:24.000000000 +0100
+++ ./pkg-descr 2012-11-03 12:18:26.000000000 +0100
@@ -1,6 +1,11 @@
XArchon is a chess-like strategy game with battle options.
It is modelled after the golden oldie Archon game created by
-Freefall Associates and distributed by Electronic Arts.
+Freefall Associates and distributed by Electronic Arts around 1985.
+
+In this game, the Light Side and Dark Side fight over control of a
+chess-like board. Each side is composed of 18 fantastic creatures of
+myth and legend, which are represented by images (or icons). While not
+identical, the opposing sides are balanced in strength.
WWW: http://xarchon.seul.org/
diff -ruN --exclude=CVS /usr/ports/games/xarchon/pkg-plist ./pkg-plist
--- /usr/ports/games/xarchon/pkg-plist 2013-01-14 17:55:24.000000000 +0100
+++ ./pkg-plist 2013-02-22 15:08:21.000000000 +0100
@@ -1,4 +1,5 @@
bin/xarchon
+share/pixmaps/xarchon.png
%%DATADIR%%/archon/NAMES
%%DATADIR%%/archon/actors/dark/banshee/move.down.0.xpm
%%DATADIR%%/archon/actors/dark/banshee/move.downleft.0.xpm
@@ -485,9 +486,9 @@
@dirrm %%DATADIR%%/archon/wav/side/dark
@dirrm %%DATADIR%%/archon/wav/side
@dirrm %%DATADIR%%/archon/wav/generic
-@dirrmtry %%DATADIR%%/archon/wav/actor/weapon
-@dirrmtry %%DATADIR%%/archon/wav/actor/piece
-@dirrmtry %%DATADIR%%/archon/wav/actor
+@dirrm %%DATADIR%%/archon/wav/actor/weapon
+@dirrm %%DATADIR%%/archon/wav/actor/piece
+@dirrm %%DATADIR%%/archon/wav/actor
@dirrm %%DATADIR%%/archon/wav
@dirrm %%DATADIR%%/archon/floor
@dirrm %%DATADIR%%/archon/cursor
===> Done
--MP_/YWHeDhl9T+cRSTMy2Zqxv7P--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302221420.r1MEK1EX028262>