summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2016-08-17 13:21:46 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2016-08-17 13:21:46 +0000
commit446a3a34288dea0d4c12df399a449fced10262f5 (patch)
tree2ac910af8979eb23a61ec7b0323f256d0277a40f /deskutils
parent- Update to 1.4.0 (diff)
- Fix license
- Cosmetic fixes
Notes
Notes: svn path=/head/; revision=420346
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/cairo-dock-plugins/Makefile5
-rw-r--r--deskutils/cairo-dock/Makefile10
2 files changed, 7 insertions, 8 deletions
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 078b453ce433..b9ff18092e27 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -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 \
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index e6af86f43261..87ec5a751074 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -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 <bsd.port.mk>