Skip to content

Commit

Permalink
misc/freebsd-doc-*: Enable HTML in all languages and Simplify ports
Browse files Browse the repository at this point in the history
Several improvements with this change:

Overall cleanup.

Simplify plists.

Make the HTML option default for all languages.

Non-English ports must build the HTML English version together, and the
shared files are stored in the freebsd-doc-en port.

Fix some image's src addresses on freebsd-doc-en.

Point MASTER_SITES to LOCAL/doceng; it's a shared folder with the team.

It's necessary to choose at least one option.

Reviewed by:	doceng (blackend)
Differential Revision: https://reviews.freebsd.org/D39632
  • Loading branch information
dbaio committed Apr 25, 2023
1 parent 6fc7c89 commit dad58c1
Show file tree
Hide file tree
Showing 107 changed files with 2,353 additions and 4,860 deletions.
2 changes: 1 addition & 1 deletion misc/freebsd-doc-all/Makefile
@@ -1,5 +1,5 @@
PORTNAME= freebsd-doc-all
PORTVERSION= 20230410
PORTVERSION= 20230420
PORTEPOCH= 1
CATEGORIES= misc docs

Expand Down
3 changes: 3 additions & 0 deletions misc/freebsd-doc-bn/Makefile
Expand Up @@ -7,6 +7,9 @@ COMMENT= Bengali translation of the FreeBSD Documentation Project
MASTERDIR= ${.CURDIR}/../freebsd-doc-en
PLIST= ${.CURDIR}/pkg-plist

# en-freebsd-doc installs the common files
HTML_RUN_DEPENDS= en-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-en

DOCLANG= bn-bd

.include "${MASTERDIR}/Makefile"
4 changes: 4 additions & 0 deletions misc/freebsd-doc-bn/pkg-plist
@@ -0,0 +1,4 @@
%%HTML%%%%DOCBASE%%/bn-bd/articles/explaining-bsd/index.html
%%HTML%%%%DOCBASE%%/bn-bd/articles/new-users/index.html
%%PDF%%%%DOCBASE%%/bn-bd/articles/explaining-bsd/explaining-bsd_bn-bd.pdf
%%PDF%%%%DOCBASE%%/bn-bd/articles/new-users/new-users_bn-bd.pdf
2 changes: 0 additions & 2 deletions misc/freebsd-doc-bn/pkg-plist.html

This file was deleted.

9 changes: 0 additions & 9 deletions misc/freebsd-doc-bn/pkg-plist.html-common

This file was deleted.

Binary file removed misc/freebsd-doc-bn/pkg-plist.pdf
Binary file not shown.
3 changes: 3 additions & 0 deletions misc/freebsd-doc-da/Makefile
Expand Up @@ -7,6 +7,9 @@ COMMENT= Danish translation of the FreeBSD Documentation Project
MASTERDIR= ${.CURDIR}/../freebsd-doc-en
PLIST= ${.CURDIR}/pkg-plist

# en-freebsd-doc installs the common files
HTML_RUN_DEPENDS= en-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-en

DOCLANG= da

.include "${MASTERDIR}/Makefile"
2 changes: 2 additions & 0 deletions misc/freebsd-doc-da/pkg-plist
@@ -0,0 +1,2 @@
%%HTML%%%%DOCBASE%%/da/articles/ipsec-must/index.html
%%PDF%%%%DOCBASE%%/da/articles/ipsec-must/ipsec-must_da.pdf
1 change: 0 additions & 1 deletion misc/freebsd-doc-da/pkg-plist.html

This file was deleted.

9 changes: 0 additions & 9 deletions misc/freebsd-doc-da/pkg-plist.html-common

This file was deleted.

Binary file removed misc/freebsd-doc-da/pkg-plist.pdf
Binary file not shown.
3 changes: 3 additions & 0 deletions misc/freebsd-doc-de/Makefile
Expand Up @@ -7,6 +7,9 @@ COMMENT= German translation of the FreeBSD Documentation Project
MASTERDIR= ${.CURDIR}/../freebsd-doc-en
PLIST= ${.CURDIR}/pkg-plist

# en-freebsd-doc installs the common files
HTML_RUN_DEPENDS= en-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-en

DOCLANG= de

.include "${MASTERDIR}/Makefile"
101 changes: 101 additions & 0 deletions misc/freebsd-doc-de/pkg-plist
@@ -0,0 +1,101 @@
%%HTML%%%%DOCBASE%%/de/articles/contributing/index.html
%%HTML%%%%DOCBASE%%/de/articles/explaining-bsd/index.html
%%HTML%%%%DOCBASE%%/de/articles/freebsd-update-server/index.html
%%HTML%%%%DOCBASE%%/de/articles/leap-seconds/index.html
%%HTML%%%%DOCBASE%%/de/articles/linux-users/index.html
%%HTML%%%%DOCBASE%%/de/articles/nanobsd/index.html
%%HTML%%%%DOCBASE%%/de/articles/new-users/index.html
%%HTML%%%%DOCBASE%%/de/articles/port-mentor-guidelines/index.html
%%HTML%%%%DOCBASE%%/de/articles/solid-state/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/bibliography/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/book/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/introduction/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/ipv6/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/kernelbuild/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/kerneldebug/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/l10n/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/parti/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/partii/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/partiii/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/partiv/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/partv/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/policies/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/secure/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/sockets/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/testing/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/tools/index.html
%%HTML%%%%DOCBASE%%/de/books/developers-handbook/x86/index.html
%%HTML%%%%DOCBASE%%/de/books/faq/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/advanced-networking/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/audit/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/basics/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/bibliography/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/book/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/boot/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/bsdinstall/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/config/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/cutting-edge/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/desktop/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/disks/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/dtrace/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/eresources/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/filesystems/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/firewalls/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/geom/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/introduction/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/jails/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/kernelconfig/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/l10n/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/linuxemu/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/mac/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/mail/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/mirrors/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/multimedia/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/network-servers/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/parti/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/partii/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/partiii/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/partiv/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/partv/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/pgpkeys/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/ports/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/ppp-and-slip/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/preface/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/printing/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/security/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/serialcomms/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/usb-device-mode/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/virtualization/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/x11/index.html
%%HTML%%%%DOCBASE%%/de/books/handbook/zfs/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/book/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/keeping-up/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/makefile/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/own-port/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/pkg-files/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/plist/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/port-upgrading/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/porting-dads/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/porting-samplem/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/quick-porting/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/security/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/slow/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/special/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/testing/index.html
%%HTML%%%%DOCBASE%%/de/books/porters-handbook/why-port/index.html
%%PDF%%%%DOCBASE%%/de/articles/contributing/contributing_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/explaining-bsd/explaining-bsd_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/freebsd-update-server/freebsd-update-server_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/leap-seconds/leap-seconds_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/linux-users/linux-users_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/nanobsd/nanobsd_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/new-users/new-users_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/port-mentor-guidelines/port-mentor-guidelines_de.pdf
%%PDF%%%%DOCBASE%%/de/articles/solid-state/solid-state_de.pdf
%%PDF%%%%DOCBASE%%/de/books/developers-handbook/developers-handbook_de.pdf
%%PDF%%%%DOCBASE%%/de/books/faq/faq_de.pdf
%%PDF%%%%DOCBASE%%/de/books/handbook/handbook_de.pdf
%%PDF%%%%DOCBASE%%/de/books/porters-handbook/porters-handbook_de.pdf
2 changes: 0 additions & 2 deletions misc/freebsd-doc-de/pkg-plist.extras

This file was deleted.

13 changes: 0 additions & 13 deletions misc/freebsd-doc-de/pkg-plist.html

This file was deleted.

0 comments on commit dad58c1

Please sign in to comment.