From owner-svn-ports-all@freebsd.org Fri Nov 25 09:25:42 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 47296C53970; Fri, 25 Nov 2016 09:25:42 +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 080A215D4; Fri, 25 Nov 2016 09:25:41 +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 uAP9PfV1036328; Fri, 25 Nov 2016 09:25:41 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAP9Peio036324; Fri, 25 Nov 2016 09:25:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201611250925.uAP9Peio036324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 25 Nov 2016 09:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427090 - in head/games/toycars: . 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: Fri, 25 Nov 2016 09:25:42 -0000 Author: amdmi3 Date: Fri Nov 25 09:25:40 2016 New Revision: 427090 URL: https://svnweb.freebsd.org/changeset/ports/427090 Log: - Add LICENSE - Switch to USES=localbase - Switch to options helpers - Fix build with clang 3.9 - Regenerate patches PR: 214647 Added: head/games/toycars/files/patch-toycars__track_editor_src_TrackView.cxx (contents, props changed) head/games/toycars/files/patch-toycars__vehicle_editor_src_LoadSpriteFromImage.cpp (contents, props changed) head/games/toycars/files/patch-toycars__vehicle_editor_src_VehicleObject.cpp - copied, changed from r427089, head/games/toycars/files/patch-toycars__vehicle__editor_src_VehicleObject.cpp Deleted: head/games/toycars/files/patch-toycars__vehicle__editor_src_VehicleObject.cpp Modified: head/games/toycars/Makefile Modified: head/games/toycars/Makefile ============================================================================== --- head/games/toycars/Makefile Fri Nov 25 09:24:57 2016 (r427089) +++ head/games/toycars/Makefile Fri Nov 25 09:25:40 2016 (r427090) @@ -10,15 +10,15 @@ MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Physics-based 2D racing game +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libfltk.so:x11-toolkits/fltk -USES= gmake +USES= gmake localbase +GNU_CONFIGURE= yes USE_SDL= image sdl USE_GL= gl glu -GNU_CONFIGURE= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/toycars \ bin/toycars_track_editor \ @@ -31,8 +31,8 @@ OPTIONS_DEFINE= DOCS post-extract: @${RM} ${WRKSRC}/data/.*Store -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Added: head/games/toycars/files/patch-toycars__track_editor_src_TrackView.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/toycars/files/patch-toycars__track_editor_src_TrackView.cxx Fri Nov 25 09:25:40 2016 (r427090) @@ -0,0 +1,33 @@ +--- toycars_track_editor/src/TrackView.cxx.orig 2009-06-28 03:13:24 UTC ++++ toycars_track_editor/src/TrackView.cxx +@@ -89,7 +89,7 @@ TiXmlDocument *findXMLFile(const char *f + //{jpg,png,bmp,pnm,pbm,pgm,ppm} + Fl_Image* loadImage(const char *filename) + { +- char *suffix = strrchr(filename, '.'); ++ const char *suffix = strrchr(filename, '.'); + if (suffix == NULL) + return NULL; + if (strcmp(suffix,".jpg") == 0) +@@ -956,8 +956,8 @@ void TrackView::importImage(const char * + // installs map into user data directory + void TrackView::installMap(const char *name) + { +-#ifdef WIN32 +- fl_alert("Unfortunately this is unsupported on Windows at this time.\nYou may still install maps manually by saving them to a folder and placing it inside the data\\tracks directory and editing the tracklist.xml file."); ++#if 1 ++ fl_alert("Unfortunately this is unsupported at this time.\nYou may still install maps manually by saving them to a folder and placing it inside the data\\tracks directory and editing the tracklist.xml file."); + return; + #else + char fullname[1024]; +@@ -1033,8 +1033,8 @@ void TrackView::installMap(const char *n + // nb: doesn't remove track data itself, only remove entry from tracklist xml file. + void TrackView::uninstallMap(const char *name) + { +-#ifdef WIN32 +- fl_alert("Unfortunately this is unsupported on Windows at this time.\nYou may still uninstall maps manually by removing them from the data\\tracks directory and editing the tracklist.xml file."); ++#if 1 ++ fl_alert("Unfortunately this is unsupported at this time.\nYou may still uninstall maps manually by removing them from the data\\tracks directory and editing the tracklist.xml file."); + return; + #else + char fullname[1024]; Added: head/games/toycars/files/patch-toycars__vehicle_editor_src_LoadSpriteFromImage.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/toycars/files/patch-toycars__vehicle_editor_src_LoadSpriteFromImage.cpp Fri Nov 25 09:25:40 2016 (r427090) @@ -0,0 +1,11 @@ +--- toycars_vehicle_editor/src/LoadSpriteFromImage.cpp.orig 2009-02-26 19:24:22 UTC ++++ toycars_vehicle_editor/src/LoadSpriteFromImage.cpp +@@ -23,7 +23,7 @@ + //{jpg,png,bmp,pnm,pbm,pgm,ppm} + Fl_Image* loadImage(const char *filename) + { +- char *suffix = strrchr(filename, '.'); ++ const char *suffix = strrchr(filename, '.'); + if (suffix == NULL) + return NULL; + if (strcmp(suffix,".jpg") == 0) Copied and modified: head/games/toycars/files/patch-toycars__vehicle_editor_src_VehicleObject.cpp (from r427089, head/games/toycars/files/patch-toycars__vehicle__editor_src_VehicleObject.cpp) ============================================================================== --- head/games/toycars/files/patch-toycars__vehicle__editor_src_VehicleObject.cpp Fri Nov 25 09:24:57 2016 (r427089, copy source) +++ head/games/toycars/files/patch-toycars__vehicle_editor_src_VehicleObject.cpp Fri Nov 25 09:25:40 2016 (r427090) @@ -1,6 +1,15 @@ ---- toycars_vehicle_editor/src/VehicleObject.cpp.orig 2009-03-22 19:45:31.000000000 +0000 +--- toycars_vehicle_editor/src/VehicleObject.cpp.orig 2009-03-22 19:45:31 UTC +++ toycars_vehicle_editor/src/VehicleObject.cpp -@@ -152,7 +152,7 @@ void VehicleObject::loadVehicle(const ch +@@ -7,6 +7,8 @@ + * + */ + ++#include // fl_alert ++ + #include "VehicleObject.h" + #include "ScException.h" + #include "tinyxml.h" +@@ -152,7 +154,7 @@ void VehicleObject::loadVehicle(const ch short count; geometry.clear(); for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { @@ -9,7 +18,7 @@ std::list &convex = geometry.back(); readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); } -@@ -411,7 +411,7 @@ void VehicleObject::loadSpriteFromDataDi +@@ -411,7 +413,7 @@ void VehicleObject::loadSpriteFromDataDi short count; geometry.clear(); for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { @@ -18,7 +27,29 @@ std::list &convex = geometry.back(); readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); } -@@ -675,4 +675,4 @@ void VehicleObject::uninstallVehicle(con +@@ -520,8 +522,8 @@ void VehicleObject::loadWheelSpriteFromD + // installs map into user data directory + void VehicleObject::installVehicle(const char *name) + { +-#ifdef WIN32 +- fl_alert("Unfortunately this is unsupported on Windows at this time.\nYou may still install vehicles manually by saving them to a folder and placing it inside the data\\cars directory and editing the carslist.xml file."); ++#if 1 ++ fl_alert("Unfortunately this is unsupported at this time.\nYou may still install vehicles manually by saving them to a folder and placing it inside the data\\cars directory and editing the carslist.xml file."); + return; + #else + char fullname[1024]; +@@ -600,8 +602,8 @@ void VehicleObject::installVehicle(const + // nb: doesn't remove car data itself, only remove entry from carslist xml file. + void VehicleObject::uninstallVehicle(const char *name) + { +-#ifdef WIN32 +- fl_alert("Unfortunately this is unsupported on Windows at this time.\nYou may still uninstall vehicles manually by removing them from the data\\cars directory and editing the carslist.xml file."); ++#if 1 ++ fl_alert("Unfortunately this is unsupported at this time.\nYou may still uninstall vehicles manually by removing them from the data\\cars directory and editing the carslist.xml file."); + return; + #else + char fullname[1024]; +@@ -675,4 +677,4 @@ void VehicleObject::uninstallVehicle(con system(str); */ #endif