From nobody@FreeBSD.org  Tue Oct 29 16:22:53 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 392C943A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 29 Oct 2013 16:22:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 26F092266
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 29 Oct 2013 16:22:53 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9TGMq54070224
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 29 Oct 2013 16:22:52 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9TGMq8t070223;
	Tue, 29 Oct 2013 16:22:52 GMT
	(envelope-from nobody)
Message-Id: <201310291622.r9TGMq8t070223@oldred.freebsd.org>
Date: Tue, 29 Oct 2013 16:22:52 GMT
From: Sender Ghost <lightside@gmx.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] games/assaultcube: Update to v1.2.0.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183449
>Category:       ports
>Synopsis:       [MAINTAINER] games/assaultcube: Update to v1.2.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 29 16:30:00 UTC 2013
>Closed-Date:    Sun Nov 03 05:11:21 UTC 2013
>Last-Modified:  Sun Nov  3 05:20:00 UTC 2013
>Originator:     Sender Ghost
>Release:        FreeBSD 9.2-RELEASE
>Organization:
>Environment:
>Description:
Patch to update games/assaultcube port from 1.2.0.0 to 1.2.0.1 version.

- Changed menu pixmap
- Fixed dynamic generation of TMPPLIST for STAGEDIR, by removing empty directory
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
--- assaultcube.orig/Makefile	2013-10-12 06:24:14.000000000 +0400
+++ assaultcube/Makefile	2013-10-29 19:29:16.000000000 +0400
@@ -2,7 +2,7 @@
 # $FreeBSD: games/assaultcube/Makefile 330111 2013-10-12 02:24:14Z danilo $
 
 PORTNAME=	assaultcube
-PORTVERSION=	1.2.0.0
+PORTVERSION=	1.2.0.1
 CATEGORIES=	games
 MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
 DISTNAME=	AssaultCube_v${PORTVERSION}
@@ -32,7 +32,7 @@
 CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
 BUILD_WRKSRC=	${WRKSRC}/source/src
 
-PORTDATA=	config demos packages
+PORTDATA=	config packages scripts
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
@@ -55,7 +55,7 @@
 ACUBE_BIN+=	client
 
 DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
-	"${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \
+	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \
 	"Game;" false
 .endif
 
@@ -71,6 +71,13 @@
 ACUBE_BIN+=	master
 .endif
 
+pre-install: .SILENT
+.if !defined(NOPORTDATA)
+	# 	Current STAGEDIR doesn't create empty directories for package,
+	# in case of dynamically generated TMPPLIST, where these directories exist
+	${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming
+.endif
+
 do-install:
 .for f in ${ACUBE_BIN}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
@@ -84,11 +91,17 @@
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
+.if ${PORT_OPTIONS:MCLIENT}
+	${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+.endif
 
 post-install:
 .for f in ${ACUBE_BIN}
 	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}
 	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
 .endfor
+.if ${PORT_OPTIONS:MCLIENT}
+	@${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff -ruN assaultcube.orig/distinfo assaultcube/distinfo
--- assaultcube.orig/distinfo	2013-10-12 06:24:14.000000000 +0400
+++ assaultcube/distinfo	2013-10-29 17:08:13.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61
-SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452
+SHA256 (AssaultCube_v1.2.0.1.tar.bz2) = 76862193ff61291f4125f9a12130cfda1163afff56624156853ba12b83ebf65d
+SIZE (AssaultCube_v1.2.0.1.tar.bz2) = 53144394
diff -ruN assaultcube.orig/files/patch-source_src_Makefile assaultcube/files/patch-source_src_Makefile
--- assaultcube.orig/files/patch-source_src_Makefile	2013-10-12 06:24:14.000000000 +0400
+++ assaultcube/files/patch-source_src_Makefile	2013-10-29 17:01:29.000000000 +0400
@@ -1,7 +1,8 @@
---- source/src/Makefile.orig	2013-10-09 23:35:27.000000000 +0400
-+++ source/src/Makefile	2013-10-11 02:18:50.000000000 +0400
-@@ -1,8 +1,7 @@
+--- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
++++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
+@@ -1,9 +1,7 @@
 -CXXFLAGS= -O3 -fomit-frame-pointer
+-CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
  override CXXFLAGS+= -Wall -fsigned-char
  
  PLATFORM= $(shell uname -s)
@@ -10,10 +11,10 @@
  
  INCLUDES= -I. -Ibot -I../enet/include
  
-@@ -21,8 +20,8 @@
+@@ -22,8 +20,8 @@
  else
  USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
- override CXXFLAGS+= -rdynamic
+ # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
 -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
 -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
 +CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
@@ -21,7 +22,7 @@
  endif
  
  CLIENT_OBJS= \
-@@ -86,8 +85,8 @@
+@@ -87,8 +85,8 @@
  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
  SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
  else


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Sun Nov 3 00:44:06 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183449 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Sun Nov 3 05:11:20 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183449 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183449: commit references a PR
Date: Sun,  3 Nov 2013 05:10:56 +0000 (UTC)

 Author: tabthorpe
 Date: Sun Nov  3 05:10:47 2013
 New Revision: 332588
 URL: http://svnweb.freebsd.org/changeset/ports/332588
 
 Log:
   - Update to 1.2.0.1
   
   PR:		ports/183449
   Submitted by:	Sender Ghost <lightside@gmx.com> (maintainer)
 
 Modified:
   head/games/assaultcube/Makefile
   head/games/assaultcube/distinfo   (contents, props changed)
   head/games/assaultcube/files/patch-source_src_Makefile   (contents, props changed)
 
 Modified: head/games/assaultcube/Makefile
 ==============================================================================
 --- head/games/assaultcube/Makefile	Sun Nov  3 05:07:32 2013	(r332587)
 +++ head/games/assaultcube/Makefile	Sun Nov  3 05:10:47 2013	(r332588)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	assaultcube
 -PORTVERSION=	1.2.0.0
 +PORTVERSION=	1.2.0.1
  CATEGORIES=	games
  MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
  DISTNAME=	AssaultCube_v${PORTVERSION}
 @@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--enable-shared=no --ena
  CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
  BUILD_WRKSRC=	${WRKSRC}/source/src
  
 -PORTDATA=	config demos packages
 +PORTDATA=	config packages scripts
  PORTDOCS=	*
  
  OPTIONS_DEFINE=	DOCS
 @@ -55,7 +55,7 @@ SUB_FILES+=	${PORTNAME}_client
  ACUBE_BIN+=	client
  
  DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
 -	"${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \
 +	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \
  	"Game;" false
  .endif
  
 @@ -71,6 +71,13 @@ SUB_FILES+=	${PORTNAME}_master
  ACUBE_BIN+=	master
  .endif
  
 +pre-install: .SILENT
 +.if !defined(NOPORTDATA)
 +	# 	Current STAGEDIR doesn't create empty directories for package,
 +	# in case of dynamically generated TMPPLIST, where these directories exist
 +	${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming
 +.endif
 +
  do-install:
  .for f in ${ACUBE_BIN}
  	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
 @@ -84,11 +91,17 @@ do-install:
  	${MKDIR} ${STAGEDIR}${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
  .endif
 +.if ${PORT_OPTIONS:MCLIENT}
 +	${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 +.endif
  
  post-install:
  .for f in ${ACUBE_BIN}
  	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}
  	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
  .endfor
 +.if ${PORT_OPTIONS:MCLIENT}
 +	@${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST}
 +.endif
  
  .include <bsd.port.mk>
 
 Modified: head/games/assaultcube/distinfo
 ==============================================================================
 --- head/games/assaultcube/distinfo	Sun Nov  3 05:07:32 2013	(r332587)
 +++ head/games/assaultcube/distinfo	Sun Nov  3 05:10:47 2013	(r332588)
 @@ -1,2 +1,2 @@
 -SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61
 -SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452
 +SHA256 (AssaultCube_v1.2.0.1.tar.bz2) = b5e0a30fe038fed292138268077ce916dcff0690edc1ce2f06330b4132345001
 +SIZE (AssaultCube_v1.2.0.1.tar.bz2) = 53143395
 
 Modified: head/games/assaultcube/files/patch-source_src_Makefile
 ==============================================================================
 --- head/games/assaultcube/files/patch-source_src_Makefile	Sun Nov  3 05:07:32 2013	(r332587)
 +++ head/games/assaultcube/files/patch-source_src_Makefile	Sun Nov  3 05:10:47 2013	(r332588)
 @@ -1,7 +1,8 @@
 ---- source/src/Makefile.orig	2013-10-09 23:35:27.000000000 +0400
 -+++ source/src/Makefile	2013-10-11 02:18:50.000000000 +0400
 -@@ -1,8 +1,7 @@
 +--- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
 ++++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
 +@@ -1,9 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 +-CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
   override CXXFLAGS+= -Wall -fsigned-char
   
   PLATFORM= $(shell uname -s)
 @@ -10,10 +11,10 @@
   
   INCLUDES= -I. -Ibot -I../enet/include
   
 -@@ -21,8 +20,8 @@
 +@@ -22,8 +20,8 @@
   else
   USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
 - override CXXFLAGS+= -rdynamic
 + # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
  -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
  -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
  +CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
 @@ -21,7 +22,7 @@
   endif
   
   CLIENT_OBJS= \
 -@@ -86,8 +85,8 @@
 +@@ -87,8 +85,8 @@
   SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
   SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
   else
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
