From owner-svn-ports-all@freebsd.org Tue Nov 10 20:25:22 2015 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 B53C6A2B519; Tue, 10 Nov 2015 20:25:22 +0000 (UTC) (envelope-from amdmi3@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 771C81BA2; Tue, 10 Nov 2015 20:25:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAAKPLBM087865; Tue, 10 Nov 2015 20:25:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAAKPL5Y087858; Tue, 10 Nov 2015 20:25:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511102025.tAAKPL5Y087858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 10 Nov 2015 20:25:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401209 - in head/games/d2x: . 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.20 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: Tue, 10 Nov 2015 20:25:22 -0000 Author: amdmi3 Date: Tue Nov 10 20:25:21 2015 New Revision: 401209 URL: https://svnweb.freebsd.org/changeset/ports/401209 Log: - Fix fetch by using correct MASTER_SITE - Switch to options helpers - Regenerate patches with `make makepatch` Added: head/games/d2x/files/patch-include_pstypes.h - copied, changed from r401208, head/games/d2x/files/patch-pstypes head/games/d2x/files/patch-main_console.c - copied, changed from r401208, head/games/d2x/files/patch-console.c head/games/d2x/files/patch-mem_mem.c - copied, changed from r401208, head/games/d2x/files/patch-mem.c Deleted: head/games/d2x/files/patch-console.c head/games/d2x/files/patch-mem.c head/games/d2x/files/patch-pstypes Modified: head/games/d2x/Makefile head/games/d2x/pkg-message Modified: head/games/d2x/Makefile ============================================================================== --- head/games/d2x/Makefile Tue Nov 10 20:24:22 2015 (r401208) +++ head/games/d2x/Makefile Tue Nov 10 20:25:21 2015 (r401209) @@ -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 + +post-install-OPENGL-on: + ${MV} ${STAGEDIR}${PREFIX}/bin/d2x-gl ${STAGEDIR}${PREFIX}/bin/d2x -.include +post-install-OPENGL-off: + ${MV} ${STAGEDIR}${PREFIX}/bin/d2x-sdl ${STAGEDIR}${PREFIX}/bin/d2x -.if ${PORT_OPTIONS:MOPENGL} -USE_GL= glut -.endif - -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 Copied and modified: head/games/d2x/files/patch-include_pstypes.h (from r401208, head/games/d2x/files/patch-pstypes) ============================================================================== --- head/games/d2x/files/patch-pstypes Tue Nov 10 20:24:22 2015 (r401208, copy source) +++ head/games/d2x/files/patch-include_pstypes.h Tue Nov 10 20:25:21 2015 (r401209) @@ -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 # define _MAX_PATH 1024 # define _MAX_DIR 256 Copied and modified: head/games/d2x/files/patch-main_console.c (from r401208, head/games/d2x/files/patch-console.c) ============================================================================== --- head/games/d2x/files/patch-console.c Tue Nov 10 20:24:22 2015 (r401208, copy source) +++ head/games/d2x/files/patch-main_console.c Tue Nov 10 20:25:21 2015 (r401209) @@ -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]; Copied and modified: head/games/d2x/files/patch-mem_mem.c (from r401208, head/games/d2x/files/patch-mem.c) ============================================================================== --- head/games/d2x/files/patch-mem.c Tue Nov 10 20:24:22 2015 (r401208, copy source) +++ head/games/d2x/files/patch-mem_mem.c Tue Nov 10 20:25:21 2015 (r401209) @@ -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 #include #include Modified: head/games/d2x/pkg-message ============================================================================== --- head/games/d2x/pkg-message Tue Nov 10 20:24:22 2015 (r401208) +++ head/games/d2x/pkg-message Tue Nov 10 20:25:21 2015 (r401209) @@ -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.