Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Jan 2020 12:06:14 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523104 - in head: Mk Templates deskutils/fff devel/kf5-kapidox dns/dnsdbq emulators/qemu-cheri games/hexalate games/jumpnbump games/peg-e games/tanglet games/tetzle graphics/nomacs gra...
Message-ID:  <202001151206.00FC6Ea5026996@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Jan 15 12:06:13 2020
New Revision: 523104
URL: https://svnweb.freebsd.org/changeset/ports/523104

Log:
  Add LOCALBASE/share/man to the valid path for manpages
  
  Also compress manpages in this location.
  
  As a followup of a discussion which occured in 2017:
  https://lists.freebsd.org/pipermail/freebsd-arch/2017-March/018115.html
  And following:
  https://svnweb.freebsd.org/base?view=revision&revision=315053
  and
  https://svnweb.freebsd.org/base?view=revision&revision=315142
  
  All the supported FreeBSD version now supports share/man in manpath for
  LOCALBASE As a result the ports tree can now accept it for manpage, but
  more over migrate to this new path. Resulting in more consistency now the
  manpages in base and ports would be in the relative path (under share/)
  and a reduced amount of patching needed to port something to FreeBSD
  
  Note1: this has already be done for GNU info pages earlier
  Note2: due to the fact that for end user no functionnality will change during
  the migration of the manpages to the new location and to avoid massive rebuild
  of packages, it has been decided to not bump portrevision when migrating.
  
  Reviewed by:	mat (portmgr)
  Differential Revision:	https://reviews.freebsd.org/D23166

Modified:
  head/Mk/bsd.port.mk
  head/Templates/BSD.local.dist
  head/deskutils/fff/Makefile
  head/devel/kf5-kapidox/pkg-plist
  head/dns/dnsdbq/Makefile
  head/emulators/qemu-cheri/pkg-plist
  head/games/hexalate/pkg-plist
  head/games/jumpnbump/pkg-plist
  head/games/peg-e/pkg-plist
  head/games/tanglet/pkg-plist
  head/games/tetzle/pkg-plist
  head/graphics/nomacs/pkg-plist
  head/graphics/oyranos/pkg-plist
  head/math/plplot/pkg-plist
  head/net/adasockets/pkg-plist
  head/net/nfs-ganesha/pkg-plist
  head/security/openvas9-manager/pkg-plist
  head/www/roundup/Makefile
  head/www/roundup/pkg-plist
  head/www/twms/pkg-plist

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/Mk/bsd.port.mk	Wed Jan 15 12:06:13 2020	(r523104)
@@ -2681,6 +2681,7 @@ SCRIPTS_ENV+=	BATCH=yes
 MANPREFIX?=	/usr/share
 .else
 MANPREFIX?=	${PREFIX}
+MANDIRS+=	${PREFIX}/share/man
 .endif
 
 MANDIRS+=	${MANPREFIX}/man

Modified: head/Templates/BSD.local.dist
==============================================================================
--- head/Templates/BSD.local.dist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/Templates/BSD.local.dist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -644,6 +644,26 @@
                 ..
             ..
         ..
+        man
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+        ..
         misc
         ..
         nls

Modified: head/deskutils/fff/Makefile
==============================================================================
--- head/deskutils/fff/Makefile	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/deskutils/fff/Makefile	Wed Jan 15 12:06:13 2020	(r523104)
@@ -19,6 +19,6 @@ GH_ACCOUNT=	dylanaraps
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_FILES=	bin/fff share/man/man1/fff.1
+PLIST_FILES=	bin/fff share/man/man1/fff.1.gz
 
 .include <bsd.port.mk>

Modified: head/devel/kf5-kapidox/pkg-plist
==============================================================================
--- head/devel/kf5-kapidox/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/devel/kf5-kapidox/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -79,6 +79,6 @@ bin/kapidox_generate
 %%PYTHON_SITELIBDIR%%/kapidox/preprocessing.pyc
 %%PYTHON_SITELIBDIR%%/kapidox/utils.py
 %%PYTHON_SITELIBDIR%%/kapidox/utils.pyc
-share/man/man1/depdiagram-generate-all.1
-share/man/man1/depdiagram-generate.1
-share/man/man1/depdiagram-prepare.1
+share/man/man1/depdiagram-generate-all.1.gz
+share/man/man1/depdiagram-generate.1.gz
+share/man/man1/depdiagram-prepare.1.gz

Modified: head/dns/dnsdbq/Makefile
==============================================================================
--- head/dns/dnsdbq/Makefile	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/dns/dnsdbq/Makefile	Wed Jan 15 12:06:13 2020	(r523104)
@@ -27,6 +27,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 
-PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>

Modified: head/emulators/qemu-cheri/pkg-plist
==============================================================================
--- head/emulators/qemu-cheri/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/emulators/qemu-cheri/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -6,9 +6,9 @@ bin/qemu-system-cheri
 %%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
 %%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
 %%PORTDOCS%%%%DOCSDIR%%/qmp-commands.txt
-share/man/man1/qemu-img.1
-share/man/man1/qemu.1
-share/man/man8/qemu-nbd.8
+share/man/man1/qemu-img.1.gz
+share/man/man1/qemu.1.gz
+share/man/man8/qemu-nbd.8.gz
 %%DATADIR%%/QEMU,cgthree.bin
 %%DATADIR%%/QEMU,tcx.bin
 %%DATADIR%%/acpi-dsdt.aml

Modified: head/games/hexalate/pkg-plist
==============================================================================
--- head/games/hexalate/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/games/hexalate/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -31,5 +31,5 @@ share/icons/hicolor/32x32/apps/hexalate.png
 share/icons/hicolor/48x48/apps/hexalate.png
 share/icons/hicolor/512x512/apps/hexalate.png
 share/icons/hicolor/64x64/apps/hexalate.png
-share/man/man6/hexalate.6
+share/man/man6/hexalate.6.gz
 share/pixmaps/hexalate.xpm

Modified: head/games/jumpnbump/pkg-plist
==============================================================================
--- head/games/jumpnbump/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/games/jumpnbump/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -9,5 +9,5 @@ share/icons/jumpnbump.png
 %%DATADIR%%/jumpbump.dat
 %%LAUNCHER%%%%DATADIR%%/jumpnbump_menu.glade
 %%NLS%%share/locale/fr/LC_MESSAGES/jumpnbump-menu.mo
-share/man/man6/jumpnbump.6
+share/man/man6/jumpnbump.6.gz
 share/metainfo/jumpnbump.appdata.xml

Modified: head/games/peg-e/pkg-plist
==============================================================================
--- head/games/peg-e/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/games/peg-e/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -11,7 +11,7 @@ share/icons/hicolor/48x48/apps/peg-e.png
 share/icons/hicolor/512x512/apps/peg-e.png
 share/icons/hicolor/64x64/apps/peg-e.png
 share/icons/hicolor/scalable/apps/peg-e.svg
-share/man/man6/peg-e.6
+share/man/man6/peg-e.6.gz
 share/metainfo/peg-e.appdata.xml
 %%DATADIR%%/icons/hicolor/16x16/document-new.png
 %%DATADIR%%/icons/hicolor/16x16/edit-redo.png

Modified: head/games/tanglet/pkg-plist
==============================================================================
--- head/games/tanglet/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/games/tanglet/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -14,7 +14,7 @@ share/icons/hicolor/48x48/apps/tanglet.png
 share/icons/hicolor/512x512/apps/tanglet.png
 share/icons/hicolor/64x64/apps/tanglet.png
 share/icons/hicolor/scalable/apps/tanglet.svg
-share/man/man6/tanglet.6
+share/man/man6/tanglet.6.gz
 share/metainfo/tanglet.appdata.xml
 share/mime/packages/tanglet.xml
 share/pixmaps/tanglet.xpm

Modified: head/games/tetzle/pkg-plist
==============================================================================
--- head/games/tetzle/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/games/tetzle/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -11,7 +11,7 @@ share/icons/hicolor/48x48/apps/tetzle.png
 share/icons/hicolor/512x512/apps/tetzle.png
 share/icons/hicolor/64x64/apps/tetzle.png
 share/icons/hicolor/scalable/apps/tetzle.svg
-share/man/man6/tetzle.6
+share/man/man6/tetzle.6.gz
 share/metainfo/tetzle.appdata.xml
 share/pixmaps/tetzle.xpm
 %%DATADIR%%/translations/tetzle_ca.qm

Modified: head/graphics/nomacs/pkg-plist
==============================================================================
--- head/graphics/nomacs/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/graphics/nomacs/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -4,7 +4,7 @@ lib/libnomacsCore.so.3
 lib/libnomacsCore.so.3.6.0
 share/appdata/nomacs.appdata.xml
 share/applications/nomacs.desktop
-share/man/man1/nomacs.1
+share/man/man1/nomacs.1.gz
 %%DATADIR%%/translations/nomacs_als.qm
 %%DATADIR%%/translations/nomacs_ar.qm
 %%DATADIR%%/translations/nomacs_az.qm

Modified: head/graphics/oyranos/pkg-plist
==============================================================================
--- head/graphics/oyranos/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/graphics/oyranos/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -135,9 +135,9 @@ share/locale/eo/LC_MESSAGES/oyranos.mo
 share/locale/eu/LC_MESSAGES/oyranos.mo
 share/locale/fr/LC_MESSAGES/oyranos.mo
 share/locale/ru/LC_MESSAGES/oyranos.mo
-share/man/man1/oyranos-image-display.1
-share/man/man1/oyranos-xforms-fltk.1
-share/man/man1/oyranos-xforms-modules.1
+share/man/man1/oyranos-image-display.1.gz
+share/man/man1/oyranos-xforms-fltk.1.gz
+share/man/man1/oyranos-xforms-modules.1.gz
 share/pixmaps/lcms_logo2.png
 share/pixmaps/oyranos_logo.png
 share/pixmaps/qcmsevents.svg

Modified: head/math/plplot/pkg-plist
==============================================================================
--- head/math/plplot/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/math/plplot/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -197,9 +197,9 @@ libdata/pkgconfig/plplot.pc
 %%PORTDOCS%%%%DOCSDIR%%/README.pkg-config
 %%PORTDOCS%%%%DOCSDIR%%/README.release
 %%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets
-%%TCLTK%%share/man/man1/plserver.1
-%%TCLTK%%share/man/man1/pltcl.1
-%%TCLTK%%share/man/man1/pltek.1
+%%TCLTK%%share/man/man1/plserver.1.gz
+%%TCLTK%%share/man/man1/pltcl.1.gz
+%%TCLTK%%share/man/man1/pltek.1.gz
 %%DATADIR%%/cmap0_alternate.pal
 %%DATADIR%%/cmap0_black_on_white.pal
 %%DATADIR%%/cmap0_default.pal

Modified: head/net/adasockets/pkg-plist
==============================================================================
--- head/net/adasockets/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/net/adasockets/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -25,4 +25,4 @@ lib/adasockets/sockets-utils.ali
 lib/adasockets/sockets.ali
 lib/gnat/adasockets.gpr
 libdata/pkgconfig/adasockets.pc
-share/man/man1/adasockets-config.1
+share/man/man1/adasockets-config.1.gz

Modified: head/net/nfs-ganesha/pkg-plist
==============================================================================
--- head/net/nfs-ganesha/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/net/nfs-ganesha/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -140,5 +140,5 @@ share/doc/ganesha/config_samples/rgw.conf
 share/doc/ganesha/config_samples/rgw_bucket.conf
 share/doc/ganesha/config_samples/vfs.conf
 share/doc/ganesha/config_samples/xfs.conf
-share/man/man8/ganesha_conf.8
+share/man/man8/ganesha_conf.8.gz
 @dir /var/run/ganesha

Modified: head/security/openvas9-manager/pkg-plist
==============================================================================
--- head/security/openvas9-manager/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/security/openvas9-manager/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -22,7 +22,7 @@ sbin/openvasmd
 %%PORTDOCS%%%%DOCSDIR%%/example-openvas-manage-certs.conf
 %%PORTDOCS%%%%DOCSDIR%%/html/omp.html
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/postgres-HOWTO
-share/man/man1/openvas-manage-certs.1
+share/man/man1/openvas-manage-certs.1.gz
 share/openvas/cert/cert_bund_getbyname.xsl
 share/openvas/cert/cert_bund_update.xsl
 share/openvas/cert/cert_db_init.sql

Modified: head/www/roundup/Makefile
==============================================================================
--- head/www/roundup/Makefile	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/www/roundup/Makefile	Wed Jan 15 12:06:13 2020	(r523104)
@@ -30,9 +30,6 @@ SCRIPTS=	roundup-admin roundup-demo roundup-gettext ro
 
 post-install:
 	${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-${PYTHON_VER}/,} ${STAGEDIR}${PREFIX}/bin
-.for f in roundup-admin roundup-demo roundup-mailgw roundup-server
-	${INSTALL_MAN} ${WRKSRC}/share/man/man1/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.endfor
 
 post-install-NLS-on:
 	@(cd ${WRKSRC}/build/share/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/)

Modified: head/www/roundup/pkg-plist
==============================================================================
--- head/www/roundup/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/www/roundup/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -4,14 +4,10 @@ bin/roundup-gettext
 bin/roundup-mailgw
 bin/roundup-server
 bin/roundup-xmlrpc-server
-man/man1/roundup-admin.1.gz
-man/man1/roundup-demo.1.gz
-man/man1/roundup-mailgw.1.gz
-man/man1/roundup-server.1.gz
-share/man/man1/roundup-admin.1
-share/man/man1/roundup-demo.1
-share/man/man1/roundup-mailgw.1
-share/man/man1/roundup-server.1
+share/man/man1/roundup-admin.1.gz
+share/man/man1/roundup-demo.1.gz
+share/man/man1/roundup-mailgw.1.gz
+share/man/man1/roundup-server.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/edit_issue.png
 %%PORTDOCS%%%%DOCSDIR%%/html/_images/index_logged_in.png

Modified: head/www/twms/pkg-plist
==============================================================================
--- head/www/twms/pkg-plist	Wed Jan 15 11:34:57 2020	(r523103)
+++ head/www/twms/pkg-plist	Wed Jan 15 12:06:13 2020	(r523104)
@@ -46,7 +46,7 @@ bin/twms
 %%PYTHON_SITELIBDIR%%/twms/twms.pyc
 %%PYTHON_SITELIBDIR%%/twms/twms.pyo
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-share/man/man1/twms.1
+share/man/man1/twms.1.gz
 %%DATADIR%%/irs_nxt.jpg
 %%DATADIR%%/tools/compile_correction.py
 %%DATADIR%%/tools/decompile_correction.py



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