svn commit: r460966 - head/x11/lxpanel

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Feb  5 09:02:15 2018
New Revision: 460966
URL: https://svnweb.freebsd.org/changeset/ports/460966

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Fix whitespace
  - Update WWW

Modified:
  head/x11/lxpanel/Makefile
  head/x11/lxpanel/pkg-descr

Modified: head/x11/lxpanel/Makefile
==============================================================================
--- head/x11/lxpanel/Makefile	Mon Feb  5 08:45:45 2018	(r460965)
+++ head/x11/lxpanel/Makefile	Mon Feb  5 09:02:15 2018	(r460966)
@@ -9,8 +9,9 @@ MASTER_SITES=	SF/lxde/LXPanel%20%28desktop%20panel%29/
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Lightweight X11 desktop panel
 
-LICENSE=	GPLv2 MIT
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+ MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 		libkeybinder.so:x11/keybinder \
@@ -23,6 +24,8 @@ USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2 libwnck intlt
 USE_XORG=	x11
 USES=		gmake libtool localbase pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
+		--with-plugins="${LXPANEL_PLUGINS}"
 INSTALL_TARGET=	install-strip
 
 # Panel plugins
@@ -36,18 +39,15 @@ OPTIONS_SUB=	yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
-ALSA_VARS=	lxpanel_plugins+=",-volume,volumealsa"
-OSS_VARS=	lxpanel_plugins+=",volume,-volumealsa"
+ALSA_VARS=		lxpanel_plugins+=",-volume,volumealsa"
+OSS_VARS=		lxpanel_plugins+=",volume,-volumealsa"
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext
-NLS_USES_OFF=	gettext-tools
-WEATHER_USE=	gnome=libxml2
-WEATHER_VARS=	lxpanel_plugins+=",weather"
+NLS_USES=		gettext
+NLS_USES_OFF=		gettext-tools
+WEATHER_USE=		gnome=libxml2
+WEATHER_VARS=		lxpanel_plugins+=",weather"
 WEATHER_VARS_OFF=	lxpanel_plugins+=",-weather"
-WEATHER_DESC=	Weather plugin
-
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
-	--with-plugins="${LXPANEL_PLUGINS}"
+WEATHER_DESC=		Weather plugin
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|po man|man|' \

Modified: head/x11/lxpanel/pkg-descr
==============================================================================
--- head/x11/lxpanel/pkg-descr	Mon Feb  5 08:45:45 2018	(r460965)
+++ head/x11/lxpanel/pkg-descr	Mon Feb  5 09:02:15 2018	(r460966)
@@ -5,4 +5,4 @@ It's not only with fbpanel features but also
 * supports i18n
 * provides lxpanelctl to control lxpanel
 
-WWW: http://wiki.lxde.org/en/LXPanel
+WWW: https://wiki.lxde.org/en/LXPanel