From nobody@FreeBSD.org  Fri Dec 27 19:11:55 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 ESMTPS id 7CDD79A4
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Dec 2013 19:11:55 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 690E717E3
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Dec 2013 19:11:55 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rBRJBt54056014
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 27 Dec 2013 19:11:55 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rBRJBtSO056009;
	Fri, 27 Dec 2013 19:11:55 GMT
	(envelope-from nobody)
Message-Id: <201312271911.rBRJBtSO056009@oldred.freebsd.org>
Date: Fri, 27 Dec 2013 19:11:55 GMT
From: John Marino <freebsd@marino.st>
To: freebsd-gnats-submit@FreeBSD.org
Subject: games/freeciv : [PATCH] unbreak it and -nox11 too
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185235
>Category:       ports
>Synopsis:       games/freeciv : [PATCH] unbreak it and -nox11 too
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    johans
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 27 19:20:00 UTC 2013
>Closed-Date:    Sat Dec 28 09:40:38 UTC 2013
>Last-Modified:  Sat Dec 28 09:40:38 UTC 2013
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
Both games/freeciv and games/freeciv-nox11 were broken due to bad dependency definitions.  Attached patch fixes both ports.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2013-12-27 19:03:54.786634000 +0000
+++ Makefile
@@ -11,10 +11,13 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
 RUN_DEPENDS=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		gettext gmake iconv pkgconfig
 USE_BZIP2=	yes
 USE_PYTHON=	yes
+USE_SQLITE=	yes
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -34,7 +37,6 @@ IGNORE=		cannot use SDL without X11: re-
 .if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng15.so:${PORTSDIR}/graphics/png \
-		libcurl.so:${PORTSDIR}/ftp/curl \
 		libggz.so:${PORTSDIR}/games/libggz \
 		libggz-gtk.so:${PORTSDIR}/games/ggz-gtk-client \
 		libggzcore.so:${PORTSDIR}/games/ggz-client-libs \
@@ -42,7 +44,6 @@ LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/gra
 USE_XORG=	xpm
 USE_SDL=	mixer
 USE_GNOME=	gtk20
-USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS+=--enable-client=gtk
 CONFLICTS=	freeciv-nox11-[0-9]*


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->johans 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Dec 27 19:20:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185235: commit references a PR
Date: Sat, 28 Dec 2013 09:10:20 +0000 (UTC)

 Author: johans
 Date: Sat Dec 28 09:10:11 2013
 New Revision: 337842
 URL: http://svnweb.freebsd.org/changeset/ports/337842
 
 Log:
   - Correct dependencies [1,2]
   - Update to FreeCiv 2.4.1 [3]
   
   PR:		ports/185235 [2]
   Submitted by:	Alexandr Matveev <timon@timon.net.nz> [1], John Marino <freebsd@marino.st> [2]
 
 Modified:
   head/games/freeciv/Makefile
   head/games/freeciv/distinfo
   head/games/freeciv/pkg-plist
 
 Modified: head/games/freeciv/Makefile
 ==============================================================================
 --- head/games/freeciv/Makefile	Sat Dec 28 06:59:23 2013	(r337841)
 +++ head/games/freeciv/Makefile	Sat Dec 28 09:10:11 2013	(r337842)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	freeciv
 -PORTVERSION=	2.4.0
 -PORTREVISION=	1
 +PORTVERSION=	2.4.1
  CATEGORIES=	games
  MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
  
 @@ -11,10 +10,13 @@ MAINTAINER=	johans@FreeBSD.org
  COMMENT=	Free turn-based multiplayer strategy
  
  RUN_DEPENDS=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
 +LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
  
  USES=		gettext gmake iconv pkgconfig
 +USE_SQLITE=	yes
  USE_BZIP2=	yes
  USE_PYTHON=	yes
 +USE_AUTOTOOLS=	libltdl
  GNU_CONFIGURE=	yes
  LDFLAGS+=	-L${LOCALBASE}/lib
  CPPFLAGS+=	-I${LOCALBASE}/include
 @@ -34,7 +36,6 @@ IGNORE=		cannot use SDL without X11: re-
  .if ${PORT_OPTIONS:MX11}
  LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff \
  		libpng15.so:${PORTSDIR}/graphics/png \
 -		libcurl.so:${PORTSDIR}/ftp/curl \
  		libggz.so:${PORTSDIR}/games/libggz \
  		libggz-gtk.so:${PORTSDIR}/games/ggz-gtk-client \
  		libggzcore.so:${PORTSDIR}/games/ggz-client-libs \
 @@ -42,7 +43,6 @@ LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/gra
  USE_XORG=	xpm
  USE_SDL=	mixer
  USE_GNOME=	gtk20
 -USE_SQLITE=	yes
  INSTALLS_ICONS=	yes
  CONFIGURE_ARGS+=--enable-client=gtk
  CONFLICTS=	freeciv-nox11-[0-9]*
 
 Modified: head/games/freeciv/distinfo
 ==============================================================================
 --- head/games/freeciv/distinfo	Sat Dec 28 06:59:23 2013	(r337841)
 +++ head/games/freeciv/distinfo	Sat Dec 28 09:10:11 2013	(r337842)
 @@ -1,2 +1,2 @@
 -SHA256 (freeciv-2.4.0.tar.bz2) = 7b2a9e6f777d2ac62bad9378dd7d03e4be07527c89d892b8f12b6b18fd0d80ad
 -SIZE (freeciv-2.4.0.tar.bz2) = 38221472
 +SHA256 (freeciv-2.4.1.tar.bz2) = e8074e4c14b69fc23d6956084524a5f42dbbe4620196ffa8b612135af35bef80
 +SIZE (freeciv-2.4.1.tar.bz2) = 38186597
 
 Modified: head/games/freeciv/pkg-plist
 ==============================================================================
 --- head/games/freeciv/pkg-plist	Sat Dec 28 06:59:23 2013	(r337841)
 +++ head/games/freeciv/pkg-plist	Sat Dec 28 09:10:11 2013	(r337842)
 @@ -1,11 +1,10 @@
  bin/freeciv-server
 -bin/freeciv-modpack
 +%%X11%%bin/freeciv-modpack
  %%X11%%bin/freeciv-client
  %%X11%%bin/freeciv-manual
  %%GTK%%bin/freeciv-gtk2
  %%SDL%%bin/freeciv-sdl
  etc/freeciv/database.lua
 -etc/ggz.modules
  lib/libfreeciv-srv.a
  lib/libfreeciv-srv.la
  lib/libfreeciv-srv.so
 @@ -24,8 +23,38 @@ man/man6/freeciv-sdl.6.gz
  man/man6/freeciv-server.6.gz
  man/man6/freeciv-xaw.6.gz
  share/applications/freeciv-server.desktop
 -share/applications/freeciv-modpack.desktop
 +%%X11%%share/applications/freeciv-modpack.desktop
  %%X11%%share/applications/freeciv.desktop
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/BUGS
 +%%PORTDOCS%%%%DOCSDIR%%/COPYING
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/CodingStyle
 +%%PORTDOCS%%%%DOCSDIR%%/FAQ
 +%%PORTDOCS%%%%DOCSDIR%%/HACKING
 +%%PORTDOCS%%%%DOCSDIR%%/HOWTOPLAY
 +%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.Cygwin
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README.AI
 +%%PORTDOCS%%%%DOCSDIR%%/README.AI_modules
 +%%PORTDOCS%%%%DOCSDIR%%/README.SDLClient
 +%%PORTDOCS%%%%DOCSDIR%%/README.agents
 +%%PORTDOCS%%%%DOCSDIR%%/README.attributes
 +%%PORTDOCS%%%%DOCSDIR%%/README.cma
 +%%PORTDOCS%%%%DOCSDIR%%/README.delta
 +%%PORTDOCS%%%%DOCSDIR%%/README.effects
 +%%PORTDOCS%%%%DOCSDIR%%/README.fcdb
 +%%PORTDOCS%%%%DOCSDIR%%/README.graphics
 +%%PORTDOCS%%%%DOCSDIR%%/README.nations
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/README.ruleset_experimental
 +%%PORTDOCS%%%%DOCSDIR%%/README.ruleset_multiplayer
 +%%PORTDOCS%%%%DOCSDIR%%/README.rulesets
 +%%PORTDOCS%%%%DOCSDIR%%/README.scorelog
 +%%PORTDOCS%%%%DOCSDIR%%/README.sound
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
  %%X11%%%%DATADIR%%/amplio2/ancientcities.png
  %%X11%%%%DATADIR%%/amplio2/ancientcities.spec
  %%X11%%%%DATADIR%%/amplio2/explosions.png
 @@ -3210,19 +3239,19 @@ share/applications/freeciv-modpack.deskt
  %%X11%%%%DATADIR%%/wonders/united_nations.png
  %%X11%%%%DATADIR%%/wonders/womens_suffrage.png
  %%X11%%share/icons/hicolor/128x128/apps/freeciv-client.png
 +%%X11%%share/icons/hicolor/128x128/apps/freeciv-modpack.png
  %%X11%%share/icons/hicolor/16x16/apps/freeciv-client.png
 +%%X11%%share/icons/hicolor/16x16/apps/freeciv-modpack.png
  %%X11%%share/icons/hicolor/32x32/apps/freeciv-client.png
 +%%X11%%share/icons/hicolor/32x32/apps/freeciv-modpack.png
  %%X11%%share/icons/hicolor/48x48/apps/freeciv-client.png
 +%%X11%%share/icons/hicolor/48x48/apps/freeciv-modpack.png
  %%X11%%share/icons/hicolor/64x64/apps/freeciv-client.png
 -share/icons/hicolor/128x128/apps/freeciv-modpack.png
 +%%X11%%share/icons/hicolor/64x64/apps/freeciv-modpack.png
  share/icons/hicolor/128x128/apps/freeciv-server.png
 -share/icons/hicolor/16x16/apps/freeciv-modpack.png
  share/icons/hicolor/16x16/apps/freeciv-server.png
 -share/icons/hicolor/32x32/apps/freeciv-modpack.png
  share/icons/hicolor/32x32/apps/freeciv-server.png
 -share/icons/hicolor/48x48/apps/freeciv-modpack.png
  share/icons/hicolor/48x48/apps/freeciv-server.png
 -share/icons/hicolor/64x64/apps/freeciv-modpack.png
  share/icons/hicolor/64x64/apps/freeciv-server.png
  %%NLS%%share/locale/ar/LC_MESSAGES/freeciv.mo
  %%NLS%%share/locale/bg/LC_MESSAGES/freeciv.mo
 @@ -3319,4 +3348,5 @@ share/icons/hicolor/64x64/apps/freeciv-s
  @dirrmtry share/icons
  %%NLS%%@dirrm share/locale/gd/LC_MESSAGES
  %%NLS%%@dirrm share/locale/gd
 +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
  @dirrmtry etc/freeciv
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: johans 
State-Changed-When: Sat Dec 28 09:40:19 UTC 2013 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185235 
>Unformatted:
