- Update to 6.1

PR:		176539
Submitted by:	Ports Fury

3 files changed, 67 insertions, 65 deletions

diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 9dd90df11953..5556d28aeade 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -1,47 +1,45 @@
-# New ports collection makefile for:	ganyremote
-# Date created:				08 November 2008
-# Whom:					Alexander Logvinov <ports@logvinov.com>
-#
+# Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ganyremote
-PORTVERSION=	5.11.7
-PORTREVISION=	1
+PORTVERSION=	6.1
 CATEGORIES=	deskutils comms gnome
 MASTER_SITES=	SF/anyremote/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME frontend for anyRemote
 
+LICENSE=	GPLv2 # (or later)
+
 RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
 
-GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
+OPTIONS_DEFINE=	DOCS
+
 USE_GNOME=	pygtk2
+USE_PYTHON=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PORTDOCS=	AUTHORS COPYING README ChangeLog
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|usepybluez = True|usepybluez = False|' \
-		-e '/initVerify()$$/d' ${WRKSRC}/${PORTNAME}
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|/usr/local|${LOCALBASE}| ; \
+		 /usepybluez = /s|True|False| ; \
+		 /initVerify()$$/d' ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e \
+		'/$$(datadir)\/doc/s|^|#|' ${WRKSRC}/Makefile.in
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in AUTHORS ChangeLog README
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/ganyremote/distinfo b/deskutils/ganyremote/distinfo
index 74ee6c5aa865..cc9dede6645f 100644
--- a/deskutils/ganyremote/distinfo
+++ b/deskutils/ganyremote/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ganyremote-5.11.7.tar.gz) = 26dd56de02aca272ab7cf30d48931ffc7c8362963479b48940daabe5145f61a1
-SIZE (ganyremote-5.11.7.tar.gz) = 291878
+SHA256 (ganyremote-6.1.tar.gz) = c5c53e112297f3441dd8201abd47a9828227376fa5f524bf5b56e78fb3c89173
+SIZE (ganyremote-6.1.tar.gz) = 277145
diff --git a/deskutils/ganyremote/pkg-plist b/deskutils/ganyremote/pkg-plist
index ae37b4bc8de1..3a303eb53615 100644
--- a/deskutils/ganyremote/pkg-plist
+++ b/deskutils/ganyremote/pkg-plist
@@ -1,42 +1,46 @@
 bin/ganyremote
 share/applications/ganyremote.desktop
-%%NLS%%share/locale/bg/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/cs_CZ/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/de_AT/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/de_DE/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/es_ES/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/fi_FI/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/fr_FR/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/hu_HU/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/it_IT/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/nl_NL/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/pl_PL/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/ru_RU/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/sk_SK/LC_MESSAGES/ganyremote.mo
-%%NLS%%share/locale/sv_SE/LC_MESSAGES/ganyremote.mo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/locale/bg/LC_MESSAGES/ganyremote.mo
+share/locale/cs_CZ/LC_MESSAGES/ganyremote.mo
+share/locale/de_AT/LC_MESSAGES/ganyremote.mo
+share/locale/de_DE/LC_MESSAGES/ganyremote.mo
+share/locale/es_ES/LC_MESSAGES/ganyremote.mo
+share/locale/fi_FI/LC_MESSAGES/ganyremote.mo
+share/locale/fr_FR/LC_MESSAGES/ganyremote.mo
+share/locale/hu_HU/LC_MESSAGES/ganyremote.mo
+share/locale/it_IT/LC_MESSAGES/ganyremote.mo
+share/locale/nl_NL/LC_MESSAGES/ganyremote.mo
+share/locale/pl_PL/LC_MESSAGES/ganyremote.mo
+share/locale/pt_BR/LC_MESSAGES/ganyremote.mo
+share/locale/ru_RU/LC_MESSAGES/ganyremote.mo
+share/locale/sk_SK/LC_MESSAGES/ganyremote.mo
+share/locale/sv_SE/LC_MESSAGES/ganyremote.mo
 share/pixmaps/ganyremote.png
 share/pixmaps/ganyremote_flash.png
 share/pixmaps/ganyremote_light.png
 share/pixmaps/ganyremote_off.png
-%%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs_CZ
-%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de_DE
-%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi_FI
-%%NLS%%@dirrmtry share/locale/hu_HU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu_HU
-%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_IT
-%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl_NL
-%%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl_PL
-%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU
-%%NLS%%@dirrmtry share/locale/sk_SK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk_SK
-%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sk_SK/LC_MESSAGES
+@dirrmtry share/locale/sk_SK
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/fi_FI/LC_MESSAGES
+@dirrmtry share/locale/fi_FI
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/cs_CZ/LC_MESSAGES
+@dirrmtry share/locale/cs_CZ
 @dirrmtry share/applications
+%%PORTDOCS%%@dirrm %%DOCSDIR%%