Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Dec 2016 14:23:38 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429430 - in head: archivers/innoextract audio/ccaudio2 databases/tarantool games/arx-libertatis graphics/ansilove multimedia/ffmpegthumbnailer net/nanomsg sysutils/cloudabi-utils textp...
Message-ID:  <201612251423.uBPENcWY049450@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Dec 25 14:23:38 2016
New Revision: 429430
URL: https://svnweb.freebsd.org/changeset/ports/429430

Log:
  CMAKE_INSTALL_MANDIR is not set correctly by default, no need to override it
  
  Approved by:	portmgr blanket

Modified:
  head/archivers/innoextract/Makefile
  head/audio/ccaudio2/Makefile
  head/databases/tarantool/Makefile
  head/games/arx-libertatis/Makefile
  head/graphics/ansilove/Makefile
  head/multimedia/ffmpegthumbnailer/Makefile
  head/net/nanomsg/Makefile
  head/sysutils/cloudabi-utils/Makefile
  head/textproc/uncrustify/Makefile
  head/www/faup/Makefile
  head/www/otter-browser/Makefile
  head/x11/xfce4-whiskermenu-plugin/Makefile

Modified: head/archivers/innoextract/Makefile
==============================================================================
--- head/archivers/innoextract/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/archivers/innoextract/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -19,7 +19,6 @@ LIB_DEPENDS=	libboost_iostreams.so:devel
 		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

Modified: head/audio/ccaudio2/Makefile
==============================================================================
--- head/audio/ccaudio2/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/audio/ccaudio2/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libccgnu2.so:devel/commoncp
 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>

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/databases/tarantool/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -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
 

Modified: head/games/arx-libertatis/Makefile
==============================================================================
--- head/games/arx-libertatis/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/games/arx-libertatis/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boos
 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

Modified: head/graphics/ansilove/Makefile
==============================================================================
--- head/graphics/ansilove/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/graphics/ansilove/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -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=	*

Modified: head/multimedia/ffmpegthumbnailer/Makefile
==============================================================================
--- head/multimedia/ffmpegthumbnailer/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/multimedia/ffmpegthumbnailer/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -22,8 +22,7 @@ USES=		cmake:outsource compiler:c++11-li
 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

Modified: head/net/nanomsg/Makefile
==============================================================================
--- head/net/nanomsg/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/net/nanomsg/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -23,6 +23,5 @@ DOCS_DESC=			Build and/or install HTML a
 
 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>

Modified: head/sysutils/cloudabi-utils/Makefile
==============================================================================
--- head/sysutils/cloudabi-utils/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/sysutils/cloudabi-utils/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -24,7 +24,6 @@ ONLY_FOR_ARCHS_REASON=	CloudABI has not 
 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>

Modified: head/textproc/uncrustify/Makefile
==============================================================================
--- head/textproc/uncrustify/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/textproc/uncrustify/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_WRKSUBDIR=	yes
 USES=		cmake:outsource
-CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man
 TEST_TARGET=	test
 
 PORTDOCS=	*

Modified: head/www/faup/Makefile
==============================================================================
--- head/www/faup/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/www/faup/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -20,7 +20,6 @@ GH_ACCOUNT=	stricaud
 
 USES=		cmake:outsource lua
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
 
 PORTDOCS=	*
 

Modified: head/www/otter-browser/Makefile
==============================================================================
--- head/www/otter-browser/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/www/otter-browser/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -16,6 +16,4 @@ USES=		cmake:outsource compiler:c++11-li
 USE_GITHUB=	yes
 GH_ACCOUNT=	OtterBrowser
 
-CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man
-
 .include <bsd.port.mk>

Modified: head/x11/xfce4-whiskermenu-plugin/Makefile
==============================================================================
--- head/x11/xfce4-whiskermenu-plugin/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
+++ head/x11/xfce4-whiskermenu-plugin/Makefile	Sun Dec 25 14:23:38 2016	(r429430)
@@ -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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612251423.uBPENcWY049450>