mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00
Code Issues Releases Activity

- Update to 20110628 [1]

Browse Source 
- Add desktop entries for client programs [2]

PR:		ports/161910
Submitted by:	green dog <fiziologus@gmail.com> [1], myself [2]
This commit is contained in:
Pawel Pekala 2011-10-25 16:46:11 +00:00
parent 136d5cf3ec
commit 8bf7974e1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=284296
6 changed files with 88 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/darkplaces/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= darkplaces
PORTVERSION= 20071120
PORTREVISION= 5
PORTVERSION= 20110628
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org:9090/twilight/darkplaces/files/
DISTNAME= ${PORTNAME}engine${PORTVERSION}
@ -35,7 +34,7 @@ PORTDOCS= darkplaces.txt
.include "${.CURDIR}/../quake-data/Makefile.include"
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED) && !defined(WITH_SDL)
IGNORE= needs at least one of CLIENT, DEDICATED and SDL options
@ -53,6 +52,8 @@ ALL_TARGET+= cl-release
EXE_TARGETS+= ${PORTNAME}-glx
PLIST_SUB+= CLIENT=""
PLIST_FILES+= bin/${PORTNAME}-glx
DESKTOP_ENTRIES+="Darkplaces GLX Client" "" "" "darkplaces-glx" \
"Game;ActionGame;" "false"
.endif
.if defined(WITH_DEDICATED)
@ -66,6 +67,8 @@ USE_SDL= sdl
ALL_TARGET+= sdl-release
EXE_TARGETS+= ${PORTNAME}-sdl
PLIST_FILES+= bin/${PORTNAME}-sdl
DESKTOP_ENTRIES+="Darkplaces SDL Client" "" "" "darkplaces-sdl" \
"Game;ActionGame;" "false"
.endif
post-extract:
@ -84,4 +87,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

4
games/darkplaces/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (darkplacesengine20071120.zip) = a5a06e5dd692375f8ca936841832e306838916f694dd1d8d0972ce63a97235ef
SIZE (darkplacesengine20071120.zip) = 10272585
SHA256 (darkplacesengine20110628.zip) = d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce
SIZE (darkplacesengine20110628.zip) = 23377408

11
games/darkplaces/files/patch-cd_bsd.c Normal file
View File

@ -0,0 +1,11 @@
--- cd_bsd.c.orig 2011-10-23 01:01:02.000000000 +0400
+++ cd_bsd.c 2011-10-23 01:02:00.000000000 +0400
@@ -39,7 +39,7 @@
#ifndef __FreeBSD__
# define DEFAULT_CD_DEVICE _PATH_DEV "cd0"
#else
-# define DEFAULT_CD_DEVICE "/dev/acd0c"
+# define DEFAULT_CD_DEVICE "/dev/acd0"
#endif
static int cdfile = -1;

14
games/darkplaces/files/patch-glquake.h Normal file
View File

@ -0,0 +1,14 @@
--- glquake.h.orig 2011-10-22 00:02:41.000000000 +0400
+++ glquake.h 2011-10-21 23:16:37.000000000 +0400
@@ -758,9 +758,11 @@
// GL 2.0 shader objects
#ifndef GL_PROGRAM_OBJECT
+#ifndef __glext_h_
// 1-byte character string
typedef char GLchar;
#endif
+#endif
extern void (GLAPIENTRY *qglDeleteShader)(GLuint obj);
extern void (GLAPIENTRY *qglDeleteProgram)(GLuint obj);
//extern GLuint (GLAPIENTRY *qglGetHandle)(GLenum pname);

13
games/darkplaces/files/patch-makefile Normal file
View File

@ -0,0 +1,13 @@
--- makefile.orig 2011-10-22 23:23:36.000000000 +0400
+++ makefile 2011-10-22 23:36:14.000000000 +0400
@@ -171,8 +171,8 @@
EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
# libjpeg dependency (set these to "" if you want to use dynamic loading instead)
- CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
- LIB_JPEG=-ljpeg
+ CFLAGS_LIBJPEG=""
+ LIB_JPEG=""
endif
# Win32 configuration

67
games/darkplaces/files/patch-makefile.inc
View File

@ -1,54 +1,69 @@
--- makefile.inc.orig Sat Nov 10 06:34:18 2007
+++ makefile.inc Thu Nov 29 16:39:58 2007
@@ -1,5 +1,5 @@
# Choose the compiler you want to use
-CC=gcc
+CC?=gcc
--- makefile.inc.orig 2011-06-01 14:47:42.000000000 +0400
+++ makefile.inc 2011-10-23 00:50:35.000000000 +0400
@@ -201,8 +201,8 @@
#OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
#OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
#OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
-#OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
-OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE=$(CPUOPTIMIZATIONS)
+#OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
# NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
# athlon optimizations
#CPUOPTIMIZATIONS=-march=athlon
@@ -172,7 +172,7 @@
OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
DO_CC=$(CC) $(CFLAGS) -c $< -o $@
@@ -219,7 +219,7 @@
OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
LDFLAGS_UNIXCOMMON=-lm
-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+LDFLAGS_UNIXCL=-L$(LOCALBASE)/lib -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl
LDFLAGS_UNIXSV_PRELOAD=-lz -lcurl
LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -lvorbis -lvorbisfile -lcurl
@@ -376,28 +376,28 @@
LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm -pthread $(LIB_SOUND)
+LDFLAGS_UNIXCL=-L$(LOCALBASE)/lib -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm -pthread $(LIB_SOUND)
LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug
LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug
@@ -453,8 +453,8 @@
@echo "========== $(EXE) (debug) =========="
$(MAKE) $(EXE) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
- CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
- LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
- LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2
+ CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
+ LDFLAGS+="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
+ LDFLAGS+="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)" LEVEL=2
bin-profile :
@echo
$(CHECKLEVEL1)
@@ -462,8 +462,8 @@
@echo "========== $(EXE) (profile) =========="
$(MAKE) $(EXE) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
- CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
- LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
- LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2
+ CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
+ LDFLAGS+="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
+ LDFLAGS+="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)" LEVEL=2
bin-release :
@echo
$(CHECKLEVEL1)
@@ -471,8 +471,8 @@
@echo "========== $(EXE) (release) =========="
$(MAKE) $(EXE) \
DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
- CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
- LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
- LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2
+ CFLAGS+="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
+ LDFLAGS+="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
+ LDFLAGS+="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" LEVEL=2
$(STRIP) $(EXE)
bin-release-profile :
@@ -496,11 +496,11 @@
vid_glx.o: vid_glx.c
$(CHECKLEVEL2)
- $(DO_CC) -I/usr/X11R6/include
+ $(DO_CC) -I$(LOCALBASE)/include
keysym2ucs.o: keysym2ucs.c
$(CHECKLEVEL2)
- $(DO_CC) -I/usr/X11R6/include
+ $(DO_CC) -I$(LOCALBASE)/include
vid_sdl.o: vid_sdl.c
$(DO_CC) $(CFLAGS_SDL)
$(CHECKLEVEL2)