ports/141891: [patch] games/ioquake3: OPENAL and CURL knobs

[Anonymous]

>Number:         141891
>Category:       ports
>Synopsis:       [patch] games/ioquake3: OPENAL and CURL knobs
>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:   Tue Dec 22 13:20:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD 9.0-CURRENT #0 200510M: Mon Dec 14 14:03:25 UTC 2009     holo at raphael.local:/a/objdir/a/dirty_build/sys/PHOENIX  amd64

>Description:
- don't force ancient openal library on users
- compile with libcurl by default as is done for linux client
>How-To-Repeat:
>Fix:
--- ioquake3.diff begins here ---
Index: games/ioquake3/Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/ioquake3/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- games/ioquake3/Makefile	18 Dec 2009 19:54:07 -0000	1.17
+++ games/ioquake3/Makefile	22 Dec 2009 13:00:11 -0000
@@ -23,6 +23,8 @@ USE_GMAKE=	yes
 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 \
 		VORBIS "Enable Ogg Vorbis support" on
 
 MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
@@ -53,8 +55,19 @@ IGNORE=		needs at least one of CLIENT, D
 .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
Index: games/ioquake3/files/patch-Makefile
===================================================================
RCS file: /a/.cvsup/ports/games/ioquake3/files/patch-Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile
--- games/ioquake3/files/patch-Makefile	18 Dec 2009 19:54:08 -0000	1.9
+++ games/ioquake3/files/patch-Makefile	22 Dec 2009 12:47:06 -0000
@@ -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 @@
+@@ -521,15 +521,29 @@
  
  ifeq ($(PLATFORM),freebsd)
  
@@ -29,6 +29,13 @@
 +   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
@@ -57,10 +64,16 @@
    SHLIBEXT=so
    SHLIBCFLAGS=-fPIC
    SHLIBLDFLAGS=-shared $(LDFLAGS)
-@@ -582,6 +571,27 @@
+@@ -582,6 +571,33 @@
      CLIENT_LIBS += -lvorbisfile -lvorbis -logg
    endif
  
++  ifeq ($(USE_CURL),1)
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LIBS += -lcurl
++    endif
++  endif
++
 +  ifeq ($(ARCH),i386)
 +    ifeq ($(CROSS_COMPILING),1)
 +      BASE_CFLAGS += -m32
--- ioquake3.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: