Attachment 102884 Details for Bug 142712 – file.diff

[patch] file.diff

file.diff (text/plain), 7.79 KB, created by kamikaze on 2010-01-11 09:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2010-01-11 09:30:05 UTC

Size: 7.79 KB

patch

obsolete

>diff -Nur ports/games/ioquake3.orig/Makefile ports/games/ioquake3/Makefile
>--- ports/games/ioquake3.orig/Makefile	2010-01-04 20:17:47.000000000 +0100
>+++ ports/games/ioquake3/Makefile	2010-01-11 10:24:09.000000000 +0100
>@@ -7,6 +7,7 @@
> 
> PORTNAME?=	ioquake3
> DISTVERSION?=	1.36
>+PORTREVISION?=	1
> CATEGORIES=	games
> MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
> 
>@@ -20,16 +21,20 @@
> .endif
> USE_GMAKE=	yes
> 
>-OPTIONS=	CLIENT "Build client" on \
>+OPTIONS+=	CLIENT "Build client" on \
> 		GAMELIBS "Build game libraries (when not mandatory)" off \
> 		DEDICATED "Build dedicated server" on \
>+		CURL "Enable cURL for http/ftp download" on \
>+		OPENAL "Enable OpenAL audio output" on \
>+		MUMBLE "Enable Mumble support (no dependencies)" on \
> 		VORBIS "Enable Ogg Vorbis support" on
> 
> MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
> 		DEFAULT_LIBDIR="${LIBDIR}" \
> 		HOMEPATH="/.${PORTNAME}" \
>+		VERSION="${DISTVERSION}" \
> 		ARCH="${ARCH}"
>-PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
>+PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
> 		ARCH="${ARCH}" \
> 		BINSUFFIX="${BINSUFFIX}"
> ALL_TARGET=	release
>@@ -45,7 +50,7 @@
> MACHINE_ARCH=	${ARCH}
> .include <bsd.cpu.mk>
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
>     defined(WITHOUT_SMP)
>@@ -53,8 +58,19 @@
> .endif
> 
> .if defined(WITH_CLIENT) || defined(WITH_SMP)
>+# cURL
>+.if defined(WITH_CURL)
>+LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
>+#MAKE_ARGS+=	USE_CURL_DLOPEN=0
>+.else
>+MAKE_ARGS+=	USE_CURL=0
>+.endif
> # OpenAL
>+.if defined(WITH_OPENAL)
> LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
>+.else
>+MAKE_ARGS+=	USE_OPENAL=0
>+.endif
> # SDL
> USE_SDL=	sdl
> # Vorbis
>@@ -62,6 +78,12 @@
> LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
> MAKE_ARGS+=	USE_CODEC_VORBIS=1
> .endif
>+# Mumble
>+.if defined(WITH_MUMBLE)
>+MAKE_ARGS+=	USE_MUMBLE=1
>+.else
>+MAKE_ARGS+=	USE_MUMBLE=0
>+.endif
> .endif
> 
> # SMP is only built with CLIENT.
>@@ -119,4 +141,4 @@
> 	@${ECHO_CMD}
> 
> .include "${.CURDIR}/../quake3-data/Makefile.include"
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -Nur ports/games/ioquake3.orig/files/patch-Makefile ports/games/ioquake3/files/patch-Makefile
>--- ports/games/ioquake3.orig/files/patch-Makefile	2010-01-04 20:17:47.000000000 +0100
>+++ ports/games/ioquake3/files/patch-Makefile	2010-01-04 20:48:42.000000000 +0100
>@@ -1,6 +1,6 @@
> --- Makefile.orig	2009-04-22 20:54:48.000000000 +0200
>-+++ Makefile	2009-12-08 11:38:10.000000000 +0100
>-@@ -521,15 +521,22 @@
>++++ Makefile	2010-01-04 20:48:02.000000000 +0100
>+@@ -521,15 +521,29 @@
>  
>  ifeq ($(PLATFORM),freebsd)
>  
>@@ -29,10 +29,17 @@
> +   CLIENT_CFLAGS = $(SDL_CFLAGS)
> +   SERVER_CFLAGS = 
> +   HAVE_VM_COMPILED = true
>++
>++  ifeq ($(USE_CURL),1)
>++    BASE_CFLAGS += -DUSE_CURL
>++    ifeq ($(USE_CURL_DLOPEN),1)
>++      BASE_CFLAGS += -DUSE_CURL_DLOPEN
>++    endif
>++  endif
>  
>    ifeq ($(USE_OPENAL),1)
>      BASE_CFLAGS += -DUSE_OPENAL
>-@@ -542,24 +549,6 @@
>+@@ -542,24 +556,6 @@
>      BASE_CFLAGS += -DUSE_CODEC_VORBIS
>    endif
>  
>@@ -57,10 +64,20 @@
>    SHLIBEXT=so
>    SHLIBCFLAGS=-fPIC
>    SHLIBLDFLAGS=-shared $(LDFLAGS)
>-@@ -582,6 +571,27 @@
>+@@ -582,6 +578,37 @@
>      CLIENT_LIBS += -lvorbisfile -lvorbis -logg
>    endif
>  
>++  ifeq ($(USE_CURL),1)
>++    ifneq ($(USE_CURL_DLOPEN),1)
>++      CLIENT_LIBS += -lcurl
>++    endif
>++  endif
>++
>++  ifeq ($(USE_MUMBLE),1)
>++    CLIENT_LIBS += -lrt
>++  endif
>++
> +  ifeq ($(ARCH),i386)
> +    ifeq ($(CROSS_COMPILING),1)
> +      BASE_CFLAGS += -m32
>@@ -85,7 +102,7 @@
>  else # ifeq freebsd
>  
>  #############################################################################
>-@@ -1442,6 +1452,9 @@
>+@@ -1442,6 +1469,9 @@
>    ifeq ($(ARCH),x86_64)
>      Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
>    endif
>@@ -95,7 +112,7 @@
>    ifeq ($(ARCH),ppc)
>      Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
>    endif
>-@@ -1591,6 +1604,9 @@
>+@@ -1591,6 +1621,9 @@
>    ifeq ($(ARCH),x86_64)
>      Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
>    endif
>diff -Nur ports/games/ioquake3.orig/pkg-descr ports/games/ioquake3/pkg-descr
>--- ports/games/ioquake3.orig/pkg-descr	2010-01-04 20:17:47.000000000 +0100
>+++ ports/games/ioquake3/pkg-descr	2009-10-23 19:48:12.000000000 +0200
>@@ -1,5 +1,11 @@
>-This port creates development snapshots of icculus.org/quake3. The project is
>-known to seldomly produce releases. Due to the conservative development goals
>-of the project, development snapshots are generally considered reliable.
>+This project, icculus.org/quake3 (sometimes referred to ioquake3, or ioq3 for
>+short) aims to build upon id Software's Quake 3 source code release. The
>+source code was released on August 20, 2005 under the GPL. Since then, we have
>+been cleaning up, fixing bugs, and adding features. Our permanent goal is to
>+create the open source Quake 3 distribution upon which people base their games
>+and projects. We also seek to have the perfect version of the engine for
>+playing Quake 3: Arena, Team Arena, and all popular mods. This distribution of
>+the engine has been ported to many new platforms and has had a slew of new
>+features added, along with massive bug extermination.
> 
> WWW: http://ioquake3.org/
>diff -Nur ports/games/ioquake3-devel.orig/Makefile ports/games/ioquake3-devel/Makefile
>--- ports/games/ioquake3-devel.orig/Makefile	2010-01-04 20:17:56.000000000 +0100
>+++ ports/games/ioquake3-devel/Makefile	2010-01-11 10:24:42.000000000 +0100
>@@ -7,18 +7,17 @@
> 
> PORTNAME=	ioquake3-devel
> DISTVERSION=	1.36_SVN${SVNREVISION}
>+PORTREVISION=	0
> MASTER_SITES=	ftp://deponie.yamagi.org/freebsd/distfiles/ioquake3/ \
> 		http://deponie.yamagi.org/freebsd/distfiles/ioquake3/
> 
> MAINTAINER=	kamikaze@bsdforen.de
> COMMENT=	Development SVN snapshots of ioquake3
> 
>-BUILD_DEPENDS+=	svnversion:${PORTSDIR}/devel/subversion
>-
> PLIST=		${.CURDIR}/../ioquake3/pkg-plist
> PATCHDIR=	${WRKDIR}/freebsd-patchset/
> 
>-SVNREVISION=	1754
>+SVNREVISION=	1771
> BINSUFFIX=	-devel
> 
> .include "${.CURDIR}/../ioquake3/Makefile"
>diff -Nur ports/games/ioquake3-devel.orig/distinfo ports/games/ioquake3-devel/distinfo
>--- ports/games/ioquake3-devel.orig/distinfo	2010-01-04 20:17:56.000000000 +0100
>+++ ports/games/ioquake3-devel/distinfo	2010-01-11 10:19:31.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (ioquake3-devel-1.36_SVN1754.zip) = 163fe62d8540244a9eda8af66ae62fb2
>-SHA256 (ioquake3-devel-1.36_SVN1754.zip) = f743e4454bb445fd58188107ee0c36eb4ee3be0f9dce9667bec7516bec59136f
>-SIZE (ioquake3-devel-1.36_SVN1754.zip) = 5017181
>+MD5 (ioquake3-devel-1.36_SVN1771.zip) = 1ed74a4cd9ed2c31b5959725e1cf82a2
>+SHA256 (ioquake3-devel-1.36_SVN1771.zip) = 9d9835c05dc7be1bddd804b8036e3f07cdb9de71b3ca0b8038e0d55b416ff553
>+SIZE (ioquake3-devel-1.36_SVN1771.zip) = 4927016
>diff -Nur ports/games/ioquake3-devel.orig/pkg-descr ports/games/ioquake3-devel/pkg-descr
>--- ports/games/ioquake3-devel.orig/pkg-descr	2010-01-04 20:17:56.000000000 +0100
>+++ ports/games/ioquake3-devel/pkg-descr	2010-01-05 15:53:21.000000000 +0100
>@@ -1,11 +1,5 @@
>-This project, icculus.org/quake3 (sometimes referred to ioquake3, or ioq3 for
>-short) aims to build upon id Software's Quake 3 source code release. The
>-source code was released on August 20, 2005 under the GPL. Since then, we have
>-been cleaning up, fixing bugs, and adding features. Our permanent goal is to
>-create the open source Quake 3 distribution upon which people base their games
>-and projects. We also seek to have the perfect version of the engine for
>-playing Quake 3: Arena, Team Arena, and all popular mods. This distribution of
>-the engine has been ported to many new platforms and has had a slew of new
>-features added, along with massive bug extermination.
>+This port builds development snapshots of icculus.org/quake3. The project is
>+known to seldomly produce releases. Due to the conservative development goals
>+of the project, development snapshots are generally considered reliable.
> 
> WWW: http://ioquake3.org/

Actions: View | Diff

Attachments on bug 142712: 102884