4 files changed, 45 insertions, 6 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 7a22e0e3d9ea..1ade1d50d583 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -6,17 +6,29 @@
 #
 
 PORTNAME=	anyremote
-PORTVERSION=	4.18.1
+PORTVERSION=	5.0
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Remote control service over Bluetooth, infrared or tcp/ip networking
 
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+OPTIONS=	DBUS		"Build with DBUS support" on \
+		X11		"Build with X11 library" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.endif
+
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--disable-xtest
 .else
@@ -34,4 +46,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/comms/anyremote/distinfo b/comms/anyremote/distinfo
index b6c899d9c238..20023378dd82 100644
--- a/comms/anyremote/distinfo
+++ b/comms/anyremote/distinfo
@@ -1,3 +1,3 @@
-MD5 (anyremote-4.18.1.tar.gz) = 005e3bd09a5a982cae68a53549235003
-SHA256 (anyremote-4.18.1.tar.gz) = 022b26feec5bc9c7d1c8813e88461b2f74ab835380584584432aac57f4197f32
-SIZE (anyremote-4.18.1.tar.gz) = 1622558
+MD5 (anyremote-5.0.tar.gz) = c7e2def41a920d826866b4de2b54a1ad
+SHA256 (anyremote-5.0.tar.gz) = e42a5f846c063f97c6f40c016389dfa07f77a035a49e4587f2be9b73a27b293f
+SIZE (anyremote-5.0.tar.gz) = 1695422
diff --git a/comms/anyremote/files/patch-configure b/comms/anyremote/files/patch-configure
new file mode 100644
index 000000000000..0d2d8e6c018d
--- /dev/null
+++ b/comms/anyremote/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2009-07-15 23:08:34.000000000 +0300
++++ configure	2009-10-05 06:26:25.000000000 +0300
+@@ -6584,7 +6584,7 @@
+ 
+ 
+   pkg_config_args=glib-2.0
+-  for module in .
++  for module in . gthread 
+   do
+       case "$module" in
+          gmodule)
diff --git a/comms/anyremote/pkg-plist b/comms/anyremote/pkg-plist
index 55c3b3543e4d..b50beac9a8ea 100644
--- a/comms/anyremote/pkg-plist
+++ b/comms/anyremote/pkg-plist
@@ -33,7 +33,6 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/noatun.cfg
 %%DATADIR%%/cfg-data/Server-mode/gnomeradio.cfg
 %%DATADIR%%/cfg-data/Server-mode/customizeClient2.cfg
-%%DATADIR%%/cfg-data/Server-mode/elisa.cfg
 %%DATADIR%%/cfg-data/Server-mode/xmms.cfg
 %%DATADIR%%/cfg-data/Server-mode/kmplayer.cfg
 %%DATADIR%%/cfg-data/Server-mode/iconUpload.cfg
@@ -89,11 +88,15 @@ bin/anyremote
 %%DATADIR%%/cfg-data/Server-mode/kscd2.cfg
 %%DATADIR%%/cfg-data/Server-mode/impressive.cfg
 %%DATADIR%%/cfg-data/Server-mode/autoUpload.cfg
+%%DATADIR%%/cfg-data/Server-mode/moovida.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/Utils/aliases-at.cfg
+%%DATADIR%%/cfg-data/Utils/aliases-bemused.cfg
+%%DATADIR%%/cfg-data/Utils/aliases-server.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/exaile.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/juk.cfg
 %%DATADIR%%/cfg-data/Bemused-emulation/quodlibet.cfg
@@ -171,6 +174,17 @@ bin/anyremote
 %%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/48/bottom.png
+%%DATADIR%%/cfg-data/Icons/48/eject.png
+%%DATADIR%%/cfg-data/Icons/48/exit.png
+%%DATADIR%%/cfg-data/Icons/48/favorites.png
+%%DATADIR%%/cfg-data/Icons/48/first.png
+%%DATADIR%%/cfg-data/Icons/48/info.png
+%%DATADIR%%/cfg-data/Icons/48/last.png
+%%DATADIR%%/cfg-data/Icons/48/launch.png
+%%DATADIR%%/cfg-data/Icons/48/ok.png
+%%DATADIR%%/cfg-data/Icons/48/record.png
+%%DATADIR%%/cfg-data/Icons/48/top.png
 %%DATADIR%%/cfg-data/Icons/64/favorites.png
 %%DATADIR%%/cfg-data/Icons/64/bottom.png
 %%DATADIR%%/cfg-data/Icons/64/eject.png
@@ -194,6 +208,7 @@ bin/anyremote
 @dirrm %%DATADIR%%/cfg-data/Bemused-emulation
 @dirrm %%DATADIR%%/cfg-data/Icons/16
 @dirrm %%DATADIR%%/cfg-data/Icons/32
+@dirrm %%DATADIR%%/cfg-data/Icons/48
 @dirrm %%DATADIR%%/cfg-data/Icons/64
 @dirrm %%DATADIR%%/cfg-data/Icons
 @dirrm %%DATADIR%%/cfg-data/iViewer
@@ -388,6 +403,7 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/event.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/icon-themes.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/iviewer.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/dbus.html
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README