Skip to content

Commit

Permalink
Add LOCALBASE/share/man to the valid path for manpages
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bapt
bapt committed Jan 15, 2020
1 parent f9be5b1 commit 003a571
Show file tree
Hide file tree
Showing 20 changed files with 49 additions and 35 deletions.
1 change: 1 addition & 0 deletions Mk/bsd.port.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2681,6 +2681,7 @@ SCRIPTS_ENV+= BATCH=yes
MANPREFIX?= /usr/share
.else
MANPREFIX?= ${PREFIX}
MANDIRS+= ${PREFIX}/share/man
.endif

MANDIRS+= ${MANPREFIX}/man
Expand Down
20 changes: 20 additions & 0 deletions Templates/BSD.local.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,26 @@
..
..
..
man
man1
..
man2
..
man3
..
man4
..
man5
..
man6
..
man7
..
man8
..
man9
..
..
misc
..
nls
Expand Down
2 changes: 1 addition & 1 deletion deskutils/fff/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions devel/kf5-kapidox/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion dns/dnsdbq/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions emulators/qemu-cheri/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion games/hexalate/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion games/jumpnbump/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion games/peg-e/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion games/tanglet/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion games/tetzle/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion graphics/nomacs/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions graphics/oyranos/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions math/plplot/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion net/adasockets/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion net/nfs-ganesha/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion security/openvas9-manager/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions www/roundup/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
12 changes: 4 additions & 8 deletions www/roundup/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion www/twms/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 003a571

Please sign in to comment.