Merge branch 'master' into gnome-3.24

9 files changed, 58 insertions, 20 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index a3fbf6dc6a32..c297a80f2d18 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	2.84.0
+PORTVERSION=	2.85.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 6600e16a6d8f..f5d521e6bb1a 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493966591
-SHA256 (calibre-2.84.0.tar.xz) = 75a6c2f142ccee594d6e208c4c7f57e137e2c4f06c81d36d5bc42f0dcdaa76cf
-SIZE (calibre-2.84.0.tar.xz) = 37770832
+TIMESTAMP = 1494570072
+SHA256 (calibre-2.85.0.tar.xz) = d3d26643a6c97d4e88e8c91cbe6b540186ef679aa580af970e179708e71c2a5e
+SIZE (calibre-2.85.0.tar.xz) = 37786816
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 25edc35748c8..f4fa049683e5 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -362,6 +362,7 @@ lib/calibre/calibre/ebooks/metadata/pml.py
 lib/calibre/calibre/ebooks/metadata/rar.py
 lib/calibre/calibre/ebooks/metadata/rb.py
 lib/calibre/calibre/ebooks/metadata/rtf.py
+lib/calibre/calibre/ebooks/metadata/search_internet.py
 lib/calibre/calibre/ebooks/metadata/snb.py
 lib/calibre/calibre/ebooks/metadata/sources/__init__.py
 lib/calibre/calibre/ebooks/metadata/sources/amazon.py
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 8f6fb595e5f4..235342c0beab 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -2,12 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	gcal
-PORTVERSION=	4
+PORTVERSION=	4.1
 CATEGORIES=	deskutils
 MASTER_SITES=	GNU
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	The GNU Gregorian calendar program
+COMMENT=	GNU Gregorian calendar program
+
+LICENSE=	GPLv3+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
@@ -37,7 +39,7 @@ post-install:
 		${TAR} -xpf - -C ${STAGEDIR}${DATADIR}
 .for p in ${GCAL_SCRIPTS}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/misc/${p}
-	@${LN} -s ${DATADIR}/misc/${p} ${STAGEDIR}${PREFIX}/bin/gcal-${p:T}
+	@${LN} -s ../${DATADIR_REL}/misc/${p} ${STAGEDIR}${PREFIX}/bin/gcal-${p:T}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/deskutils/gcal/distinfo b/deskutils/gcal/distinfo
index 2d22b8c0c2b6..aec71f0d8250 100644
--- a/deskutils/gcal/distinfo
+++ b/deskutils/gcal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gcal-4.tar.xz) = 59c5c876b12ec70649d90e2ce76afbe2f4ed93503d49ec39e5c575b3aef8ff6e
-SIZE (gcal-4.tar.xz) = 1626652
+TIMESTAMP = 1494497550
+SHA256 (gcal-4.1.tar.xz) = 91b56c40b93eee9bda27ec63e95a6316d848e3ee047b5880ed71e5e8e60f61ab
+SIZE (gcal-4.1.tar.xz) = 1658948
diff --git a/deskutils/gcal/pkg-plist b/deskutils/gcal/pkg-plist
index 63ad63a109d6..58d6320bd6ef 100644
--- a/deskutils/gcal/pkg-plist
+++ b/deskutils/gcal/pkg-plist
@@ -145,3 +145,4 @@ bin/txt2gcal
 %%NLS%%share/locale/rw/LC_MESSAGES/gcal.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gcal.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gcal.mo
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index 46db3da95b12..1febafc1c89d 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -3,23 +3,44 @@
 
 PORTNAME=	qrfcview
 PORTVERSION=	0.62
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	BERLIOS
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical RFC viewer
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		qmake tar:tgz
 USE_QT4=	gui network corelib uic_build moc_build rcc_build
-PLIST_FILES=	bin/qRFCView
+
+SUB_FILES=	qRFCView
+
+PLIST_FILES=	bin/qRFCView \
+		libexec/qRFCView \
+		bin/qrfcview \
+		share/pixmaps/qrfcview.png
 PORTDOCS=	*
 
+DESKTOP_ENTRIES="qRFCView" \
+		"" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"qRFCView" \
+		"Utility;TextTools;Qt;" \
+		""
+
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qRFCView ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/qRFCView ${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_SCRIPT} ${WRKDIR}/qRFCView ${STAGEDIR}${PREFIX}/bin/
+	${LN} -s qRFCView ${STAGEDIR}${PREFIX}/bin/qrfcview
+	${INSTALL_DATA} ${WRKSRC}/images/rfcview.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/qrfcview/files/qRFCView.in b/deskutils/qrfcview/files/qRFCView.in
new file mode 100644
index 000000000000..ae16ab3af1f4
--- /dev/null
+++ b/deskutils/qrfcview/files/qRFCView.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+QRFCVIEW_DIR=$HOME/.local/share/qrfcview
+
+if [ -n "$XDG_DATA_HOME" ]; then
+	QRFCVIEW_DIR="$XDG_DATA_HOME/qrfcview"
+fi
+
+mkdir -p $QRFCVIEW_DIR
+cd $QRFCVIEW_DIR
+
+exec %%PREFIX%%/libexec/qRFCView "$@"
diff --git a/deskutils/qrfcview/pkg-descr b/deskutils/qrfcview/pkg-descr
index d83586ff5f73..67c9e1fc96a8 100644
--- a/deskutils/qrfcview/pkg-descr
+++ b/deskutils/qrfcview/pkg-descr
@@ -1,10 +1,10 @@
 qRFCView is a viewer for IETF RFCs. Advantages are:
-* automatic table of content, with direct opening of section;
-* handling of RFC internal cross-references;
+* automatic table of content, with direct opening of section
+* handling of RFC internal cross-references
 * automatic downloading of a referenced RFC from the IETF web site on
-  a simple click;
-* caching of RFC in a local directory;
-* tab-browsing of RFC;
-* searching.
+  a simple click
+* caching of RFC in a local directory
+* tab-browsing of RFC
+* searching
 
-WWW: http://qrfcview.berlios.de/
+WWW: https://web-beta.archive.org/web/20130618220115/http://qrfcview.berlios.de/