Date: Mon, 4 May 2015 11:16:48 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385392 - in head/games/assaultcube: . files Message-ID: <201505041116.t44BGm03046448@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon May 4 11:16:47 2015 New Revision: 385392 URL: https://svnweb.freebsd.org/changeset/ports/385392 Log: games/assaultcube: unbreak on DragonFly and the package cluster - Disable PCH (precompiled header) to unbreak build with GCC in jails for older branches and recent 11.0C kernel - Add upstream patch for bundled libenet to unbreak build on DragonFly [1] - Convert patch for ${BUILD_WRKSRC}/Makefile into sed(1) variant - Pet portlint since r383894 by formatting patches with makepatch target PR: 199912 Submitted by: lightside <lightside@gmx.com> (maintainer) Obtained from: https://github.com/lsalzman/enet/commit/8df6e58 [1] Added: head/games/assaultcube/files/patch-source_enet_unix.c (contents, props changed) Deleted: head/games/assaultcube/files/patch-source_src_Makefile Modified: head/games/assaultcube/Makefile (contents, props changed) head/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp (contents, props changed) head/games/assaultcube/files/patch-source_src_console.h (contents, props changed) head/games/assaultcube/files/patch-source_src_master.cpp (contents, props changed) Modified: head/games/assaultcube/Makefile ============================================================================== --- head/games/assaultcube/Makefile Mon May 4 10:36:59 2015 (r385391) +++ head/games/assaultcube/Makefile Mon May 4 11:16:47 2015 (r385392) @@ -64,6 +64,16 @@ DESKTOP_ENTRIES="AssaultCube" "${COMMENT "Game;" false .endif +post-patch: .SILENT + ${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \ + /^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \ + s|-I/usr/include || ; \ + s|sdl-config|$$(SDL_CONFIG)| ; \ + s|$$(USRLIB)|$$(LOCALBASE)/lib| ; \ + /^CLIENT_LIBS=/s|$$| -lintl| ; \ + /^SERVER_LIBS=/s|$$| -L$$(LOCALBASE)/lib|' \ + ${BUILD_WRKSRC}/Makefile + do-install: .for f in ${PLIST_FILES:Mbin/*} ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f} Added: head/games/assaultcube/files/patch-source_enet_unix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/assaultcube/files/patch-source_enet_unix.c Mon May 4 11:16:47 2015 (r385392) @@ -0,0 +1,20 @@ +--- source/enet/unix.c.orig 2013-10-22 18:57:22 UTC ++++ source/enet/unix.c +@@ -97,7 +97,7 @@ enet_address_set_host (ENetAddress * add + char buffer [2048]; + int errnum; + +-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); + #else + hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum); +@@ -150,7 +150,7 @@ enet_address_get_host (const ENetAddress + + in.s_addr = address -> host; + +-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum); + #else + hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum); Modified: head/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp ============================================================================== --- head/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp Mon May 4 10:36:59 2015 (r385391) +++ head/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp Mon May 4 11:16:47 2015 (r385392) @@ -1,5 +1,5 @@ ---- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 22:50:03.000000000 +0400 -+++ source/src/bot/bot_waypoint.cpp 2015-02-13 07:33:14.000000000 +0400 +--- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 18:50:03 UTC ++++ source/src/bot/bot_waypoint.cpp @@ -848,7 +848,7 @@ if (!pWP) Modified: head/games/assaultcube/files/patch-source_src_console.h ============================================================================== --- head/games/assaultcube/files/patch-source_src_console.h Mon May 4 10:36:59 2015 (r385391) +++ head/games/assaultcube/files/patch-source_src_console.h Mon May 4 11:16:47 2015 (r385392) @@ -1,5 +1,5 @@ ---- source/src/console.h.orig 2013-10-09 12:27:31.000000000 +0400 -+++ source/src/console.h 2013-10-11 02:23:35.000000000 +0400 +--- source/src/console.h.orig 2013-10-09 08:27:31 UTC ++++ source/src/console.h @@ -127,7 +127,7 @@ } }; Modified: head/games/assaultcube/files/patch-source_src_master.cpp ============================================================================== --- head/games/assaultcube/files/patch-source_src_master.cpp Mon May 4 10:36:59 2015 (r385391) +++ head/games/assaultcube/files/patch-source_src_master.cpp Mon May 4 11:16:47 2015 (r385392) @@ -1,5 +1,5 @@ ---- source/src/master.cpp.orig 2013-10-09 12:27:37.000000000 +0400 -+++ source/src/master.cpp 2013-10-11 02:26:24.000000000 +0400 +--- source/src/master.cpp.orig 2013-10-09 08:27:37 UTC ++++ source/src/master.cpp @@ -510,7 +510,7 @@ authreq &a = c.authreqs.add(); a.reqtime = servtime;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041116.t44BGm03046448>