svn commit: r337784 - in head/games/djgame2: . files

[Pawel Pekala]

Author: pawel
Date: Fri Dec 27 19:16:55 2013
New Revision: 337784
URL: http://svnweb.freebsd.org/changeset/ports/337784

Log:
  - Fix build with clang
  - Use multiple make jobs
  - Strip binaries
  - Support staging

Added:
  head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp   (contents, props changed)
  head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h   (contents, props changed)
  head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp   (contents, props changed)
Modified:
  head/games/djgame2/Makefile

Modified: head/games/djgame2/Makefile
==============================================================================
--- head/games/djgame2/Makefile	Fri Dec 27 19:15:57 2013	(r337783)
+++ head/games/djgame2/Makefile	Fri Dec 27 19:16:55 2013	(r337784)
@@ -3,7 +3,7 @@
 
 PORTNAME=	djgame2
 PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.bluedj.com/download/src/
 DISTNAME=	source-${PORTVERSION}
@@ -15,13 +15,14 @@ COMMENT=	bluedj contains many popular on
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_QT4=	gui qt3support qmake_build uic_build rcc_build moc_build svg
+USES=		dos2unix
+DOS2UNIX_FILES=	Base/src/DJGraphicsChessTimerItem.cpp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 DATADIR=	${PREFIX}/share/djgame2
 
 SUB_FILES=	djgame2.desktop startdjg
 
-NO_STAGE=	yes
 post-patch:
 	${RM} -f ${WRKSRC}/Hall/HallRes/platform/x11/install
 	@${REINPLACE_CMD} -e 's|linux/soundcard.h|sys/soundcard.h|g' \
@@ -29,6 +30,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
 		${WRKSRC}/make_linux_output
 	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|make$$|make -j${MAKE_JOBS_NUMBER}|' \
 		${WRKSRC}/make_linux_output
 	@${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \
 		>> ${WRKSRC}/Base/Base.pro
@@ -40,10 +42,13 @@ do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make_linux_output
 
 do-install:
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/Hall/build; ${TAR} -cf - *) | \
-		${TAR}  -xf - -C ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/djgame2.desktop ${PREFIX}/share/applications
-	${INSTALL_SCRIPT} ${WRKDIR}/startdjg ${PREFIX}/bin
+		${TAR}  -xf - -C ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/djgame2.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_SCRIPT} ${WRKDIR}/startdjg ${STAGEDIR}${PREFIX}/bin
+	@(cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} modules/*.so Hall \
+		UpdateHall libBase.so.1)
 
 .include <bsd.port.mk>

Added: head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp	Fri Dec 27 19:16:55 2013	(r337784)
@@ -0,0 +1,10 @@
+--- ./Base/src/DJGraphicsChessTimerItem.cpp.orig	2013-12-27 20:08:04.531116404 +0100
++++ ./Base/src/DJGraphicsChessTimerItem.cpp	2013-12-27 20:08:30.220122689 +0100
+@@ -19,6 +19,7 @@
+ //Contact us at ggwizard at gmail.com or darkdong at gmail.com.
+ //****************************************************************************/
+ 
++#include <time.h>
+ #include "DJGraphicsChessTimerItem.h"
+ #include "DJGraphicsTextItem.h"
+ #include "DJDesktop.h"

Added: head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h	Fri Dec 27 19:16:55 2013	(r337784)
@@ -0,0 +1,10 @@
+--- ./Shisensho/src/DJGameRank.h.orig	2008-03-11 13:17:22.000000000 +0100
++++ ./Shisensho/src/DJGameRank.h	2013-12-27 20:07:09.040179358 +0100
+@@ -22,6 +22,7 @@
+ #ifndef DJGAMERANK_H
+ #define DJGAMERANK_H
+ 
++#include <time.h>
+ #include "DJTreeWidget.h"
+ #include "protocol.h"
+ 

Added: head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp	Fri Dec 27 19:16:55 2013	(r337784)
@@ -0,0 +1,17 @@
+--- ./Shisensho/src/LLKPanelController.cpp.orig	2008-03-19 12:20:04.000000000 +0100
++++ ./Shisensho/src/LLKPanelController.cpp	2013-12-27 20:07:09.043178203 +0100
+@@ -19,6 +19,7 @@
+ //Contact us at ggwizard at gmail.com or darkdong at gmail.com.
+ //****************************************************************************/
+ 
++#include <time.h>
+ #include "LLKPanelController.h"
+ #include "LLKDesktopController.h"
+ #include "DJGameController.h"
+@@ -61,4 +62,4 @@
+ 		break;
+ 	}
+ 	DJPanelController::gameTrace(gameTrace);
+-}
+\ No newline at end of file
++}