From owner-svn-ports-all@freebsd.org Fri Apr 7 15:43:22 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58077D3288E; Fri, 7 Apr 2017 15:43:22 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FC34957; Fri, 7 Apr 2017 15:43:22 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v37FhL49021743; Fri, 7 Apr 2017 15:43:21 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v37FhKqw021739; Fri, 7 Apr 2017 15:43:20 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201704071543.v37FhKqw021739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 7 Apr 2017 15:43:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437928 - in head/games/doomlegacy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2017 15:43:22 -0000 Author: danfe Date: Fri Apr 7 15:43:20 2017 New Revision: 437928 URL: https://svnweb.freebsd.org/changeset/ports/437928 Log: - Update Doom Legacy to version 1.46.3 - Do not pass SVN_REV via CFLAGS, it is now defined in `src/d_main.c' - OLD_DEPENDENCIES is no longer a valid setting, stop referencing it - When adjusting default WAD search path, fix only one DEFWADS rather than a bunch of them (one is enough) - Remove old hack for better support for relative paths (for `-iwad' switch): it no longer applies and the game works correctly per se - Remove Clang-related fixes that were integrated upstream - Do not overwrite `make_options' file, simply append few necessary settings at the end of it List of changes: http://doomlegacy.sourceforge.net/docs/whatsnew.html Added: head/games/doomlegacy/files/patch-src_Makefile - copied, changed from r437927, head/games/doomlegacy/files/patch-Makefile head/games/doomlegacy/files/patch-src_i__tcp.c (contents, props changed) Deleted: head/games/doomlegacy/files/patch-Makefile Modified: head/games/doomlegacy/Makefile head/games/doomlegacy/distinfo Modified: head/games/doomlegacy/Makefile ============================================================================== --- head/games/doomlegacy/Makefile Fri Apr 7 15:26:29 2017 (r437927) +++ head/games/doomlegacy/Makefile Fri Apr 7 15:43:20 2017 (r437928) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= doomlegacy -PORTVERSION= 1.45.2 +PORTVERSION= 1.46.3 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:S,_,%20,}/ @@ -19,8 +19,6 @@ USES= gmake tar:bzip2 USE_GL= glu USE_SDL= mixer sdl -CFLAGS+= -DSVN_REV=\\\"1139\\\" - PLIST_FILES= bin/${PORTNAME} share/doom/legacy.wad PORTDOCS= * @@ -33,30 +31,22 @@ IPX_DESC= IPX protocol support .endif ASM_BUILD_DEPENDS= nasm:devel/nasm -ASM_MAKE_ENV= USEASM=1 OLD_DEPENDENCIES=1 +ASM_MAKE_ENV= USEASM=1 .include post-patch: .SILENT # Adjust default WAD search path - ${REINPLACE_CMD} -e '/DEFWADS1/s|/.*|${DMDIR}"|' \ + ${REINPLACE_CMD} -e '/DEFWADS20/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 + ${REINPLACE_CMD} -e 's| -lipx||' ${WRKSRC}/src/Makefile .endif pre-build: - ${ECHO_CMD} CC_ENVIRONMENT=1 MAKE_OPTIONS_PRESENT=1 HAVE_MIXER=1 | \ - ${XARGS} -n 1 > ${BUILD_WRKSRC}/make_options + ${ECHO_CMD} CC_ENVIRONMENT=1 OS=${OPSYS:tu} | \ + ${XARGS} -n 1 >> ${BUILD_WRKSRC}/make_options ${MAKE_CMD} -C ${BUILD_WRKSRC} dirs ${MAKE_CMD} -C ${BUILD_WRKSRC} depend Modified: head/games/doomlegacy/distinfo ============================================================================== --- head/games/doomlegacy/distinfo Fri Apr 7 15:26:29 2017 (r437927) +++ head/games/doomlegacy/distinfo Fri Apr 7 15:43:20 2017 (r437928) @@ -1,4 +1,5 @@ -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 +TIMESTAMP = 1488573218 +SHA256 (doomlegacy_1.46.3_source.tar.bz2) = 7bdb2b3c39113802d66cb3db501d3f5464fb286a97b7e39d76603202cc28b0ea +SIZE (doomlegacy_1.46.3_source.tar.bz2) = 2206648 +SHA256 (doomlegacy_1.46.3_common.zip) = 6447e12b9b1238a096e59bae8429329ed04786fb10d16a927405df3d3b225df2 +SIZE (doomlegacy_1.46.3_common.zip) = 971347 Copied and modified: head/games/doomlegacy/files/patch-src_Makefile (from r437927, head/games/doomlegacy/files/patch-Makefile) ============================================================================== --- head/games/doomlegacy/files/patch-Makefile Fri Apr 7 15:26:29 2017 (r437927, copy source) +++ head/games/doomlegacy/files/patch-src_Makefile Fri Apr 7 15:43:20 2017 (r437928) @@ -1,18 +1,15 @@ ---- 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 +--- src/Makefile.orig 2017-01-01 23:32:38 UTC ++++ src/Makefile +@@ -577,7 +577,7 @@ ifeq ($(SMIF), SDL) + # default is Linux, for all unix SDL + EXENAME:=doomlegacy + 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. +@@ -963,7 +963,7 @@ ifdef CDMUS endif # compiler and linker flags @@ -21,7 +18,7 @@ ifdef PROFILEMODE # build with gprof profiling information -@@ -616,7 +616,7 @@ ifdef DEBUG +@@ -980,11 +980,11 @@ ifdef DEBUG else # build a normal optimized version #CFLAGS+=-O3 @@ -30,3 +27,8 @@ endif endif +-CFLAGS+=-ffast-math -fno-strict-aliasing ++#CFLAGS+=-ffast-math -fno-strict-aliasing + # WIN98 linking needs LCFLAGS without -D flags and does not need includes + LCFLAGS:=$(CFLAGS) + CFLAGS+=$(OPTS) $(OPTINC) Added: head/games/doomlegacy/files/patch-src_i__tcp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/doomlegacy/files/patch-src_i__tcp.c Fri Apr 7 15:43:20 2017 (r437928) @@ -0,0 +1,15 @@ +--- src/i_tcp.c.orig 2017-03-03 19:49:10 UTC ++++ src/i_tcp.c +@@ -411,8 +411,12 @@ byte IPX_hashaddr(mysockaddr_t *a) + // Not allowed to be 0. + // Big endian, want final addr byte. + #ifdef LINUX ++# ifdef FREEBSD ++ return ((byte)(a->ipx.sipx_addr.x_host.c_host[5])) | 0x80; ++# else + // Linux: IPX address hash + return ((byte)(a->ipx.sipx_node[5])) | 0x80; ++# endif + #else + // Windows, OS2, DJGPP: IPX address hash + return ((byte)(a->ipx.sa_nodenum[5])) | 0x80;