From beyert@fastmail.fm  Tue Nov 19 09:19:54 2013
Return-Path: <beyert@fastmail.fm>
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 332A88CD
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 19 Nov 2013 09:19:54 +0000 (UTC)
Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 08DBD2F3E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 19 Nov 2013 09:19:53 +0000 (UTC)
Received: from compute3.internal (compute3.nyi.mail.srv.osa [10.202.2.43])
	by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 9A55D20B27;
	Tue, 19 Nov 2013 04:19:52 -0500 (EST)
Received: from frontend1 ([10.202.2.160])
  by compute3.internal (MEProxy); Tue, 19 Nov 2013 04:19:52 -0500
Received: from hypercube.aeonnet.fastmail.fm (unknown [76.90.217.240])
	by mail.messagingengine.com (Postfix) with ESMTPA id 15434C00E83;
	Tue, 19 Nov 2013 04:19:51 -0500 (EST)
Message-Id: <87ob5g4ukq.wl@fastmail.fm>
Date: Tue, 19 Nov 2013 01:19:49 -0800
From: Timothy Beyer <beyert@cs.ucr.edu>
To: FreeBSD GNATS Submit <FreeBSD-gnats-submit@FreeBSD.org>
Cc: Timothy Beyer <beyert@cs.ucr.edu>
Subject: update port: games/gemrb

>Number:         184077
>Category:       ports
>Synopsis:       update port: games/gemrb
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 19 09:20:00 UTC 2013
>Closed-Date:    Sat Nov 23 13:19:01 UTC 2013
>Last-Modified:  Sat Nov 23 13:20:00 UTC 2013
>Originator:     Timothy Beyer
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
no organization
>Environment:
System: FreeBSD hypercube.aeonnet 9.2-RELEASE FreeBSD 9.2-RELEASE #0: Tue Oct 1 00:41:23 PDT 2013 root@hypercube.aeonnet:/usr/obj/usr/src/sys/CUSTOM-9.2 amd64

>Description:

- Update to version 0.8.0.1 (has some kind of security fix), and bring back INSTALLS_ICONS

>How-To-Repeat:

    Apply patch and build port

>Fix:

    The included patch

--- gemrb.diff begins here ---
diff -urN gemrb.orig/Makefile gemrb/Makefile
--- gemrb.orig/Makefile	2013-09-20 10:36:33.000000000 -0700
+++ gemrb/Makefile	2013-11-19 01:11:22.000000000 -0800
@@ -2,9 +2,9 @@
 # $FreeBSD: games/gemrb/Makefile 327730 2013-09-20 17:36:33Z bapt $
 
 PORTNAME=	gemrb
-PORTVERSION=	0.8.0
+PORTVERSION=	0.8.0.1
 CATEGORIES=	games emulators
-MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources
+MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION:.1=}%20Sources
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	GemRB (Game engine made with preRendered Background)
@@ -23,6 +23,7 @@
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 CMAKE_C_FLAGS=	${CFLAGS}
 CMAKE_ARGS=	-DDOC_DIR="${DOCSDIR}" -DMAN_DIR="${MAN6PREFIX}/man/man6/" -DDISABLE_WERROR=1 -DINSOURCEBUILD=1
+INSTALLS_ICONS=	yes
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
diff -urN gemrb.orig/distinfo gemrb/distinfo
--- gemrb.orig/distinfo	2013-05-11 05:03:02.000000000 -0700
+++ gemrb/distinfo	2013-11-19 01:00:46.000000000 -0800
@@ -1,2 +1,2 @@
-SHA256 (gemrb-0.8.0.tar.gz) = 085af5d20e5ac4d587b3f26bb3878a0a5478e3ef8b317c4907d298c3aae1de29
-SIZE (gemrb-0.8.0.tar.gz) = 12231959
+SHA256 (gemrb-0.8.0.1.tar.gz) = 4d4fb00b09789c6de7e0959e7d7a1ccf6fc2aa6d0c86c4a6b35c45a2e9f5316d
+SIZE (gemrb-0.8.0.1.tar.gz) = 12303524

--- gemrb.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Thu Nov 21 20:57:44 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: Alex Kozlov <ak@FreeBSD.org>
To: Timothy Beyer <beyert@cs.ucr.edu>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/184077: update port: games/gemrb
Date: Fri, 22 Nov 2013 00:32:06 +0200

 --G4iJoqBmSsgzjUCe
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi, Timothy
 
 What do you think about the attached patch?
 
 p.s. I'm not sure that INSTALLS_ICONS is a very good idea,
 it adds 27 packages to dependencies, some of which
 are pretty heavy.
 
 
 -- 
 Alex
 
 --G4iJoqBmSsgzjUCe
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch-gemrb.txt"
 
 - Support STAGEDIR
 - Convert to new LIB_DEPENDS syntax
 - Update to 0.8.0.1
 Index: games/gemrb/Makefile
 @@ -2,9 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	gemrb
 -PORTVERSION=	0.8.0
 +PORTVERSION=	0.8.0.1
  CATEGORIES=	games emulators
 -MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources
 +MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION:.1=}%20Sources
  
  MAINTAINER=	beyert@cs.ucr.edu
  COMMENT=	GemRB (Game engine made with preRendered Background)
 @@ -12,8 +12,8 @@
  LICENSE=	GPLv2
  LICENSE_FILE=	${WRKSRC}/COPYING
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 -		vorbis:${PORTSDIR}/audio/libvorbis
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 +		libvorbis.so:${PORTSDIR}/audio/libvorbis
  
  USES=		cmake
  USE_SDL=	sdl mixer ttf
 @@ -24,32 +24,4 @@
  CMAKE_C_FLAGS=	${CFLAGS}
  CMAKE_ARGS=	-DDOC_DIR="${DOCSDIR}" -DMAN_DIR="${MAN6PREFIX}/man/man6/" -DDISABLE_WERROR=1 -DINSOURCEBUILD=1
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 -
 -MAN6=		gemrb.6
 -
 -post-patch:
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( VLCPlayer )/d' \
 -	${WRKSRC}/gemrb/plugins/CMakeLists.txt
 -
 -.if empty(PORT_OPTIONS:MDOCS)
 -	@${REINPLACE_CMD} \
 -	-e '/^INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION \$${DOC_DIR} )/d' \
 -	${WRKSRC}/CMakeLists.txt
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( docs )/d' \
 -	${WRKSRC}/gemrb/CMakeLists.txt
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( en )/d' \
 -	${WRKSRC}/gemrb/docs/CMakeLists.txt
 -.endif
 -
 -post-install:
 -	@if [ ! -f ${PREFIX}/etc/gemrb.cfg ]; then \
 -		${CP} ${WRKSRC}/gemrb/GemRB.cfg.sample ${PREFIX}/etc/gemrb.cfg; \
 -	fi
 -	@${CAT} ${PKGMESSAGE}
 -
  .include <bsd.port.mk>
 Index: games/gemrb/distinfo
 @@ -1,2 +1,2 @@
 -SHA256 (gemrb-0.8.0.tar.gz) = 085af5d20e5ac4d587b3f26bb3878a0a5478e3ef8b317c4907d298c3aae1de29
 -SIZE (gemrb-0.8.0.tar.gz) = 12231959
 +SHA256 (gemrb-0.8.0.1.tar.gz) = 4d4fb00b09789c6de7e0959e7d7a1ccf6fc2aa6d0c86c4a6b35c45a2e9f5316d
 +SIZE (gemrb-0.8.0.1.tar.gz) = 12303524
 Index: games/gemrb/pkg-plist
 @@ -48,6 +48,7 @@
  lib/gemrb/plugins/WEDImporter.so
  lib/gemrb/plugins/WMPImporter.so
  lib/gemrb/plugins/ZLibManager.so
 +man/man6/gemrb.6.gz
  %%PORTDOCS%%%%DOCSDIR%%/README
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/COPYING
 
 --G4iJoqBmSsgzjUCe--

From: Timothy Beyer <beyert@cs.ucr.edu>
To: Alex Kozlov <ak@FreeBSD.org>
Cc: Timothy Beyer <beyert@cs.ucr.edu>,
	bug-followup@FreeBSD.org
Subject: Re: ports/184077: update port: games/gemrb
Date: Thu, 21 Nov 2013 18:32:05 -0800

 At Fri, 22 Nov 2013 00:32:06 +0200,
 Alex Kozlov wrote:
 > 
 > [1  <text/plain; us-ascii (7bit)>]
 > Hi, Timothy
 > 
 > What do you think about the attached patch?
 > 
 > p.s. I'm not sure that INSTALLS_ICONS is a very good idea,
 > it adds 27 packages to dependencies, some of which
 > are pretty heavy.
 > 
 > 
 
 Provided that your patch works, it looks much easier to maintain than the
 existing Makefile.  It seems like a big improvement.
 
 I agree regarding the INSTALLS_ICONS.  Though, what should be done about the
 file "/usr/local/share/pixmaps/gemrb.png"? Should it be in the pkg-plist?
 
 Tim

From: Alex Kozlov <ak@FreeBSD.org>
To: Timothy Beyer <beyert@cs.ucr.edu>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/184077: update port: games/gemrb
Date: Sat, 23 Nov 2013 15:09:12 +0200

 On Thu, Nov 21, 2013 at 06:32:05PM -0800, Timothy Beyer wrote:
 > At Fri, 22 Nov 2013 00:32:06 +0200, Alex Kozlov wrote:
 > > What do you think about the attached patch?
 > > 
 > > p.s. I'm not sure that INSTALLS_ICONS is a very good idea,
 > > it adds 27 packages to dependencies, some of which
 > > are pretty heavy.
 > > 
 > > 
 > Provided that your patch works, it looks much easier to maintain than the
 > existing Makefile.  It seems like a big improvement.
 Yes, stagedir is a big improvement.
  
 > I agree regarding the INSTALLS_ICONS.  Though, what should be done about the
 > file "/usr/local/share/pixmaps/gemrb.png"? Should it be in the pkg-plist?
 You can leave it as is, for now.
 
 
 -- 
 Alex
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Sat Nov 23 13:19:00 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184077: commit references a PR
Date: Sat, 23 Nov 2013 13:17:08 +0000 (UTC)

 Author: ak
 Date: Sat Nov 23 13:16:59 2013
 New Revision: 334665
 URL: http://svnweb.freebsd.org/changeset/ports/334665
 
 Log:
   - Support STAGEDIR
   - Convert to new LIB_DEPENDS syntax
   - Update to 0.8.0.1 [1]
   
   PR:	ports/184077 (based on) [1]
   Submitted by:		Timothy Beyer <beyert@cs.ucr.edu> (maintainer) [1]
 
 Modified:
   head/games/gemrb/Makefile
   head/games/gemrb/distinfo
   head/games/gemrb/pkg-plist
 
 Modified: head/games/gemrb/Makefile
 ==============================================================================
 --- head/games/gemrb/Makefile	Sat Nov 23 12:37:32 2013	(r334664)
 +++ head/games/gemrb/Makefile	Sat Nov 23 13:16:59 2013	(r334665)
 @@ -2,9 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	gemrb
 -PORTVERSION=	0.8.0
 +PORTVERSION=	0.8.0.1
  CATEGORIES=	games emulators
 -MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources
 +MASTER_SITES=	SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION:.1=}%20Sources
  
  MAINTAINER=	beyert@cs.ucr.edu
  COMMENT=	GemRB (Game engine made with preRendered Background)
 @@ -12,8 +12,8 @@ COMMENT=	GemRB (Game engine made with pr
  LICENSE=	GPLv2
  LICENSE_FILE=	${WRKSRC}/COPYING
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 -		vorbis:${PORTSDIR}/audio/libvorbis
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 +		libvorbis.so:${PORTSDIR}/audio/libvorbis
  
  USES=		cmake
  USE_SDL=	sdl mixer ttf
 @@ -24,32 +24,4 @@ CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBAS
  CMAKE_C_FLAGS=	${CFLAGS}
  CMAKE_ARGS=	-DDOC_DIR="${DOCSDIR}" -DMAN_DIR="${MAN6PREFIX}/man/man6/" -DDISABLE_WERROR=1 -DINSOURCEBUILD=1
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 -
 -MAN6=		gemrb.6
 -
 -post-patch:
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( VLCPlayer )/d' \
 -	${WRKSRC}/gemrb/plugins/CMakeLists.txt
 -
 -.if empty(PORT_OPTIONS:MDOCS)
 -	@${REINPLACE_CMD} \
 -	-e '/^INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION \$${DOC_DIR} )/d' \
 -	${WRKSRC}/CMakeLists.txt
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( docs )/d' \
 -	${WRKSRC}/gemrb/CMakeLists.txt
 -	@${REINPLACE_CMD} \
 -	-e '/^ADD_SUBDIRECTORY( en )/d' \
 -	${WRKSRC}/gemrb/docs/CMakeLists.txt
 -.endif
 -
 -post-install:
 -	@if [ ! -f ${PREFIX}/etc/gemrb.cfg ]; then \
 -		${CP} ${WRKSRC}/gemrb/GemRB.cfg.sample ${PREFIX}/etc/gemrb.cfg; \
 -	fi
 -	@${CAT} ${PKGMESSAGE}
 -
  .include <bsd.port.mk>
 
 Modified: head/games/gemrb/distinfo
 ==============================================================================
 --- head/games/gemrb/distinfo	Sat Nov 23 12:37:32 2013	(r334664)
 +++ head/games/gemrb/distinfo	Sat Nov 23 13:16:59 2013	(r334665)
 @@ -1,2 +1,2 @@
 -SHA256 (gemrb-0.8.0.tar.gz) = 085af5d20e5ac4d587b3f26bb3878a0a5478e3ef8b317c4907d298c3aae1de29
 -SIZE (gemrb-0.8.0.tar.gz) = 12231959
 +SHA256 (gemrb-0.8.0.1.tar.gz) = 4d4fb00b09789c6de7e0959e7d7a1ccf6fc2aa6d0c86c4a6b35c45a2e9f5316d
 +SIZE (gemrb-0.8.0.1.tar.gz) = 12303524
 
 Modified: head/games/gemrb/pkg-plist
 ==============================================================================
 --- head/games/gemrb/pkg-plist	Sat Nov 23 12:37:32 2013	(r334664)
 +++ head/games/gemrb/pkg-plist	Sat Nov 23 13:16:59 2013	(r334665)
 @@ -48,6 +48,7 @@ lib/gemrb/plugins/WAVReader.so
  lib/gemrb/plugins/WEDImporter.so
  lib/gemrb/plugins/WMPImporter.so
  lib/gemrb/plugins/ZLibManager.so
 +man/man6/gemrb.6.gz
  %%PORTDOCS%%%%DOCSDIR%%/README
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/COPYING
 _______________________________________________
 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:
