summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2016-12-25 14:23:38 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2016-12-25 14:23:38 +0000
commitadeac03634dc088422f3f6ee17b35476cf6c52fc (patch)
tree05b9e860a27e994b0a5b5c4832c2e2a1d57431b6
parent- Document CVE-2016-9963 for exim (diff)
CMAKE_INSTALL_MANDIR is not set correctly by default, no need to override it
Approved by: portmgr blanket
Notes
Notes: svn path=/head/; revision=429430
-rw-r--r--archivers/innoextract/Makefile1
-rw-r--r--audio/ccaudio2/Makefile3
-rw-r--r--databases/tarantool/Makefile3
-rw-r--r--games/arx-libertatis/Makefile5
-rw-r--r--graphics/ansilove/Makefile1
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile3
-rw-r--r--net/nanomsg/Makefile1
-rw-r--r--sysutils/cloudabi-utils/Makefile1
-rw-r--r--textproc/uncrustify/Makefile1
-rw-r--r--www/faup/Makefile1
-rw-r--r--www/otter-browser/Makefile2
-rw-r--r--x11/xfce4-whiskermenu-plugin/Makefile4
12 files changed, 7 insertions, 19 deletions
diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index 7c7d17249127..f8efc64bb65c 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \
libboost_program_options.so:devel/boost-libs
USES= cmake iconv
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
PLIST_FILES= bin/innoextract \
man/man1/innoextract.1.gz
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index eb5464c5f464..d128ae5abc0d 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= libccgnu2.so:devel/commoncpp \
USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig
USE_LDCONFIG= yes
-CMAKE_ARGS= -DWITH_INCLUDES:PATH=${LOCALBASE}/include \
- -DCMAKE_INSTALL_MANDIR:STRING=man
+CMAKE_ARGS= -DWITH_INCLUDES:PATH=${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 07722c177bb9..0cdd09541d72 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -23,8 +23,7 @@ TT_DATADIR?= /var/db/tarantool
TT_RUNDIR?= /var/run/tarantool
TT_LOGDIR?= /var/log/tarantool
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man \
- -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
+CMAKE_ARGS= -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DENABLE_DIST=ON
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index 023f3237f9c0..e240171fad27 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/foreach.hpp:devel/boost-libs
USES= cmake openal tar:xz
USE_SDL= sdl
USE_GL= gl glew
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR="man" -DDATA_DIR=arx -DSTRICT_USE=ON
+CMAKE_ARGS= -DDATA_DIR=arx \
+ -DSTRICT_USE=ON
SUB_FILES= pkg-message
@@ -46,7 +47,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt
post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
diff --git a/graphics/ansilove/Makefile b/graphics/ansilove/Makefile
index efbcfb05b3ac..0ee178b1093e 100644
--- a/graphics/ansilove/Makefile
+++ b/graphics/ansilove/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS= libgd.so:graphics/gd
USE_GITHUB= yes
USES= cmake
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
PORTDOCS= AUTHORS ChangeLog README.md THANKS TODO
PORTEXAMPLES= *
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 744d9a120c18..b66eff55660e 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -22,8 +22,7 @@ USES= cmake:outsource compiler:c++11-lib jpeg localbase pathfix pkgconfig
USE_GNOME= glib20
USE_LDCONFIG= yes
-CMAKE_ARGS= -DENABLE_GIO=ON \
- -DCMAKE_INSTALL_MANDIR:PATH="man"
+CMAKE_ARGS= -DENABLE_GIO=ON
OPTIONS_DEFINE= THUMBNAILER
THUMBNAILER_DESC=Register as a system thumbnailer
diff --git a/net/nanomsg/Makefile b/net/nanomsg/Makefile
index 8521f725f630..e336f50bd844 100644
--- a/net/nanomsg/Makefile
+++ b/net/nanomsg/Makefile
@@ -23,6 +23,5 @@ DOCS_DESC= Build and/or install HTML and manpages
DOCS_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
DOCS_CMAKE_BOOL= NN_ENABLE_DOC
-DOCS_CMAKE_ON= -DCMAKE_INSTALL_MANDIR:STRING=man
.include <bsd.port.mk>
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index bb55c7abf9c7..fdd4f0376815 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -24,7 +24,6 @@ ONLY_FOR_ARCHS_REASON= CloudABI has not yet been ported to other architectures
USES= cmake compiler:c11 pkgconfig tar:xz
USE_LDCONFIG= yes
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile
index 97136782eb6c..606a4f5daff9 100644
--- a/textproc/uncrustify/Makefile
+++ b/textproc/uncrustify/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_WRKSUBDIR= yes
USES= cmake:outsource
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
TEST_TARGET= test
PORTDOCS= *
diff --git a/www/faup/Makefile b/www/faup/Makefile
index 82c06446a83b..b835ed6b162d 100644
--- a/www/faup/Makefile
+++ b/www/faup/Makefile
@@ -20,7 +20,6 @@ GH_ACCOUNT= stricaud
USES= cmake:outsource lua
USE_LDCONFIG= yes
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man
PORTDOCS= *
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index 69c987c4473e..af263cf9955a 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -16,6 +16,4 @@ USES= cmake:outsource compiler:c++11-lib desktop-file-utils
USE_GITHUB= yes
GH_ACCOUNT= OtterBrowser
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
-
.include <bsd.port.mk>
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 5ef46bca591c..779d4b1fd14e 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -15,11 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limit:^1\.6\.
-USES= cmake:outsource gettext localbase pkgconfig tar:bzip2 xfce
+USES= cmake:outsource gettext localbase pkgconfig tar:bzip2 xfce
USE_GNOME= gtk20 cairo
USE_XFCE= panel
INSTALLS_ICONS= yes
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${MANDIRS}
-
.include <bsd.port.mk>