Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Sep 2013 15:35:08 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328585 - in head/games/freesynd: . files
Message-ID:  <201309281535.r8SFZ8od054664@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Sat Sep 28 15:35:08 2013
New Revision: 328585
URL: http://svnweb.freebsd.org/changeset/ports/328585

Log:
  - Fix build on HEAD [1]
  - Use new LIB_DEPENDS format
  - USES gmake
  - Stagify
  - Use dirrmtry instead of dirrm
  
  Submitted by:	ed [1]

Added:
  head/games/freesynd/files/patch-dump.cpp   (contents, props changed)
  head/games/freesynd/files/patch-dumpmaps.cpp   (contents, props changed)
Modified:
  head/games/freesynd/Makefile   (contents, props changed)
  head/games/freesynd/pkg-plist   (contents, props changed)

Modified: head/games/freesynd/Makefile
==============================================================================
--- head/games/freesynd/Makefile	Sat Sep 28 15:35:04 2013	(r328584)
+++ head/games/freesynd/Makefile	Sat Sep 28 15:35:08 2013	(r328585)
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	FreeSynd GPLed reimplementation of the classic Bullfrog game Syndicate
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_ZIP=	yes
 USE_SDL=	sdl mixer
 
@@ -20,7 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 SUB_FILES=	freesynd.sh
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's|-lpng|-lpng -L${LOCALBASE}/lib|g; \
 		s|g++|${CXX}|g; \
@@ -28,12 +27,12 @@ post-patch:
 		${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} ${DATADIR}/data
-	${INSTALL_PROGRAM} ${WRKSRC}/freesynd ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/freesynd.sh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/*.mp3 ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/data
+	${INSTALL_PROGRAM} ${WRKSRC}/freesynd ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/freesynd.sh ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/*.mp3 ${STAGEDIR}${DATADIR}
 .for datafile in ${WRKDIR}/${PORTNAME}/data/*
-	${INSTALL_DATA} ${WRKDIR}/${datafile} ${DATADIR}/data
+	${INSTALL_DATA} ${WRKDIR}/${datafile} ${STAGEDIR}${DATADIR}/data
 .endfor
 
 .include <bsd.port.mk>

Added: head/games/freesynd/files/patch-dump.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/freesynd/files/patch-dump.cpp	Sat Sep 28 15:35:08 2013	(r328585)
@@ -0,0 +1,10 @@
+--- dump.cpp.orig	2013-09-28 17:25:56.240863970 +0200
++++ dump.cpp	2013-09-28 17:25:38.414006911 +0200
+@@ -5,6 +5,7 @@
+ #include <png.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <stdlib.h>
+ 
+ class App : public Singleton < App > {
+ public:

Added: head/games/freesynd/files/patch-dumpmaps.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/freesynd/files/patch-dumpmaps.cpp	Sat Sep 28 15:35:08 2013	(r328585)
@@ -0,0 +1,10 @@
+--- dumpmaps.cpp.orig	2013-09-28 17:26:05.102862359 +0200
++++ dumpmaps.cpp	2013-09-28 17:26:14.860038673 +0200
+@@ -5,6 +5,7 @@
+ #include <png.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <stdlib.h>
+ 
+ class App : public Singleton < App > {
+ public:

Modified: head/games/freesynd/pkg-plist
==============================================================================
--- head/games/freesynd/pkg-plist	Sat Sep 28 15:35:04 2013	(r328584)
+++ head/games/freesynd/pkg-plist	Sat Sep 28 15:35:08 2013	(r328585)
@@ -385,5 +385,5 @@ bin/freesynd.sh
 %%DATADIR%%/data/syngame.xmi
 %%DATADIR%%/freesynd
 %%DATADIR%%/intro.mp3
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%



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