Date: Sun, 18 Mar 2012 00:58:21 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166212: [patch] Maintainer change and port upgrade for games/crossfire-client Message-ID: <201203180058.q2I0wLeu022484@red.freebsd.org> Resent-Message-ID: <201203180100.q2I10OA6070439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166212
>Category: ports
>Synopsis: [patch] Maintainer change and port upgrade for games/crossfire-client
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 18 01:00:23 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Kevin Zheng
>Release: 8.3-RC1
>Organization:
>Environment:
FreeBSD quasar.local 8.3-RC1 FreeBSD 8.3-RC1 #0: Sun Mar 4 00:42:38 UTC 2012 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The current version of the Crossfire client in the FreeBSD Ports collection is out of date (version 1.8). The current version is 1.60, and offers the ability to connect to the latest servers and play using the GTK2 client.
In addition, the current maintainer has explained that he does not intend to work on crossfire-client for the time being.
>How-To-Repeat:
The current client in the ports tree is out of date. Simple 'make describe' in games/crossfire-client.
>Fix:
The patch to update the port is attached. This will update the Makefile and other patch files to build the 1.60 client. In addition, the maintainer will be changed.
Patch attached with submission follows:
diff -ruN /usr/ports/games/crossfire-client/Makefile crossfire-client/Makefile
--- /usr/ports/games/crossfire-client/Makefile 2012-02-18 04:17:44.000000000 -0600
+++ crossfire-client/Makefile 2012-03-17 14:32:30.000000000 -0500
@@ -2,97 +2,22 @@
# Date created: So 27 Okt 1996 12:25:55 MET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $FreeBSD: ports/games/crossfire-client/Makefile,v 1.74 2012/02/18 10:17:44 mva Exp $
+# $FreeBSD: ports/games/crossfire-client/Makefile,v 1.73 2011/09/23 22:22:37 amdmi3 Exp $
#
PORTNAME= crossfire-client
-PORTVERSION= 1.8.0
-PORTREVISION= 9
+PORTVERSION= 1.60.0
CATEGORIES= games
-MASTER_SITES= SF/crossfire/${PORTNAME}/${PORTVERSION} \
- ftp://ftp.ifi.uio.no/pub/crossfire/ \
- ftp://ftp.real-time.com/pub/games/crossfire/
+MASTER_SITES= SF/crossfire/${PORTNAME}/${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-images-1.7.1${EXTRACT_SUFX} \
- ${PORTNAME}-sounds-1.4.0${EXTRACT_SUFX}
+MAINTAINER= kevinz5000@gmail.com
+COMMENT= A cooperative multiplayer graphical RPG and adventure game
-MAINTAINER= ports@mark.reidel.info
-COMMENT= Multiplayer graphical arcade and adventure game made for X11
+MAN6= crossfire-client-gtk2.6
-USE_PERL5= yes
-USE_XORG= xpm
-WANT_GNOME= yes
+GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_GNOME= gtk20 libglade2
USE_SDL= image sdl
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds
-
-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
-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}
- ${INSTALL_DATA} ${WRKDIR}/bmaps.client ${DATADIR}
- ${INSTALL_DATA} ${WRKDIR}/crossfire.base ${DATADIR}
- ${INSTALL_DATA} ${WRKDIR}/crossfire.clsc ${DATADIR}
- @${MKDIR} ${DATADIR}/sounds
- ${INSTALL_DATA} ${WRKDIR}/sounds/README ${DATADIR}/sounds
- ${INSTALL_DATA} ${WRKDIR}/sounds/*.raw ${DATADIR}/sounds
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/games/crossfire-client/distinfo crossfire-client/distinfo
--- /usr/ports/games/crossfire-client/distinfo 2011-07-03 09:23:41.000000000 -0500
+++ crossfire-client/distinfo 2012-02-12 20:39:02.000000000 -0600
@@ -1,6 +1,2 @@
-SHA256 (crossfire-client-1.8.0.tar.gz) = 4968da4e5d74097ddb009298ec9f196bef88cc9ab92adb983396a376579c5a5d
-SIZE (crossfire-client-1.8.0.tar.gz) = 663735
-SHA256 (crossfire-client-images-1.7.1.tar.gz) = b68799af8a7412e80b74911e6497237de80f208ceb9035e17af136b30ff07ed8
-SIZE (crossfire-client-images-1.7.1.tar.gz) = 1954215
-SHA256 (crossfire-client-sounds-1.4.0.tar.gz) = 95c7e4982d2c3792bbea0c45ea763cada548a1e0331323887dcfbdad48db270e
-SIZE (crossfire-client-sounds-1.4.0.tar.gz) = 258947
+SHA256 (crossfire-client-1.60.0.tar.gz) = 0a7c45459178ed87cf6d6d7aaf0cc485216fc4735108b08ff085f5bce2452102
+SIZE (crossfire-client-1.60.0.tar.gz) = 802899
diff -ruN /usr/ports/games/crossfire-client/files/patch-common-misc.c crossfire-client/files/patch-common-misc.c
--- /usr/ports/games/crossfire-client/files/patch-common-misc.c 2006-03-16 12:31:43.000000000 -0600
+++ crossfire-client/files/patch-common-misc.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
---- 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 /usr/ports/games/crossfire-client/files/patch-common-script.c crossfire-client/files/patch-common-script.c
--- /usr/ports/games/crossfire-client/files/patch-common-script.c 2006-03-16 12:31:43.000000000 -0600
+++ crossfire-client/files/patch-common-script.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,10 +0,0 @@
---- 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 /usr/ports/games/crossfire-client/files/patch-common__Makefile.am crossfire-client/files/patch-common__Makefile.am
--- /usr/ports/games/crossfire-client/files/patch-common__Makefile.am 1969-12-31 18:00:00.000000000 -0600
+++ crossfire-client/files/patch-common__Makefile.am 2012-03-17 14:18:41.000000000 -0500
@@ -0,0 +1,11 @@
+--- ./common/Makefile.am.orig 2011-01-28 00:17:56.000000000 -0600
++++ ./common/Makefile.am 2012-03-17 13:43:59.000000000 -0500
+@@ -64,7 +64,7 @@
+ item-types \
+ items.pl
+
+-AM_CFLAGS = $(PTHREAD_CFLAGS) -finstrument-functions
++AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+ proto:
+ cproto -DCPROTO -DCFCLIENT $(DEFAULT_INCLUDES) $(AM_CFLAGS) \
diff -ruN /usr/ports/games/crossfire-client/files/patch-common__Makefile.in crossfire-client/files/patch-common__Makefile.in
--- /usr/ports/games/crossfire-client/files/patch-common__Makefile.in 1969-12-31 18:00:00.000000000 -0600
+++ crossfire-client/files/patch-common__Makefile.in 2012-03-17 14:18:41.000000000 -0500
@@ -0,0 +1,11 @@
+--- ./common/Makefile.in.orig 2011-01-28 00:21:10.000000000 -0600
++++ ./common/Makefile.in 2012-03-17 13:43:59.000000000 -0500
+@@ -280,7 +280,7 @@
+ item-types \
+ items.pl
+
+-AM_CFLAGS = $(PTHREAD_CFLAGS) -finstrument-functions
++AM_CFLAGS = $(PTHREAD_CFLAGS)
+ all: $(BUILT_SOURCES) config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
diff -ruN /usr/ports/games/crossfire-client/files/patch-common__script.c crossfire-client/files/patch-common__script.c
--- /usr/ports/games/crossfire-client/files/patch-common__script.c 1969-12-31 18:00:00.000000000 -0600
+++ crossfire-client/files/patch-common__script.c 2012-03-17 14:18:41.000000000 -0500
@@ -0,0 +1,10 @@
+--- ./common/script.c.orig 2011-01-28 00:17:56.000000000 -0600
++++ ./common/script.c 2012-03-17 13:43:59.000000000 -0500
+@@ -116,6 +116,7 @@
+
+ #ifndef WIN32
+ #include <errno.h>
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
diff -ruN /usr/ports/games/crossfire-client/files/patch-configure crossfire-client/files/patch-configure
--- /usr/ports/games/crossfire-client/files/patch-configure 1969-12-31 18:00:00.000000000 -0600
+++ crossfire-client/files/patch-configure 2012-03-17 14:18:41.000000000 -0500
@@ -0,0 +1,11 @@
+--- ./configure.orig 2011-01-28 00:21:09.000000000 -0600
++++ ./configure 2012-03-17 14:18:37.000000000 -0500
+@@ -868,7 +868,7 @@
+ psdir='${docdir}'
+ libdir='${exec_prefix}/lib'
+ localedir='${datarootdir}/locale'
+-mandir='${datarootdir}/man'
++mandir='${prefix}/man'
+
+ ac_prev=
+ ac_dashdash=
diff -ruN /usr/ports/games/crossfire-client/pkg-descr crossfire-client/pkg-descr
--- /usr/ports/games/crossfire-client/pkg-descr 2001-10-08 10:46:02.000000000 -0500
+++ crossfire-client/pkg-descr 2012-02-12 16:53:02.000000000 -0600
@@ -1,11 +1,10 @@
-This is a multiplayer graphical arcade and adventure game made for
-the X11 environment.
+Crossfire is a highly graphical role-playing adventure game with
+characteristics reminiscent of rogue, nethack, omega, and gauntlet.
+It has multiplayer capability and presently runs under X11.
-It has certain flavours from other games, especially Gauntlet (TM)
-and Nethack/Moria.
-
-Any number of players can move around in their own window, finding
-and using items and battle monsters. They can choose to cooperate
-or compete in the same "world".
+Client for playing the new client/server based version of Crossfire.
+This package allows you to connect to Crossfire servers around the world.
+You do not need install the Crossfire server in order to use this
+package.
WWW: http://crossfire.real-time.com/
diff -ruN /usr/ports/games/crossfire-client/pkg-plist crossfire-client/pkg-plist
--- /usr/ports/games/crossfire-client/pkg-plist 1969-12-31 18:00:00.000000000 -0600
+++ crossfire-client/pkg-plist 2012-03-17 14:24:05.000000000 -0500
@@ -0,0 +1,19 @@
+bin/crossfire-client-gtk2
+bin/cfsndserv
+share/crossfire-client/glade-gtk2/caelestis.glade
+share/crossfire-client/glade-gtk2/chthonic.glade
+share/crossfire-client/glade-gtk2/dialogs.glade
+share/crossfire-client/glade-gtk2/eureka.glade
+share/crossfire-client/glade-gtk2/gtk-v1.glade
+share/crossfire-client/glade-gtk2/gtk-v2.glade
+share/crossfire-client/glade-gtk2/lobotomy.glade
+share/crossfire-client/glade-gtk2/meflin.glade
+share/crossfire-client/glade-gtk2/oroboros.glade
+share/crossfire-client/glade-gtk2/sixforty.glade
+share/crossfire-client/glade-gtk2/un-deux.glade
+share/crossfire-client/glade-gtk2/v1-redux.glade
+share/crossfire-client/themes/Black
+share/crossfire-client/themes/Standard
+@dirrm share/crossfire-client/glade-gtk2
+@dirrm share/crossfire-client/themes
+@dirrm share/crossfire-client
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203180058.q2I0wLeu022484>