From owner-svn-ports-head@freebsd.org Wed Aug 17 13:21:48 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 513EABBDC5C; Wed, 17 Aug 2016 13:21:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05C7A1C2E; Wed, 17 Aug 2016 13:21:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HDLlav041404; Wed, 17 Aug 2016 13:21:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HDLl6c041402; Wed, 17 Aug 2016 13:21:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608171321.u7HDLl6c041402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 17 Aug 2016 13:21:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420346 - in head/deskutils: cairo-dock cairo-dock-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 13:21:48 -0000 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@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