From owner-svn-ports-all@freebsd.org Mon Oct 10 23:46:45 2016 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 17CE8C0C0B6; Mon, 10 Oct 2016 23:46:45 +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 E6455A4B; Mon, 10 Oct 2016 23:46:44 +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 u9ANkiWw033321; Mon, 10 Oct 2016 23:46:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9ANkhqB033316; Mon, 10 Oct 2016 23:46:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201610102346.u9ANkhqB033316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 10 Oct 2016 23:46:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423735 - in head/games/cave9: . 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: Mon, 10 Oct 2016 23:46:45 -0000 Author: amdmi3 Date: Mon Oct 10 23:46:43 2016 New Revision: 423735 URL: https://svnweb.freebsd.org/changeset/ports/423735 Log: - Update to latest git - Move to new github home - Add LICENSE - Add missing GL depends - Add desktop file - Switch to options helpers Added: head/games/cave9/files/patch-src_GNUmakefile - copied, changed from r423734, head/games/cave9/files/patch-src-GNUmakefile head/games/cave9/files/patch-src_game.c - copied, changed from r423734, head/games/cave9/files/patch-src-game.c Deleted: head/games/cave9/files/patch-src-GNUmakefile head/games/cave9/files/patch-src-game.c Modified: head/games/cave9/Makefile head/games/cave9/distinfo head/games/cave9/pkg-descr Modified: head/games/cave9/Makefile ============================================================================== --- head/games/cave9/Makefile Mon Oct 10 23:46:39 2016 (r423734) +++ head/games/cave9/Makefile Mon Oct 10 23:46:43 2016 (r423735) @@ -2,26 +2,25 @@ # $FreeBSD$ PORTNAME= cave9 -PORTVERSION= 0.4 -PORTREVISION= 2 +PORTVERSION= 0.4.1.git20150408 CATEGORIES= games -MASTER_SITES= GOOGLE_CODE \ - http://mirror.amdmi3.ru/distfiles/ -DISTNAME= ${PORTNAME}_src-${PORTVERSION} -DISTFILES= ${DISTNAME}.tgz \ - ${PORTNAME}_data-${DATAVER}.tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Gravity cave-exploration game -BROKEN= Unfetchable (google code has gone away) - -DATAVER= 4 +LICENSE= GPLv3+ CC-BY-SA-3.0 CC-BY-2.5 +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/data/README.txt # CC licenses +LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.txt + +USE_GITHUB= yes +GH_ACCOUNT= bart9h +GH_TAGNAME= e6896eb USES= gmake USE_SDL= sdl ttf image +USE_GL= gl glu -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src MAKEFILE= GNUmakefile @@ -31,16 +30,24 @@ PLIST_FILES= bin/${PORTNAME} PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= DOCS +DESKTOP_ENTRIES="${PORTNAME}" \ + "" \ + "${DATADIR}/icon.png" \ + "${PORTNAME}" \ + "Game;ArcadeGame;" \ + "" -post-extract: - @${MV} ${WRKDIR}/data ${WRKSRC}/ +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cave9 ${STAGEDIR}${PREFIX}/bin/ - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}/ - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${DATADIR} +.for d in wav png ttf jpg + ${INSTALL_DATA} ${WRKSRC}/data/*.$d ${STAGEDIR}${DATADIR}/ +.endfor + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS.txt ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/cave9/distinfo ============================================================================== --- head/games/cave9/distinfo Mon Oct 10 23:46:39 2016 (r423734) +++ head/games/cave9/distinfo Mon Oct 10 23:46:43 2016 (r423735) @@ -1,4 +1,3 @@ -SHA256 (cave9_src-0.4.tgz) = 285fd1070e9fadade890ddd64f30db6bcfeaa5326c99d6e69744abab80da93d8 -SIZE (cave9_src-0.4.tgz) = 28517 -SHA256 (cave9_data-4.tgz) = 89a1ef99f2399bf7638b25ce4b51c5c088e01c29bc407eab689ccbb39c5b8d39 -SIZE (cave9_data-4.tgz) = 857330 +TIMESTAMP = 1476140318 +SHA256 (bart9h-cave9-0.4.1.git20150408-e6896eb_GH0.tar.gz) = f869d3e4044787550acc7d87d93e328598c7f0f55b9ca5ce33c69c4003825a60 +SIZE (bart9h-cave9-0.4.1.git20150408-e6896eb_GH0.tar.gz) = 887183 Copied and modified: head/games/cave9/files/patch-src_GNUmakefile (from r423734, head/games/cave9/files/patch-src-GNUmakefile) ============================================================================== --- head/games/cave9/files/patch-src-GNUmakefile Mon Oct 10 23:46:39 2016 (r423734, copy source) +++ head/games/cave9/files/patch-src_GNUmakefile Mon Oct 10 23:46:43 2016 (r423735) @@ -1,17 +1,17 @@ ---- src/GNUmakefile.orig 2008-09-15 23:11:44.000000000 +0400 -+++ src/GNUmakefile 2008-09-17 20:31:28.000000000 +0400 +--- src/GNUmakefile.orig 2015-04-07 14:37:56 UTC ++++ src/GNUmakefile @@ -2,8 +2,8 @@ TARGET = ../cave9 -CFLAGS += -std=c99 -Wall -Werror -ggdb `sdl-config --cflags` --LDFLAGS += `sdl-config --libs` -lm -L/usr/X11/lib -lGL -lGLU -lSDL_ttf -lSDL_image -+CFLAGS += -std=c99 -Wall -Werror `$(SDL_CONFIG) --cflags` -+LDFLAGS += `$(SDL_CONFIG) --libs` -lm -lGL -lGLU -lSDL_ttf -lSDL_image +-LDFLAGS += -lSDL_ttf -lSDL_image `sdl-config --libs` -L/usr/X11/lib -lGL -lGLU -lm ++CFLAGS += -std=c99 -Wall -Werror -isystem ${LOCALBASE}/include `sdl-config --cflags` ++LDFLAGS += -lSDL_ttf -lSDL_image -L${LOCALBASE}/lib `sdl-config --libs` -lGL -lGLU -lm ifdef GLOBAL_SCORE CFLAGS += -DGLOBAL_SCORE -@@ -11,7 +11,6 @@ +@@ -11,7 +11,6 @@ LDFLAGS += -lSDL_net endif # necessary when some SDL libs are on /usr/local, and others on /usr @@ -19,12 +19,12 @@ #{{{1 build rules -@@ -28,6 +27,8 @@ +@@ -29,6 +28,8 @@ SRCS = \ OBJS = $(subst .c,.o,$(SRCS)) +all: $(TARGET) + $(TARGET): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $^ $(LDFLAGS) -o $@ Copied and modified: head/games/cave9/files/patch-src_game.c (from r423734, head/games/cave9/files/patch-src-game.c) ============================================================================== --- head/games/cave9/files/patch-src-game.c Mon Oct 10 23:46:39 2016 (r423734, copy source) +++ head/games/cave9/files/patch-src_game.c Mon Oct 10 23:46:43 2016 (r423735) @@ -1,6 +1,6 @@ ---- src/game.c.orig 2008-09-15 23:11:44.000000000 +0400 -+++ src/game.c 2008-09-23 23:06:05.000000000 +0400 -@@ -29,11 +29,7 @@ +--- src/game.c.orig 2015-04-07 14:37:56 UTC ++++ src/game.c +@@ -31,11 +31,7 @@ const char* data_paths[] = { Modified: head/games/cave9/pkg-descr ============================================================================== --- head/games/cave9/pkg-descr Mon Oct 10 23:46:39 2016 (r423734) +++ head/games/cave9/pkg-descr Mon Oct 10 23:46:43 2016 (r423735) @@ -3,4 +3,4 @@ cave9 is a gravity cave-exploration game Use only two buttons to activate the thrust jets of your ship in this first-person 3D version of the classic SF-Cave game. -WWW: http://code.google.com/p/cave9/ +WWW: https://github.com/bart9h/cave9