- update to 2.19.4

- update master_site

while here:
- remove no more existing --disable-libxpkmaster from CONFIGURE_ARGS
- convert to optionsNG
- use ${LOCALBASE} in reinplace

PR:		170608
Submitted by:	Simon Dick <simond at irrelevant dot org> (maintainer)

3 files changed, 27 insertions, 12 deletions

diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 7d5625715851..e25a58ef2354 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	worker
-PORTVERSION=	2.16.5
+PORTVERSION=	2.19.4
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.boomerangsworld.de/worker/downloads/
+MASTER_SITES=	http://www.boomerangsworld.de/cms/worker/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -25,12 +25,11 @@ MANLANG=	"" fr it
 MAN1=		worker.1
 
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ARGS=	--disable-libxpkmaster
-OPTIONS=	XFT "Enable experimental xft support" Off
+OPTIONS_DEFINE=	XFT
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
@@ -44,8 +43,8 @@ pre-configure:
 
 post-patch:
 .for f in aa.pattern_rename.sh cd2flac.sh cd2mp3.sh cd2ogg.sh cd2wav.sh xeditor
-	${REINPLACE_CMD} -e 's|/bin/bash|/usr/local/bin/bash|g' \
+	${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
 		${WRKSRC}/scripts/${f}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/worker/distinfo b/x11-fm/worker/distinfo
index a39d00d8940c..64c5e3d8afe9 100644
--- a/x11-fm/worker/distinfo
+++ b/x11-fm/worker/distinfo
@@ -1,4 +1,4 @@
-SHA256 (worker-2.16.5.tar.bz2) = f249b09a7483bd6a118495ae9e9dba5bb071e4aecaee4e8330b5e191a56f97b9
-SIZE (worker-2.16.5.tar.bz2) = 817135
-SHA256 (worker-2.16.5.tar.bz2.asc) = a8cb87f4c71b583800680d9ae9afcc280ca4ff227a1251990a0a3269259ba512
-SIZE (worker-2.16.5.tar.bz2.asc) = 189
+SHA256 (worker-2.19.4.tar.bz2) = 0f4b4f7d8a7610f1be4181cc01eeb338ba9c368bcd03871a18d1350d12dc182e
+SIZE (worker-2.19.4.tar.bz2) = 1184410
+SHA256 (worker-2.19.4.tar.bz2.asc) = 1dbc73940c1837ec6c1b252224707506bf21b0768a185e11970809a2106cdd10
+SIZE (worker-2.19.4.tar.bz2.asc) = 197
diff --git a/x11-fm/worker/pkg-plist b/x11-fm/worker/pkg-plist
index c6700001c623..9da5b3a72126 100644
--- a/x11-fm/worker/pkg-plist
+++ b/x11-fm/worker/pkg-plist
@@ -3,6 +3,7 @@ share/pixmaps/WorkerIcon.xpm
 share/pixmaps/WorkerIcon16.xpm
 share/pixmaps/WorkerIcon32.xpm
 share/pixmaps/WorkerIcon48.xpm
+share/applications/worker.desktop
 %%DATADIR%%/catalogs/cesky.catalog
 %%DATADIR%%/catalogs/cesky.catalog.utf8
 %%DATADIR%%/catalogs/cesky.catalog.coms
@@ -57,6 +58,20 @@ share/pixmaps/WorkerIcon48.xpm
 %%DATADIR%%/catalogs/nederlands.catalog.coms.utf8
 %%DATADIR%%/catalogs/nederlands.catalog.flags
 %%DATADIR%%/catalogs/nederlands.catalog.flags.utf8
+%%DATADIR%%/catalogs/latvian.catalog
+%%DATADIR%%/catalogs/latvian.catalog.utf8
+%%DATADIR%%/catalogs/latvian.catalog.coms
+%%DATADIR%%/catalogs/latvian.catalog.coms.utf8
+%%DATADIR%%/catalogs/latvian.catalog.flags
+%%DATADIR%%/catalogs/latvian.catalog.flags.utf8
+%%DATADIR%%/catalogs/ukrainian.catalog
+%%DATADIR%%/catalogs/ukrainian.catalog.utf8
+%%DATADIR%%/catalogs/ukrainian.catalog.coms
+%%DATADIR%%/catalogs/ukrainian.catalog.coms.utf8
+%%DATADIR%%/catalogs/ukrainian.catalog.flags
+%%DATADIR%%/catalogs/ukrainian.catalog.flags.utf8
+%%DATADIR%%/hints-english
+%%DATADIR%%/hints-english.utf8
 %%DATADIR%%/config-slovensky
 %%DATADIR%%/config-slovensky.utf8
 %%DATADIR%%/config-deutsch
@@ -70,6 +85,7 @@ share/pixmaps/WorkerIcon48.xpm
 %%DATADIR%%/scripts/displaywrapper_worker
 %%DATADIR%%/scripts/xeditor
 %%DATADIR%%/scripts/xliwrapper_worker
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/catalogs
 @dirrm %%DATADIR%%