6 files changed, 101 insertions, 22 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 18b86d1ac81c..6163ddfad894 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	anyremote
-# Date created:		2008-11-05
-# Whom:			Alex Samorukov <samm@os2.kiev.ua>
-#
+# Created by: Alex Samorukov <samm@os2.kiev.ua>
 # $FreeBSD$
-#
 
 PORTNAME=	anyremote
-PORTVERSION=	6.1.1
+PORTVERSION=	6.3.1
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
@@ -20,22 +16,23 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DBUS X11
+OPTIONS_DEFINE=	DOCS DBUS X11
 OPTIONS_DEFAULT=	DBUS X11
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MDBUS)
+.if ! ${PORT_OPTIONS:MDBUS}
 CONFIGURE_ARGS+=--disable-dbus
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 .endif
 
-.if empty(PORT_OPTIONS:MX11)
+.if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=--disable-xtest
 .else
 USE_XORG=	x11 xtst
 .endif
+
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		anyremote.1
@@ -48,4 +45,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/anyremote/distinfo b/comms/anyremote/distinfo
index 517d3245acb5..80f11f9c2d55 100644
--- a/comms/anyremote/distinfo
+++ b/comms/anyremote/distinfo
@@ -1,2 +1,2 @@
-SHA256 (anyremote-6.1.1.tar.gz) = 411760b74d9888378bb269a8e0172f5a1b8249b5e6834fdf06af5cd20eff1abd
-SIZE (anyremote-6.1.1.tar.gz) = 2281355
+SHA256 (anyremote-6.3.1.tar.gz) = 0d0a99c12630d462186b4468288a1ba2adef1e70c95bdd35f3165116cb8f4dd6
+SIZE (anyremote-6.3.1.tar.gz) = 2423381
diff --git a/comms/anyremote/files/patch-src_pr_web.c b/comms/anyremote/files/patch-src_pr_web.c
new file mode 100644
index 000000000000..ea8b02f9f5e7
--- /dev/null
+++ b/comms/anyremote/files/patch-src_pr_web.c
@@ -0,0 +1,46 @@
+--- src/pr_web.c	2013-07-10 11:07:03.922188287 +0200
++++ src/pr_web.c	2013-07-10 11:27:16.319193955 +0200
+@@ -33,7 +33,11 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <sys/uio.h>
++#else
+ #include <sys/sendfile.h>
++#endif
+ 
+ #define SERVER     "webserver/1.1"
+ #define PROTOCOL   "HTTP/1.1"
+@@ -272,7 +276,7 @@
+ static void sendFile(_WebClientConnection* cc, char *path, struct stat *statbuf)
+ {
+     int fd = cc->connDescriptor;
+-    int bytes_sent;
++    ssize_t bytes_sent;
+ 
+     INFO2("[WS]: sendFile %s",path);
+ 
+@@ -293,8 +297,12 @@
+         int length = S_ISREG(statbuf->st_mode) ? statbuf->st_size : -1;
+         sendHeaders(cc, 200, "OK", NULL, get_mime_type(path), length, statbuf->st_mtime);
+ 
++#ifdef __FreeBSD__
++        int err = sendfile(fdout, fd, 0, length, NULL, &bytes_sent, 0);
++#else
+         bytes_sent = sendfile(fd,fdout,NULL,length);
+-    
++        int err = 0;
++#endif
+         /*while ((n = fread(data, 1, sizeof(data), file)) > 0) {
+             //INFO2("read %d bytes from file",n);
+ 
+@@ -305,7 +313,7 @@
+             }
+         }*/
+     
+-        if (length != bytes_sent) {
++        if (err || length != bytes_sent) {
+             ERROR2("[WS]: Error on send file %s", path);
+         }
+ 
diff --git a/comms/anyremote/files/patch-src_sys_util.c b/comms/anyremote/files/patch-src_sys_util.c
new file mode 100644
index 000000000000..01add27d515c
--- /dev/null
+++ b/comms/anyremote/files/patch-src_sys_util.c
@@ -0,0 +1,17 @@
+--- src/sys_util.c	2013-07-10 14:49:42.461289772 +0200
++++ src/sys_util.c	2013-07-10 14:49:02.000000000 +0200
+@@ -24,13 +24,13 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <net/if.h>
+ #include <netinet/in.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
diff --git a/comms/anyremote/pkg-descr b/comms/anyremote/pkg-descr
index 311ad042b381..0d3ad06b30c6 100644
--- a/comms/anyremote/pkg-descr
+++ b/comms/anyremote/pkg-descr
@@ -8,4 +8,4 @@ It was developed as thin communication layer between Bluetooth (or IR, Wi-Fi)
 capabled phone and UNIX, and in principle could be configured to manage almost
 any software.
 
-WWW:	http://anyremote.sourceforge.net/
+WWW: http://anyremote.sourceforge.net/
diff --git a/comms/anyremote/pkg-plist b/comms/anyremote/pkg-plist
index 6db3f6f61501..3135216cadf6 100644
--- a/comms/anyremote/pkg-plist
+++ b/comms/anyremote/pkg-plist
@@ -1,11 +1,14 @@
-@comment $FreeBSD$
 bin/anyremote
+%%DATADIR%%/cfg-data/Utils/weather.sh
+%%DATADIR%%/cfg-data/Utils/imdb-mf.sh
+%%DATADIR%%/cfg-data/Utils/generate_cover.sh
+%%DATADIR%%/cfg-data/Utils/registry.sh
+%%DATADIR%%/cfg-data/Utils/generate_poster.sh
 %%DATADIR%%/cfg-data/Utils/aliases-bemused.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-server.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-iviewer.cfg
 %%DATADIR%%/cfg-data/Utils/getPlayList.sh
 %%DATADIR%%/cfg-data/Utils/aliases-server-presentation.cfg
-%%DATADIR%%/cfg-data/Utils/xmms_is_playing
 %%DATADIR%%/cfg-data/Utils/aliases-server-pix-viewer.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-server-player.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-at.cfg
@@ -15,7 +18,6 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Utils/all-in-1.py
 %%DATADIR%%/cfg-data/Utils/aliases-server-video-player.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-server-fbrowser-v3i.cfg
-%%DATADIR%%/cfg-data/Utils/gradient.png
 %%DATADIR%%/cfg-data/Utils/run-or-switch-to.sh
 %%DATADIR%%/cfg-data/Utils/anyremote.gui
 %%DATADIR%%/cfg-data/Utils/iViewer/next-active.png
@@ -42,6 +44,7 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Utils/iViewer/next.png
 %%DATADIR%%/cfg-data/Utils/iViewer/stop.png
 %%DATADIR%%/cfg-data/Utils/iViewer/pause-active.png
+%%DATADIR%%/cfg-data/Icons/128/transparent.png
 %%DATADIR%%/cfg-data/Icons/128/favorites.png
 %%DATADIR%%/cfg-data/Icons/128/minus.png
 %%DATADIR%%/cfg-data/Icons/128/right.png
@@ -79,6 +82,7 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Icons/128/file.png
 %%DATADIR%%/cfg-data/Icons/128/last.png
 %%DATADIR%%/cfg-data/Icons/16/record.png
+%%DATADIR%%/cfg-data/Icons/16/transparent.png
 %%DATADIR%%/cfg-data/Icons/16/first.png
 %%DATADIR%%/cfg-data/Icons/16/eject.png
 %%DATADIR%%/cfg-data/Icons/16/favorites.png
@@ -117,6 +121,7 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Icons/16/vol_up.png
 %%DATADIR%%/cfg-data/Icons/anyRemote.png
 %%DATADIR%%/cfg-data/Icons/48/bottom.png
+%%DATADIR%%/cfg-data/Icons/48/transparent.png
 %%DATADIR%%/cfg-data/Icons/48/vol_up.png
 %%DATADIR%%/cfg-data/Icons/48/prev.png
 %%DATADIR%%/cfg-data/Icons/48/vol_down.png
@@ -152,6 +157,7 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Icons/48/favorites.png
 %%DATADIR%%/cfg-data/Icons/48/up.png
 %%DATADIR%%/cfg-data/Icons/48/record.png
+%%DATADIR%%/cfg-data/Icons/32/transparent.png
 %%DATADIR%%/cfg-data/Icons/32/plus.png
 %%DATADIR%%/cfg-data/Icons/32/down.png
 %%DATADIR%%/cfg-data/Icons/32/mute.png
@@ -190,6 +196,7 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Icons/32/minus.png
 %%DATADIR%%/cfg-data/Icons/32/none.png
 %%DATADIR%%/cfg-data/Icons/64/first.png
+%%DATADIR%%/cfg-data/Icons/64/transparent.png
 %%DATADIR%%/cfg-data/Icons/64/folder.png
 %%DATADIR%%/cfg-data/Icons/64/up.png
 %%DATADIR%%/cfg-data/Icons/64/vol_down.png
@@ -225,6 +232,14 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Icons/64/left.png
 %%DATADIR%%/cfg-data/Icons/64/launch.png
 %%DATADIR%%/cfg-data/Icons/64/click_icon.png
+%%DATADIR%%/cfg-data/Icons/common/cover-video.png
+%%DATADIR%%/cfg-data/Icons/common/cover-weather.png
+%%DATADIR%%/cfg-data/Icons/common/cover-pix.png
+%%DATADIR%%/cfg-data/Icons/common/cover-setup.png
+%%DATADIR%%/cfg-data/Icons/common/cover-computer.png
+%%DATADIR%%/cfg-data/Icons/common/cover-files.png
+%%DATADIR%%/cfg-data/Icons/common/cover-presentation.png
+%%DATADIR%%/cfg-data/Icons/common/cover-audio.png
 %%DATADIR%%/cfg-data/Bemused-emulation/rhythmbox.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/quodlibet.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/exaile.cfg
@@ -269,6 +284,11 @@ bin/anyremote
 %%DATADIR%%/cfg-data/AT-mode/audacious.cfg
 %%DATADIR%%/cfg-data/AT-mode/totem.cfg
 %%DATADIR%%/cfg-data/AT-mode/example-lirc.cfg
+%%DATADIR%%/cfg-data/Server-mode/djview.cfg
+%%DATADIR%%/cfg-data/Server-mode/mediacenter.cfg
+%%DATADIR%%/cfg-data/Server-mode/noise.cfg
+%%DATADIR%%/cfg-data/Server-mode/tomahawk.cfg
+%%DATADIR%%/cfg-data/Server-mode/foobnix.cfg
 %%DATADIR%%/cfg-data/Server-mode/qwerty-device-test.cfg
 %%DATADIR%%/cfg-data/Server-mode/mpd.cfg
 %%DATADIR%%/cfg-data/Server-mode/xbmc.cfg
@@ -282,7 +302,6 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/nokia-e70.cfg
 %%DATADIR%%/cfg-data/Server-mode/xine.cfg
 %%DATADIR%%/cfg-data/Server-mode/exampleFont.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok-v3.cfg
 %%DATADIR%%/cfg-data/Server-mode/totem.cfg
 %%DATADIR%%/cfg-data/Server-mode/nokia-e61.cfg
 %%DATADIR%%/cfg-data/Server-mode/fileManager3.cfg
@@ -309,7 +328,6 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/gpicview.cfg
 %%DATADIR%%/cfg-data/Server-mode/fileManager2.cfg
 %%DATADIR%%/cfg-data/Server-mode/evince.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok-v2.cfg
 %%DATADIR%%/cfg-data/Server-mode/autoUpload.cfg
 %%DATADIR%%/cfg-data/Server-mode/winManager.cfg
 %%DATADIR%%/cfg-data/Server-mode/imageViewer.cfg
@@ -351,7 +369,6 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/deadbeef.cfg
 %%DATADIR%%/cfg-data/Server-mode/mplayer.cfg
 %%DATADIR%%/cfg-data/Server-mode/wmctrl.cfg
-%%DATADIR%%/cfg-data/Server-mode/banshee-v2.cfg
 %%DATADIR%%/cfg-data/Server-mode/template-presentation.cfg
 %%DATADIR%%/cfg-data/Server-mode/exampleEditField.cfg
 %%DATADIR%%/cfg-data/Server-mode/gnomeShortcuts.cfg
@@ -365,6 +382,7 @@ bin/anyremote
 @dirrm %%DATADIR%%/cfg-data/Icons/48
 @dirrm %%DATADIR%%/cfg-data/Icons/64
 @dirrm %%DATADIR%%/cfg-data/Icons/128
+@dirrm %%DATADIR%%/cfg-data/Icons/common
 @dirrm %%DATADIR%%/cfg-data/Icons
 @dirrm %%DATADIR%%/cfg-data/iViewer
 @dirrm %%DATADIR%%/cfg-data/Server-mode
@@ -372,6 +390,7 @@ bin/anyremote
 @dirrm %%DATADIR%%/cfg-data/Utils
 @dirrm %%DATADIR%%/cfg-data
 @dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-cf2.jpg
 %%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
@@ -513,7 +532,6 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-cf.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-search.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/man.html
-%%PORTDOCS%%%%DOCSDIR%%/doc-html/dcop.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/cfg-howto.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/conf-server-ex.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/conf-server.html
@@ -564,6 +582,7 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/dbus.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/android-client.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/cm-xml.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/cfg-server-status.html
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README