diff options
author | amdmi3 <amdmi3@FreeBSD.org> | 2015-11-10 20:25:21 +0000 |
---|---|---|
committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-11-10 20:25:21 +0000 |
commit | b67de45ca2bbffcea2cbd0189a297ba523a5b1e4 (patch) | |
tree | b7f275b4d3067e1aebd4c5116229f8707abefd66 | |
parent | 081db0cd3f63c3d790455a3d149d2fb0f5b5384c (diff) | |
download | FreeBSD-ports-b67de45ca2bbffcea2cbd0189a297ba523a5b1e4.zip FreeBSD-ports-b67de45ca2bbffcea2cbd0189a297ba523a5b1e4.tar.gz |
- Fix fetch by using correct MASTER_SITE
- Switch to options helpers
- Regenerate patches with `make makepatch`
-rw-r--r-- | games/d2x/Makefile | 24 | ||||
-rw-r--r-- | games/d2x/files/patch-include_pstypes.h (renamed from games/d2x/files/patch-pstypes) | 6 | ||||
-rw-r--r-- | games/d2x/files/patch-main_console.c (renamed from games/d2x/files/patch-console.c) | 6 | ||||
-rw-r--r-- | games/d2x/files/patch-mem_mem.c (renamed from games/d2x/files/patch-mem.c) | 6 | ||||
-rw-r--r-- | games/d2x/pkg-message | 5 |
5 files changed, 20 insertions, 27 deletions
diff --git a/games/d2x/Makefile b/games/d2x/Makefile index 42ba195..5585a5d 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -5,13 +5,11 @@ PORTNAME= d2x PORTVERSION= 0.2.5 PORTREVISION= 14 CATEGORIES= games -MASTER_SITES= http://offload2.icculus.org:9090/d2x/src/ +MASTER_SITES= http://icculus.org/d2x/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Unix port of Descent 2 Game -BROKEN= unfetchable - GNU_CONFIGURE= yes USES= gmake USE_SDL= sdl image @@ -26,22 +24,18 @@ OPTIONS_DEFINE= OPENGL DOCS OPENGL_CONFIGURE_WITH= opengl OPENGL_CXXFLAGS= -I${LOCALBASE}/include OPENGL_LDFLAGS= -L${LOCALBASE}/lib +OPENGL_USE= GL=glut -.include <bsd.port.options.mk> +post-install-OPENGL-on: + ${MV} ${STAGEDIR}${PREFIX}/bin/d2x-gl ${STAGEDIR}${PREFIX}/bin/d2x -.if ${PORT_OPTIONS:MOPENGL} -USE_GL= glut -.endif +post-install-OPENGL-off: + ${MV} ${STAGEDIR}${PREFIX}/bin/d2x-sdl ${STAGEDIR}${PREFIX}/bin/d2x -do-install: -.if ${PORT_OPTIONS:MOPENGL} - ${INSTALL_PROGRAM} ${WRKSRC}/d2x-gl ${STAGEDIR}${PREFIX}/bin/d2x -.else - ${INSTALL_PROGRAM} ${WRKSRC}/d2x-sdl ${STAGEDIR}${PREFIX}/bin/d2x -.endif - @${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include <bsd.port.mk> diff --git a/games/d2x/files/patch-pstypes b/games/d2x/files/patch-include_pstypes.h index 5893c44..28e70ad 100644 --- a/games/d2x/files/patch-pstypes +++ b/games/d2x/files/patch-include_pstypes.h @@ -1,6 +1,6 @@ ---- include/pstypes.h.orig Sat Apr 12 01:51:48 2003 -+++ include/pstypes.h Mon Apr 5 17:45:06 2004 -@@ -46,7 +46,7 @@ +--- include/pstypes.h.orig 2003-04-11 23:51:48 UTC ++++ include/pstypes.h +@@ -46,7 +46,7 @@ typedef uint16_t u_int16_t; # include <sys/types.h> # define _MAX_PATH 1024 # define _MAX_DIR 256 diff --git a/games/d2x/files/patch-console.c b/games/d2x/files/patch-main_console.c index fbc45d3..a3f679a 100644 --- a/games/d2x/files/patch-console.c +++ b/games/d2x/files/patch-main_console.c @@ -1,6 +1,6 @@ ---- main/console.c.orig Fri Jun 6 23:59:49 2003 -+++ main/console.c Tue Apr 6 14:45:18 2004 -@@ -70,7 +70,7 @@ +--- main/console.c.orig 2003-06-06 21:59:49 UTC ++++ main/console.c +@@ -70,7 +70,7 @@ void con_printf(int priority, char *fmt, va_list arglist; char buffer[2048]; diff --git a/games/d2x/files/patch-mem.c b/games/d2x/files/patch-mem_mem.c index 37ee9d0..6b10eab 100644 --- a/games/d2x/files/patch-mem.c +++ b/games/d2x/files/patch-mem_mem.c @@ -1,6 +1,6 @@ ---- mem/mem.c.orig Mon Apr 5 15:37:36 2004 -+++ mem/mem.c Mon Apr 5 15:38:11 2004 -@@ -34,11 +34,6 @@ +--- mem/mem.c.orig 2003-04-11 23:51:48 UTC ++++ mem/mem.c +@@ -34,11 +34,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CO #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/games/d2x/pkg-message b/games/d2x/pkg-message index 00bddc8..cbb1176 100644 --- a/games/d2x/pkg-message +++ b/games/d2x/pkg-message @@ -1,4 +1,3 @@ You need to get datafiles from original Descent 2 or 1 game. -Descent has also shareware edition, which is freely -downloadable from d2x home page. Read file installation.txt for -more information. +Descent has also shareware edition, which is freely downloadable +from d2x home page. Read file installation.txt for more information. |