From owner-svn-ports-all@FreeBSD.ORG  Fri May 16 23:56:54 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5A42FB0F;
 Fri, 16 May 2014 23:56:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2D084267D;
 Fri, 16 May 2014 23:56:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GNuskx014265;
 Fri, 16 May 2014 23:56:54 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GNurml014260;
 Fri, 16 May 2014 23:56:53 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201405162356.s4GNurml014260@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 16 May 2014 23:56:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354272 - in head/games/wargus: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 23:56:54 -0000

Author: amdmi3
Date: Fri May 16 23:56:53 2014
New Revision: 354272
URL: http://svnweb.freebsd.org/changeset/ports/354272
QAT: https://qat.redports.org/buildarchive/r354272/

Log:
  - Support staging
  - Fix build with clang

Added:
  head/games/wargus/files/patch-wargus.c   (contents, props changed)
Modified:
  head/games/wargus/Makefile

Modified: head/games/wargus/Makefile
==============================================================================
--- head/games/wargus/Makefile	Fri May 16 23:29:17 2014	(r354271)
+++ head/games/wargus/Makefile	Fri May 16 23:56:53 2014	(r354272)
@@ -12,33 +12,23 @@ EXTRACT_SUFX=	.orig.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus
 
-LICENSE=	GPLv2
 NOT_FOR_ARCHS=	sparc64
 USES=		pathfix gmake pkgconfig
-USE_CSTD=	gnu89
 USE_GNOME=	gtk20
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	${PORTNAME} pkg-message
 
 MAKE_ARGS+=	CFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15" LDFLAGS+=-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	cd ${WRKSRC} && \
-	    ${FIND} campaigns contrib maps scripts -type d \
-	    -exec ${MKDIR} "${DATADIR}/{}" \; && \
-	    ${FIND} campaigns contrib maps scripts -type f \
-	    -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
-	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${DATADIR}
-
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "campaigns contrib maps scripts" ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/wartool ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/build.sh ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Added: head/games/wargus/files/patch-wargus.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/wargus/files/patch-wargus.c	Fri May 16 23:56:53 2014	(r354272)
@@ -0,0 +1,11 @@
+--- wargus.c.orig	2010-11-22 03:07:16.000000000 +0300
++++ wargus.c	2014-05-16 20:50:55.007540700 +0400
+@@ -86,7 +86,7 @@
+ int ConsoleMode = 0;
+ #endif
+ 
+-inline void error(char * title, char * text) {
++void error(char * title, char * text) {
+ 
+ #ifdef WIN32
+ 	MessageBox(NULL, text, title, MB_OK | MB_ICONERROR);