[Midnightbsd-cvs] mports [20765] trunk/games/doomlegacy/pkg-plist: update doomlegacy to 1.45.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Nov 12 20:23:36 EST 2015
Revision: 20765
http://svnweb.midnightbsd.org/mports/?rev=20765
Author: laffer1
Date: 2015-11-12 20:23:36 -0500 (Thu, 12 Nov 2015)
Log Message:
-----------
update doomlegacy to 1.45.2
Modified Paths:
--------------
trunk/games/doomlegacy/Makefile
trunk/games/doomlegacy/distinfo
trunk/games/doomlegacy/pkg-descr
Added Paths:
-----------
trunk/games/doomlegacy/files/patch-Makefile
trunk/games/doomlegacy/files/patch-sdl+i_system.c
Removed Paths:
-------------
trunk/games/doomlegacy/files/legacy.in
trunk/games/doomlegacy/files/patch-byteptr.h
trunk/games/doomlegacy/files/patch-i_sound.c
trunk/games/doomlegacy/files/patch-i_tcp.c
trunk/games/doomlegacy/files/patch-makefile
trunk/games/doomlegacy/files/patch-sndserv_Makefile
trunk/games/doomlegacy/pkg-plist
Property Changed:
----------------
trunk/games/doomlegacy/pkg-descr
Modified: trunk/games/doomlegacy/Makefile
===================================================================
--- trunk/games/doomlegacy/Makefile 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/Makefile 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,78 +1,72 @@
-# New ports collection makefile for: doomlegacy
-# Date Created: Oct 20 2007
-# Whom: Lucas Holt <luke at midnightbsd.org>
-#
# $MidnightBSD$
# $FreeBSD: ports/games/doomlegacy/Makefile,v 1.15 2007/06/07 00:00:30 alepulver Exp $
PORTNAME= doomlegacy
-PORTVERSION= 142
-PORTREVISION= 5
+PORTVERSION= 1.45.2
+PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= SF/${PORTNAME}/DooM%20Legacy%20source%20code/1.42
-DISTNAME= legacy_${PORTVERSION}_src
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${WADFILE}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:S,_,%20,}/
+DISTNAME= ${PORTNAME}_${DISTVERSION}_source
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${PORTNAME}_${DISTVERSION}_common.zip
MAINTAINER= ports at MidnightBSD.org
-COMMENT= DooM Legacy: popular DooM clone!
+COMMENT= Improved and extended version of Doom
+
LICENSE= gpl2
-EXTRACT_DEPENDS=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-
-USE_GL= yes
-USE_GMAKE= yes
+USES= gmake tar:bzip2
+USE_GL= glu
USE_SDL= mixer sdl
-MAKEFILE= makefile
-MAKE_ENV= FREEBSD=1 FBSD_SDL=1 PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
-WRKSRC= ${WRKDIR}/doomlegacy_${PORTVERSION}_src
-OPTIONS= X86_ASM "Enable use of x86 assembly code" on
+CFLAGS+= -DSVN_REV=\\\"1139\\\"
-DATADIR= ${PREFIX}/lib/${PORTNAME}
-SUB_FILES= legacy
+PLIST_FILES= bin/${PORTNAME} share/doom/legacy.wad
+PORTDOCS= *
-WADFILE= legacy_dat.zip
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE_i386= ASM
-.include "${.CURDIR}/../doom-data/Makefile.include"
+.if exists(/usr/include/netipx/ipx.h)
+OPTIONS_DEFINE+= IPX
+IPX_DESC= IPX protocol support
+.endif
-.include <bsd.port.pre.mk>
+ASM_BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
+ASM_MAKE_ENV= USEASM=1 OLD_DEPENDENCIES=1
-.if defined(WITH_X86_ASM) && ${ARCH} == "i386"
-BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
-MAKE_ARGS+= USEASM=1
+.include <bsd.mport.options.mk>
+
+post-patch: .SILENT
+# Adjust default WAD search path
+ ${REINPLACE_CMD} -e '/DEFWADS1/s|/.*|${DMDIR}"|' \
+ ${WRKSRC}/src/doomdef.h
+# Provide better support for relative paths (for `-iwad' switch)
+ ${REINPLACE_CMD} -e "s|s\[0\] ==[^)]*|strchr(s, '/')|" \
+ ${WRKSRC}/src/d_main.c
+# Unbreak against Clang (https://llvm.org/bugs/show_bug.cgi?id=10365)
+ ${REINPLACE_CMD} -e 's,%cc,cc,' ${WRKSRC}/src/m_fixed.h
+# Unbreak against Clang 3.7.0
+ ${REINPLACE_CMD} -e '/draw_dir_line(/s,inline,static &,' \
+ ${WRKSRC}/src/m_menu.c
+.if ! ${PORT_OPTIONS:MIPX}
+ ${REINPLACE_CMD} -e '/USE_IPX/s|define|undef|' ${WRKSRC}/src/doomdef.h
+ ${REINPLACE_CMD} -e 's| -lipx||' ${WRKSRC}/Makefile
.endif
-post-extract:
- @${UNZIP_CMD} -q ${DISTDIR}/${WADFILE} -d ${WRKDIR}/bin
-
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|-I/usr/local/include/SDL11|`${SDL_CONFIG} --cflags`|; \
- s|-lSDL-1\.1|`${SDL_CONFIG} --libs`|; \
- s|/usr/local|${LOCALBASE}|; \
- s|/usr/X11R6|${LOCALBASE}|' \
- ${WRKSRC}/${MAKEFILE}
-
pre-build:
- @cd ${WRKSRC}/linux_x/sndserv && ${GMAKE} clean
+ ${ECHO_CMD} CC_ENVIRONMENT=1 MAKE_OPTIONS_PRESENT=1 HAVE_MIXER=1 | \
+ ${XARGS} -n 1 > ${BUILD_WRKSRC}/make_options
+ ${MAKE_CMD} -C ${BUILD_WRKSRC} dirs
+ ${MAKE_CMD} -C ${BUILD_WRKSRC} depend
-post-build:
- @${LN} -sf ${WRKSRC}/linux_x/sndserv/linux/llsndserv ${WRKDIR}/bin
-
do-install:
- ${MKDIR} ${DATADIR}
- cd ${WRKDIR}/bin && ${INSTALL_PROGRAM} llsndserv r_opengl.so ${DATADIR}
- ${INSTALL} -c -s -o root -g kmem -m 2555 ${WRKDIR}/bin/lsdldoom \
- ${DATADIR}
- ${INSTALL_DATA} ${WRKDIR}/bin/legacy.dat ${DATADIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/legacy ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-. for f in *.html *.txt *.cfg README_SDL copying
- ${INSTALL_DATA} ${WRKSRC}/_doc/${f} ${DOCSDIR}
-. endfor
-.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy ${STAGEDIR}${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${DMDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}/legacy.wad \
+ ${STAGEDIR}${DMDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../doom-data/Makefile.include"
+.include <bsd.port.mk>
Modified: trunk/games/doomlegacy/distinfo
===================================================================
--- trunk/games/doomlegacy/distinfo 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/distinfo 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,8 +1,4 @@
-MD5 (legacy_142_src.tar.gz) = 62f5cdad464463038d568a53b13c22f7
-SHA256 (legacy_142_src.tar.gz) = f5d80aaafddb1a9525af72f118cc63f724f3542c9f58496ad5eabd334b8e2d98
-RMD160 (legacy_142_src.tar.gz) = 887d5d5283db50fe6bc653071511c32bed3e5e2f
-SIZE (legacy_142_src.tar.gz) = 1687954
-MD5 (legacy_dat.zip) = 8182e1aebac3696ddc7f9e0663740d9a
-SHA256 (legacy_dat.zip) = 2904fb4e14f60b85aeb49b4fe046ac360156dbe79acb26b640507d00ab949dfb
-RMD160 (legacy_dat.zip) = a7f84423f802a7a53a440d0765b631d132ebcc30
-SIZE (legacy_dat.zip) = 340934
+SHA256 (doomlegacy_1.45.2_source.tar.bz2) = 092c23418974062a516df4c21ccd8c7d6187755220ba518475935ea5b2688fb9
+SIZE (doomlegacy_1.45.2_source.tar.bz2) = 2076653
+SHA256 (doomlegacy_1.45.2_common.zip) = 509bac4a05e55a9640846d64d43a0371eaed06ff82a9c4a0d8d564d35a9aec28
+SIZE (doomlegacy_1.45.2_common.zip) = 941784
Deleted: trunk/games/doomlegacy/files/legacy.in
===================================================================
--- trunk/games/doomlegacy/files/legacy.in 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/legacy.in 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# The executable needs to run from a directory with the Doom Legacy data
-# files, libraries and executables. So we mirror the Doom Legacy data
-# directory to ~/.doomlegacy, and create symlinks to the data files.
-
-DOOMWADDIR="%%DMDIR%%"; export DOOMWADDIR
-
-if [ -d ~/.doomlegacy ]
-then
- echo "Using existing ~/.doomlegacy directory."
-else
- echo "Creating ~/.doomlegacy directory."
- cd %%DATADIR%% || exit 1
- mkdir -p ~/.doomlegacy
- ln -s %%DATADIR%%/* ~/.doomlegacy
-fi
-
-cd ~/.doomlegacy || exit 1
-exec ./lsdldoom -nocheckwadversion "$@"
Added: trunk/games/doomlegacy/files/patch-Makefile
===================================================================
--- trunk/games/doomlegacy/files/patch-Makefile (rev 0)
+++ trunk/games/doomlegacy/files/patch-Makefile 2015-11-13 01:23:36 UTC (rev 20765)
@@ -0,0 +1,32 @@
+--- Makefile.orig 2014-05-17 18:32:47 UTC
++++ Makefile
+@@ -263,9 +263,9 @@ ifeq ($(SMIF), SDL)
+ else
+ # default is Linux, for all unix SDL
+ EXENAME:=doomlegacy
+- OPTS:=-DLINUX
++ OPTS:=-DLINUX -DFREEBSD
+ LDFLAGS=-L/usr/X11R6/lib
+- LIBS:=-lGL -lGLU -lm
++ LIBS:=-lGL -lGLU -lm -lipx
+ # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have
+ # the GLU libraries in an X11 directory.
+ # -lm is needed for pow, powf, and other MATH1 functions.
+@@ -599,7 +599,7 @@ ifdef CDMUS
+ endif
+
+ # compiler and linker flags
+-CFLAGS:=$(WFLAGS)
++#CFLAGS:=$(WFLAGS)
+
+ ifdef PROFILEMODE
+ # build with gprof profiling information
+@@ -616,7 +616,7 @@ ifdef DEBUG
+ else
+ # build a normal optimized version
+ #CFLAGS+=-O3
+- CFLAGS+=$(OPTLEV) -fomit-frame-pointer
++ #CFLAGS+=$(OPTLEV) -fomit-frame-pointer
+ endif
+ endif
+
Property changes on: trunk/games/doomlegacy/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/games/doomlegacy/files/patch-byteptr.h
===================================================================
--- trunk/games/doomlegacy/files/patch-byteptr.h 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/patch-byteptr.h 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,208 +0,0 @@
---- byteptr.h.orig Sun Apr 18 18:02:24 2004
-+++ byteptr.h Wed Jun 6 20:09:36 2007
-@@ -32,109 +32,123 @@
- //
- //-----------------------------------------------------------------------------
-
--#ifndef __BIG_ENDIAN__
--//
--// Little-endian machines
--//
--#define writeshort(p,b) *(short*) (p) = b
--#define writelong(p,b) *(long *) (p) = b
--#define WRITEBYTE(p,b) *((byte *)p)++ = b
--#define WRITECHAR(p,b) *((char *)p)++ = b
--#define WRITESHORT(p,b) *((short *)p)++ = b
--#define WRITEUSHORT(p,b) *((USHORT *)p)++ = b
--#define WRITELONG(p,b) *((long *)p)++ = b
--#define WRITEULONG(p,b) *((ULONG *)p)++ = b
--#define WRITEFIXED(p,b) *((fixed_t*)p)++ = b
--#define WRITEANGLE(p,b) *((angle_t*)p)++ = b
--#define WRITESTRING(p,b) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); } while(b[tmp_i++]); }
--#define WRITESTRINGN(p,b,n) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); if(!b[tmp_i]) break;tmp_i++; } while(tmp_i<n); }
--#define WRITEMEM(p,s,n) memcpy(p, s, n);p+=n
-+#include <assert.h>
-+#include <stdint.h>
-
--#define readshort(p) *((short *)p)
--#define readlong(p) *((long *)p)
--#define READBYTE(p) *((byte *)p)++
--#define READCHAR(p) *((char *)p)++
--#define READSHORT(p) *((short *)p)++
--#define READUSHORT(p) *((USHORT *)p)++
--#define READLONG(p) *((long *)p)++
--#define READULONG(p) *((ULONG *)p)++
--#define READFIXED(p) *((fixed_t*)p)++
--#define READANGLE(p) *((angle_t*)p)++
--#define READSTRING(p,s) { int tmp_i=0; do { s[tmp_i]=READBYTE(p); } while(s[tmp_i++]); }
--#define SKIPSTRING(p) while(READBYTE(p))
--#define READMEM(p,s,n) memcpy(s, p, n);p+=n
--#else
--//
--// definitions for big-endian machines with alignment constraints.
--//
--// Write a value to a little-endian, unaligned destination.
--//
--static inline void writeshort(void * ptr, int val)
-+#ifdef __BIG_ENDIAN__
-+#define ptrtole(ptr, size) endian_swap(ptr, size)
-+#else
-+#define ptrtole(ptr, size)
-+#endif
-+
-+static inline void *endian_swap(void *ptr, size_t size)
- {
-- char * cp = ptr;
-- cp[0] = val ; val >>= 8;
-- cp[1] = val ;
-+ unsigned char *myptr = ptr;
-+ int i, x;
-+
-+ for (i = 1; i <= size / 2; i++) {
-+ x = myptr[i-1];
-+ myptr[i-1] = myptr[size-i];
-+ myptr[size-i] = x;
-+ }
-+
-+ return (ptr);
- }
-
--static inline void writelong(void * ptr, int val)
-+static inline void *incptr(void **ptr, size_t size)
- {
-- char * cp = ptr;
-- cp[0] = val ; val >>= 8;
-- cp[1] = val ; val >>= 8;
-- cp[2] = val ; val >>= 8;
-- cp[3] = val ;
-+ unsigned char **myptr = ptr;
-+ void *oldptr = *ptr;
-+ int i;
-+
-+ for (i = 0; i < size; i++)
-+ (*myptr)++;
-+
-+ return (oldptr);
- }
-
--#define WRITEBYTE(p,b) *((byte *)p)++ = (b)
--#define WRITECHAR(p,b) *((char *)p)++ = (b)
--#define WRITESHORT(p,b) writeshort(((short *)p)++, (b))
--#define WRITEUSHORT(p,b) writeshort(((u_short*)p)++, (b))
--#define WRITELONG(p,b) writelong (((long *)p)++, (b))
--#define WRITEULONG(p,b) writelong (((u_long *)p)++, (b))
--#define WRITEFIXED(p,b) writelong (((fixed_t*)p)++, (b))
--#define WRITEANGLE(p,b) writelong (((angle_t*)p)++, (long) (b))
--#define WRITESTRING(p,b) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); } while(b[tmp_i++]); }
--#define WRITESTRINGN(p,b,n) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); if(!b[tmp_i]) break;tmp_i++; } while(tmp_i<n); }
--#define WRITEMEM(p,s,n) memcpy(p, s, n);p+=n
-+static inline intmax_t readptr(void **ptr, size_t size)
-+{
-+ intmax_t res = 0;
-
--// Read a signed quantity from little-endian, unaligned data.
--//
--static inline short readshort(void * ptr)
-+ // Check if it won't work
-+ assert(size > 0 && size <= sizeof(intmax_t));
-+
-+ memcpy(&res, incptr(ptr, size), size);
-+ ptrtole(&res, size);
-+
-+ return (res);
-+}
-+
-+static inline intmax_t writeptr(void **dst, intmax_t src, size_t size)
- {
-- char *cp = ptr;
-- u_char *ucp = ptr;
-- return (cp[1] << 8) | ucp[0] ;
-+ intmax_t res = 0;
-+
-+ // Check if it won't work
-+ assert(size > 0 && size <= sizeof(intmax_t));
-+
-+ memcpy(*dst, &src, size);
-+ ptrtole(*dst, size);
-+ memcpy(&res, *dst, size);
-+ incptr(dst, size);
-+
-+ return (res);
- }
-
--static inline u_short readushort(void * ptr)
-+static inline short readshort(void *ptr)
- {
-- u_char *ucp = ptr;
-- return (ucp[1] << 8) | ucp[0] ;
-+ short res = *(short *)ptr;
-+
-+ ptrtole(&res, sizeof(short));
-+
-+ return (res);
- }
-
--static inline long readlong(void * ptr)
-+static inline long readlong(void *ptr)
- {
-- char *cp = ptr;
-- u_char *ucp = ptr;
-- return (cp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0] ;
-+ long res = *(long *)ptr;
-+
-+ ptrtole(&res, sizeof(long));
-+
-+ return (res);
- }
-
--static inline u_long readulong(void * ptr)
-+static inline void writeshort(void *ptr, int val)
- {
-- u_char *ucp = ptr;
-- return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0] ;
-+ short *myptr = ptr;
-+
-+ *myptr = val;
-+ ptrtole(myptr, sizeof(*myptr));
- }
-
-+static inline void writelong(void *ptr, int val)
-+{
-+ long *myptr = ptr;
-
--#define READBYTE(p) *((byte *)p)++
--#define READCHAR(p) *((char *)p)++
--#define READSHORT(p) readshort ( ((short*) p)++)
--#define READUSHORT(p) readushort(((USHORT*) p)++)
--#define READLONG(p) readlong ( ((long*) p)++)
--#define READULONG(p) readulong ( ((ULONG*) p)++)
--#define READFIXED(p) readlong ( ((long*) p)++)
--#define READANGLE(p) readulong ( ((ULONG*) p)++)
-+ *myptr = val;
-+ ptrtole(myptr, sizeof(*myptr));
-+}
-+
-+#define WRITEBYTE(p,b) writeptr(&p, b, sizeof(byte))
-+#define WRITECHAR(p,b) writeptr(&p, b, sizeof(char))
-+#define WRITESHORT(p,b) writeptr(&p, b, sizeof(short))
-+#define WRITEUSHORT(p,b) writeptr(&p, b, sizeof(USHORT))
-+#define WRITELONG(p,b) writeptr(&p, b, sizeof(long))
-+#define WRITEULONG(p,b) writeptr(&p, b, sizeof(ULONG))
-+#define WRITEFIXED(p,b) writeptr(&p, b, sizeof(fixed_t))
-+#define WRITEANGLE(p,b) writeptr(&p, b, sizeof(angle_t))
-+#define WRITESTRING(p,b) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); } while(b[tmp_i++]); }
-+#define WRITESTRINGN(p,b,n) { int tmp_i=0; do { WRITECHAR(p,b[tmp_i]); if(!b[tmp_i]) break;tmp_i++; } while(tmp_i<n); }
-+#define WRITEMEM(p,s,n) memcpy(p, s, n);p+=n
-+
-+#define READBYTE(p) readptr(&p, sizeof(byte))
-+#define READCHAR(p) readptr(&p, sizeof(char))
-+#define READSHORT(p) readptr(&p, sizeof(short))
-+#define READUSHORT(p) readptr(&p, sizeof(USHORT))
-+#define READLONG(p) readptr(&p, sizeof(long))
-+#define READULONG(p) readptr(&p, sizeof(ULONG))
-+#define READFIXED(p) readptr(&p, sizeof(fixed_t))
-+#define READANGLE(p) readptr(&p, sizeof(angle_t))
- #define READSTRING(p,s) { int tmp_i=0; do { s[tmp_i]=READBYTE(p); } while(s[tmp_i++]); }
- #define SKIPSTRING(p) while(READBYTE(p))
- #define READMEM(p,s,n) memcpy(s, p, n);p+=n
--#endif //__BIG_ENDIAN__
Deleted: trunk/games/doomlegacy/files/patch-i_sound.c
===================================================================
--- trunk/games/doomlegacy/files/patch-i_sound.c 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/patch-i_sound.c 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,11 +0,0 @@
---- sdl/i_sound.c.orig Mon Apr 19 01:02:24 2004
-+++ sdl/i_sound.c Sat Mar 5 23:04:27 2005
-@@ -118,7 +118,7 @@
-
- #define SAMPLERATE 11025 // Hz
-
--static int samplecount = 512;
-+static int samplecount = 1024;
-
- static int lengths[NUMSFX]; // The actual lengths of all sound effects.
- static unsigned int channelstep[NUM_CHANNELS]; // The channel step amount...
Deleted: trunk/games/doomlegacy/files/patch-i_tcp.c
===================================================================
--- trunk/games/doomlegacy/files/patch-i_tcp.c 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/patch-i_tcp.c 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,13 +0,0 @@
---- i_tcp.c.orig Fri Jan 17 17:26:18 2003
-+++ i_tcp.c Fri Jan 17 17:27:09 2003
-@@ -219,6 +219,10 @@
- #include "doomstat.h"
- #include "mserv.h" //Hurdler: support master server
-
-+// somewhere on the track between 4.5 and -current this one has disappered.
-+#ifndef IPPORT_USERRESERVED
-+ #define IPPORT_USERRESERVED 5000
-+#endif
- #ifdef __WIN32__
- // some undifined under win32
- #define IPPORT_USERRESERVED 5000
Deleted: trunk/games/doomlegacy/files/patch-makefile
===================================================================
--- trunk/games/doomlegacy/files/patch-makefile 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/patch-makefile 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,99 +0,0 @@
---- makefile.orig Sun Apr 18 18:02:24 2004
-+++ makefile Mon Sep 19 20:44:29 2005
-@@ -260,12 +260,10 @@
-
- # gcc or g++
- #CC=@gcc
--CC=gcc
-
- #if use PGCC or EGCS
- PGCC=1
-
--WFLAGS=-Wall # -W -Wno-unused -Wno-sign-compare
-
- #uncomment if you want to use the POLL_POINTER hack
- #POLL_POINTER=-DPOLL_POINTER
-@@ -407,7 +405,8 @@
-
- OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
- LDFLAGS=-L/usr/X11R6/lib
-- LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm -pthread
-+ LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm ${PTHREAD_LIBS}
-+ CFLAGS+=${PTHREAD_CFLAGS}
- # name of the exefile
- EXENAME=llxdoom
- SFLAGS=-g $(OPTS)
-@@ -418,7 +417,7 @@
- else #ifdef X
- ifdef FBSD_SDL
- INTERFACE=sdl
-- OPTS := -DLINUX -DFREEBSD -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL11 -I/usr/X11R6/include -Wall
-+ OPTS := -DLINUX -DFREEBSD -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL -I/usr/local/include -I/usr/X11R6/include
- SFLAGS=-g $(OPTS)
- OBJS=$(O)/i_video.o $(O)/dosstr.o $(O)/endtxt.o \
- $(O)/hw_bsp.o $(O)/hw_draw.o $(O)/hw_light.o $(O)/hw_main.o \
-@@ -428,7 +427,8 @@
- DEBUGLIBS=$(LIBS)
-
- LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib
-- LIBS=-lm -lSDL-1.1 -lSDL_mixer -lGL -lGLU -lipx -lkvm -pthread
-+ LIBS=-lm -lSDL -lSDL_mixer -lGL -lGLU -lipx -lkvm ${PTHREAD_LIBS}
-+ CFLAGS+=${PTHREAD_CFLAGS}
- DEBUGLIBS=$(LIBS)
-
- # name of the exefile
-@@ -533,11 +533,7 @@
-
- ifndef SOLARIS
- ifdef GCC30
-- M5=-march=pentium
-- M4=-march=486
- else
-- M5=-mpentium
-- M4=-m486
- endif
- endif
-
-@@ -555,13 +551,13 @@
-
- # build a normal optimised version
- ifdef PGCC
-- CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
-+ CFLAGS += $(OPTS)
- # -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
- # -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \
- # -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
- # -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
- else
-- CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
-+ CFLAGS += $(OPTS)
- endif
- endif
-
-@@ -735,7 +731,7 @@
-
- #dll
- dll : $(O)/r_opengl.o $(O)/ogl_x11.o
-- $(CC) $(M5) -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
-+ $(CC) $(CFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
-
- musserv:
- @mkdir -p $(MUSSERV)/linux
-@@ -760,7 +756,7 @@
- ifdef FREEBSD
- ifdef FBSD_SDL
- $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
-- $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
-+ $(CC) -fPIC $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
- else #FBSD_SDL
- $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
- $(CC) $(M5) -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
-@@ -777,7 +773,7 @@
- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
- else
- $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
-- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
-+ $(CC) -fPIC $(CFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
- endif
-
-
Added: trunk/games/doomlegacy/files/patch-sdl+i_system.c
===================================================================
--- trunk/games/doomlegacy/files/patch-sdl+i_system.c (rev 0)
+++ trunk/games/doomlegacy/files/patch-sdl+i_system.c 2015-11-13 01:23:36 UTC (rev 20765)
@@ -0,0 +1,11 @@
+--- src/sdl/i_system.c.orig 2014-05-16 20:11:49 UTC
++++ src/sdl/i_system.c
+@@ -508,6 +508,8 @@ void I_SysInit(void)
+
+ // Enable unicode key conversion
+ SDL_EnableUNICODE(1);
++ // Enable key auto repeat
++ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+ // Initialize the joystick subsystem.
+ I_JoystickInit();
Property changes on: trunk/games/doomlegacy/files/patch-sdl+i_system.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/games/doomlegacy/files/patch-sndserv_Makefile
===================================================================
--- trunk/games/doomlegacy/files/patch-sndserv_Makefile 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/files/patch-sndserv_Makefile 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,12 +0,0 @@
---- linux_x/sndserv/Makefile.orig Sun Apr 18 18:02:24 2004
-+++ linux_x/sndserv/Makefile Sun Sep 18 13:09:38 2005
-@@ -26,8 +26,7 @@
- #
- #
-
--CC=gcc
--CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
-+CFLAGS=-DNORMALUNIX -DLINUX
- ifdef FREEBSD
- CFLAGS:=${CFLAGS} -DFREEBSD
- endif
Modified: trunk/games/doomlegacy/pkg-descr
===================================================================
--- trunk/games/doomlegacy/pkg-descr 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/pkg-descr 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,12 +1,17 @@
-DooM Legacy is a DooM port. Some of the supported features are:
- * VIDEO OPTIONS MENU
- * TRANSLUCENCY ON SPRITES AND WALLS
- * SETUP CONTROLS MENU
- * LOOK UP AND DOWN (FREELOOK)
- * CHASE-CAM : also called a 'third-person' view, or 'Tomb Raider' view.
- * CONSOLE
- * STATUS BAR OVERLAY
- * SKINS
+Doom Legacy is a source port of Doom available for various operating systems
+which was originally written as a fork of DOSDoom introducing lots of useful
+improvements yet retaining original feel of the game. It currently features:
-WWW: http://legacy.newdoom.com/
-WWW: http://sourceforge.net/projects/doomlegacy
+ * TCP/IP multiplayer networking (including a master server for Internet
+ game searches)
+ * Nearly complete Boom and Heretic support
+ * OpenGL rendering
+ * Higher resolutions
+ * Console with support for key bindings (Quake-style)
+ * FraggleScript for scripting
+ * 3D floors, water, and coloured lighting
+ * Mouse aim and crosshairs
+ * Jumping
+ * 32 players (including support for custom skins)
+
+WWW: http://doomlegacy.sourceforge.net/
Property changes on: trunk/games/doomlegacy/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/games/doomlegacy/pkg-plist
===================================================================
--- trunk/games/doomlegacy/pkg-plist 2015-11-13 01:20:55 UTC (rev 20764)
+++ trunk/games/doomlegacy/pkg-plist 2015-11-13 01:23:36 UTC (rev 20765)
@@ -1,27 +0,0 @@
-bin/doomlegacy
-%%DATADIR%%/legacy.dat
-%%DATADIR%%/llsndserv
-%%DATADIR%%/lsdldoom
-%%DATADIR%%/r_opengl.so
-%%PORTDOCS%%%%DOCSDIR%%/3dfloors.html
-%%PORTDOCS%%%%DOCSDIR%%/Doublescan.txt
-%%PORTDOCS%%%%DOCSDIR%%/README_SDL
-%%PORTDOCS%%%%DOCSDIR%%/boomref.html
-%%PORTDOCS%%%%DOCSDIR%%/Console.html
-%%PORTDOCS%%%%DOCSDIR%%/copying
-%%PORTDOCS%%%%DOCSDIR%%/doomatic.txt
-%%PORTDOCS%%%%DOCSDIR%%/doomlic.txt
-%%PORTDOCS%%%%DOCSDIR%%/Editing.html
-%%PORTDOCS%%%%DOCSDIR%%/editspecs.html
-%%PORTDOCS%%%%DOCSDIR%%/Faq.html
-%%PORTDOCS%%%%DOCSDIR%%/fsbasic.html
-%%PORTDOCS%%%%DOCSDIR%%/fsfuncs.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Legacy.html
-%%PORTDOCS%%%%DOCSDIR%%/rules.txt
-%%PORTDOCS%%%%DOCSDIR%%/Skinspec.html
-%%PORTDOCS%%%%DOCSDIR%%/sound.cfg
-%%PORTDOCS%%%%DOCSDIR%%/source.html
-%%PORTDOCS%%%%DOCSDIR%%/Whatsnew.html
- at dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%
More information about the Midnightbsd-cvs
mailing list