diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile index 6051862356a7..24460115484b 100644 --- a/games/mvdsv/Makefile +++ b/games/mvdsv/Makefile @@ -1,43 +1,38 @@ # Created by: Alexey Dokuchaev PORTNAME?= mvdsv -PORTVERSION= 0.33 +PORTVERSION= 0.34 PORTEPOCH= 2 CATEGORIES?= games MAINTAINER= danfe@FreeBSD.org COMMENT?= Enhanced QuakeWorld server with multi-view demos capability LICENSE= GPLv2 .if ${PORTNAME} == mvdsv LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre USES= localbase:ldflags .endif USE_GITHUB= yes GH_ACCOUNT= deurk -BUILD_WRKSRC?= ${WRKSRC}/build/make MAKEFILE= Makefile.BSD MAKE_ARGS= UNAME=${OPSYS} PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT_i386= ASM ASM_IMPLIES= OPTIMIZED_CFLAGS ASM_MAKE_ARGS_OFF= -DWITHOUT_X86_ASM OPTIMIZED_CFLAGS_MAKE_ARGS= -DWITH_OPTIMIZED_CFLAGS -post-patch: - @${REINPLACE_CMD} -e '/#include/s,/source,/src,' \ - ${WRKSRC}/tools/qwdtools/source/defs.h - do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include diff --git a/games/mvdsv/distinfo b/games/mvdsv/distinfo index 340d89efd258..baf7e664e387 100644 --- a/games/mvdsv/distinfo +++ b/games/mvdsv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1598948122 -SHA256 (deurk-mvdsv-0.33_GH0.tar.gz) = dc9abdbbe07659d6edc7ff0bc88034f1e5928a164f7ba9aaf92869930e2e4184 -SIZE (deurk-mvdsv-0.33_GH0.tar.gz) = 576306 +TIMESTAMP = 1632262916 +SHA256 (deurk-mvdsv-0.34_GH0.tar.gz) = 8190718dfe1088f4f12a66177eeb01c1a527f5f465e70dec4fbb8feed4994c6a +SIZE (deurk-mvdsv-0.34_GH0.tar.gz) = 597476 diff --git a/games/mvdsv/files/patch-build_make_Makefile.BSD b/games/mvdsv/files/patch-Makefile.BSD similarity index 92% rename from games/mvdsv/files/patch-build_make_Makefile.BSD rename to games/mvdsv/files/patch-Makefile.BSD index 2c47406e0d8a..cbea6f6e23ea 100644 --- a/games/mvdsv/files/patch-build_make_Makefile.BSD +++ b/games/mvdsv/files/patch-Makefile.BSD @@ -1,50 +1,50 @@ ---- build/make/Makefile.BSD.orig 2018-06-30 09:20:48 UTC -+++ build/make/Makefile.BSD -@@ -17,12 +17,11 @@ SV_DIR = ../../src +--- Makefile.BSD.orig 2021-09-21 22:21:56 UTC ++++ Makefile.BSD +@@ -17,12 +17,11 @@ SV_DIR = ./src # for gcc its like: make mvdsv FORCE32BITFLAGS=-m32 # configure script add FORCE32BITFLAGS=-m32 -DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} +BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\1,p' +DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DWWW_INTEGRATION -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -WITH_OPTIMIZED_CFLAGS = YES - .if defined(WITH_OPTIMIZED_CFLAGS) -DO_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -funroll-loops +DO_CFLAGS += -ffast-math -funroll-loops . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) USE_ASM=-Did386 DO_CFLAGS += ${USE_ASM} @@ -35,7 +34,7 @@ STRIP_FLAGS = --strip-unneeded .endif STRIP_FLAGS += --remove-section=.comment -LDFLAGS = -lm +LDFLAGS += -lm -lpthread -lpcre -lcurl ############################################################################# # SERVER @@ -90,9 +89,6 @@ SV_OBJS = \ ${SV_DIR}/world.o \ ${SV_DIR}/zone.o \ \ - ${SV_DIR}/pcre/get.o \ - ${SV_DIR}/pcre/pcre.o \ -\ ${SV_DIR}/central.o .ifdef USE_ASM @@ -106,10 +102,10 @@ SV_ASM_OBJS = \ ############################################################################# .c.o: - ${CC} ${DO_CFLAGS} -c $< -o $*.o + ${CC} ${DO_CFLAGS} -c $< -o $@ .s.o: - ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o + ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@ all: mvdsv ${STRIP} ${STRIP_FLAGS} mvdsv diff --git a/games/qwdtools/Makefile b/games/qwdtools/Makefile index faa524653a81..eaae76304aae 100644 --- a/games/qwdtools/Makefile +++ b/games/qwdtools/Makefile @@ -1,17 +1,17 @@ # Created by: Alexey Dokuchaev PORTNAME= qwdtools CATEGORIES= games converters COMMENT= Convert QuakeWorld demos from QWD format to MVD format DESCR= ${.CURDIR}/pkg-descr PKGMESSAGE= /nonexistent BUILD_WRKSRC= ${WRKSRC}/tools/qwdtools/source GH_PROJECT= mvdsv -CFLAGS+= -DQWE_VERSION=\\\"${PORTVERSION}\\\" \ - -DPROJECT_NAME=SERVER_NAME -DPROJECT_URL=HOMEPAGE_URL +CFLAGS+= -DVERSION_NUMBER=\\\"${PORTVERSION}\\\" \ + -DHOMEPAGE_URL=SERVER_HOME_URL MASTERDIR= ${.CURDIR}/../mvdsv .include "${MASTERDIR}/Makefile"