- Bump PORTREVISION.

- Fix GAMELIBS (both when required and optional). - Remove pkg-message comment about CELLSHADING (removed in previous commits). - Don't install game libraries for Q3 expansion (unused).
svn path=/head/; revision=216984
2008-07-17 22:43:57 +00:00 · 2008-07-17 22:43:57 +00:00 · 5c591f8beb · 2021-03-31 03:12:20 +00:00
commit 5c591f8beb
parent 9765b6dd2f
4 changed files with 37 additions and 51 deletions
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	worldofpadman
 PORTVERSION=	1.2.20080621
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://thilo.kickchat.com/download/:full \
 		http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/:full \
@ -140,20 +141,10 @@ post-patch:
 # Do not log debug output of bots (can be enabled with "homedir"/"gamedir").
 	@${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \
 		${WRKSRC}/code/botlib/be_interface.c
-.if defined(WITH_CURL_DLOPEN)
-# 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
-.endif

 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -r ${WRKDIR}/wop ${DATADIR}
+	${MKDIR} ${DATADIR}/wop
+	${CP} -r ${WRKDIR}/wop/* ${DATADIR}/wop
 	${INSTALL_DATA} ${WRKDIR}/wop.png \
 		${PREFIX}/share/pixmaps/${PORTNAME}.png
 .for bin in ${Q3BIN}
@ -162,10 +153,7 @@ do-install:
 		${PREFIX}/bin/${bin:S/wop/${PORTNAME}/}
 .endfor
 .if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
-. for dir in wop missionpack
-	${MKDIR} ${DATADIR}/${dir}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/${dir}/*.so ${DATADIR}/${dir}
-. endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so ${DATADIR}/wop
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
--- a/games/worldofpadman/files/patch-Makefile
+++ b/games/worldofpadman/files/patch-Makefile
@ -1,9 +1,12 @@
 --- Makefile.orig	2008-05-10 10:05:55.000000000 -0300
-+++ Makefile	2008-06-21 15:31:37.000000000 -0300
-@@ -26,25 +26,6 @@
- ifndef BUILD_STANDALONE
-   BUILD_STANDALONE = 1
+++ Makefile	2008-06-27 20:52:45.000000000 -0300
+@@ -23,29 +23,6 @@
+   endif
 endif
+ 
+-ifndef BUILD_STANDALONE
+-  BUILD_STANDALONE = 1
+-endif
 -ifndef BUILD_CLIENT
 -  BUILD_CLIENT     =
 -endif
@ -23,10 +26,11 @@
 -ifneq ($(PLATFORM),darwin)
 -  BUILD_CLIENT_SMP = 0
 -endif
- 
+-
 #############################################################################
 #
-@@ -97,46 +78,23 @@
+ # If you require a different configuration from the defaults below, create a
+@@ -97,46 +74,26 @@
 GENERATE_DEPENDENCIES=1
 endif
 
@ -65,17 +69,20 @@
 -ifndef USE_LOCAL_HEADERS
 -USE_LOCAL_HEADERS=1
 -endif
+BUILD_STANDALONE=1
 +BUILD_CLIENT?=0
 +BUILD_CLIENT_SMP?=0
-+BUILD_GAME_QVM?=0
-+BUILD_GAME_SO?=0
 +BUILD_SERVER?=0
+BUILD_GAME_QVM=0
+BUILD_GAME_SO?=0
 +HAVE_VM_COMPILED?=false
 +USE_CODEC_MP3?=0
 +USE_CODEC_VORBIS?=0
-+USE_LOCAL_HEADERS?=0
+USE_LOCAL_HEADERS=0
 +USE_OPENAL?=0
 +USE_OPENAL_DLOPEN?=0
+USE_CURL?=0
+USE_CURL_DLOPEN?=0
 +USE_OPTIMIZED_CFLAGS?=0
 
 #############################################################################
@ -87,7 +94,7 @@
 CDIR=$(MOUNT_DIR)/client
 SDIR=$(MOUNT_DIR)/server
 RDIR=$(MOUNT_DIR)/renderer
-@@ -286,14 +244,14 @@
+@@ -286,14 +243,14 @@
     endif
   endif
 
@ -106,7 +113,7 @@
   ifeq ($(ARCH),i386)
     # linux32 make ...
     BASE_CFLAGS += -m32
-@@ -499,16 +457,12 @@
+@@ -499,16 +456,12 @@
 
 ifeq ($(PLATFORM),freebsd)
 
@ -127,7 +134,7 @@
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL
     ifeq ($(USE_OPENAL_DLOPEN),1)
-@@ -524,23 +478,18 @@
+@@ -524,23 +477,18 @@
     BASE_CFLAGS += -DUSE_CODEC_MP3
   endif
 
@ -161,7 +168,7 @@
 
   SHLIBEXT=so
   SHLIBCFLAGS=-fPIC
-@@ -550,13 +499,23 @@
+@@ -550,13 +498,23 @@
   # don't need -ldl (FreeBSD)
   LDFLAGS=-lm
 
@ -187,7 +194,7 @@
     endif
   endif
 
-@@ -781,24 +740,25 @@
+@@ -781,24 +739,22 @@
 TARGETS =
 
 ifneq ($(BUILD_SERVER),0)
@ -217,14 +224,11 @@
 -    $(B)/missionpack/ui$(ARCH).$(SHLIBEXT)
 +    $(B)/baseq3/cgame.$(SHLIBEXT) \
 +    $(B)/baseq3/qagame.$(SHLIBEXT) \
-+    $(B)/baseq3/ui.$(SHLIBEXT)     \
-+    $(B)/missionpack/cgame.$(SHLIBEXT) \
-+    $(B)/missionpack/qagame.$(SHLIBEXT) \
-+    $(B)/missionpack/ui.$(SHLIBEXT)
+    $(B)/baseq3/ui.$(SHLIBEXT)
 endif
 
 ifneq ($(BUILD_GAME_QVM),0)
-@@ -929,7 +889,7 @@
+@@ -929,7 +885,7 @@
 #############################################################################
 
 default: release
@ -233,7 +237,7 @@
 
 debug:
 	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
-@@ -1360,9 +1320,15 @@
+@@ -1360,9 +1316,15 @@
   ifeq ($(ARCH),x86)
     Q3OBJ += $(B)/client/vm_x86.o
   endif
@ -249,7 +253,7 @@
   ifeq ($(ARCH),ppc)
     Q3OBJ += $(B)/client/vm_ppc.o
   endif
-@@ -1383,12 +1349,12 @@
+@@ -1383,12 +1345,12 @@
 Q3POBJ_SMP += \
   $(B)/clientsmp/sdl_glimp.o
 
@ -264,7 +268,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
 		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-@@ -1497,9 +1463,15 @@
+@@ -1497,9 +1459,15 @@
   ifeq ($(ARCH),x86)
     Q3DOBJ += $(B)/ded/vm_x86.o
   endif
@ -280,7 +284,7 @@
   ifeq ($(ARCH),ppc)
     Q3DOBJ += $(B)/ded/vm_ppc.o
   endif
-@@ -1516,7 +1488,7 @@
+@@ -1516,7 +1484,7 @@
     $(B)/ded/con_tty.o
 endif
 
@ -289,7 +293,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
 
-@@ -1556,7 +1528,7 @@
+@@ -1556,7 +1524,7 @@
 Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
 Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm)
 
@ -298,7 +302,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
 
-@@ -1600,7 +1572,7 @@
+@@ -1600,7 +1568,7 @@
 MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
 MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm)
 
@ -307,7 +311,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
 
-@@ -1653,7 +1625,7 @@
+@@ -1653,7 +1621,7 @@
 Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
 Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm)
 
@ -316,7 +320,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
 
-@@ -1704,7 +1676,7 @@
+@@ -1704,7 +1672,7 @@
 MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
 MPGVMOBJ = $(MPGOBJ_:%.o=%.asm)
 
@ -325,7 +329,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
 
-@@ -1767,7 +1739,7 @@
+@@ -1767,7 +1735,7 @@
 Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
 Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
 
@ -334,7 +338,7 @@
 	$(echo_cmd) "LD $@"
 	$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
 
-@@ -1795,7 +1767,7 @@
+@@ -1795,7 +1763,7 @@
 MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
 MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm)
 
--- a/games/worldofpadman/pkg-message
+++ b/games/worldofpadman/pkg-message
@ -7,6 +7,4 @@ If you have sound problems with OpenAL recompile without it. Also the OPENAL
 option causes the program to omit restoring gamma and mouse sensivity after
 exitting.

-If you enabled CELLSHADING, check files/extra-patch-cellshading for variables.
-
 ==============================================================================
--- a/games/worldofpadman/pkg-plist
+++ b/games/worldofpadman/pkg-plist
@ -72,9 +72,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/weapons_de.html
 %%PORTDOCS%%%%DOCSDIR%%/weapons_en.html
 share/pixmaps/worldofpadman.png
-%%GAMELIBS%%%%DATADIR%%/missionpack/cgame.so
-%%GAMELIBS%%%%DATADIR%%/missionpack/qagame.so
-%%GAMELIBS%%%%DATADIR%%/missionpack/ui.so
 %%DATADIR%%/wop/server-allgametypes.cfg
 %%DATADIR%%/wop/server-bigballoon.cfg
 %%DATADIR%%/wop/server-lastpadstanding.cfg
@ -94,7 +91,6 @@ share/pixmaps/worldofpadman.png
 %%GAMELIBS%%%%DATADIR%%/wop/qagame.so
 %%GAMELIBS%%%%DATADIR%%/wop/ui.so
@dirrm %%DATADIR%%/wop
-%%GAMELIBS%%@dirrm %%DATADIR%%/missionpack
@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pictures/weapons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pictures/powerups