3 files changed, 44 insertions, 14 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 6598a1baa0c8..c116078a7746 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -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-run make config
 .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}/graphics/tiff \
 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]*
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index f6c5b1ad6dc3..a452384abef0 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -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
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 3eed9b4684fb..0bf742eb86fa 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -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.desktop
 %%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-server.png
 @dirrmtry share/icons
 %%NLS%%@dirrm share/locale/gd/LC_MESSAGES
 %%NLS%%@dirrm share/locale/gd
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry etc/freeciv