Attachment #61956 for bug #92748

View | Details | Raw Unified | Return to bug 92748
Collapse All | Expand All




#

PORTNAME=	crossfire-client
PORTVERSION=	1.8.0
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		ftp://ftp.ifi.uio.no/pub/crossfire/ \
		ftp://ftp.real-time.com/pub/games/crossfire/
MASTER_SITE_SUBDIR=	${PORTNAME:S/-client//}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		${PORTNAME}-images-1.7.1${EXTRACT_SUFX} \
		${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}

MAINTAINER=	ports@mark.reidel.info

WANT_GNOME=	yes
USE_GNOME=	gnometarget
USE_GMAKE=	yes
USE_SDL=	image sdl
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS=	--with-sound-dir=${DATADIR}/sounds

MAN6=		cfclient.6

MAN1=		cfclient.1

.include <bsd.port.pre.mk>

PLIST_FILES=	bin/cfclient \
		bin/cfsndserv
.if ${HAVE_GNOME:Mgtk20}!="" || ${HAVE_GNOME:Mgtk12}!=""
MAN6+=		gcfclient.6
.if ${HAVE_GNOME:Mgtk20}!=""
USE_GNOME+=	gtk20
PLIST_FILES+=bin/gcfclient2
.endif
.if ${HAVE_GNOME:Mgtk12}!=""
USE_GNOME+=	gtk12
PLIST_FILES+=bin/gcfclient
.endif
.else
CONFIGURE_ARGS+=	--disable-gtk
.endif

PLIST_DIRS=	%%DATADIR%%/sounds \
		%%DATADIR%%
PLIST_FILES+=	%%DATADIR%%/bmaps.client \
		%%DATADIR%%/crossfire.base \
		%%DATADIR%%/crossfire.clsc \
		%%DATADIR%%/sounds/README \
		%%DATADIR%%/sounds/Creaky-1.raw \
		%%DATADIR%%/sounds/Evil_Laugh.raw \
		%%DATADIR%%/sounds/Explosion.raw \
		%%DATADIR%%/sounds/FloorTom.raw \
		%%DATADIR%%/sounds/Gun-5.raw \
		%%DATADIR%%/sounds/MetalCrash.raw \
		%%DATADIR%%/sounds/Missed.raw \
		%%DATADIR%%/sounds/Missle1.raw \
		%%DATADIR%%/sounds/Puke.raw \
		%%DATADIR%%/sounds/Tear.raw \
		%%DATADIR%%/sounds/Teeswing.raw \
		%%DATADIR%%/sounds/TowerClock.raw \
		%%DATADIR%%/sounds/Whoosh.raw \
		%%DATADIR%%/sounds/blip.raw \
		%%DATADIR%%/sounds/boink2.raw \
		%%DATADIR%%/sounds/bugle_charge.raw \
		%%DATADIR%%/sounds/chord.raw \
		%%DATADIR%%/sounds/click1.raw \
		%%DATADIR%%/sounds/click2.raw \
		%%DATADIR%%/sounds/drip.raw \
		%%DATADIR%%/sounds/first_try.raw \
		%%DATADIR%%/sounds/gong.raw \
		%%DATADIR%%/sounds/lightning1.raw \
		%%DATADIR%%/sounds/magic.raw \
		%%DATADIR%%/sounds/ouch1.raw \
		%%DATADIR%%/sounds/phit2.raw \
		%%DATADIR%%/sounds/sci_fi_gun.raw \
		%%DATADIR%%/sounds/squish.raw \
		%%DATADIR%%/sounds/swish.raw \

post-install:
	@${MKDIR} ${DATADIR}

Lines 1-9 Link Here

(-)/usr/ports/games/crossfire-client/distinfo (-6 / +6 lines)
1	MD5 (crossfire-client-1.7.0.tar.gz) = ef405f78d54be0bf22feeef6b4fc0d73	1	MD5 (crossfire-client-1.8.0.tar.gz) = 3198bb5ad0e85ca7d8dcdd812bdf4c2f
2	SHA256 (crossfire-client-1.7.0.tar.gz) = 4704cbb0088665337a930f576d4cda36b2b272ef4b2da1a1e0363d416871e6fd	2	SHA256 (crossfire-client-1.8.0.tar.gz) = 4968da4e5d74097ddb009298ec9f196bef88cc9ab92adb983396a376579c5a5d
3	SIZE (crossfire-client-1.7.0.tar.gz) = 458940	3	SIZE (crossfire-client-1.8.0.tar.gz) = 663735
4	MD5 (crossfire-client-images-1.5.0.tar.gz) = 63cbfb00ff8000f2567880b72c8162bd	4	MD5 (crossfire-client-images-1.7.1.tar.gz) = 30dc5c22e864694a3d01309a073642f9
5	SHA256 (crossfire-client-images-1.5.0.tar.gz) = 65c61d6cd5be2fa25d93d66ace1624d36ad24535845b0dfe1392cec1ccb5431d	5	SHA256 (crossfire-client-images-1.7.1.tar.gz) = b68799af8a7412e80b74911e6497237de80f208ceb9035e17af136b30ff07ed8
6	SIZE (crossfire-client-images-1.5.0.tar.gz) = 1504405	6	SIZE (crossfire-client-images-1.7.1.tar.gz) = 1954215
7	MD5 (crossfire-client-sounds-1.4.0.tar.gz) = 1b33401d9d2af0d391fee7ad04282cfd	7	MD5 (crossfire-client-sounds-1.4.0.tar.gz) = 1b33401d9d2af0d391fee7ad04282cfd
8	SHA256 (crossfire-client-sounds-1.4.0.tar.gz) = 95c7e4982d2c3792bbea0c45ea763cada548a1e0331323887dcfbdad48db270e	8	SHA256 (crossfire-client-sounds-1.4.0.tar.gz) = 95c7e4982d2c3792bbea0c45ea763cada548a1e0331323887dcfbdad48db270e
9	SIZE (crossfire-client-sounds-1.4.0.tar.gz) = 258947	9	SIZE (crossfire-client-sounds-1.4.0.tar.gz) = 258947




--- common/misc.c.orig	Wed Feb  1 19:15:57 2006
+++ common/misc.c	Wed Feb  1 19:16:21 2006
@@ -237,11 +237,11 @@
 #ifndef WIN32
     ChildProcess* cp=FirstChild;
     ChildProcess* last=NULL;
+    ChildProcess* next;
     for (;;){
         if (!cp)
             return; /*no child to monitor*/
         if (waitpid(cp->pid,NULL,WNOHANG)){
-            ChildProcess* next;
 
             /*pid is dead*/
             LOG(LOG_INFO,"common::monitorChilds","Child %s died. Removing and closing pipes",cp->name?cp->name:"UNKNOWN");

Line 0 Link Here

(-)/usr/ports/games/crossfire-client/files/patch-common-script.c (+10 lines)
	1	--- common/script.c.orig Wed Feb 1 19:14:36 2006
	2	+++ common/script.c Wed Feb 1 19:14:51 2006
	3	@@ -120,6 +120,7 @@
	4	#include <sys/types.h>
	5	#include <sys/socket.h>
	6	#include <sys/wait.h>
	7	+#include <sys/signal.h>
	8	#include <signal.h>
	9	#endif
	10

Lines 1-11 Link Here

(-)/usr/ports/games/crossfire-client/files/patch-common-script.c::signal.c (-11 lines)
1	--- common/script.c.orig Fri May 7 07:51:00 2004
2	+++ common/script.c Fri May 7 07:51:41 2004
3	@@ -114,6 +114,8 @@
4	#include <sys/types.h>
5	#include <sys/socket.h>
6	#include <sys/wait.h>
7	+#include <sys/signal.h>
8	+#include <signal.h>
9	#endif
10
11	#include <client.h>




--- common/misc.c.orig	Sat May  8 15:31:29 2004
+++ common/misc.c	Sat May  8 15:31:49 2004
@@ -237,13 +237,13 @@
 #ifndef WIN32
     ChildProcess* cp=FirstChild;
     ChildProcess* last=NULL;
+    ChildProcess* next;
     for (;;){
         if (!cp)
             return; /*no child to monitor*/
         if (waitpid(cp->pid,NULL,WNOHANG)){
             /*pid is dead*/
             LOG(LOG_INFO,"common::monitorChilds","Child %s died. Removing and closing pipes",cp->name?cp->name:"UNKNOWN");
-            ChildProcess* next;
             if (cp==LastChild)
                 LastChild=last;
             next=cp->next;




bin/cfclient
bin/cfsndserv
%%GNOME:%%bin/gcfclient
%%DATADIR%%/bmaps.client
%%DATADIR%%/crossfire.base
%%DATADIR%%/crossfire.clsc
%%DATADIR%%/sounds/Creaky-1.raw
%%DATADIR%%/sounds/Evil_Laugh.raw
%%DATADIR%%/sounds/Explosion.raw
%%DATADIR%%/sounds/FloorTom.raw
%%DATADIR%%/sounds/Gun-5.raw
%%DATADIR%%/sounds/MetalCrash.raw
%%DATADIR%%/sounds/Missed.raw
%%DATADIR%%/sounds/Missle1.raw
%%DATADIR%%/sounds/Puke.raw
%%DATADIR%%/sounds/README
%%DATADIR%%/sounds/Tear.raw
%%DATADIR%%/sounds/Teeswing.raw
%%DATADIR%%/sounds/TowerClock.raw
%%DATADIR%%/sounds/Whoosh.raw
%%DATADIR%%/sounds/blip.raw
%%DATADIR%%/sounds/boink2.raw
%%DATADIR%%/sounds/bugle_charge.raw
%%DATADIR%%/sounds/chord.raw
%%DATADIR%%/sounds/click1.raw
%%DATADIR%%/sounds/click2.raw
%%DATADIR%%/sounds/drip.raw
%%DATADIR%%/sounds/first_try.raw
%%DATADIR%%/sounds/gong.raw
%%DATADIR%%/sounds/lightning1.raw
%%DATADIR%%/sounds/magic.raw
%%DATADIR%%/sounds/ouch1.raw
%%DATADIR%%/sounds/phit2.raw
%%DATADIR%%/sounds/sci_fi_gun.raw
%%DATADIR%%/sounds/squish.raw
%%DATADIR%%/sounds/swish.raw
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%

Return to bug 92748

Lines 6-19 Link Here

(-)/usr/ports/games/crossfire-client/Makefile (-11 / +49 lines)
6	#	6	#
7		7
8	PORTNAME= crossfire-client	8	PORTNAME= crossfire-client
9	PORTVERSION= 1.7.0	9	PORTVERSION= 1.8.0
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
12	ftp://ftp.ifi.uio.no/pub/crossfire/ \	12	ftp://ftp.ifi.uio.no/pub/crossfire/ \
13	ftp://ftp.real-time.com/pub/games/crossfire/	13	ftp://ftp.real-time.com/pub/games/crossfire/
14	MASTER_SITE_SUBDIR= ${PORTNAME:S/-client//}	14	MASTER_SITE_SUBDIR= ${PORTNAME:S/-client//}
15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
16	${PORTNAME}-images-1.5.0${EXTRACT_SUFX} \	16	${PORTNAME}-images-1.7.1${EXTRACT_SUFX} \
17	${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}	17	${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}
18		18
19	MAINTAINER= ports@mark.reidel.info	19	MAINTAINER= ports@mark.reidel.info
Lines 25-53 Link Here
25	WANT_GNOME= yes	25	WANT_GNOME= yes
26	USE_GNOME= gnometarget	26	USE_GNOME= gnometarget
27	USE_GMAKE= yes	27	USE_GMAKE= yes
		28	USE_SDL= image sdl
28	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
30	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	31	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
31	CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds	32	CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds
32		33
33	OPTIONS= SDL "Use SDL for images" on	34	MAN6= cfclient.6
34
35	MAN1= cfclient.1
36		35
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
		38	PLIST_FILES= bin/cfclient \
		39	bin/cfsndserv
		40	.if ${HAVE_GNOME:Mgtk20}!="" \|\| ${HAVE_GNOME:Mgtk12}!=""
		41	MAN6+= gcfclient.6
		42	.if ${HAVE_GNOME:Mgtk20}!=""
		43	USE_GNOME+= gtk20
		44	PLIST_FILES+=bin/gcfclient2
		45	.endif
39	.if ${HAVE_GNOME:Mgtk12}!=""	46	.if ${HAVE_GNOME:Mgtk12}!=""
40	USE_GNOME+= gtk12	47	USE_GNOME+= gtk12
41	MAN1+= gcfclient.1	48	PLIST_FILES+=bin/gcfclient
		49	.endif
42	.else	50	.else
43	CONFIGURE_ARGS+= --disable-gtk	51	CONFIGURE_ARGS+= --disable-gtk
44	.endif	52	.endif
45		53
46	.if defined(WITHOUT_SDL)	54	PLIST_DIRS= %%DATADIR%%/sounds \
47	CONFIGURE_ARGS+= --disable-sdl	55	%%DATADIR%%
48	.else	56	PLIST_FILES+= %%DATADIR%%/bmaps.client \
49	USE_SDL= image sdl	57	%%DATADIR%%/crossfire.base \
50	.endif	58	%%DATADIR%%/crossfire.clsc \
		59	%%DATADIR%%/sounds/README \
		60	%%DATADIR%%/sounds/Creaky-1.raw \
		61	%%DATADIR%%/sounds/Evil_Laugh.raw \
		62	%%DATADIR%%/sounds/Explosion.raw \
		63	%%DATADIR%%/sounds/FloorTom.raw \
		64	%%DATADIR%%/sounds/Gun-5.raw \
		65	%%DATADIR%%/sounds/MetalCrash.raw \
		66	%%DATADIR%%/sounds/Missed.raw \
		67	%%DATADIR%%/sounds/Missle1.raw \
		68	%%DATADIR%%/sounds/Puke.raw \
		69	%%DATADIR%%/sounds/Tear.raw \
		70	%%DATADIR%%/sounds/Teeswing.raw \
		71	%%DATADIR%%/sounds/TowerClock.raw \
		72	%%DATADIR%%/sounds/Whoosh.raw \
		73	%%DATADIR%%/sounds/blip.raw \
		74	%%DATADIR%%/sounds/boink2.raw \
		75	%%DATADIR%%/sounds/bugle_charge.raw \
		76	%%DATADIR%%/sounds/chord.raw \
		77	%%DATADIR%%/sounds/click1.raw \
		78	%%DATADIR%%/sounds/click2.raw \
		79	%%DATADIR%%/sounds/drip.raw \
		80	%%DATADIR%%/sounds/first_try.raw \
		81	%%DATADIR%%/sounds/gong.raw \
		82	%%DATADIR%%/sounds/lightning1.raw \
		83	%%DATADIR%%/sounds/magic.raw \
		84	%%DATADIR%%/sounds/ouch1.raw \
		85	%%DATADIR%%/sounds/phit2.raw \
		86	%%DATADIR%%/sounds/sci_fi_gun.raw \
		87	%%DATADIR%%/sounds/squish.raw \
		88	%%DATADIR%%/sounds/swish.raw \
51		89
52	post-install:	90	post-install:
53	@${MKDIR} ${DATADIR}	91	@${MKDIR} ${DATADIR}

Line 0 Link Here

(-)/usr/ports/games/crossfire-client/files/patch-common-misc.c (+15 lines)
	1	--- common/misc.c.orig Wed Feb 1 19:15:57 2006
	2	+++ common/misc.c Wed Feb 1 19:16:21 2006
	3	@@ -237,11 +237,11 @@
	4	#ifndef WIN32
	5	ChildProcess* cp=FirstChild;
	6	ChildProcess* last=NULL;
	7	+ ChildProcess* next;
	8	for (;;){
	9	if (!cp)
	10	return; /no child to monitor/
	11	if (waitpid(cp->pid,NULL,WNOHANG)){
	12	- ChildProcess* next;
	13
	14	/pid is dead/
	15	LOG(LOG_INFO,"common::monitorChilds","Child %s died. Removing and closing pipes",cp->name?cp->name:"UNKNOWN");

Lines 1-17 Link Here

(-)/usr/ports/games/crossfire-client/files/patch-common::misc.c (-17 lines)
1	--- common/misc.c.orig Sat May 8 15:31:29 2004
2	+++ common/misc.c Sat May 8 15:31:49 2004
3	@@ -237,13 +237,13 @@
4	#ifndef WIN32
5	ChildProcess* cp=FirstChild;
6	ChildProcess* last=NULL;
7	+ ChildProcess* next;
8	for (;;){
9	if (!cp)
10	return; /no child to monitor/
11	if (waitpid(cp->pid,NULL,WNOHANG)){
12	/pid is dead/
13	LOG(LOG_INFO,"common::monitorChilds","Child %s died. Removing and closing pipes",cp->name?cp->name:"UNKNOWN");
14	- ChildProcess* next;
15	if (cp==LastChild)
16	LastChild=last;
17	next=cp->next;

Lines 1-38 Link Here

(-)/usr/ports/games/crossfire-client/pkg-plist (-38 lines)
1	bin/cfclient
2	bin/cfsndserv
3	%%GNOME:%%bin/gcfclient
4	%%DATADIR%%/bmaps.client
5	%%DATADIR%%/crossfire.base
6	%%DATADIR%%/crossfire.clsc
7	%%DATADIR%%/sounds/Creaky-1.raw
8	%%DATADIR%%/sounds/Evil_Laugh.raw
9	%%DATADIR%%/sounds/Explosion.raw
10	%%DATADIR%%/sounds/FloorTom.raw
11	%%DATADIR%%/sounds/Gun-5.raw
12	%%DATADIR%%/sounds/MetalCrash.raw
13	%%DATADIR%%/sounds/Missed.raw
14	%%DATADIR%%/sounds/Missle1.raw
15	%%DATADIR%%/sounds/Puke.raw
16	%%DATADIR%%/sounds/README
17	%%DATADIR%%/sounds/Tear.raw
18	%%DATADIR%%/sounds/Teeswing.raw
19	%%DATADIR%%/sounds/TowerClock.raw
20	%%DATADIR%%/sounds/Whoosh.raw
21	%%DATADIR%%/sounds/blip.raw
22	%%DATADIR%%/sounds/boink2.raw
23	%%DATADIR%%/sounds/bugle_charge.raw
24	%%DATADIR%%/sounds/chord.raw
25	%%DATADIR%%/sounds/click1.raw
26	%%DATADIR%%/sounds/click2.raw
27	%%DATADIR%%/sounds/drip.raw
28	%%DATADIR%%/sounds/first_try.raw
29	%%DATADIR%%/sounds/gong.raw
30	%%DATADIR%%/sounds/lightning1.raw
31	%%DATADIR%%/sounds/magic.raw
32	%%DATADIR%%/sounds/ouch1.raw
33	%%DATADIR%%/sounds/phit2.raw
34	%%DATADIR%%/sounds/sci_fi_gun.raw
35	%%DATADIR%%/sounds/squish.raw
36	%%DATADIR%%/sounds/swish.raw
37	@dirrm %%DATADIR%%/sounds
38	@dirrm %%DATADIR%%