svn commit: r364718 - in head/Mk: . Uses

[Mathieu Arnold]

Author: mat
Date: Tue Aug 12 16:24:27 2014
New Revision: 364718
URL: http://svnweb.freebsd.org/changeset/ports/364718
QAT: https://qat.redports.org/buildarchive/r364718/

Log:
  Add a USES=imake:noman to make NO_INSTALL_MANPAGES go away.
  
  CR:		D594
  Reviewed by:	antoine
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/imake.mk
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk

Modified: head/Mk/Uses/imake.mk
==============================================================================
--- head/Mk/Uses/imake.mk	Tue Aug 12 16:15:07 2014	(r364717)
+++ head/Mk/Uses/imake.mk	Tue Aug 12 16:24:27 2014	(r364718)
@@ -6,6 +6,8 @@
 # Usage:		USES=imake
 # Valid ARGS:		env: do not define any target
 #			notall: do not pass -a to xmkmf
+#			noman: do not add install-man to
+#			INSTALL_TARGET
 #
 # MAINTAINER: x11 at FreeBSD.org
 
@@ -13,16 +15,19 @@
 _INCLUDE_USES_IMAKE_MK=	yes
 
 .if defined(imake_ARGS)
-.if ${imake_ARGS} == env
-IMAKE_ENV_ONLY=	yes
-.elif ${imake_ARGS} == notall
-IMAKE_NOTALL=	yes
+imake_ARGS:=	${imake_ARGS:S/,/ /g}
+.if ${imake_ARGS:Nnotall:Nenv:Nnoman}
+IGNORE=		USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
+.endif
 .else
-IGNORE=		USES=imake ${imake_ARGS} is not a valid argument
+imake_ARGS=
 .endif
+
+.if defined(NO_INSTALL_MANPAGES)
+imake_ARGS+=	noman
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
+.if ! ${imake_ARGS:Mnoman}
 MANCOMPRESSED?=	yes
 .endif
 
@@ -39,17 +44,17 @@ BUILD_DEPENDS+=		tradcpp:${PORTSDIR}/dev
 MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 
-.if !defined(IMAKE_NOTALL)
+.if ! ${imake_ARGS:Mnotall}
 XMKMF_ARGS+=		-a
 .endif
 
-.if !defined(IMAKE_ENV_ONLY)
+.if ! ${imake_ARGS:Menv}
 .if !target(do-configure)
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
+.if ! ${imake_ARGS:Mnoman}
 LATE_INSTALL_ARGS=	install.man
 .endif
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Aug 12 16:15:07 2014	(r364717)
+++ head/Mk/bsd.port.mk	Tue Aug 12 16:24:27 2014	(r364718)
@@ -587,12 +587,6 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #				  Installs all directories and files from ${WRKSRC}/doc
 #				  to ${DOCSDIR} except sed backup files.
 #
-# Boolean to control whether manpages are installed.
-#
-# NO_INSTALL_MANPAGES
-#				- If set, this port doesn't want to install any manpages.
-#				  Default: not set, i.e. manpages are installed by default.
-#
 # Set the following to specify all manpages that your port installs.
 # These manpages will be automatically listed in ${PLIST}.  Depending
 # on the setting of NO_MANCOMPRESS, the make rules will compress the
@@ -629,8 +623,8 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #				  "maybe".  "yes" means manpages are installed
 #				  compressed; "no" means they are not; "maybe" means
 #				  it changes depending on the value of NO_MANCOMPRESS.
-#				  Default: "yes" if USES=imake is set and NO_INSTALL_MANPAGES
-#				  is not set, and "no" otherwise.
+#				  Default: "yes" if USES=imake is set without the noman
+#				  argument, and "no" otherwise.
 #
 # Set the following to specify all .info files your port installs.
 #

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Tue Aug 12 16:15:07 2014	(r364717)
+++ head/Mk/bsd.sanity.mk	Tue Aug 12 16:24:27 2014	(r364718)
@@ -150,7 +150,8 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM U
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL
 SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		PYTHON_MASTER_SITES USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX
+		PYTHON_MASTER_SITES USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX \
+		NO_INSTALL_MANPAGES
 
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
@@ -180,6 +181,7 @@ PYDISTUTILS_NOEGGINFO_ALT=	PYTHON_FEATUR
 USE_PYTHON_PREFIX_ALT=		PYTHON_FEATURES=pythonprefix
 PYTHON_PKGNAMESUFFIX_ALT=	PYTHON_PKGNAMEPREFIX
 PYTHON_MASTER_SITES_ALT=	MASTER_SITE_PYTHON
+NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 
 .for a in ${SANITY_DEPRECATED}
 .if defined(${a})