Index: head/graphics/drawpile/Makefile
===================================================================
--- head/graphics/drawpile/Makefile	(revision 493255)
+++ head/graphics/drawpile/Makefile	(revision 493256)
@@ -1,44 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	Drawpile
-DISTVERSION=	2.1.0
+DISTVERSION=	2.1.1
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collaborative drawing program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libminiupnpc.so:net/miniupnpc \
 		libsodium.so:security/libsodium \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}
 USE_QT=		core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
-USE_KDE=	archive
+USE_KDE=	archive dnssd
 
 OPTIONS_DEFINE=	DOCS
 
+PORTDOCS=	*
+
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-post-install:
-.for SZ in 16 32 64 128 256
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/mimetypes
-	${INSTALL_DATA} ${WRKSRC}/desktop/drawpile-${SZ}x${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/drawpile.png
-	${INSTALL_DATA} ${WRKSRC}/desktop/drawpile-${SZ}x${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/mimetypes/application-x-drawpile-recording.png
-	${INSTALL_DATA} ${WRKSRC}/desktop/drawpile-${SZ}x${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/mimetypes/gnome-mime-application-x-drawpile-recording.png
-.endfor
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes
-	${GZIP_CMD} ${GZIP} < ${WRKSRC}/desktop/drawpile.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes/drawpile.svgz
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
-	${INSTALL_DATA} ${WRKSRC}/desktop/x-drawpile.xml ${STAGEDIR}${PREFIX}/share/mime/packages
-	${INSTALL_DATA} ${WRKSRC}/desktop/net.drawpile.drawpile.desktop ${STAGEDIR}${PREFIX}/share/applications
-	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
Index: head/graphics/drawpile/distinfo
===================================================================
--- head/graphics/drawpile/distinfo	(revision 493255)
+++ head/graphics/drawpile/distinfo	(revision 493256)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550369609
-SHA256 (drawpile-Drawpile-2.1.0_GH0.tar.gz) = df003da4b808f336405b697f135135c8b660a21de81d3be2dd9acfcd8966408b
-SIZE (drawpile-Drawpile-2.1.0_GH0.tar.gz) = 2332950
+TIMESTAMP = 1550484552
+SHA256 (drawpile-Drawpile-2.1.1_GH0.tar.gz) = 69768c72f834904af7d39d662aba9953710327bcabaf1422551ef636b60d83b6
+SIZE (drawpile-Drawpile-2.1.1_GH0.tar.gz) = 2380321
Index: head/graphics/drawpile/files/patch-desktop_CMakeLists.txt
===================================================================
--- head/graphics/drawpile/files/patch-desktop_CMakeLists.txt	(revision 493255)
+++ head/graphics/drawpile/files/patch-desktop_CMakeLists.txt	(nonexistent)
@@ -1,31 +0,0 @@
---- desktop/CMakeLists.txt.orig	2019-02-13 17:11:53 UTC
-+++ desktop/CMakeLists.txt
-@@ -1,8 +1,8 @@
--find_program(XDGICON xdg-icon-resource)
--find_program(XDGMENU xdg-desktop-menu)
--find_program(XDGMIME xdg-mime)
-+#find_program(XDGICON xdg-icon-resource)
-+#find_program(XDGMENU xdg-desktop-menu)
-+#find_program(XDGMIME xdg-mime)
- 
--if( XDGICON )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGICON} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/drawpile-16x16.png --size 16 drawpile)
- 		execute_process(COMMAND ${XDGICON} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/drawpile-32x32.png --size 32 drawpile)
-@@ -18,13 +18,13 @@ if( XDGICON )
- 	")
- endif()
- 
--if( XDGMENU )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGMENU} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/net.drawpile.drawpile.desktop)
- 	")
- endif()
- 
--if( XDGMIME )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGMIME} install ${CMAKE_CURRENT_SOURCE_DIR}/x-drawpile.xml)
- 	")

Property changes on: head/graphics/drawpile/files/patch-desktop_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/drawpile/files/patch-doc_CMakeLists.txt
===================================================================
--- head/graphics/drawpile/files/patch-doc_CMakeLists.txt	(revision 493255)
+++ head/graphics/drawpile/files/patch-doc_CMakeLists.txt	(revision 493256)
@@ -1,10 +1,17 @@
---- doc/CMakeLists.txt.orig	2017-06-26 15:54:00 UTC
+--- doc/CMakeLists.txt.orig	2019-02-18 10:23:08 UTC
 +++ doc/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ SET(base_files
+ 	../ChangeLog
+-	../COPYING
+ 	../README.md
+ 	openraster.txt
+ 	textloader.md
 @@ -20,6 +20,6 @@ if (UNIX AND NOT APPLE)
  		)
  	INSTALL (
  		FILES ${man1}
 -		DESTINATION "share/man/man1"
 +		DESTINATION man/man1
  		)
  endif ()
Index: head/graphics/drawpile/pkg-plist
===================================================================
--- head/graphics/drawpile/pkg-plist	(revision 493255)
+++ head/graphics/drawpile/pkg-plist	(revision 493256)
@@ -1,186 +1,177 @@
 bin/drawpile
 bin/drawpile-%%PORTVERSION%%
 bin/drawpile-srv
 man/man1/drawpile-srv.1.gz
 share/applications/net.drawpile.drawpile.desktop
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/logins.md
-%%PORTDOCS%%%%DOCSDIR%%/messages.md
-%%PORTDOCS%%%%DOCSDIR%%/openraster.txt
-%%PORTDOCS%%%%DOCSDIR%%/protocol.md
-%%PORTDOCS%%%%DOCSDIR%%/textloader.md
 share/drawpile/drawpile/i18n/drawpile_cs.qm
 share/drawpile/drawpile/i18n/drawpile_de.qm
 share/drawpile/drawpile/i18n/drawpile_fi.qm
 share/drawpile/drawpile/i18n/drawpile_ja.qm
 share/drawpile/drawpile/i18n/drawpile_ru.qm
 share/drawpile/drawpile/i18n/drawpile_zh.qm
 share/drawpile/drawpile/palettes/Breeze.gpl
 share/drawpile/drawpile/palettes/DB32.gpl
 share/drawpile/drawpile/palettes/Grayscale.gpl
 share/drawpile/drawpile/palettes/Ponies.gpl
 share/drawpile/drawpile/palettes/Sketching.gpl
 share/drawpile/drawpile/palettes/Tango.gpl
 share/drawpile/drawpile/sounds/chat.wav
 share/drawpile/drawpile/sounds/lock.wav
 share/drawpile/drawpile/sounds/login.wav
 share/drawpile/drawpile/sounds/logout.wav
 share/drawpile/drawpile/sounds/marker.wav
 share/drawpile/drawpile/sounds/sounds.txt
 share/drawpile/drawpile/sounds/unlock.wav
 share/drawpile/drawpile/theme/dark/application-exit.svg
 share/drawpile/drawpile/theme/dark/application-menu.svg
 share/drawpile/drawpile/theme/dark/color-picker.svg
 share/drawpile/drawpile/theme/dark/configure-shortcuts.svg
 share/drawpile/drawpile/theme/dark/cursor-arrow.svg
 share/drawpile/drawpile/theme/dark/document-export.svg
 share/drawpile/drawpile/theme/dark/document-new.svg
 share/drawpile/drawpile/theme/dark/document-open.svg
 share/drawpile/drawpile/theme/dark/document-save-as.svg
 share/drawpile/drawpile/theme/dark/document-save.svg
 share/drawpile/drawpile/theme/dark/dontknow.svg
 share/drawpile/drawpile/theme/dark/draw-bezier-curves.svg
 share/drawpile/drawpile/theme/dark/draw-brush.svg
 share/drawpile/drawpile/theme/dark/draw-ellipse.svg
 share/drawpile/drawpile/theme/dark/draw-eraser.svg
 share/drawpile/drawpile/theme/dark/draw-freehand.svg
 share/drawpile/drawpile/theme/dark/draw-line.svg
 share/drawpile/drawpile/theme/dark/draw-rectangle.svg
 share/drawpile/drawpile/theme/dark/draw-text.svg
 share/drawpile/drawpile/theme/dark/draw-watercolor.svg
 share/drawpile/drawpile/theme/dark/edit-copy.svg
 share/drawpile/drawpile/theme/dark/edit-cut.svg
 share/drawpile/drawpile/theme/dark/edit-delete.svg
 share/drawpile/drawpile/theme/dark/edit-paste.svg
 share/drawpile/drawpile/theme/dark/edit-redo.svg
 share/drawpile/drawpile/theme/dark/edit-select-lasso.svg
 share/drawpile/drawpile/theme/dark/edit-undo.svg
 share/drawpile/drawpile/theme/dark/fill-color.svg
 share/drawpile/drawpile/theme/dark/flag-blue.svg
 share/drawpile/drawpile/theme/dark/flag-red.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-bottom.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-center.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-top.svg
 share/drawpile/drawpile/theme/dark/format-justify-center.svg
 share/drawpile/drawpile/theme/dark/format-justify-fill.svg
 share/drawpile/drawpile/theme/dark/format-justify-left.svg
 share/drawpile/drawpile/theme/dark/format-justify-right.svg
 share/drawpile/drawpile/theme/dark/format-text-bold.svg
 share/drawpile/drawpile/theme/dark/format-text-italic.svg
 share/drawpile/drawpile/theme/dark/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/dark/format-text-underline.svg
 share/drawpile/drawpile/theme/dark/go-jump.svg
 share/drawpile/drawpile/theme/dark/im-ban-user.svg
 share/drawpile/drawpile/theme/dark/im-kick-user.svg
 share/drawpile/drawpile/theme/dark/im-user.svg
 share/drawpile/drawpile/theme/dark/irc-operator.svg
 share/drawpile/drawpile/theme/dark/irc-unvoice.svg
 share/drawpile/drawpile/theme/dark/layer-visible-off.svg
 share/drawpile/drawpile/theme/dark/layer-visible-on.svg
 share/drawpile/drawpile/theme/dark/list-add.svg
 share/drawpile/drawpile/theme/dark/media-playback-pause.svg
 share/drawpile/drawpile/theme/dark/media-playback-start.svg
 share/drawpile/drawpile/theme/dark/media-record.svg
 share/drawpile/drawpile/theme/dark/media-seek-backward.svg
 share/drawpile/drawpile/theme/dark/media-seek-forward.svg
 share/drawpile/drawpile/theme/dark/media-skip-backward.svg
 share/drawpile/drawpile/theme/dark/media-skip-forward.svg
 share/drawpile/drawpile/theme/dark/object-flip-horizontal.svg
 share/drawpile/drawpile/theme/dark/object-flip-vertical.svg
 share/drawpile/drawpile/theme/dark/object-locked.svg
 share/drawpile/drawpile/theme/dark/object-rotate-left.svg
 share/drawpile/drawpile/theme/dark/object-rotate-right.svg
 share/drawpile/drawpile/theme/dark/select-rectangular.svg
 share/drawpile/drawpile/theme/dark/transform-rotate.svg
 share/drawpile/drawpile/theme/dark/zoom-in.svg
 share/drawpile/drawpile/theme/dark/zoom-original.svg
 share/drawpile/drawpile/theme/dark/zoom-out.svg
 share/drawpile/drawpile/theme/dark/zoom-select.svg
 share/drawpile/drawpile/theme/icons.txt
 share/drawpile/drawpile/theme/light/application-exit.svg
 share/drawpile/drawpile/theme/light/application-menu.svg
 share/drawpile/drawpile/theme/light/color-picker.svg
 share/drawpile/drawpile/theme/light/configure-shortcuts.svg
 share/drawpile/drawpile/theme/light/cursor-arrow.svg
 share/drawpile/drawpile/theme/light/document-export.svg
 share/drawpile/drawpile/theme/light/document-new.svg
 share/drawpile/drawpile/theme/light/document-open.svg
 share/drawpile/drawpile/theme/light/document-save-as.svg
 share/drawpile/drawpile/theme/light/document-save.svg
 share/drawpile/drawpile/theme/light/dontknow.svg
 share/drawpile/drawpile/theme/light/draw-bezier-curves.svg
 share/drawpile/drawpile/theme/light/draw-brush.svg
 share/drawpile/drawpile/theme/light/draw-ellipse.svg
 share/drawpile/drawpile/theme/light/draw-eraser.svg
 share/drawpile/drawpile/theme/light/draw-freehand.svg
 share/drawpile/drawpile/theme/light/draw-line.svg
 share/drawpile/drawpile/theme/light/draw-rectangle.svg
 share/drawpile/drawpile/theme/light/draw-text.svg
 share/drawpile/drawpile/theme/light/draw-watercolor.svg
 share/drawpile/drawpile/theme/light/edit-copy.svg
 share/drawpile/drawpile/theme/light/edit-cut.svg
 share/drawpile/drawpile/theme/light/edit-delete.svg
 share/drawpile/drawpile/theme/light/edit-paste.svg
 share/drawpile/drawpile/theme/light/edit-redo.svg
 share/drawpile/drawpile/theme/light/edit-select-lasso.svg
 share/drawpile/drawpile/theme/light/edit-undo.svg
 share/drawpile/drawpile/theme/light/fill-color.svg
 share/drawpile/drawpile/theme/light/flag-blue.svg
 share/drawpile/drawpile/theme/light/flag-red.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-bottom.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-center.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-top.svg
 share/drawpile/drawpile/theme/light/format-justify-center.svg
 share/drawpile/drawpile/theme/light/format-justify-fill.svg
 share/drawpile/drawpile/theme/light/format-justify-left.svg
 share/drawpile/drawpile/theme/light/format-justify-right.svg
 share/drawpile/drawpile/theme/light/format-text-bold.svg
 share/drawpile/drawpile/theme/light/format-text-italic.svg
 share/drawpile/drawpile/theme/light/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/light/format-text-underline.svg
 share/drawpile/drawpile/theme/light/go-jump.svg
 share/drawpile/drawpile/theme/light/im-ban-user.svg
 share/drawpile/drawpile/theme/light/im-kick-user.svg
 share/drawpile/drawpile/theme/light/im-user.svg
 share/drawpile/drawpile/theme/light/irc-operator.svg
 share/drawpile/drawpile/theme/light/irc-unvoice.svg
 share/drawpile/drawpile/theme/light/layer-visible-off.svg
 share/drawpile/drawpile/theme/light/layer-visible-on.svg
 share/drawpile/drawpile/theme/light/list-add.svg
 share/drawpile/drawpile/theme/light/media-playback-pause.svg
 share/drawpile/drawpile/theme/light/media-playback-start.svg
 share/drawpile/drawpile/theme/light/media-record.svg
 share/drawpile/drawpile/theme/light/media-seek-backward.svg
 share/drawpile/drawpile/theme/light/media-seek-forward.svg
 share/drawpile/drawpile/theme/light/media-skip-backward.svg
 share/drawpile/drawpile/theme/light/media-skip-forward.svg
 share/drawpile/drawpile/theme/light/object-flip-horizontal.svg
 share/drawpile/drawpile/theme/light/object-flip-vertical.svg
 share/drawpile/drawpile/theme/light/object-locked.svg
 share/drawpile/drawpile/theme/light/object-rotate-left.svg
 share/drawpile/drawpile/theme/light/object-rotate-right.svg
 share/drawpile/drawpile/theme/light/select-rectangular.svg
 share/drawpile/drawpile/theme/light/transform-rotate.svg
 share/drawpile/drawpile/theme/light/zoom-in.svg
 share/drawpile/drawpile/theme/light/zoom-original.svg
 share/drawpile/drawpile/theme/light/zoom-out.svg
 share/drawpile/drawpile/theme/light/zoom-select.svg
 share/icons/hicolor/128x128/apps/drawpile.png
 share/icons/hicolor/128x128/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-drawpile-recording.png
 share/icons/hicolor/16x16/apps/drawpile.png
 share/icons/hicolor/16x16/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-drawpile-recording.png
 share/icons/hicolor/256x256/apps/drawpile.png
 share/icons/hicolor/256x256/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/256x256/mimetypes/gnome-mime-application-x-drawpile-recording.png
 share/icons/hicolor/32x32/apps/drawpile.png
 share/icons/hicolor/32x32/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-drawpile-recording.png
+share/icons/hicolor/48x48/apps/drawpile.png
+share/icons/hicolor/48x48/mimetypes/application-x-drawpile-recording.png
 share/icons/hicolor/64x64/apps/drawpile.png
 share/icons/hicolor/64x64/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-drawpile-recording.png
-share/icons/hicolor/scalable/mimetypes/drawpile.svgz
+share/icons/hicolor/scalable/apps/drawpile.svgz
+share/icons/hicolor/scalable/mimetypes/application-x-drawpile-recording.svgz
 share/metainfo/net.drawpile.drawpile.appdata.xml
 share/mime/packages/x-drawpile.xml