- Bump PORTREVISION.

- Fix CURL option (flag wasn't passed to the build).
- Fix CURL_DLOPEN option (was trying to open the wrong file, so remove version:
  libcurl.so.4 -> libcurl.so).

The original PR was for games/iourbanterror, but also applies to
games/worldofpadman.

PR:		ports/119813
Submitted by:	"Nerius Landys" <nlandys@gmail.com>

4 files changed, 87 insertions, 34 deletions

diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index 8c8f088a8c3..1fb81350de5 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iourbanterror
 DISTVERSION=	2007_12_20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/
 DISTNAME=	ioUrbanTerrorSource_${DISTVERSION}
@@ -148,6 +148,11 @@ post-patch:
 # There are new variables in the config files, so keep them in another dir.
 	@${REINPLACE_CMD} -E 's|/\.q3a|/.ioUrbanTerror|' \
 		${WRKSRC}/code/unix/unix_shared.c
+# Fix wrong library version (use general case as only one is installed).
+.if defined(WITH_CURL_DLOPEN)
+	@${REINPLACE_CMD} -e 's|libcurl\.so\.[[:digit:]]|libcurl.so|' \
+		${WRKSRC}/code/client/cl_curl.h
+.endif
 
 do-install:
 .for bin in ${Q3BIN}
diff --git a/games/iourbanterror/files/patch-Makefile b/games/iourbanterror/files/patch-Makefile
index 39084ba0bb5..9cebe77b385 100644
--- a/games/iourbanterror/files/patch-Makefile
+++ b/games/iourbanterror/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	Sun Dec 16 18:09:18 2007
-+++ Makefile	Fri Jan  4 10:40:41 2008
++++ Makefile	Sun Jan 27 15:36:33 2008
 @@ -27,16 +27,22 @@
    endif
  endif
@@ -128,7 +128,20 @@
  
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -520,45 +504,61 @@
+@@ -516,49 +500,80 @@
+     endif
+   endif
+ 
++  ifeq ($(USE_CURL),1)
++    BASE_CFLAGS += -DUSE_CURL=1
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LDFLAGS += -lcurl
++    else
++      BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
++    endif
++  endif
++
+   ifeq ($(USE_CODEC_VORBIS),1)
      BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
    endif
  
@@ -208,10 +221,16 @@
      ifneq ($(USE_OPENAL_DLOPEN),1)
 -      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
 +      CLIENT_LDFLAGS += -lopenal
++    endif
++  endif
++
++  ifeq ($(USE_CURL),1)
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LDFLAGS += -lcurl
      endif
    endif
  
-@@ -566,7 +566,6 @@
+@@ -566,7 +581,6 @@
      CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
    endif
  
@@ -219,7 +238,7 @@
  else # ifeq freebsd
  
  #############################################################################
-@@ -717,24 +716,25 @@
+@@ -717,24 +731,25 @@
  TARGETS =
  
  ifneq ($(BUILD_SERVER),0)
@@ -256,7 +275,7 @@
  endif
  
  ifneq ($(BUILD_GAME_QVM),0)
-@@ -824,10 +824,10 @@
+@@ -824,10 +839,10 @@
  all: debug release
  
  debug:
@@ -269,7 +288,7 @@
  
  # Create the build directories and tools, print out
  # an informational message, then start building
-@@ -880,7 +880,7 @@
+@@ -880,7 +895,7 @@
  Q3LCC=$(TOOLSDIR)/q3lcc$(BINEXT)
  Q3ASM=$(TOOLSDIR)/q3asm$(BINEXT)
  
@@ -278,7 +297,7 @@
  tools:
  	@echo QVM tools not built when cross-compiling
  else
-@@ -943,8 +943,13 @@
+@@ -943,8 +958,13 @@
    $(B)/client/snd_main.o \
    $(B)/client/snd_codec.o \
    $(B)/client/snd_codec_wav.o \
@@ -294,7 +313,7 @@
    $(B)/client/qal.o \
    $(B)/client/snd_openal.o \
    \
-@@ -1078,9 +1083,15 @@
+@@ -1078,9 +1098,15 @@
    ifeq ($(ARCH),x86)
      Q3OBJ += $(B)/client/vm_x86.o
    endif
@@ -310,7 +329,7 @@
    ifeq ($(ARCH),ppc)
      Q3OBJ += $(B)/client/vm_ppc.o
    endif
-@@ -1113,7 +1124,7 @@
+@@ -1113,7 +1139,7 @@
  
    ifeq ($(USE_SDL),1)
      ifneq ($(PLATFORM),darwin)
@@ -319,7 +338,7 @@
      endif
    endif
  
-@@ -1126,12 +1137,12 @@
+@@ -1126,12 +1152,12 @@
      $(B)/clientsmp/sdl_glimp.o
  endif
  
@@ -334,7 +353,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
  		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-@@ -1248,7 +1259,7 @@
+@@ -1248,7 +1274,7 @@
    endif
  endif
  
@@ -343,7 +362,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
  
-@@ -1287,7 +1298,7 @@
+@@ -1287,7 +1313,7 @@
  Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
  Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -352,7 +371,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
  
-@@ -1330,7 +1341,7 @@
+@@ -1330,7 +1356,7 @@
  MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
  MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -361,7 +380,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
  
-@@ -1382,7 +1393,7 @@
+@@ -1382,7 +1408,7 @@
  Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
  Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -370,7 +389,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
  
-@@ -1432,7 +1443,7 @@
+@@ -1432,7 +1458,7 @@
  MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
  MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -379,7 +398,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
  
-@@ -1494,7 +1505,7 @@
+@@ -1494,7 +1520,7 @@
  Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -388,7 +407,7 @@
  	$(echo_cmd) "LD $@"
  	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
  
-@@ -1521,7 +1532,7 @@
+@@ -1521,7 +1547,7 @@
  MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index e18cd74f9cc..99ff2060b94 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	worldofpadman
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://thilo.kickchat.com/download/:full \
 		http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/:full \
@@ -158,6 +158,13 @@ post-extract:
 .endfor
 	@cd ${WRKDIR} && ${TAR} xf readme.tar
 
+.if defined(WITH_CURL_DLOPEN)
+post-patch:
+# Fix wrong library version (use general case as only one is installed).
+	@${REINPLACE_CMD} -e 's|libcurl\.so\.[[:digit:]]|libcurl.so|' \
+		${WRKSRC}/code/client/cl_curl.h
+.endif
+
 .if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
 post-build:
 	@cd ${WRKSRC}/build/release && ${MV} baseq3 wop
diff --git a/games/worldofpadman/files/patch-Makefile b/games/worldofpadman/files/patch-Makefile
index e8390d6b35d..13759574ae1 100644
--- a/games/worldofpadman/files/patch-Makefile
+++ b/games/worldofpadman/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	Tue Apr 17 17:17:01 2007
-+++ Makefile	Fri Jan 11 16:55:57 2008
++++ Makefile	Tue Jan 29 02:00:59 2008
 @@ -27,11 +27,20 @@
    endif
  endif
@@ -138,7 +138,23 @@
  
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -553,47 +520,61 @@
+@@ -545,6 +512,15 @@
+     endif
+   endif
+ 
++  ifeq ($(USE_CURL),1)
++    BASE_CFLAGS += -DUSE_CURL=1
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LDFLAGS += -lcurl
++    else
++      BASE_CFLAGS += -DUSE_CURL_DLOPEN=1
++    endif
++  endif
++
+   ifeq ($(USE_CODEC_VORBIS),1)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
+@@ -553,47 +529,67 @@
      BASE_CFLAGS += -DUSE_CODEC_MP3=1
    endif
  
@@ -173,7 +189,7 @@
 +
 +  ifeq ($(USE_SDL_VIDEO),1)
 +    BASE_CFLAGS += -DUSE_SDL_VIDEO=1
-   endif
++  endif
 +
 +  ifeq ($(USE_OPTIMIZED_CFLAGS),1)
 +    RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \
@@ -182,7 +198,7 @@
 +      RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
 +         -fstrength-reduce
 +    endif
-+  endif
+   endif
 +
 +  ifneq ($(HAVE_VM_COMPILED),true)
 +    BASE_CFLAGS += -DNO_VM_COMPILED
@@ -220,10 +236,16 @@
      ifneq ($(USE_OPENAL_DLOPEN),1)
 -      CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal
 +      CLIENT_LDFLAGS += -lopenal
++    endif
++  endif
++
++  ifeq ($(USE_CURL),1)
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LDFLAGS += -lcurl
      endif
    endif
  
-@@ -759,24 +740,25 @@
+@@ -759,24 +755,25 @@
  TARGETS =
  
  ifneq ($(BUILD_SERVER),0)
@@ -260,7 +282,7 @@
  endif
  
  ifneq ($(BUILD_GAME_QVM),0)
-@@ -838,11 +820,11 @@
+@@ -838,11 +835,11 @@
  	$(MAKE)  targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)"
  
  build_release: B=$(BR)
@@ -274,7 +296,7 @@
  
  targets: $(TARGETS)
  
-@@ -1056,13 +1038,10 @@
+@@ -1056,13 +1053,10 @@
    ifeq ($(ARCH),i386)
      Q3OBJ += $(B)/client/vm_x86.o
    endif
@@ -290,7 +312,7 @@
      Q3OBJ += $(B)/client/$(VM_PPC).o
    endif
  endif
-@@ -1109,10 +1088,10 @@
+@@ -1109,10 +1103,10 @@
      $(B)/client/sdl_glimp_smp.o
  endif
  
@@ -303,7 +325,7 @@
  	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
  		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
  
-@@ -1415,15 +1394,21 @@
+@@ -1415,15 +1409,21 @@
    ifeq ($(ARCH),x86)
      Q3DOBJ += $(B)/ded/vm_x86.o
    endif
@@ -326,7 +348,7 @@
  	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
  
  $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)
-@@ -1540,7 +1525,7 @@
+@@ -1540,7 +1540,7 @@
  Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
  Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -335,7 +357,7 @@
  	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
  
  $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm
-@@ -1581,7 +1566,7 @@
+@@ -1581,7 +1581,7 @@
  MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
  MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -344,7 +366,7 @@
  	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
  
  $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm
-@@ -1631,7 +1616,7 @@
+@@ -1631,7 +1631,7 @@
  Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
  Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -353,7 +375,7 @@
  	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
  
  $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm
-@@ -1679,7 +1664,7 @@
+@@ -1679,7 +1679,7 @@
  MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
  MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm
  
@@ -362,7 +384,7 @@
  	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
  
  $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm
-@@ -1739,7 +1724,7 @@
+@@ -1739,7 +1739,7 @@
  Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm
  
@@ -371,7 +393,7 @@
  	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
  
  $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm
-@@ -1764,7 +1749,7 @@
+@@ -1764,7 +1764,7 @@
  MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
  MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm