- Update to xboard 4.6.0

- Remove code patch (fixed upstream)
- Honour WITHOUT_NLS to disable NLS support (new in this version)

Feature safe:	yes

3 files changed, 33 insertions, 4 deletions

diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 5b54af563a50..977134e2739e 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xboard
-PORTVERSION=	4.5.3
+PORTVERSION=	4.6.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	xboard
@@ -56,6 +56,13 @@ RUN_DEPENDS+=	KnightCap:${PORTSDIR}/games/KnightCap
 .ifdef WITH_PHALANX
 RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/phalanx
 .endif
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -70,7 +77,6 @@ post-patch:
 		${WRKSRC}/engineoutput.c ${WRKSRC}/uci.c
 	@${REINPLACE_CMD} -e 's:INSTALL.*sysconfdir):&/$$$$files.dist:' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's/^SendString/void &/' ${WRKSRC}/xoptions.c
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/cmail ${PREFIX}/bin/
diff --git a/games/xboard/distinfo b/games/xboard/distinfo
index 1e84454b8067..acc3db85c179 100644
--- a/games/xboard/distinfo
+++ b/games/xboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xboard-4.5.3.tar.gz) = 04d9c7f5c6391d041e6b0449a82bd14f49c33462b67a0b2b51b2f1e6b103c585
-SIZE (xboard-4.5.3.tar.gz) = 2412637
+SHA256 (xboard-4.6.0.tar.gz) = 656786430c58d92cec6e505bcf70b490bd91c9f628dd7ba55aef2ab1103f3473
+SIZE (xboard-4.6.0.tar.gz) = 2945028
diff --git a/games/xboard/pkg-plist b/games/xboard/pkg-plist
index 6a8c9e453e5b..68935b32e2f6 100644
--- a/games/xboard/pkg-plist
+++ b/games/xboard/pkg-plist
@@ -3,6 +3,9 @@ bin/cmail
 share/icons/hicolor/48x48/apps/xboard.png
 share/icons/hicolor/scalable/apps/xboard.svg
 share/applications/xboard.desktop
+share/applications/xboard-fen-viewer.desktop
+share/applications/xboard-pgn-viewer.desktop
+share/applications/xboard-tourney.desktop
 share/games/xboard/bitmaps/default/a33o.bm
 share/games/xboard/bitmaps/default/a33s.bm
 share/games/xboard/bitmaps/default/a37o.bm
@@ -383,6 +386,10 @@ share/games/xboard/bitmaps/default/ws72o.bm
 share/games/xboard/bitmaps/default/ws72s.bm
 share/games/xboard/pixmaps/textures/wood_d.xpm
 share/games/xboard/pixmaps/textures/wood_l.xpm
+share/games/xboard/pixmaps/textures/board32.xpm
+share/games/xboard/pixmaps/textures/board48.xpm
+share/games/xboard/pixmaps/textures/cross32.xpm
+share/games/xboard/pixmaps/textures/cross48.xpm
 share/games/xboard/sounds/cymbal.wav
 share/games/xboard/sounds/ding1.wav
 share/games/xboard/sounds/gong.wav
@@ -393,6 +400,20 @@ share/games/xboard/sounds/phone.wav
 share/games/xboard/sounds/pop2.wav
 share/games/xboard/sounds/slap.wav
 share/games/xboard/sounds/woodthunk.wav
+share/mime/packages/xboard.xml
+%%NLS%%share/locale/da/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xboard.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xboard.mo
+%%NLS%%@dirrmtry share/locale/zh_HK
+%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/scalable/apps
@@ -400,6 +421,8 @@ share/games/xboard/sounds/woodthunk.wav
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
 @dirrm share/games/xboard/bitmaps/default
 @dirrm share/games/xboard/bitmaps
 @dirrm share/games/xboard/pixmaps/textures