svn commit: r368446 - in head: Mk Mk/Uses audio/sonata cad/qelectrotech deskutils/cairo-dock graphics/hugin-devel irc/py-supybot math/proofgeneral net-im/prosody net/htpdate net/mosquitto net/mpd5 ...

Thu Sep 18 12:31:30 UTC 2014

Author: mat
Date: Thu Sep 18 12:31:24 2014
New Revision: 368446
URL: http://svnweb.freebsd.org/changeset/ports/368446
QAT: https://qat.redports.org/buildarchive/r368446/

Log:
  Retire MANCOMPRESSED.
  
  Also the compat NO_INSTALL_MANPAGES shim.
  
  Differential Revision:	https://reviews.freebsd.org/D730
  Reviewed by:	antoine
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/imake.mk
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk
  head/audio/sonata/Makefile
  head/cad/qelectrotech/Makefile
  head/deskutils/cairo-dock/Makefile
  head/graphics/hugin-devel/Makefile
  head/irc/py-supybot/Makefile
  head/math/proofgeneral/Makefile
  head/net-im/prosody/Makefile
  head/net/htpdate/Makefile
  head/net/mosquitto/Makefile
  head/net/mpd5/Makefile
  head/ports-mgmt/dialog4ports/Makefile
  head/print/rprint/Makefile
  head/sysutils/bacula-server/Makefile
  head/sysutils/bacula5-server/Makefile
  head/sysutils/pfstat/Makefile
  head/sysutils/puppet27/Makefile
  head/textproc/hs-pandoc/Makefile
  head/x11-toolkits/tk85/Makefile
  head/x11-wm/afterstep/Makefile

Modified: head/Mk/Uses/imake.mk
==============================================================================

--- head/Mk/Uses/imake.mk	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/Mk/Uses/imake.mk	Thu Sep 18 12:31:24 2014	(r368446)
@@ -23,14 +23,6 @@ IGNORE=		USES=imake:${imake_ARGS:S/ /,/g
 imake_ARGS=
 .endif
 
-.if defined(NO_INSTALL_MANPAGES)
-imake_ARGS+=	noman
-.endif
-
-.if ! ${imake_ARGS:Mnoman}
-MANCOMPRESSED?=	yes
-.endif
-
 BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake
 
 .if defined(USE_GCC)

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/Mk/bsd.port.mk	Thu Sep 18 12:31:24 2014	(r368446)
@@ -574,8 +574,7 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 # INSTALL_SCRIPT
 #				- A command to install executable scripts.
 # INSTALL_DATA	- A command to install sharable data.
-# INSTALL_MAN	- A command to install manpages.  May or not compress,
-#				  depending on the value of MANCOMPRESSED (see below).
+# INSTALL_MAN	- A command to install manpages.
 # COPYTREE_BIN
 # COPYTREE_SHARE
 #				- Similiar to INSTALL_PROGRAM and INSTALL_DATA commands but
@@ -1616,17 +1615,6 @@ MAKE_SHELL?=	${SH}
 CONFIGURE_ENV+=	SHELL=${CONFIGURE_SHELL} CONFIG_SHELL=${CONFIGURE_SHELL}
 MAKE_ENV+=		SHELL=${MAKE_SHELL} NO_LINT=YES
 
-.if defined(MANCOMPRESSED)
-.if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
-	${MANCOMPRESSED} != maybe
-check-makevars::
-	@${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"".
-	@${FALSE}
-.endif
-.endif
-
-MANCOMPRESSED?=	no
-
 .if defined(PATCHFILES)
 .if ${PATCHFILES:M*.zip}x != x
 PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/Mk/bsd.sanity.mk	Thu Sep 18 12:31:24 2014	(r368446)
@@ -140,10 +140,10 @@ DEV_WARNING+=	"INSTALLS_EGGINFO is depre
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
-		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL
+		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES
 SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX NO_INSTALL_MANPAGES
+		USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX
 
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam

Modified: head/audio/sonata/Makefile
==============================================================================
--- head/audio/sonata/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/audio/sonata/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -29,7 +29,7 @@ TAGLIB_DESC=	Install support for editing
 ZSI_DESC=	Install support for automatic lyrics fetching
 OPTIONS_SUB=	yes
 
-MANPAGES_MAKE_ENV_OFF=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
+MANPAGES_MAKE_ENV_OFF=	NO_INSTALL_MANPAGES=yes
 DOCS_MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 MPD_RUN_DEPENDS+=	musicpd:${PORTSDIR}/audio/musicpd
 MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus

Modified: head/cad/qelectrotech/Makefile
==============================================================================
--- head/cad/qelectrotech/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/cad/qelectrotech/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -26,7 +26,6 @@ QMAKE_ARGS+=	QMAKE_RPATHDIR="${_GCC_RUNT
 
 MAN1=		qelectrotech.1
 MANLANG=	"" cs el es fr.ISO8859-1 fr.UTF-8 fr it pl pt_PT
-MANCOMPRESSED=	yes
 
 pre-configure:
 	${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT

Modified: head/deskutils/cairo-dock/Makefile
==============================================================================
--- head/deskutils/cairo-dock/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/deskutils/cairo-dock/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -28,8 +28,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
 CMAKE_ARGS+=	-DROOT_PREFIX:PATH=${STAGEDIR}
 
-MANCOMPRESSED=	yes
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
 	    's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \

Modified: head/graphics/hugin-devel/Makefile
==============================================================================
--- head/graphics/hugin-devel/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/graphics/hugin-devel/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -49,38 +49,6 @@ WX_UNICODE=	yes
 
 USE_GL=		glew glut
 
-MANCOMPRESSED=	yes
-
-MAN1=		align_image_stack.1 \
-		autooptimiser.1 \
-		autopano-noop.sh.1 \
-		calibrate_lens_gui.1 \
-		celeste_standalone.1 \
-		checkpto.1 \
-		cpclean.1 \
-		cpfind.1 \
-		deghosting_mask.1 \
-		fulla.1 \
-		hugin.1 \
-		hugin_hdrmerge.1 \
-		hugin_stitch_project.1 \
-		icpfind.1 \
-		nona.1 \
-		linefind.1 \
-		matchpoint.1 \
-		nona_gui.1 \
-		pano_modify.1 \
-		pano_trafo.1 \
-		pto2mk.1 \
-		pto_gen.1 \
-		pto_lensstack.1 \
-		pto_merge.1 \
-		pto_var.1 \
-		tca_correct.1 \
-		PTBatcher.1 \
-		PTBatcherGUI.1 \
-		vig_optimize.1
-
 post-configure:
 	${REINPLACE_CMD} \
 		's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g' \

Modified: head/irc/py-supybot/Makefile
==============================================================================
--- head/irc/py-supybot/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/irc/py-supybot/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -19,7 +19,6 @@ PYDISTUTILS_EGGINFO=	supybot-${PORTVERSI
 
 DOCS=	ACKS ChangeLog INSTALL LICENSE README RELNOTES
 
-MANCOMPRESSED=	no
 MAN1=	supybot.1 supybot-adduser.1 supybot-wizard.1 supybot-botchk.1 \
 	supybot-plugin-create.1 supybot-plugin-doc.1
 

Modified: head/math/proofgeneral/Makefile
==============================================================================
--- head/math/proofgeneral/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/math/proofgeneral/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -43,7 +43,6 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_P
 SUB_FILES=	pkg-message
 SUB_LIST=	EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
 
-MANCOMPRESSED=	no
 INFO=		PG-adapting ProofGeneral
 
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/net-im/prosody/Makefile
==============================================================================
--- head/net-im/prosody/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/net-im/prosody/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -24,7 +24,6 @@ USERS=		prosody
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	prosody
-MANCOMPRESSED=	no
 
 OPTIONS_DEFINE= LUAJIT
 LUAJIT_DESC=    Run prosody using luajit

Modified: head/net/htpdate/Makefile
==============================================================================
--- head/net/htpdate/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/net/htpdate/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -15,7 +15,6 @@ LICENSE=	GPLv2 # (or later)
 USES=	tar:bzip2
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
-MANCOMPRESSED=	yes
 PLIST_FILES=	bin/${PORTNAME} man/man8/${PORTNAME}.8.gz
 PORTDOCS=	Changelog README
 USE_RC_SUBR=	${PORTNAME}

Modified: head/net/mosquitto/Makefile
==============================================================================
--- head/net/mosquitto/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/net/mosquitto/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -24,8 +24,6 @@ USES=		cmake
 USE_PYTHON=	2
 NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
-MANCOMPRESSED=	no
-NO_MANCOMPRESS=	yes
 USE_LDCONFIG=	yes
 
 USERS=		nobody

Modified: head/net/mpd5/Makefile
==============================================================================
--- head/net/mpd5/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/net/mpd5/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -31,7 +31,6 @@ RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko
 .endif
 .endif
 
-MANCOMPRESSED=	maybe
 USE_RC_SUBR=	mpd5
 HTMLNUM!=	jot 70 1
 CONFSUF=	conf secret script

Modified: head/ports-mgmt/dialog4ports/Makefile
==============================================================================
--- head/ports-mgmt/dialog4ports/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/ports-mgmt/dialog4ports/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -23,7 +23,6 @@ USES=		uidfix
 # CCACHE has options, so may need d4p, make d4p not ccache friendly
 # to avoid circular dependency
 NO_CCACHE=	yes
-MANCOMPRESSED=	yes
 MAKE_ENV+=	__MAKE_CONF=/dev/null SRCCONF=/dev/null
 
 .if !defined(D4P_SLAVE)

Modified: head/print/rprint/Makefile
==============================================================================
--- head/print/rprint/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/print/rprint/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -12,7 +12,6 @@ COMMENT=	Remote printing utility using a
 
 LICENSE=	BSD4CLAUSE
 
-MANCOMPRESSED=	yes
 PLIST_FILES=	bin/rprint man/man1/rprint.1.gz
 
 post-patch:

Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/sysutils/bacula-server/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -48,7 +48,6 @@ SUB_FILES+=	pkg-install.client pkg-deins
 SUB_FILES+=	pkg-message.server
 .endif
 
-MANCOMPRESSED=	yes
 CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
 		--enable-smartalloc \
 		--sysconfdir=${ETCDIR} \

Modified: head/sysutils/bacula5-server/Makefile
==============================================================================
--- head/sysutils/bacula5-server/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/sysutils/bacula5-server/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -53,7 +53,6 @@ SUB_FILES+=	pkg-install.client pkg-deins
 SUB_FILES+=	pkg-message.server
 .endif
 
-MANCOMPRESSED=	yes
 CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
 		--enable-smartalloc \
 		--sysconfdir=${ETCDIR} \

Modified: head/sysutils/pfstat/Makefile
==============================================================================
--- head/sysutils/pfstat/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/sysutils/pfstat/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -20,7 +20,6 @@ USE_RC_SUBR=	pfstatd
 MAN8=		pfstat.8 \
 		pfstatd.8
 
-MANCOMPRESSED=	no
 PLIST_FILES=	bin/pfstat \
 		bin/pfstatd
 

Modified: head/sysutils/puppet27/Makefile
==============================================================================
--- head/sysutils/puppet27/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/sysutils/puppet27/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -30,8 +30,6 @@ SUB_FILES+=	pkg-message
 
 PORTSCOUT=	limit:^2\.7\.
 
-MANCOMPRESSED=	yes
-
 OPTIONS_DEFAULT=	PACKAGE_ORIGIN
 OPTIONS_SINGLE=		PATCHES
 OPTIONS_SINGLE_PATCHES=	PACKAGE_ORIGIN PACKAGE_ROOT

Modified: head/textproc/hs-pandoc/Makefile
==============================================================================
--- head/textproc/hs-pandoc/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/textproc/hs-pandoc/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -33,7 +33,6 @@ MAN1SRC=	man/man1
 MAN5SRC=	man/man5
 MAN1PAGES=	pandoc.1
 MAN5PAGES=	pandoc_markdown.5
-MANCOMPRESSED=	no
 
 FLAGS_DEFINE=			EMBED_DATA_FILES HTTPS TRYPANDOC
 FLAGS_DEFAULT=			HTTPS

Modified: head/x11-toolkits/tk85/Makefile
==============================================================================
--- head/x11-toolkits/tk85/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/x11-toolkits/tk85/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -41,7 +41,6 @@ INSTALL_TARGET=	install
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
 PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
-MANCOMPRESSED=	no
 DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
 SUB_FILES=	pkgIndex.tcl
 

Modified: head/x11-wm/afterstep/Makefile
==============================================================================
--- head/x11-wm/afterstep/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
+++ head/x11-wm/afterstep/Makefile	Thu Sep 18 12:31:24 2014	(r368446)
@@ -23,7 +23,6 @@ USES=		imake
 USE_XORG=	xpm xext x11
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install install.man
-MANCOMPRESSED=	yes
 CFLAGS+=	-Wno-return-type
 
 SRCDIRS=	afterstep \
