- Update to version 1.45.2 (r1139, still officially beta)

- Remove some of our patches that were integrated or reworked upstream (bugs
  603, 607, and 617; revisions r1130, r1135)
- Now, system compiler is upheld by setting CC_ENVIRONMENT variable
- Try to unbreak parallel builds by pre-generating .dep files in `pre-build'
- Take maintainership back after giving it to games@ team didn't work out

4 files changed, 21 insertions, 43 deletions

diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 06ad581da5ec..0e08a5064a51 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doomlegacy
-DISTVERSION=	1.45_beta1
-PORTREVISION=	2
+PORTVERSION=	1.45.2
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${DISTVERSION:S,_,%20,}/
@@ -11,7 +10,7 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}_source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}_${DISTVERSION}_common.zip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Improved and extended version of Doom
 
 LICENSE=	GPLv2
@@ -20,9 +19,7 @@ USES=		gmake tar:bzip2
 USE_GL=		glu
 USE_SDL=	mixer sdl
 
-CFLAGS+=	-DSVN_REV=\\\"1107\\\"
-WRKSRC=		${WRKDIR}/${DISTNAME:S,_beta1,,}/src
-MAKE_JOBS_UNSAFE=	yes
+CFLAGS+=	-DSVN_REV=\\\"1139\\\"
 
 PLIST_FILES=	bin/${PORTNAME} share/doom/legacy.wad
 PORTDOCS=	*
@@ -42,32 +39,31 @@ ASM_MAKE_ENV=		USEASM=1 OLD_DEPENDENCIES=1
 
 post-patch: .SILENT
 # Adjust default WAD search path
-	${REINPLACE_CMD} -e '/DEFWADS1/s|/.*|${DMDIR}"|' ${WRKSRC}/doomdef.h
+	${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}/d_main.c
-# Unbreak on big-endian architectures
-	${REINPLACE_CMD} -e '150s|^|#include "m_swap.h"|' \
-		${WRKSRC}/p_spec.c
-	${REINPLACE_CMD} -e '60s|^|#include "m_swap.h"|' \
-		${WRKSRC}/p_switch.c
+		${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
 .if ! ${PORT_OPTIONS:MIPX}
-	${REINPLACE_CMD} -e '/USE_IPX/s|define|undef|' ${WRKSRC}/doomdef.h
+	${REINPLACE_CMD} -e '/USE_IPX/s|define|undef|' ${WRKSRC}/src/doomdef.h
 	${REINPLACE_CMD} -e 's| -lipx||' ${WRKSRC}/Makefile
 .endif
 
 pre-build:
-	${ECHO_CMD} MAKE_OPTIONS_PRESENT=1 HAVE_MIXER=1 | ${XARGS} -n 1 \
-		> ${BUILD_WRKSRC}/../make_options
+	${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
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/doomlegacy ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DMDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_1.45/legacy.wad \
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}/legacy.wad \
 		${STAGEDIR}${DMDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/../docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
 .include <bsd.port.mk>
diff --git a/games/doomlegacy/distinfo b/games/doomlegacy/distinfo
index 4aaee454dda8..82aa39ff9607 100644
--- a/games/doomlegacy/distinfo
+++ b/games/doomlegacy/distinfo
@@ -1,4 +1,4 @@
-SHA256 (doomlegacy_1.45_beta1_source.tar.bz2) = 6bf954c95896c6707db84a66a970552a3d04224cfec94972c87d7834532eb1d4
-SIZE (doomlegacy_1.45_beta1_source.tar.bz2) = 2064988
-SHA256 (doomlegacy_1.45_beta1_common.zip) = 54bb1731b986d2f41c9d03ae8d1e382e2253d361687856ce04199801a7c611cd
-SIZE (doomlegacy_1.45_beta1_common.zip) = 937242
+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
diff --git a/games/doomlegacy/files/patch-Makefile b/games/doomlegacy/files/patch-Makefile
index cfe4b5fb28a7..aea70f410264 100644
--- a/games/doomlegacy/files/patch-Makefile
+++ b/games/doomlegacy/files/patch-Makefile
@@ -1,14 +1,5 @@
 --- Makefile.orig	2014-05-17 18:32:47 UTC
 +++ Makefile
-@@ -140,7 +140,7 @@ OPTLEV=-O3
- #POLL_POINTER=-DPOLL_POINTER
- 
- # gcc or g++
--CC=gcc
-+CC?=gcc
- ifdef CC_WATCOM
-   CC=WATCOMC
- endif
 @@ -263,9 +263,9 @@ ifeq ($(SMIF), SDL)
    else
      # default is Linux, for all unix SDL
@@ -39,12 +30,3 @@
  endif
  endif
  
-@@ -1002,7 +1002,7 @@ endif
- ../dep/main_t.dep : t*.c
- # none: e*.c j*.c k*.c l*.c n*.c o*.c
- ../dep/hard1.dep : hardware/*.c
--../dep/hard2.dep : hardware/*/*.c
-+../dep/hard2.dep : hardware/r_opengl/*.c
- # $(INTERFACE).dep : $(INTERFACE)/*.c
- ../dep/djgppdos.dep : djgppdos/*.c
- ../dep/linux_x.dep : linux_x/*.c linux_x/musserv/*.c linux_x/sndserv/*.c
diff --git a/games/doomlegacy/files/patch-sdl+i_system.c b/games/doomlegacy/files/patch-sdl+i_system.c
index 1b8323e8c098..975d4f5a3e6a 100644
--- a/games/doomlegacy/files/patch-sdl+i_system.c
+++ b/games/doomlegacy/files/patch-sdl+i_system.c
@@ -1,5 +1,5 @@
---- sdl/i_system.c.orig	2014-05-16 20:11:49 UTC
-+++ sdl/i_system.c
+--- 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