From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 1 07:50:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 600741065675 for ; Thu, 1 Apr 2010 07:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3C1A08FC12 for ; Thu, 1 Apr 2010 07:50:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o317o4jL017057 for ; Thu, 1 Apr 2010 07:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o317o4Ei017056; Thu, 1 Apr 2010 07:50:04 GMT (envelope-from gnats) Resent-Date: Thu, 1 Apr 2010 07:50:04 GMT Resent-Message-Id: <201004010750.o317o4Ei017056@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ganael Laplanche Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB9F31065672 for ; Thu, 1 Apr 2010 07:42:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id BA0CC8FC13 for ; Thu, 1 Apr 2010 07:42:55 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o317gtqQ047739 for ; Thu, 1 Apr 2010 07:42:55 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o317gtLS047738; Thu, 1 Apr 2010 07:42:55 GMT (envelope-from nobody) Message-Id: <201004010742.o317gtLS047738@www.freebsd.org> Date: Thu, 1 Apr 2010 07:42:55 GMT From: Ganael Laplanche To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/145258: Port update: games/openjazz - Update to v.20100328 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Apr 2010 07:50:04 -0000 >Number: 145258 >Category: ports >Synopsis: Port update: games/openjazz - Update to v.20100328 >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 Apr 01 07:50:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 9.0-CURRENT >Organization: http://contribs.martymac.org >Environment: FreeBSD laptop.martymac.com 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Thu Jan 21 14:46:32 UTC 2010 martymac@laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC i386 >Description: This patch updates games/openjazz to v.20100328 (280310). >How-To-Repeat: >Fix: Patch attached with submission follows: diff -aurN openjazz.orig/Makefile openjazz/Makefile --- openjazz.orig/Makefile 2010-03-30 07:57:37.270169323 +0000 +++ openjazz/Makefile 2010-03-31 18:35:15.965667144 +0000 @@ -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 diff -aurN openjazz.orig/distinfo openjazz/distinfo --- openjazz.orig/distinfo 2010-03-30 07:57:37.268169487 +0000 +++ openjazz/distinfo 2010-03-30 08:01:28.748958247 +0000 @@ -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 -aurN openjazz.orig/files/Makefile.in openjazz/files/Makefile.in --- openjazz.orig/files/Makefile.in 2010-03-30 07:57:37.265167569 +0000 +++ openjazz/files/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -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 -aurN openjazz.orig/files/openjazz.in openjazz/files/openjazz.in --- openjazz.orig/files/openjazz.in 2010-03-30 07:57:37.261168458 +0000 +++ openjazz/files/openjazz.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -cd %%DATADIR%% && exec openjazz-bin diff -aurN openjazz.orig/files/patch-Makefile openjazz/files/patch-Makefile --- openjazz.orig/files/patch-Makefile 1970-01-01 00:00:00.000000000 +0000 +++ openjazz/files/patch-Makefile 2010-03-30 17:04:16.032068321 +0000 @@ -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 -aurN openjazz.orig/files/patch-src-io-network.cpp openjazz/files/patch-src-io-network.cpp --- openjazz.orig/files/patch-src-io-network.cpp 1970-01-01 00:00:00.000000000 +0000 +++ openjazz/files/patch-src-io-network.cpp 2010-03-30 17:14:22.536925363 +0000 @@ -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 ++ #include + #include + #include + #include diff -aurN openjazz.orig/pkg-descr openjazz/pkg-descr --- openjazz.orig/pkg-descr 2010-03-30 07:57:37.266175309 +0000 +++ openjazz/pkg-descr 2010-03-30 07:58:06.206016546 +0000 @@ -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 -aurN openjazz.orig/pkg-plist openjazz/pkg-plist --- openjazz.orig/pkg-plist 2010-03-30 07:57:37.271170497 +0000 +++ openjazz/pkg-plist 2010-03-31 18:14:16.137517477 +0000 @@ -1,4 +1,3 @@ bin/openjazz -bin/openjazz-bin %%DATADIR%%/openjazz.000 @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: