8 files changed, 44 insertions, 51 deletions

diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index bd1a1adfc536..10eee480c8c3 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -6,28 +6,33 @@
 #
 
 PORTNAME=	openjazz
-PORTVERSION=	20070212
+PORTVERSION=	20100328
 CATEGORIES=	games
-MASTER_SITES=	http://contribs.martymac.com/FreeBSD-ports/distfiles/
+MASTER_SITES=	http://alister.eu/jazz/oj/
+DISTNAME=	OpenJazz-src-280310
 
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Free re-implementation of the Jazz Jackrabbit(tm) game engine
 
+WRKSRC=	${WRKDIR}
+
+USE_ZIP=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	OpenJazz
 USE_XORG=	x11 xext xrandr xrender xau xdmcp
 USE_SDL=	sdl
-MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`" \
-		INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
-SUB_FILES=	openjazz pkg-message
+CPPFLAGS=	"-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
+		-DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR"
+LDFLAGS=	"-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`"
+MAKE_ENV=	CPPFLAGS=${CPPFLAGS} LDFLAGS=${LDFLAGS}
 
-post-extract:
-	@${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+SUB_FILES=	pkg-message
 
-post-install:
+do-install:
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/openjazz.000 ${DATADIR}/
-	@${INSTALL_SCRIPT} ${WRKDIR}/openjazz ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/OpenJazz ${PREFIX}/bin/openjazz
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/openjazz/distinfo b/games/openjazz/distinfo
index f639889b2ede..2e04eb95ffd8 100644
--- a/games/openjazz/distinfo
+++ b/games/openjazz/distinfo
@@ -1,3 +1,3 @@
-MD5 (openjazz-20070212.tar.gz) = e57ff08452183e84259e57859023809f
-SHA256 (openjazz-20070212.tar.gz) = 78c91487c5ac54eba9a2a72ce09388e468d594219948eb1f099233a582e0328b
-SIZE (openjazz-20070212.tar.gz) = 35748
+MD5 (OpenJazz-src-280310.zip) = f49d0b8ed955877dcce4190a3454ae73
+SHA256 (OpenJazz-src-280310.zip) = 266daf9c0c03ed26a6e7b13f298cefc3a8f645cdf2f3582d8f47f938f17c2f91
+SIZE (OpenJazz-src-280310.zip) = 141547
diff --git a/games/openjazz/files/Makefile.in b/games/openjazz/files/Makefile.in
deleted file mode 100644
index 9bf41cb00b64..000000000000
--- a/games/openjazz/files/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-CFLAGS?= -O -pipe
-CPPFLAGS+= -I/usr/local/include `sdl-config --cflags`
-LDFLAGS+= -L/usr/local/lib -pthread `sdl-config --libs`
-PREFIX?= /usr/local
-INSTALL?=	install
-INSTALL_PROGRAM?= install -s -o root -g wheel -m 555
-
-all:	bonus.o events.o font.o level.o main.o planet.o scene.o menu.o sound.o
-	gcc ${LDFLAGS} bonus.o events.o font.o level.o main.o planet.o scene.o menu.o sound.o -o openjazz-bin
-bonus.o:	bonus.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c bonus.c
-events.o:	events.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c events.c
-font.o:	font.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c font.c
-level.o: level.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c level.c
-main.o:	main.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c main.c
-planet.o:	planet.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c planet.c
-scene.o:	scene.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c scene.c
-menu.o:	menu.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c menu.c
-sound.o:	sound.c
-	gcc ${CFLAGS} ${CPPFLAGS} -c sound.c
-install:	all
-	${INSTALL} -d ${PREFIX}/bin
-	${INSTALL_PROGRAM} openjazz-bin ${PREFIX}/bin
-uninstall:
-	rm -f ${PREFIX}/bin/openjazz-bin
-clean:
-	rm -f *.o openjazz-bin
diff --git a/games/openjazz/files/openjazz.in b/games/openjazz/files/openjazz.in
deleted file mode 100644
index c21b8a6b11c6..000000000000
--- a/games/openjazz/files/openjazz.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd %%DATADIR%% && exec openjazz-bin
diff --git a/games/openjazz/files/patch-Makefile b/games/openjazz/files/patch-Makefile
new file mode 100644
index 000000000000..cb4238013340
--- /dev/null
+++ b/games/openjazz/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	2010-03-30 16:59:54.981199076 +0000
++++ Makefile	2010-03-30 17:04:10.070142573 +0000
+@@ -21,10 +21,10 @@
+ 
+ 
+ OpenJazz: $(objects)
+-	cc -Wall -o OpenJazz -lSDL -lstdc++ $(objects)
++	${CC} ${LDFLAGS} -Wall -o OpenJazz -lstdc++ $(objects)
+ 
+ %.o: %.cpp
+-	cc -Wall -DUSE_SOCKETS -DSCALE -Isrc -O2 -c $< -o $@
++	${CC} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
+ 
+ clean:
+ 	rm -f OpenJazz $(objects)
diff --git a/games/openjazz/files/patch-src-io-network.cpp b/games/openjazz/files/patch-src-io-network.cpp
new file mode 100644
index 000000000000..67fb28170c95
--- /dev/null
+++ b/games/openjazz/files/patch-src-io-network.cpp
@@ -0,0 +1,10 @@
+--- src/io/network.cpp.orig	2010-03-30 17:07:37.715288674 +0000
++++ src/io/network.cpp	2010-03-30 17:13:25.119068484 +0000
+@@ -41,6 +41,7 @@
+ 		#define MSG_NOSIGNAL 0
+ 	#else
+ 		#include <sys/types.h>
++        #include <netinet/in.h>
+ 		#include <sys/socket.h>
+ 		#include <arpa/inet.h>
+ 		#include <sys/ioctl.h>
diff --git a/games/openjazz/pkg-descr b/games/openjazz/pkg-descr
index 3002013fea96..ccadd4f6cb25 100644
--- a/games/openjazz/pkg-descr
+++ b/games/openjazz/pkg-descr
@@ -1,4 +1,4 @@
 OpenJazz, is a free, open-source re-implementation of
 the classic Jazz Jackrabbit(tm) game engine. 
 
-WWW: http://treacle.hewwo.com/jazz/oj/index.html
+WWW: http://alister.eu/jazz/oj
diff --git a/games/openjazz/pkg-plist b/games/openjazz/pkg-plist
index c5b1bf17eb0b..ec15203ccdd8 100644
--- a/games/openjazz/pkg-plist
+++ b/games/openjazz/pkg-plist
@@ -1,4 +1,3 @@
 bin/openjazz
-bin/openjazz-bin
 %%DATADIR%%/openjazz.000
 @dirrm %%DATADIR%%