6 files changed, 7 insertions, 38 deletions

diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 70ecbe59c212..2a505e86efbd 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	crossfire-client
-PORTVERSION=	1.60.0
+PORTVERSION=	1.70.0
 CATEGORIES=	games
-MASTER_SITES=	SF/crossfire/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/crossfire/crossfire-${PORTVERSION}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	A cooperative multiplayer graphical RPG and adventure game
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
@@ -26,5 +25,7 @@ MAN6=	crossfire-client-gtk2.6
 post-patch:
 	${REINPLACE_CMD} -e '/#include <curl\/types.h>/d' \
 		${WRKSRC}/common/metaserver.c
+	${REINPLACE_CMD} -e "/mandir='${datarootdir}\/man'/d" \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/games/crossfire-client/distinfo b/games/crossfire-client/distinfo
index 666b5d8cfe3c..46cf1533c8fc 100644
--- a/games/crossfire-client/distinfo
+++ b/games/crossfire-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (crossfire-client-1.60.0.tar.gz) = 0a7c45459178ed87cf6d6d7aaf0cc485216fc4735108b08ff085f5bce2452102
-SIZE (crossfire-client-1.60.0.tar.gz) = 802899
+SHA256 (crossfire-client-1.70.0.tar.gz) = afa3981785689baa22813ebc3893250c2f73374dda64bfc1dc41e64f4adc60b2
+SIZE (crossfire-client-1.70.0.tar.gz) = 801043
diff --git a/games/crossfire-client/files/patch-common__Makefile.in b/games/crossfire-client/files/patch-common__Makefile.in
deleted file mode 100644
index 4e53fe613412..000000000000
--- a/games/crossfire-client/files/patch-common__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 --git a/games/crossfire-client/files/patch-common__script.c b/games/crossfire-client/files/patch-common__script.c
deleted file mode 100644
index 5b4d0276fe61..000000000000
--- a/games/crossfire-client/files/patch-common__script.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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 --git a/games/crossfire-client/files/patch-configure b/games/crossfire-client/files/patch-configure
deleted file mode 100644
index 0109a0dcf597..000000000000
--- a/games/crossfire-client/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 --git a/games/crossfire-client/pkg-plist b/games/crossfire-client/pkg-plist
index f16bf596a40f..71be50bf4ca3 100644
--- a/games/crossfire-client/pkg-plist
+++ b/games/crossfire-client/pkg-plist
@@ -14,6 +14,6 @@ bin/crossfire-client-gtk2
 %%DATADIR%%/glade-gtk2/v1-redux.glade
 %%DATADIR%%/themes/Black
 %%DATADIR%%/themes/Standard
-@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/glade-gtk2
+@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%