svn commit: r420346 - in head/deskutils: cairo-dock cairo-dock-plugins

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Aug 17 13:21:46 2016
New Revision: 420346
URL: https://svnweb.freebsd.org/changeset/ports/420346

Log:
  - Fix license
  - Cosmetic fixes

Modified:
  head/deskutils/cairo-dock-plugins/Makefile
  head/deskutils/cairo-dock/Makefile

Modified: head/deskutils/cairo-dock-plugins/Makefile
==============================================================================
--- head/deskutils/cairo-dock-plugins/Makefile	Wed Aug 17 13:20:36 2016	(r420345)
+++ head/deskutils/cairo-dock-plugins/Makefile	Wed Aug 17 13:21:46 2016	(r420346)
@@ -27,10 +27,9 @@ USE_LDCONFIG=	yes
 USE_XORG=	xrender
 USES=		cmake gettext pkgconfig python
 LDFLAGS+=	-L${LOCALBASE}/lib
-PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
-CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}
+PLIST_SUB=	PYVER="${PYTHON_VERSION:S/thon//}"
+CMAKE_ARGS=	-DROOT_PREFIX:PATH=${STAGEDIR}
 
-OPTIONS_DEFINE=
 OPTIONS_GROUP=		INTEGR PLUGINS ADDON TPI
 OPTIONS_GROUP_INTEGR=	GNOME_INTEGRATION KDE_INTEGRATION XFCE_INTEGRATION
 OPTIONS_GROUP_PLUGINS=	ALSA_MIXER GMENU IMPULSE KEYBOARD_INDICATOR \

Modified: head/deskutils/cairo-dock/Makefile
==============================================================================
--- head/deskutils/cairo-dock/Makefile	Wed Aug 17 13:20:36 2016	(r420345)
+++ head/deskutils/cairo-dock/Makefile	Wed Aug 17 13:21:46 2016	(r420346)
@@ -7,7 +7,7 @@ CATEGORIES=	deskutils
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Cairo-Dock is a light and eye-candy dock
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
@@ -27,9 +27,9 @@ USE_LDCONFIG=	yes
 USE_XORG=	xrender xtst
 USES=		cmake gettext pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
-CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH=man
+CMAKE_ARGS=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" \
+		-DROOT_PREFIX:PATH=${STAGEDIR} \
+		-DCMAKE_INSTALL_MANDIR:PATH=man \
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -41,6 +41,6 @@ post-patch:
 	     s|%%LOCALBASE%%|${LOCALBASE}|g;'
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so
 
 .include <bsd.port.mk>