- Update to 1.2.4

- Add new option (QRCODE)
- Rewrite pkg-descr and COMMENT entry (Makefile)
- Adjust dependencies

4 files changed, 26 insertions, 71 deletions

diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index cdf205412a67..c25ccc99d354 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-clipman-plugin
-PORTVERSION=	1.2.3
-PORTREVISION=	6
+PORTVERSION=	1.2.4
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 clipboard module for xfce4-panel
+COMMENT=	Clipboard manager for the Xfce panel
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	UNIQUE
-UNIQUE_DESC=	Enable Unique (single instance) support
+OPTIONS_DEFINE=	QRCODE UNIQUE
+QRCODE_DESC=	QR Code support
+UNIQUE_DESC=	Unique (single instance) support
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 intltool intlhack glib20
 USE_XFCE=	configenv libexo libmenu libutil panel xfconf
-USE_XORG=	xtst
+USE_XORG=	xtst xproto
 USES=		pkgconfig gettext gmake
 INSTALLS_ICONS=	yes
 
@@ -34,4 +34,11 @@ CONFIGURE_ARGS+=	--enable-unique
 CONFIGURE_ARGS+=	--disable-unique
 .endif
 
+.if ${PORT_OPTIONS:MQRCODE}
+LIB_DEPENDS+=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+CONFIGURE_ARGS+=	--enable-libqrencode
+.else
+CONFIGURE_ARGS+=	--disable-libqrencode
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo
index 31764c69b773..b8d698a8b560 100644
--- a/x11/xfce4-clipman-plugin/distinfo
+++ b/x11/xfce4-clipman-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-clipman-plugin-1.2.3.tar.bz2) = 4424447067cb2c3972c375330d2e1d19f12e59c41bd03e111c2e6e9e174a5067
-SIZE (xfce4/xfce4-clipman-plugin-1.2.3.tar.bz2) = 1004176
+SHA256 (xfce4/xfce4-clipman-plugin-1.2.4.tar.bz2) = c1e40767434c435392a068efebad09095cfabdfcdf3eef4721e9509df0243d69
+SIZE (xfce4/xfce4-clipman-plugin-1.2.4.tar.bz2) = 408035
diff --git a/x11/xfce4-clipman-plugin/pkg-descr b/x11/xfce4-clipman-plugin/pkg-descr
index 0d220dacb81c..d4c757bc13df 100644
--- a/x11/xfce4-clipman-plugin/pkg-descr
+++ b/x11/xfce4-clipman-plugin/pkg-descr
@@ -1,5 +1,6 @@
-Xfce 4 clipboard module for xfce4-panel.  This plugin is a clipboard history
-for the panel. It now includes a "Clear clipboard" option, and a drag-and-drop
-paste feature contributed by Andre Lerche.
+Clipboard Manager for the Xfce Panel and as a standalone application. It keep
+the clipboard contents around (even after an application quits), it is able
+to handle text and images, and has a feature to execute actions on specific
+text selection by matching them against regexes.
 
 WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index 67ae498507df..a4a8559d2c48 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -6,47 +6,6 @@ etc/xdg/xfce4/panel/xfce4-clipman-actions.xml
 lib/xfce4/panel/plugins/libclipman.la
 lib/xfce4/panel/plugins/libclipman.so
 share/applications/xfce4-clipman.desktop
-%%DOCSDIR%%/html/C/index.html
-%%DOCSDIR%%/html/C/media/clipman-action-dialog.png
-%%DOCSDIR%%/html/C/media/clipman-menu.png
-%%DOCSDIR%%/html/C/media/clipman-settings-actions.png
-%%DOCSDIR%%/html/C/media/clipman-settings-general.png
-%%DOCSDIR%%/html/C/media/clipman-settings-tweaks.png
-%%DOCSDIR%%/html/ca/index.html
-%%DOCSDIR%%/html/ca/media
-%%DOCSDIR%%/html/da/index.html
-%%DOCSDIR%%/html/da/media
-%%DOCSDIR%%/html/el/index.html
-%%DOCSDIR%%/html/el/media
-%%DOCSDIR%%/html/fr/index.html
-%%DOCSDIR%%/html/fr/media/clipman-action-dialog.png
-%%DOCSDIR%%/html/fr/media/clipman-menu.png
-%%DOCSDIR%%/html/fr/media/clipman-settings-actions.png
-%%DOCSDIR%%/html/fr/media/clipman-settings-general.png
-%%DOCSDIR%%/html/fr/media/clipman-settings-tweaks.png
-%%DOCSDIR%%/html/gl/index.html
-%%DOCSDIR%%/html/gl/media
-%%DOCSDIR%%/html/index.css
-%%DOCSDIR%%/html/it/index.html
-%%DOCSDIR%%/html/it/media
-%%DOCSDIR%%/html/ja/index.html
-%%DOCSDIR%%/html/ja/media/clipman-action-dialog.png
-%%DOCSDIR%%/html/ja/media/clipman-menu.png
-%%DOCSDIR%%/html/ja/media/clipman-settings-actions.png
-%%DOCSDIR%%/html/ja/media/clipman-settings-general.png
-%%DOCSDIR%%/html/ja/media/clipman-settings-tweaks.png
-%%DOCSDIR%%/html/pt/index.html
-%%DOCSDIR%%/html/pt/media
-%%DOCSDIR%%/html/ru/index.html
-%%DOCSDIR%%/html/ru/media
-%%DOCSDIR%%/html/tr/index.html
-%%DOCSDIR%%/html/tr/media
-%%DOCSDIR%%/html/ug/index.html
-%%DOCSDIR%%/html/ug/media
-%%DOCSDIR%%/html/uk/index.html
-%%DOCSDIR%%/html/uk/media
-%%DOCSDIR%%/html/zh_CN/index.html
-%%DOCSDIR%%/html/zh_CN/media
 share/icons/hicolor/16x16/apps/xfce4-clipman-plugin.png
 share/icons/hicolor/22x22/apps/xfce4-clipman-plugin.png
 share/icons/hicolor/24x24/apps/xfce4-clipman-plugin.png
@@ -55,11 +14,13 @@ share/icons/hicolor/scalable/apps/xfce4-clipman-plugin.svg
 share/locale/ar/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/ast/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/be/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/bg/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/da/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/el/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/es/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
@@ -79,12 +40,15 @@ share/locale/lt/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/lv/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/nb/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/nl/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/oc/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/pt/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/ru/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/sk/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/sl/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/sq/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/sr/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/sv/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/ug/LC_MESSAGES/xfce4-clipman-plugin.mo
@@ -102,29 +66,12 @@ share/xfce4/panel/plugins/xfce4-clipman-plugin.desktop
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrm %%DOCSDIR%%/html/zh_CN
-@dirrm %%DOCSDIR%%/html/uk
-@dirrm %%DOCSDIR%%/html/ug
-@dirrm %%DOCSDIR%%/html/tr
-@dirrm %%DOCSDIR%%/html/ru
-@dirrm %%DOCSDIR%%/html/pt
-@dirrm %%DOCSDIR%%/html/ja/media
-@dirrm %%DOCSDIR%%/html/ja
-@dirrm %%DOCSDIR%%/html/it
-@dirrm %%DOCSDIR%%/html/gl
-@dirrm %%DOCSDIR%%/html/fr/media
-@dirrm %%DOCSDIR%%/html/fr
-@dirrm %%DOCSDIR%%/html/el
-@dirrm %%DOCSDIR%%/html/da
-@dirrm %%DOCSDIR%%/html/ca
-@dirrm %%DOCSDIR%%/html/C/media
-@dirrm %%DOCSDIR%%/html/C
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrmtry lib/xfce4/panel/plugins
 @dirrmtry etc/xdg/xfce4/panel
 @dirrmtry etc/xdg/xfce4