4 files changed, 40 insertions, 45 deletions

diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index a4d87ed18abb..ab295af440c0 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -1,12 +1,11 @@
-# Created by:	nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	capitalism
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	http://www.linux-ecke.de/Capitalism/packages/0.5/
-DISTNAME=	${PORTNAME}_${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Capitalism/0.5/
 EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	nemysis@gmx.ch
@@ -14,8 +13,6 @@ COMMENT=	Qt client for the Monopd server
 
 LICENSE=	GPLv2
 
-BROKEN=		Does not fetch
-
 LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		pcre:${PORTSDIR}/devel/pcre \
 		png15:${PORTSDIR}/graphics/png \
@@ -24,48 +21,61 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		xcb:${PORTSDIR}/x11/libxcb
 
-USES=		gettext iconv
+WRKSRC=		${WRKDIR}/Capitalism-${PORTVERSION}
+
+USES=		iconv
 USE_XORG=	ice sm x11 xau xdmcp xext xrender
 USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
 		corelib gui network script xml
-INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
-PORTDOCS=	README changelog
+PORTDOCS=	README changelog readme.txt
 
-WRKSRC=		${WRKDIR}/Capitalism_${PORTVERSION}
+INSTALLS_ICONS=	yes
 ICON_SIZES=	16x16 22x22 24x24 32x32 48x48 64x64
 
 DESKTOP_ENTRIES="Capitalism" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;BoardGame;" ${FALSE}
+		"${PORTNAME}" "Game;BoardGame;" false
+
+OPTIONS_DEFINE=	NLS
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
 post-configure:
-	@${REINPLACE_CMD} 's|-O2 -Wall -W||g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-O2 -Wall -W||g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Capitalism ${PREFIX}/bin/${PORTNAME}
 
-.for d in games images ts
+.for d in games images
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
 .endfor
 
+.if ${PORT_OPTIONS:MNLS}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ts ${DATADIR})
+.endif
+
 post-install:
 .for s in ${ICON_SIZES}
 	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/${s}.png \
 		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-		${PREFIX}/share/pixmaps
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
diff --git a/games/capitalism/distinfo b/games/capitalism/distinfo
index 2415edd08c56..30e96dc56ce2 100644
--- a/games/capitalism/distinfo
+++ b/games/capitalism/distinfo
@@ -1,2 +1,2 @@
-SHA256 (capitalism_0.5.1.tbz) = 049baf35bf90bab35f06fe0963969362375b1d8a78efe70514f0527cfe725119
-SIZE (capitalism_0.5.1.tbz) = 343927
+SHA256 (capitalism-0.5.1.tbz) = 9580bc11bd186a24fbc81b318d3c6620b072d827c019e2da44a5b1889c952895
+SIZE (capitalism-0.5.1.tbz) = 340835
diff --git a/games/capitalism/pkg-descr b/games/capitalism/pkg-descr
index ff96861038fd..e72077711b8e 100644
--- a/games/capitalism/pkg-descr
+++ b/games/capitalism/pkg-descr
@@ -1,4 +1,4 @@
 Capitalism is a Client for the Monopd server.
 You can play Monopoly like games with it.
 
-WWW: http://www.linux-ecke.de/Capitalism/
+WWW: https://sourceforge.net/projects/capitalism/
diff --git a/games/capitalism/pkg-plist b/games/capitalism/pkg-plist
index 46086ecc0a2c..1458b471a76f 100644
--- a/games/capitalism/pkg-plist
+++ b/games/capitalism/pkg-plist
@@ -69,17 +69,16 @@ bin/capitalism
 %%DATADIR%%/images/tools/sellhouserow.png
 %%DATADIR%%/images/tools/trade.png
 %%DATADIR%%/images/tools/unmortage.png
-%%DATADIR%%/ts/Capid_de.trans
-%%DATADIR%%/ts/Capitalism_de.qm
-%%DATADIR%%/ts/Capitalism_de.ts
-%%DATADIR%%/ts/Capitalism_es.qm
-%%DATADIR%%/ts/Capitalism_es.ts
-%%DATADIR%%/ts/Capitalism_fi.qm
-%%DATADIR%%/ts/Capitalism_fi.ts
-%%DATADIR%%/ts/Capitalism_it.ts
-%%DATADIR%%/ts/Capitalism_pl.qm
-%%DATADIR%%/ts/Capitalism_pl.ts
-%%DATADIR%%/ts/Capitalism_ru.ts
+%%NLS%%%%DATADIR%%/ts/Capid_de.trans
+%%NLS%%%%DATADIR%%/ts/Capitalism_de.qm
+%%NLS%%%%DATADIR%%/ts/Capitalism_de.ts
+%%NLS%%%%DATADIR%%/ts/Capitalism_es.qm
+%%NLS%%%%DATADIR%%/ts/Capitalism_es.ts
+%%NLS%%%%DATADIR%%/ts/Capitalism_fi.qm
+%%NLS%%%%DATADIR%%/ts/Capitalism_fi.ts
+%%NLS%%%%DATADIR%%/ts/Capitalism_it.ts
+%%NLS%%%%DATADIR%%/ts/Capitalism_pl.qm
+%%NLS%%%%DATADIR%%/ts/Capitalism_pl.ts
 share/icons/hicolor/16x16/apps/capitalism.png
 share/icons/hicolor/22x22/apps/capitalism.png
 share/icons/hicolor/24x24/apps/capitalism.png
@@ -87,21 +86,7 @@ share/icons/hicolor/32x32/apps/capitalism.png
 share/icons/hicolor/48x48/apps/capitalism.png
 share/icons/hicolor/64x64/apps/capitalism.png
 share/pixmaps/capitalism.png
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm %%DATADIR%%/ts
+%%NLS%%@dirrm %%DATADIR%%/ts
 @dirrm %%DATADIR%%/images/tools
 @dirrm %%DATADIR%%/images/smilies
 @dirrm %%DATADIR%%/images/menu