Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Apr 2015 17:27:16 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382924 - in head/games/passage: . files
Message-ID:  <201504011727.t31HRGYR095842@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Apr  1 17:27:15 2015
New Revision: 382924
URL: https://svnweb.freebsd.org/changeset/ports/382924

Log:
  - Remove useless libs tampering
  - Fix build on DragonFly

Added:
  head/games/passage/files/patch-gamma256_gameSource_Makefile.all
     - copied, changed from r382923, head/games/passage/files/patch-Makefile.all
  head/games/passage/files/patch-minorGems_system_endian.h   (contents, props changed)
Deleted:
  head/games/passage/files/patch-Makefile.all
Modified:
  head/games/passage/Makefile

Modified: head/games/passage/Makefile
==============================================================================
--- head/games/passage/Makefile	Wed Apr  1 17:23:08 2015	(r382923)
+++ head/games/passage/Makefile	Wed Apr  1 17:27:15 2015	(r382924)
@@ -13,27 +13,25 @@ COMMENT=	Experimental video game by Jaso
 
 USE_SDL=	sdl
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/gamma256/gameSource
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/gamma256/gameSource
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(PLATFORM_LINK_FLAGS =\).*|\1 -pthread|' \
-		${WRKSRC}/Makefile.GnuLinux
 	@${REINPLACE_CMD} -e 's|"graphics"|"${DATADIR}/graphics"|' \
-		${WRKSRC}/common.cpp
+		${WRKSRC}/gamma256/gameSource/common.cpp
 	@${REINPLACE_CMD} -e 's|"music"|"${DATADIR}/music"|' \
-		${WRKSRC}/musicPlayer.cpp
+		${WRKSRC}/gamma256/gameSource/musicPlayer.cpp
 	@${REINPLACE_CMD} -e 's|"settings"|"${DATADIR}/settings"|' \
-		${WRKDIR}/${DISTNAME}/minorGems/util/SettingsManager.cpp
+		${WRKSRC}/minorGems/util/SettingsManager.cpp
 
 do-configure:
-	cd ${WRKSRC} && ${CAT} Makefile.GnuLinux Makefile.all > Makefile
+	cd ${BUILD_WRKSRC} && ${CAT} Makefile.GnuLinux Makefile.all > Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Passage ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Passage ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics music settings" ${STAGEDIR}${DATADIR}/
+	cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} "graphics music settings" ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>

Copied and modified: head/games/passage/files/patch-gamma256_gameSource_Makefile.all (from r382923, head/games/passage/files/patch-Makefile.all)
==============================================================================
--- head/games/passage/files/patch-Makefile.all	Wed Apr  1 17:23:08 2015	(r382923, copy source)
+++ head/games/passage/files/patch-gamma256_gameSource_Makefile.all	Wed Apr  1 17:27:15 2015	(r382924)
@@ -1,5 +1,5 @@
---- Makefile.all.orig	2010-05-24 01:03:11.000000000 +0400
-+++ Makefile.all	2011-08-04 02:06:46.000000000 +0400
+--- gamma256/gameSource/Makefile.all.orig	2010-05-24 01:03:11.000000000 +0400
++++ gamma256/gameSource/Makefile.all	2011-08-04 02:06:46.000000000 +0400
 @@ -1,8 +1,8 @@
  
  ROOT_PATH = ../..

Added: head/games/passage/files/patch-minorGems_system_endian.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/passage/files/patch-minorGems_system_endian.h	Wed Apr  1 17:27:15 2015	(r382924)
@@ -0,0 +1,11 @@
+--- minorGems/system/endian.h.orig	2009-04-03 17:39:19.000000000 +0400
++++ minorGems/system/endian.h	2015-03-27 02:42:33.353630000 +0300
+@@ -25,7 +25,7 @@
+ 
+ 
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <machine/endian.h>
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504011727.t31HRGYR095842>