Page MenuHomeFreeBSD
Files F154784957

D37143.id112310.diff
No OneTemporary
Actions

D37143.id112310.diff
View Options

Index: documentation/Makefile
===================================================================
--- documentation/Makefile
+++ documentation/Makefile
@@ -32,17 +32,18 @@
ALL_LANGUAGES= bn-bd da de el en es fr hu id it ja ko mn nl pl pt-br ru tr zh-cn zh-tw
LOCALBASE?= /usr/local
+GEM_PATH?= ${LOCALBASE}
-RUBY_CMD = ${LOCALBASE}/bin/ruby
+RUBY_CMD = ${GEM_PATH}/bin/ruby
HUGO_CMD = ${LOCALBASE}/bin/hugo
HUGO_ARGS?= --verbose --minify
HUGO_OFFLINE_ARGS?= --environment offline --verbose --minify
-ASCIIDOCTOR_CMD= ${LOCALBASE}/bin/asciidoctor
-ASCIIDOCTORPDF_CMD= ${LOCALBASE}/bin/asciidoctor-pdf
+ASCIIDOCTOR_CMD= ${GEM_PATH}/bin/asciidoctor
+ASCIIDOCTORPDF_CMD= ${GEM_PATH}/bin/asciidoctor-pdf
.if defined(DOC_LANG) && !empty(DOC_LANG)
LANGUAGES= ${DOC_LANG:S/,/ /g}
-.if ${LANGUAGES:Men} == "" && ${.TARGETS:Mpdf*} == "" && ${.TARGETS:Mhtml*} == ""
+.if ${LANGUAGES:Men} == "" && ${TARGETS:Mpdf*} == "" && ${.TARGETS:Mhtml*} == ""
.warning "Warning: cannot skip 'en'; adding it back"
LANGUAGES+= en
.endif
@@ -54,8 +55,8 @@
.export RUBYLIB
RUN_DEPENDS= ${HUGO_CMD} \
- ${LOCALBASE}/bin/asciidoctor \
- ${LOCALBASE}/bin/rougify
+ ${GEM_PATH}/bin/asciidoctor \
+ ${GEM_PATH}/bin/rougify
.ifndef HOSTNAME
. ifdef BIND
@@ -111,13 +112,13 @@
.endfor
requirements-pdf:
-.if !exists(${LOCALBASE}/bin/asciidoctor-pdf)
- @(echo ${LOCALBASE}/bin/asciidoctor-pdf not found, please run 'pkg install rubygem-asciidoctor-pdf'; exit 1)
+.if !exists(${GEM_PATH}/bin/asciidoctor-pdf)
+ @(echo ${GEM_PATH}/bin/asciidoctor-pdf not found, please run 'pkg install rubygem-asciidoctor-pdf'; exit 1)
.endif
requirements-epub:
-.if !exists(${LOCALBASE}/bin/asciidoctor-epub3)
- @(echo ${LOCALBASE}/bin/asciidoctor-epub3 not found, please run 'pkg install rubygem-asciidoctor-epub3'; exit 1)
+.if !exists(${GEM_PATH}/bin/asciidoctor-epub3)
+ @(echo ${GEM_PATH}/bin/asciidoctor-epub3 not found, please run 'pkg install rubygem-asciidoctor-epub3'; exit 1)
.endif
starting-message: .PHONY
Index: documentation/content/en/books/fdp-primer/overview/_index.adoc
===================================================================
--- documentation/content/en/books/fdp-primer/overview/_index.adoc
+++ documentation/content/en/books/fdp-primer/overview/_index.adoc
@@ -251,21 +251,21 @@
+
[source,shell]
....
-$ brew install hugo ruby git bmake asciidoctor
+$ brew install hugo ruby git bmake
....
+
. Add Ruby to the Path.
+
[source,shell]
....
-$ echo 'export PATH="/usr/local/opt/ruby/bin:$PATH"' >> ~/.zshrc
+$ echo 'export PATH="$(brew --prefix ruby)/bin:$PATH"' >> ~/.zshrc
....
+
. Install the rouge package using RubyGem.
+
[source,shell]
....
-$ sudo gem install rouge
+$ sudo gem install rouge asciidoctor asciidoctor-pdf asciidoctor-epub3
....
+
. Install a local working copy of the documentation from the FreeBSD repository in [.filename]#~/doc# (see crossref:working-copy[working-copy,The Working Copy]).
@@ -284,7 +284,7 @@
+
[source,shell]
....
-$ bmake run LOCALBASE=/usr
+$ bmake run LOCALBASE=/usr GEM_PATH=/usr/local/lib/ruby/gems/[ruby_version]
....
. Add all the files with `git add .`, then review the diff with `git diff`. For example:
+

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 11:00 AM (18 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32499977
Default Alt Text
D37143.id112310.diff (3 KB)

Event Timeline