From owner-svn-ports-all@FreeBSD.ORG Tue Dec 24 12:56:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 670DDC7F; Tue, 24 Dec 2013 12:56:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 467AB1F0D; Tue, 24 Dec 2013 12:56:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCuDR0087667; Tue, 24 Dec 2013 12:56:13 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCuCs1087662; Tue, 24 Dec 2013 12:56:12 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241256.rBOCuCs1087662@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:56:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337347 - in branches/2014Q1/games/icbm3d: . files X-SVN-Group: ports-branches 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.17 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, 24 Dec 2013 12:56:13 -0000 Author: mat Date: Tue Dec 24 12:56:11 2013 New Revision: 337347 URL: http://svnweb.freebsd.org/changeset/ports/337347 Log: MFH: r337322 - Bump PORTREVISION - Change master sites and icon - Support STAGEDIR - Add DOCS Option - Add Desktop entry file - Simplify Makefile - Add patches, fix bad C++ code Approved by: pawel / wg (mentors, implicit) Approved by: portmgr (implicit) Added: branches/2014Q1/games/icbm3d/files/patch-randnum.c - copied unchanged from r337322, head/games/icbm3d/files/patch-randnum.c branches/2014Q1/games/icbm3d/files/patch-text.c - copied unchanged from r337322, head/games/icbm3d/files/patch-text.c Modified: branches/2014Q1/games/icbm3d/Makefile branches/2014Q1/games/icbm3d/distinfo (contents, props changed) branches/2014Q1/games/icbm3d/files/patch-makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/icbm3d/Makefile ============================================================================== --- branches/2014Q1/games/icbm3d/Makefile Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/Makefile Tue Dec 24 12:56:11 2013 (r337347) @@ -3,43 +3,40 @@ PORTNAME= icbm3d PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/icbm3d/ \ ftp://ftp.billsgames.com/unix/x/icbm3d/ \ - http://www.newbreedsoftware.com/images/prodicons/:icons + SF/nemysisfreebsdp/games/${PORTNAME}/:icons DISTFILES= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}.gif:icons + ${PORTNAME}.png:icons EXTRACT_ONLY= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= nemysis@gmx.ch COMMENT= Inter-Continental Ballistic Missiles, 3D -WRKSRC= ${WRKDIR}/icbm3d +WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= x11 MAKEFILE= makefile ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/${PORTNAME} \ - share/pixmaps/${PORTNAME}.gif + share/pixmaps/${PORTNAME}.png PORTDOCS= README.txt -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS -do-install: -# Executable - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin +DESKTOP_ENTRIES="ICBM3D" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" -# Pixmaps - ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.gif ${PREFIX}/share/pixmaps/ +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ -# Documentation -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q1/games/icbm3d/distinfo ============================================================================== --- branches/2014Q1/games/icbm3d/distinfo Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/distinfo Tue Dec 24 12:56:11 2013 (r337347) @@ -1,4 +1,4 @@ SHA256 (icbm3d.0.4.tar.gz) = 9ad41c154ef47695771a26875d5415bcedcb139352b1e2175f386d206b0038fd SIZE (icbm3d.0.4.tar.gz) = 31187 -SHA256 (icbm3d.gif) = e5d6d45ee11ff669414ac2e22943a0786b62b72035884a06abd5f12dcd0d5f15 -SIZE (icbm3d.gif) = 1024 +SHA256 (icbm3d.png) = 993ef04425b4211a699437076386f27368abf5a3d660194c1d800e20fcd1517c +SIZE (icbm3d.png) = 877 Modified: branches/2014Q1/games/icbm3d/files/patch-makefile ============================================================================== --- branches/2014Q1/games/icbm3d/files/patch-makefile Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/files/patch-makefile Tue Dec 24 12:56:11 2013 (r337347) @@ -1,13 +1,13 @@ ---- makefile.orig 1998-07-31 06:41:20.000000000 +0200 -+++ makefile 2012-09-02 23:21:36.000000000 +0200 +--- ./makefile.orig 1998-07-31 06:41:20.000000000 +0200 ++++ ./makefile 2013-12-24 08:28:45.000000000 +0100 @@ -9,14 +9,16 @@ # Makefile user-definable variables------------------------------------------ -CC=gcc -+CC?=g++ -+PREFIX?=/usr/local -+LOCALBASE?=/usr/local ++CC?=${CC} ++PREFIX?=${PREFIX} ++LOCALBASE?=${PREFIX} MATHLIB=-lm INSTALLROOT=$(PREFIX) Copied: branches/2014Q1/games/icbm3d/files/patch-randnum.c (from r337322, head/games/icbm3d/files/patch-randnum.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/icbm3d/files/patch-randnum.c Tue Dec 24 12:56:11 2013 (r337347, copy of r337322, head/games/icbm3d/files/patch-randnum.c) @@ -0,0 +1,10 @@ +--- ./randnum.c.orig 1998-07-29 23:25:59.000000000 +0200 ++++ ./randnum.c 2013-12-24 08:33:46.000000000 +0100 +@@ -11,6 +11,7 @@ + #include + #include + #include "randnum.h" ++#include + + void randinit() + { Copied: branches/2014Q1/games/icbm3d/files/patch-text.c (from r337322, head/games/icbm3d/files/patch-text.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/icbm3d/files/patch-text.c Tue Dec 24 12:56:11 2013 (r337347, copy of r337322, head/games/icbm3d/files/patch-text.c) @@ -0,0 +1,10 @@ +--- ./text.c.orig 1998-07-29 23:25:59.000000000 +0200 ++++ ./text.c 2013-12-24 08:28:45.000000000 +0100 +@@ -7,6 +7,7 @@ + + #include + #include "text.h" ++#include + + int FontHeight(XFontStruct *font_struct) + {