Date: Wed, 1 Feb 2006 22:15:24 +0000 From: "Mark Daniel Reidel" <mark@alu.reidel.info> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92748: [MAINTAINER] games/crossfire-client: update to 1.8.0 Message-ID: <20060202220958.A67CC43D53@mx1.FreeBSD.org> Resent-Message-ID: <200602022220.k12MK4Vm012749@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92748
>Category: ports
>Synopsis: [MAINTAINER] games/crossfire-client: update to 1.8.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 02 22:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Mark Daniel Reidel
>Release: FreeBSD 6.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD alu.reidel.info 6.0-STABLE FreeBSD 6.0-STABLE #4: Tue Jan 24 07:23:03 UTC 2006
>Description:
- Update to 1.8.0
- Does not work WITHOUT_SDL anymore
- Dynamically create the PKGLIST
>How-To-Repeat:
>Fix:
--- crossfire-client-1.8.0.patch begins here ---
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/Makefile /usr/ports/games/crossfire-client/Makefile
--- /var/tmp/portbackup/games/crossfire-client/Makefile Fri May 7 07:49:09 2004
+++ /usr/ports/games/crossfire-client/Makefile Thu Feb 2 22:05:42 2006
@@ -6,14 +6,14 @@
#
PORTNAME= crossfire-client
-PORTVERSION= 1.7.0
+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.5.0${EXTRACT_SUFX} \
+ ${PORTNAME}-images-1.7.1${EXTRACT_SUFX} \
${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}
MAINTAINER= ports@mark.reidel.info
@@ -25,29 +25,67 @@
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
-OPTIONS= SDL "Use SDL for images" on
-
-MAN1= cfclient.1
+MAN6= cfclient.6
.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
-MAN1+= gcfclient.1
+PLIST_FILES+=bin/gcfclient
+.endif
.else
CONFIGURE_ARGS+= --disable-gtk
.endif
-.if defined(WITHOUT_SDL)
-CONFIGURE_ARGS+= --disable-sdl
-.else
-USE_SDL= image sdl
-.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}
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/distinfo /usr/ports/games/crossfire-client/distinfo
--- /var/tmp/portbackup/games/crossfire-client/distinfo Sun Jan 22 11:18:04 2006
+++ /usr/ports/games/crossfire-client/distinfo Thu Feb 2 18:59:07 2006
@@ -1,9 +1,9 @@
-MD5 (crossfire-client-1.7.0.tar.gz) = ef405f78d54be0bf22feeef6b4fc0d73
-SHA256 (crossfire-client-1.7.0.tar.gz) = 4704cbb0088665337a930f576d4cda36b2b272ef4b2da1a1e0363d416871e6fd
-SIZE (crossfire-client-1.7.0.tar.gz) = 458940
-MD5 (crossfire-client-images-1.5.0.tar.gz) = 63cbfb00ff8000f2567880b72c8162bd
-SHA256 (crossfire-client-images-1.5.0.tar.gz) = 65c61d6cd5be2fa25d93d66ace1624d36ad24535845b0dfe1392cec1ccb5431d
-SIZE (crossfire-client-images-1.5.0.tar.gz) = 1504405
+MD5 (crossfire-client-1.8.0.tar.gz) = 3198bb5ad0e85ca7d8dcdd812bdf4c2f
+SHA256 (crossfire-client-1.8.0.tar.gz) = 4968da4e5d74097ddb009298ec9f196bef88cc9ab92adb983396a376579c5a5d
+SIZE (crossfire-client-1.8.0.tar.gz) = 663735
+MD5 (crossfire-client-images-1.7.1.tar.gz) = 30dc5c22e864694a3d01309a073642f9
+SHA256 (crossfire-client-images-1.7.1.tar.gz) = b68799af8a7412e80b74911e6497237de80f208ceb9035e17af136b30ff07ed8
+SIZE (crossfire-client-images-1.7.1.tar.gz) = 1954215
MD5 (crossfire-client-sounds-1.4.0.tar.gz) = 1b33401d9d2af0d391fee7ad04282cfd
SHA256 (crossfire-client-sounds-1.4.0.tar.gz) = 95c7e4982d2c3792bbea0c45ea763cada548a1e0331323887dcfbdad48db270e
SIZE (crossfire-client-sounds-1.4.0.tar.gz) = 258947
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/files/patch-common-misc.c /usr/ports/games/crossfire-client/files/patch-common-misc.c
--- /var/tmp/portbackup/games/crossfire-client/files/patch-common-misc.c Thu Jan 1 00:00:00 1970
+++ /usr/ports/games/crossfire-client/files/patch-common-misc.c Wed Feb 1 19:16:53 2006
@@ -0,0 +1,15 @@
+--- 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");
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/files/patch-common-script.c /usr/ports/games/crossfire-client/files/patch-common-script.c
--- /var/tmp/portbackup/games/crossfire-client/files/patch-common-script.c Thu Jan 1 00:00:00 1970
+++ /usr/ports/games/crossfire-client/files/patch-common-script.c Wed Feb 1 19:15:24 2006
@@ -0,0 +1,10 @@
+--- common/script.c.orig Wed Feb 1 19:14:36 2006
++++ common/script.c Wed Feb 1 19:14:51 2006
+@@ -120,6 +120,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
++#include <sys/signal.h>
+ #include <signal.h>
+ #endif
+
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/files/patch-common-script.c::signal.c /usr/ports/games/crossfire-client/files/patch-common-script.c::signal.c
--- /var/tmp/portbackup/games/crossfire-client/files/patch-common-script.c::signal.c Fri May 7 07:49:10 2004
+++ /usr/ports/games/crossfire-client/files/patch-common-script.c::signal.c Thu Jan 1 00:00:00 1970
@@ -1,11 +0,0 @@
---- common/script.c.orig Fri May 7 07:51:00 2004
-+++ common/script.c Fri May 7 07:51:41 2004
-@@ -114,6 +114,8 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
-+#include <signal.h>
- #endif
-
- #include <client.h>
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/files/patch-common::misc.c /usr/ports/games/crossfire-client/files/patch-common::misc.c
--- /var/tmp/portbackup/games/crossfire-client/files/patch-common::misc.c Tue May 11 04:41:44 2004
+++ /usr/ports/games/crossfire-client/files/patch-common::misc.c Thu Jan 1 00:00:00 1970
@@ -1,17 +0,0 @@
---- 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;
diff -ruN --exclude=CVS /var/tmp/portbackup/games/crossfire-client/pkg-plist /usr/ports/games/crossfire-client/pkg-plist
--- /var/tmp/portbackup/games/crossfire-client/pkg-plist Sun Nov 16 14:41:56 2003
+++ /usr/ports/games/crossfire-client/pkg-plist Thu Jan 1 00:00:00 1970
@@ -1,38 +0,0 @@
-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%%
--- crossfire-client-1.8.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060202220958.A67CC43D53>