aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO_8859-1/books
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1999-09-11 10:42:32 +0000
committerSatoshi Asami <asami@FreeBSD.org>1999-09-11 10:42:32 +0000
commit96e2c89d72f88f03a74c873b0ea1b4509ca18210 (patch)
tree63213e29d5e2e379855dff36060bed846ac2d412 /en_US.ISO_8859-1/books
parent3199ea63100620d3b3c745641311e42e66ae3d38 (diff)
downloaddoc-96e2c89d72f88f03a74c873b0ea1b4509ca18210.tar.gz
doc-96e2c89d72f88f03a74c873b0ea1b4509ca18210.zip
No need to create info/dir by yourself -- install-info does it now.
Notes
Notes: svn path=/head/; revision=5600
Diffstat (limited to 'en_US.ISO_8859-1/books')
-rw-r--r--en_US.ISO_8859-1/books/handbook/ports/chapter.sgml32
-rw-r--r--en_US.ISO_8859-1/books/porters-handbook/book.sgml32
2 files changed, 22 insertions, 42 deletions
diff --git a/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
index 0fd91624ee..d83f409d40 100644
--- a/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD$
+ $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.54 1999/09/06 06:53:02 peter Exp $
-->
<chapter id="ports">
@@ -2686,10 +2686,12 @@ diff -u -r1.15 PLIST
<step>
<para>Add a <maketarget>post-install</maketarget> target to the
- <filename>Makefile</filename> to create a <filename>dir</filename>
- file if it is not there. Also, call
- <maketarget>install-info</maketarget> with the installed info
- files.</para>
+ <filename>Makefile</filename> to call
+ <maketarget>install-info</maketarget> with the installed
+ info files. (It is no longer necessary to create the
+ <filename>dir</filename> file yourself;
+ <command>install-info</command> automatically creates this
+ file if it does not exist.)</para>
<programlisting>
Index: Makefile
@@ -2699,34 +2701,23 @@ retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile 1996/11/19 13:14:40 1.26
+++ Makefile 1997/05/20 10:25:09 1.28
-@@ -20,5 +20,11 @@
+@@ -20,5 +20,8 @@
post-install:
.for file in emacs-19.34 emacsclient etags ctags b2m
strip ${PREFIX}/bin/${file}
.endfor
-+ if [ ! -f ${PREFIX}/info/dir ]; then \
-+ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-+ fi
+.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
+ install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.endfor
.include &lt;bsd.port.mk&gt;</programlisting>
-
- <para>Do not use anything other than
- <filename>/usr/share/info/dir</filename> and the above command to
- create a new info file. In fact, I would add the first three lines
- of the above patch to <filename>bsd.port.mk</filename> if you (the
- porter) would not have to do it in <filename>PLIST</filename> by
- yourself anyway.</para>
</step>
<step>
<para>Edit <filename>PLIST</filename> and add equivalent
<literal>@exec</literal> statements and also
- <literal>@unexec</literal> for <command>pkg_delete</command>. You
- do not need to delete <filename>info/dir</filename> with
- <literal>@unexec</literal>.</para>
+ <literal>@unexec</literal> for
+ <command>pkg_delete</command>.</para>
<programlisting>
Index: pkg/PLIST
@@ -2736,7 +2727,7 @@ retrieving revision 1.15
diff -u -r1.15 PLIST
--- PLIST 1997/03/04 08:04:00 1.15
+++ PLIST 1997/05/20 10:25:12 1.17
-@@ -16,7 +14,15 @@
+@@ -16,7 +14,14 @@
man/man1/etags.1.gz
man/man1/ctags.1.gz
+@unexec install-info --delete %D/info/emacs %D/info/dir
@@ -2747,7 +2738,6 @@ diff -u -r1.15 PLIST
@@ -87,6 +94,18 @@
info/viper-3
info/viper-4
-+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/emacs %D/info/dir
:
+@exec install-info %D/info/ccmode %D/info/dir
diff --git a/en_US.ISO_8859-1/books/porters-handbook/book.sgml b/en_US.ISO_8859-1/books/porters-handbook/book.sgml
index 0fd91624ee..d83f409d40 100644
--- a/en_US.ISO_8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO_8859-1/books/porters-handbook/book.sgml
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD$
+ $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/ports/chapter.sgml,v 1.54 1999/09/06 06:53:02 peter Exp $
-->
<chapter id="ports">
@@ -2686,10 +2686,12 @@ diff -u -r1.15 PLIST
<step>
<para>Add a <maketarget>post-install</maketarget> target to the
- <filename>Makefile</filename> to create a <filename>dir</filename>
- file if it is not there. Also, call
- <maketarget>install-info</maketarget> with the installed info
- files.</para>
+ <filename>Makefile</filename> to call
+ <maketarget>install-info</maketarget> with the installed
+ info files. (It is no longer necessary to create the
+ <filename>dir</filename> file yourself;
+ <command>install-info</command> automatically creates this
+ file if it does not exist.)</para>
<programlisting>
Index: Makefile
@@ -2699,34 +2701,23 @@ retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile 1996/11/19 13:14:40 1.26
+++ Makefile 1997/05/20 10:25:09 1.28
-@@ -20,5 +20,11 @@
+@@ -20,5 +20,8 @@
post-install:
.for file in emacs-19.34 emacsclient etags ctags b2m
strip ${PREFIX}/bin/${file}
.endfor
-+ if [ ! -f ${PREFIX}/info/dir ]; then \
-+ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-+ fi
+.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
+ install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.endfor
.include &lt;bsd.port.mk&gt;</programlisting>
-
- <para>Do not use anything other than
- <filename>/usr/share/info/dir</filename> and the above command to
- create a new info file. In fact, I would add the first three lines
- of the above patch to <filename>bsd.port.mk</filename> if you (the
- porter) would not have to do it in <filename>PLIST</filename> by
- yourself anyway.</para>
</step>
<step>
<para>Edit <filename>PLIST</filename> and add equivalent
<literal>@exec</literal> statements and also
- <literal>@unexec</literal> for <command>pkg_delete</command>. You
- do not need to delete <filename>info/dir</filename> with
- <literal>@unexec</literal>.</para>
+ <literal>@unexec</literal> for
+ <command>pkg_delete</command>.</para>
<programlisting>
Index: pkg/PLIST
@@ -2736,7 +2727,7 @@ retrieving revision 1.15
diff -u -r1.15 PLIST
--- PLIST 1997/03/04 08:04:00 1.15
+++ PLIST 1997/05/20 10:25:12 1.17
-@@ -16,7 +14,15 @@
+@@ -16,7 +14,14 @@
man/man1/etags.1.gz
man/man1/ctags.1.gz
+@unexec install-info --delete %D/info/emacs %D/info/dir
@@ -2747,7 +2738,6 @@ diff -u -r1.15 PLIST
@@ -87,6 +94,18 @@
info/viper-3
info/viper-4
-+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/emacs %D/info/dir
:
+@exec install-info %D/info/ccmode %D/info/dir