aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2020-01-15 12:06:13 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2020-01-15 12:06:13 +0000
commit003a571d1d6585196545295efc181514f171c4c4 (patch)
tree06d0cd32ad10cba97523b42d83bfe390d9ea1421
parentf9be5b164cbf9f2c43786754e82821c59a1a8007 (diff)
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
Notes
svn path=/head/; revision=523104
-rw-r--r--Mk/bsd.port.mk1
-rw-r--r--Templates/BSD.local.dist20
-rw-r--r--deskutils/fff/Makefile2
-rw-r--r--devel/kf5-kapidox/pkg-plist6
-rw-r--r--dns/dnsdbq/Makefile2
-rw-r--r--emulators/qemu-cheri/pkg-plist6
-rw-r--r--games/hexalate/pkg-plist2
-rw-r--r--games/jumpnbump/pkg-plist2
-rw-r--r--games/peg-e/pkg-plist2
-rw-r--r--games/tanglet/pkg-plist2
-rw-r--r--games/tetzle/pkg-plist2
-rw-r--r--graphics/nomacs/pkg-plist2
-rw-r--r--graphics/oyranos/pkg-plist6
-rw-r--r--math/plplot/pkg-plist6
-rw-r--r--net/adasockets/pkg-plist2
-rw-r--r--net/nfs-ganesha/pkg-plist2
-rw-r--r--security/openvas9-manager/pkg-plist2
-rw-r--r--www/roundup/Makefile3
-rw-r--r--www/roundup/pkg-plist12
-rw-r--r--www/twms/pkg-plist2
20 files changed, 49 insertions, 35 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7872f35592a5..56a0089e3874 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2681,6 +2681,7 @@ SCRIPTS_ENV+= BATCH=yes
MANPREFIX?= /usr/share
.else
MANPREFIX?= ${PREFIX}
+MANDIRS+= ${PREFIX}/share/man
.endif
MANDIRS+= ${MANPREFIX}/man
diff --git a/Templates/BSD.local.dist b/Templates/BSD.local.dist
index 80ebde088673..40ee6672253c 100644
--- a/Templates/BSD.local.dist
+++ b/Templates/BSD.local.dist
@@ -644,6 +644,26 @@
..
..
..
+ man
+ man1
+ ..
+ man2
+ ..
+ man3
+ ..
+ man4
+ ..
+ man5
+ ..
+ man6
+ ..
+ man7
+ ..
+ man8
+ ..
+ man9
+ ..
+ ..
misc
..
nls
diff --git a/deskutils/fff/Makefile b/deskutils/fff/Makefile
index d6994091769f..bf1d107d5523 100644
--- a/deskutils/fff/Makefile
+++ b/deskutils/fff/Makefile
@@ -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>
diff --git a/devel/kf5-kapidox/pkg-plist b/devel/kf5-kapidox/pkg-plist
index 90faefeb1c09..3ac2842b25fd 100644
--- a/devel/kf5-kapidox/pkg-plist
+++ b/devel/kf5-kapidox/pkg-plist
@@ -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
diff --git a/dns/dnsdbq/Makefile b/dns/dnsdbq/Makefile
index d5954a34e62d..e55965230976 100644
--- a/dns/dnsdbq/Makefile
+++ b/dns/dnsdbq/Makefile
@@ -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>
diff --git a/emulators/qemu-cheri/pkg-plist b/emulators/qemu-cheri/pkg-plist
index 63be0dcfde79..77d55b237493 100644
--- a/emulators/qemu-cheri/pkg-plist
+++ b/emulators/qemu-cheri/pkg-plist
@@ -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
diff --git a/games/hexalate/pkg-plist b/games/hexalate/pkg-plist
index 56b7475ac0d4..8cfa17034aa4 100644
--- a/games/hexalate/pkg-plist
+++ b/games/hexalate/pkg-plist
@@ -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
diff --git a/games/jumpnbump/pkg-plist b/games/jumpnbump/pkg-plist
index b64076b95c77..ce14eddee290 100644
--- a/games/jumpnbump/pkg-plist
+++ b/games/jumpnbump/pkg-plist
@@ -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
diff --git a/games/peg-e/pkg-plist b/games/peg-e/pkg-plist
index 7ada1224a182..562a15f8545d 100644
--- a/games/peg-e/pkg-plist
+++ b/games/peg-e/pkg-plist
@@ -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
diff --git a/games/tanglet/pkg-plist b/games/tanglet/pkg-plist
index 5b075d1969ce..6f94f3f81139 100644
--- a/games/tanglet/pkg-plist
+++ b/games/tanglet/pkg-plist
@@ -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
diff --git a/games/tetzle/pkg-plist b/games/tetzle/pkg-plist
index 54195a01dca4..7e16ccf0c7f0 100644
--- a/games/tetzle/pkg-plist
+++ b/games/tetzle/pkg-plist
@@ -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
diff --git a/graphics/nomacs/pkg-plist b/graphics/nomacs/pkg-plist
index 53d009bbbdbd..efa41f72757c 100644
--- a/graphics/nomacs/pkg-plist
+++ b/graphics/nomacs/pkg-plist
@@ -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
diff --git a/graphics/oyranos/pkg-plist b/graphics/oyranos/pkg-plist
index 0eed119e4eb9..6d6a3091d589 100644
--- a/graphics/oyranos/pkg-plist
+++ b/graphics/oyranos/pkg-plist
@@ -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
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index d8ed7c53a924..abd8a8ff48e7 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -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
diff --git a/net/adasockets/pkg-plist b/net/adasockets/pkg-plist
index 440897167a54..482264f57fff 100644
--- a/net/adasockets/pkg-plist
+++ b/net/adasockets/pkg-plist
@@ -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
diff --git a/net/nfs-ganesha/pkg-plist b/net/nfs-ganesha/pkg-plist
index 13163b084da2..0254f88715ae 100644
--- a/net/nfs-ganesha/pkg-plist
+++ b/net/nfs-ganesha/pkg-plist
@@ -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
diff --git a/security/openvas9-manager/pkg-plist b/security/openvas9-manager/pkg-plist
index c4fa8f70832d..f0bba538750e 100644
--- a/security/openvas9-manager/pkg-plist
+++ b/security/openvas9-manager/pkg-plist
@@ -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
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index cb5d8dc4e661..058352c5eee2 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -30,9 +30,6 @@ SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \
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/)
diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist
index 439861b8db4c..e52b46bcc832 100644
--- a/www/roundup/pkg-plist
+++ b/www/roundup/pkg-plist
@@ -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
diff --git a/www/twms/pkg-plist b/www/twms/pkg-plist
index 55d260fd5420..58e1a33f9d34 100644
--- a/www/twms/pkg-plist
+++ b/www/twms/pkg-plist
@@ -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