svn commit: r388542 - in branches/2015Q2/games/assaultcube: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Jun  4 18:48:34 2015
New Revision: 388542
URL: https://svnweb.freebsd.org/changeset/ports/388542

Log:
  MFH: r385392
  
  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 at gmx.com> (maintainer)
  Obtained from:	https://github.com/lsalzman/enet/commit/8df6e58 [1]
  Approved by:	ports-secteam (delhij)

Added:
  branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c
     - copied unchanged from r385392, head/games/assaultcube/files/patch-source_enet_unix.c
Deleted:
  branches/2015Q2/games/assaultcube/files/patch-source_src_Makefile
Modified:
  branches/2015Q2/games/assaultcube/Makefile
  branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp
  branches/2015Q2/games/assaultcube/files/patch-source_src_console.h
  branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/games/assaultcube/Makefile
==============================================================================
--- branches/2015Q2/games/assaultcube/Makefile	Thu Jun  4 18:35:36 2015	(r388541)
+++ branches/2015Q2/games/assaultcube/Makefile	Thu Jun  4 18:48:34 2015	(r388542)
@@ -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}

Copied: branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c (from r385392, head/games/assaultcube/files/patch-source_enet_unix.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/games/assaultcube/files/patch-source_enet_unix.c	Thu Jun  4 18:48:34 2015	(r388542, copy of r385392, head/games/assaultcube/files/patch-source_enet_unix.c)
@@ -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: branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp
==============================================================================
--- branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp	Thu Jun  4 18:35:36 2015	(r388541)
+++ branches/2015Q2/games/assaultcube/files/patch-source_src_bot_bot_waypoint.cpp	Thu Jun  4 18:48:34 2015	(r388542)
@@ -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: branches/2015Q2/games/assaultcube/files/patch-source_src_console.h
==============================================================================
--- branches/2015Q2/games/assaultcube/files/patch-source_src_console.h	Thu Jun  4 18:35:36 2015	(r388541)
+++ branches/2015Q2/games/assaultcube/files/patch-source_src_console.h	Thu Jun  4 18:48:34 2015	(r388542)
@@ -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: branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp
==============================================================================
--- branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp	Thu Jun  4 18:35:36 2015	(r388541)
+++ branches/2015Q2/games/assaultcube/files/patch-source_src_master.cpp	Thu Jun  4 18:48:34 2015	(r388542)
@@ -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;