From nobody@FreeBSD.org  Wed Apr  9 00:56:59 2014
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 ESMTPS id E20EEBFB
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 Apr 2014 00:56:58 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id CE5501002
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 Apr 2014 00:56:58 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s390uw5i007166
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 9 Apr 2014 00:56:58 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s390uwX0007164;
	Wed, 9 Apr 2014 00:56:58 GMT
	(envelope-from nobody)
Message-Id: <201404090056.s390uwX0007164@cgiserv.freebsd.org>
Date: Wed, 9 Apr 2014 00:56:58 GMT
From: Kevin Zheng <kevinz5000@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] Update games/crossfire-client to 1.71.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         188385
>Category:       ports
>Synopsis:       [maintainer-update] Update games/crossfire-client to 1.71.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 09 01:00:00 UTC 2014
>Closed-Date:    Sat May 10 21:06:36 UTC 2014
>Last-Modified:  Sat May 10 21:10:00 UTC 2014
>Originator:     Kevin Zheng
>Release:        10.0-RELEASE
>Organization:
>Environment:
FreeBSD epsilon.local 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Update games/crossfire-client to 1.71.0. This also means:

- Remove libglade2 dependency.
- Remove old `configure` flags.
- Remove old patches.

Tested on Redports:
https://redports.org/~Partmedia/20140409003701-23716-195175/crossfire-client-1.71.0.log
https://redports.org/~Partmedia/20140409003701-23716-195176/crossfire-client-1.71.0.log
https://redports.org/~Partmedia/20140409003701-23716-195177/crossfire-client-1.71.0.log
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index c1c685e..b895cb5 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	crossfire-client
-PORTVERSION=	1.70.0
-PORTREVISION=	5
+PORTVERSION=	1.71.0
 CATEGORIES=	games
-MASTER_SITES=	SF/crossfire/crossfire-${PORTVERSION}
+MASTER_SITES=	SF/crossfire/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Cooperative multiplayer graphical RPG and adventure game
@@ -16,21 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2
 USE_GL=		glut
-USE_GNOME=	gtk20 libglade2
+USE_GNOME=	gtk20
 USE_SDL=	sdl image mixer
 
-CONFIGURE_ARGS+=	--disable-alsa --disable-alsa9
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-patch:
-	${REINPLACE_CMD} -e '/#include <curl\/types.h>/d' \
-		${WRKSRC}/common/metaserver.c
-	${REINPLACE_CMD} -e "/mandir='${datarootdir}\/man'/d" \
-		${WRKSRC}/configure
-
 post-install:
 	${CP} ${WRKSRC}/pixmaps/48x48.png ${WRKSRC}/pixmaps/crossfire-client.png
 	${INSTALL_DATA} ${WRKSRC}/gtk-v2/crossfire-client.desktop \
diff --git a/games/crossfire-client/distinfo b/games/crossfire-client/distinfo
index 46cf153..5f3c3ad 100644
--- a/games/crossfire-client/distinfo
+++ b/games/crossfire-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (crossfire-client-1.70.0.tar.gz) = afa3981785689baa22813ebc3893250c2f73374dda64bfc1dc41e64f4adc60b2
-SIZE (crossfire-client-1.70.0.tar.gz) = 801043
+SHA256 (crossfire-client-1.71.0.tar.bz2) = 5427655e756ffb48e75c1d9dc3200afab81efa7f2f00ffdf5dfee51918d5819d
+SIZE (crossfire-client-1.71.0.tar.bz2) = 761156
diff --git a/games/crossfire-client/pkg-plist b/games/crossfire-client/pkg-plist
index ea095b8..b54732a 100644
--- a/games/crossfire-client/pkg-plist
+++ b/games/crossfire-client/pkg-plist
@@ -2,21 +2,21 @@ bin/cfsndserv
 bin/crossfire-client-gtk2
 man/man6/crossfire-client-gtk2.6.gz
 share/applications/crossfire-client.desktop
-%%DATADIR%%/glade-gtk2/caelestis.glade
-%%DATADIR%%/glade-gtk2/chthonic.glade
-%%DATADIR%%/glade-gtk2/dialogs.glade
-%%DATADIR%%/glade-gtk2/eureka.glade
-%%DATADIR%%/glade-gtk2/gtk-v1.glade
-%%DATADIR%%/glade-gtk2/gtk-v2.glade
-%%DATADIR%%/glade-gtk2/lobotomy.glade
-%%DATADIR%%/glade-gtk2/meflin.glade
-%%DATADIR%%/glade-gtk2/oroboros.glade
-%%DATADIR%%/glade-gtk2/sixforty.glade
-%%DATADIR%%/glade-gtk2/un-deux.glade
-%%DATADIR%%/glade-gtk2/v1-redux.glade
 %%DATADIR%%/themes/Black
 %%DATADIR%%/themes/Standard
+%%DATADIR%%/ui/caelestis.ui
+%%DATADIR%%/ui/chthonic.ui
+%%DATADIR%%/ui/dialogs.ui
+%%DATADIR%%/ui/eureka.ui
+%%DATADIR%%/ui/gtk-v1.ui
+%%DATADIR%%/ui/gtk-v2.ui
+%%DATADIR%%/ui/lobotomy.ui
+%%DATADIR%%/ui/meflin.ui
+%%DATADIR%%/ui/oroboros.ui
+%%DATADIR%%/ui/sixforty.ui
+%%DATADIR%%/ui/un-deux.ui
+%%DATADIR%%/ui/v1-redux.ui
 share/pixmaps/crossfire-client.png
+@dirrmtry %%DATADIR%%/ui
 @dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/glade-gtk2
 @dirrmtry %%DATADIR%%


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: rakuco 
State-Changed-When: Sat May 10 21:06:35 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/188385: commit references a PR
Date: Sat, 10 May 2014 21:06:28 +0000 (UTC)

 Author: rakuco
 Date: Sat May 10 21:06:22 2014
 New Revision: 353603
 URL: http://svnweb.freebsd.org/changeset/ports/353603
 QAT: https://qat.redports.org/buildarchive/r353603/
 
 Log:
   Update to 1.71.0.
   
   - Remove libglade2 dependency.
   - Remove old `configure` flags.
   - Remove old patches.
   
   PR:		ports/188385
   Submitted by:	Kevin Zheng <kevinz5000@gmail.com> (maintainer)
 
 Modified:
   head/games/crossfire-client/Makefile
   head/games/crossfire-client/distinfo
   head/games/crossfire-client/pkg-plist
 
 Modified: head/games/crossfire-client/Makefile
 ==============================================================================
 --- head/games/crossfire-client/Makefile	Sat May 10 20:44:55 2014	(r353602)
 +++ head/games/crossfire-client/Makefile	Sat May 10 21:06:22 2014	(r353603)
 @@ -2,10 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	crossfire-client
 -PORTVERSION=	1.70.0
 -PORTREVISION=	6
 +PORTVERSION=	1.71.0
  CATEGORIES=	games
 -MASTER_SITES=	SF/crossfire/crossfire-${PORTVERSION}
 +MASTER_SITES=	SF/crossfire/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	kevinz5000@gmail.com
  COMMENT=	Cooperative multiplayer graphical RPG and adventure game
 @@ -16,21 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
  LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
  
  GNU_CONFIGURE=	yes
 -USES=		pkgconfig
 +USES=		pkgconfig tar:bzip2
  USE_GL=		glut
 -USE_GNOME=	gtk20 libglade2
 +USE_GNOME=	gtk20
  USE_SDL=	sdl image mixer
  
 -CONFIGURE_ARGS+=	--disable-alsa --disable-alsa9
 -CPPFLAGS+=	-I${LOCALBASE}/include
 -LDFLAGS+=	-L${LOCALBASE}/lib
 -
 -post-patch:
 -	${REINPLACE_CMD} -e '/#include <curl\/types.h>/d' \
 -		${WRKSRC}/common/metaserver.c
 -	${REINPLACE_CMD} -e "/mandir='${datarootdir}\/man'/d" \
 -		${WRKSRC}/configure
 -
  post-install:
  	${CP} ${WRKSRC}/pixmaps/48x48.png ${WRKSRC}/pixmaps/crossfire-client.png
  	${INSTALL_DATA} ${WRKSRC}/gtk-v2/crossfire-client.desktop \
 
 Modified: head/games/crossfire-client/distinfo
 ==============================================================================
 --- head/games/crossfire-client/distinfo	Sat May 10 20:44:55 2014	(r353602)
 +++ head/games/crossfire-client/distinfo	Sat May 10 21:06:22 2014	(r353603)
 @@ -1,2 +1,2 @@
 -SHA256 (crossfire-client-1.70.0.tar.gz) = afa3981785689baa22813ebc3893250c2f73374dda64bfc1dc41e64f4adc60b2
 -SIZE (crossfire-client-1.70.0.tar.gz) = 801043
 +SHA256 (crossfire-client-1.71.0.tar.bz2) = 5427655e756ffb48e75c1d9dc3200afab81efa7f2f00ffdf5dfee51918d5819d
 +SIZE (crossfire-client-1.71.0.tar.bz2) = 761156
 
 Modified: head/games/crossfire-client/pkg-plist
 ==============================================================================
 --- head/games/crossfire-client/pkg-plist	Sat May 10 20:44:55 2014	(r353602)
 +++ head/games/crossfire-client/pkg-plist	Sat May 10 21:06:22 2014	(r353603)
 @@ -2,21 +2,21 @@ bin/cfsndserv
  bin/crossfire-client-gtk2
  man/man6/crossfire-client-gtk2.6.gz
  share/applications/crossfire-client.desktop
 -%%DATADIR%%/glade-gtk2/caelestis.glade
 -%%DATADIR%%/glade-gtk2/chthonic.glade
 -%%DATADIR%%/glade-gtk2/dialogs.glade
 -%%DATADIR%%/glade-gtk2/eureka.glade
 -%%DATADIR%%/glade-gtk2/gtk-v1.glade
 -%%DATADIR%%/glade-gtk2/gtk-v2.glade
 -%%DATADIR%%/glade-gtk2/lobotomy.glade
 -%%DATADIR%%/glade-gtk2/meflin.glade
 -%%DATADIR%%/glade-gtk2/oroboros.glade
 -%%DATADIR%%/glade-gtk2/sixforty.glade
 -%%DATADIR%%/glade-gtk2/un-deux.glade
 -%%DATADIR%%/glade-gtk2/v1-redux.glade
  %%DATADIR%%/themes/Black
  %%DATADIR%%/themes/Standard
 +%%DATADIR%%/ui/caelestis.ui
 +%%DATADIR%%/ui/chthonic.ui
 +%%DATADIR%%/ui/dialogs.ui
 +%%DATADIR%%/ui/eureka.ui
 +%%DATADIR%%/ui/gtk-v1.ui
 +%%DATADIR%%/ui/gtk-v2.ui
 +%%DATADIR%%/ui/lobotomy.ui
 +%%DATADIR%%/ui/meflin.ui
 +%%DATADIR%%/ui/oroboros.ui
 +%%DATADIR%%/ui/sixforty.ui
 +%%DATADIR%%/ui/un-deux.ui
 +%%DATADIR%%/ui/v1-redux.ui
  share/pixmaps/crossfire-client.png
 +@dirrmtry %%DATADIR%%/ui
  @dirrmtry %%DATADIR%%/themes
 -@dirrmtry %%DATADIR%%/glade-gtk2
  @dirrmtry %%DATADIR%%
 _______________________________________________
 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:
