- Update to 4.18.1.

PR:		133585
Submitted by:	Alexander Logvinov <ports@logvinov.com> (maintainer)

5 files changed, 116 insertions, 26 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 6e44ae1cc2b..7a22e0e3d9e 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	anyremote
-PORTVERSION=	4.15
+PORTVERSION=	4.18.1
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
 MAINTAINER=	samm@os2.kiev.ua
-COMMENT=	Remote control service over Bluetooth,infrared or tcp/ip networking
+COMMENT=	Remote control service over Bluetooth, infrared or tcp/ip networking
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=	${FILESDIR}/opt-nodocs-patch
-.endif
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--disable-xtest
 .else
@@ -30,9 +27,11 @@ MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 MAN1=		anyremote.1
 MANCOMPRESSED=	yes
 
-pre-build:
-	cd ${WRKSRC} && ${MAKE} clean
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/man/man1|(mandir)/man1|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|xtext|xtest|g' ${WRKSRC}/configure
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff --git a/comms/anyremote/distinfo b/comms/anyremote/distinfo
index ab5ed7c7be9..b6c899d9c23 100644
--- a/comms/anyremote/distinfo
+++ b/comms/anyremote/distinfo
@@ -1,3 +1,3 @@
-MD5 (anyremote-4.15.tar.gz) = 4bac900dafab2ffba006dcdab63cfc2b
-SHA256 (anyremote-4.15.tar.gz) = 90818e407177b1b78253727b1bca030ca20447fc1f296b36f0e0f99361e86f8e
-SIZE (anyremote-4.15.tar.gz) = 1080535
+MD5 (anyremote-4.18.1.tar.gz) = 005e3bd09a5a982cae68a53549235003
+SHA256 (anyremote-4.18.1.tar.gz) = 022b26feec5bc9c7d1c8813e88461b2f74ab835380584584432aac57f4197f32
+SIZE (anyremote-4.18.1.tar.gz) = 1622558
diff --git a/comms/anyremote/files/opt-nodocs-patch b/comms/anyremote/files/opt-nodocs-patch
deleted file mode 100644
index 556a95e0103..00000000000
--- a/comms/anyremote/files/opt-nodocs-patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.orig	2009-01-16 19:02:25.000000000 +0300
-+++ Makefile.in	2009-01-19 19:30:12.000000000 +0300
-@@ -609,12 +609,8 @@
- 
- install-data-local:
- 	test -z $(DESTDIR)$(pkgdatadir) || mkdir -p -- . $(DESTDIR)$(pkgdatadir)
--	test -z $(DESTDIR)$(datadir)/doc/anyremote || mkdir -p -- . $(DESTDIR)$(datadir)/doc/anyremote
- 	cp -r cfg-data $(DESTDIR)$(pkgdatadir)
--	cp -r doc-html ChangeLog README COPYING AUTHORS $(DESTDIR)$(datadir)/doc/anyremote/
--	find $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(datadir)/doc/anyremote -type f -exec chmod 644 {} \;
- 	chmod a+x $(DESTDIR)$(pkgdatadir)/cfg-data/Utils/all-in-1.py $(DESTDIR)$(pkgdatadir)/cfg-data/Utils/message.sh $(DESTDIR)$(pkgdatadir)/cfg-data/Utils/xmms_is_playing
--	find $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(datadir)/doc/anyremote  -type d -exec chmod 755 {} \;
- 	test -z $(DESTDIR)$(datadir)/man/man1 || mkdir -p -- . $(DESTDIR)$(datadir)/man/man1
- 	cp -r anyremote.1.gz $(DESTDIR)$(datadir)/man/man1
- 	chmod 644 $(DESTDIR)$(datadir)/man/man1/anyremote.1.gz
diff --git a/comms/anyremote/files/patch-src_pr_frontend.c b/comms/anyremote/files/patch-src_pr_frontend.c
new file mode 100644
index 00000000000..0e32e10c76d
--- /dev/null
+++ b/comms/anyremote/files/patch-src_pr_frontend.c
@@ -0,0 +1,11 @@
+--- src/pr_frontend.c.orig	2009-04-10 14:17:39.000000000 +1000
++++ src/pr_frontend.c	2009-04-10 14:17:53.000000000 +1000
+@@ -25,6 +25,8 @@
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
+ 
+ #include "common.h"
+ #include "utils.h"
diff --git a/comms/anyremote/pkg-plist b/comms/anyremote/pkg-plist
index 8bd1cfb3506..55c3b3543e4 100644
--- a/comms/anyremote/pkg-plist
+++ b/comms/anyremote/pkg-plist
@@ -85,10 +85,15 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/digikam2.cfg
 %%DATADIR%%/cfg-data/Server-mode/gpicview.cfg
 %%DATADIR%%/cfg-data/Server-mode/xmultimedia.cfg
+%%DATADIR%%/cfg-data/Server-mode/eog.cfg
+%%DATADIR%%/cfg-data/Server-mode/kscd2.cfg
+%%DATADIR%%/cfg-data/Server-mode/impressive.cfg
+%%DATADIR%%/cfg-data/Server-mode/autoUpload.cfg
 %%DATADIR%%/cfg-data/Utils/gradient.png
 %%DATADIR%%/cfg-data/Utils/message.sh
 %%DATADIR%%/cfg-data/Utils/all-in-1.py
 %%DATADIR%%/cfg-data/Utils/xmms_is_playing
+%%DATADIR%%/cfg-data/Utils/winampgui.tar.gz
 %%DATADIR%%/cfg-data/Bemused-emulation/exaile.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/juk.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/quodlibet.cfg
@@ -144,12 +149,92 @@ bin/anyremote
 %%DATADIR%%/cfg-data/AT-mode/listen.cfg
 %%DATADIR%%/cfg-data/AT-mode/exaile.cfg
 %%DATADIR%%/cfg-data/AT-mode/freevo.cfg
+%%DATADIR%%/cfg-data/Icons/16/favorites.png
+%%DATADIR%%/cfg-data/Icons/16/bottom.png
+%%DATADIR%%/cfg-data/Icons/16/eject.png
+%%DATADIR%%/cfg-data/Icons/16/top.png
+%%DATADIR%%/cfg-data/Icons/16/launch.png
+%%DATADIR%%/cfg-data/Icons/16/last.png
+%%DATADIR%%/cfg-data/Icons/16/ok.png
+%%DATADIR%%/cfg-data/Icons/16/first.png
+%%DATADIR%%/cfg-data/Icons/16/record.png
+%%DATADIR%%/cfg-data/Icons/16/exit.png
+%%DATADIR%%/cfg-data/Icons/16/info.png
+%%DATADIR%%/cfg-data/Icons/32/favorites.png
+%%DATADIR%%/cfg-data/Icons/32/bottom.png
+%%DATADIR%%/cfg-data/Icons/32/eject.png
+%%DATADIR%%/cfg-data/Icons/32/top.png
+%%DATADIR%%/cfg-data/Icons/32/launch.png
+%%DATADIR%%/cfg-data/Icons/32/last.png
+%%DATADIR%%/cfg-data/Icons/32/ok.png
+%%DATADIR%%/cfg-data/Icons/32/first.png
+%%DATADIR%%/cfg-data/Icons/32/record.png
+%%DATADIR%%/cfg-data/Icons/32/exit.png
+%%DATADIR%%/cfg-data/Icons/32/info.png
+%%DATADIR%%/cfg-data/Icons/64/favorites.png
+%%DATADIR%%/cfg-data/Icons/64/bottom.png
+%%DATADIR%%/cfg-data/Icons/64/eject.png
+%%DATADIR%%/cfg-data/Icons/64/top.png
+%%DATADIR%%/cfg-data/Icons/64/launch.png
+%%DATADIR%%/cfg-data/Icons/64/last.png
+%%DATADIR%%/cfg-data/Icons/64/ok.png
+%%DATADIR%%/cfg-data/Icons/64/first.png
+%%DATADIR%%/cfg-data/Icons/64/record.png
+%%DATADIR%%/cfg-data/Icons/64/exit.png
+%%DATADIR%%/cfg-data/Icons/64/info.png
+%%DATADIR%%/cfg-data/iViewer/vlc.cfg
+%%DATADIR%%/cfg-data/iViewer/amarok2.cfg
+%%DATADIR%%/cfg-data/iViewer/xmms.cfg
+%%DATADIR%%/cfg-data/iViewer/banshee.cfg
+%%DATADIR%%/cfg-data/iViewer/rhythmbox.cfg
+%%DATADIR%%/cfg-data/iViewer/totem.cfg
+%%DATADIR%%/cfg-data/iViewer/iviewer-template.cfg
+%%DATADIR%%/cfg-data/iViewer/juk.cfg
 @dirrm %%DATADIR%%/cfg-data/AT-mode
 @dirrm %%DATADIR%%/cfg-data/Bemused-emulation
+@dirrm %%DATADIR%%/cfg-data/Icons/16
+@dirrm %%DATADIR%%/cfg-data/Icons/32
+@dirrm %%DATADIR%%/cfg-data/Icons/64
+@dirrm %%DATADIR%%/cfg-data/Icons
+@dirrm %%DATADIR%%/cfg-data/iViewer
 @dirrm %%DATADIR%%/cfg-data/Server-mode
 @dirrm %%DATADIR%%/cfg-data/Utils
 @dirrm %%DATADIR%%/cfg-data
 @dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/echo-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/human-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/bluecurve-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/tangerine-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/bluecurve-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/crystalproject-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/ice-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gperfection2-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gnome-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/ice-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gartoon-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/crystalsvg-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/oxygen-green-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/rodent-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/tango-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/oxygen-blue-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/kids-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/crystalsvg-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/default-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/rodent-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/nuvola1-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/echo-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/crystalproject-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gnome-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gion-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/tango-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/oxygen-blue-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/nuvola2-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/human-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gartoon-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/default-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/nuvola1-arrows.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/gperfection2-player.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/kids-arrows.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/jc-menu.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/fileManager2.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/fileManager3.png
@@ -205,7 +290,6 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/fullscreen.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/pause.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/file.png
-%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/view_tree.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/fit.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/click_icon.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/refresh.png
@@ -213,6 +297,13 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/next.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/info.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/bottom.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/top.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/last.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/ok.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/first.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/record.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/icons/favorites.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/client-text.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/ganyremote1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/master.css
@@ -247,6 +338,7 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/any3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/ganyremote-devbr.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/any6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/iviewer.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/man.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/dcop.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/cfg-howto.html
@@ -294,10 +386,13 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/lirc.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/make.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/event.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/icon-themes.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/iviewer.html
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/jc/themes
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/jc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/icons