summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-08 03:42:28 +0000
committerMike Frysinger <vapier@gentoo.org>2011-04-08 03:42:28 +0000
commit664447ebb67419df519768f5ba330c9363cf3507 (patch)
tree72d341d01102564ee4b16179e0e5b0e68b7a6661 /net-misc
parentadd patch for building with gcc46 (bug #362371) (diff)
downloadhistorical-664447ebb67419df519768f5ba330c9363cf3507.tar.gz
historical-664447ebb67419df519768f5ba330c9363cf3507.tar.bz2
historical-664447ebb67419df519768f5ba330c9363cf3507.zip
trim some freebsd-specific pieces from the man page #354835 by Sergey S. Starikoff
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ntp/Manifest11
-rwxr-xr-xnet-misc/ntp/files/man-pages/genmans.sh7
-rw-r--r--net-misc/ntp/files/man-pages/ntp.conf.5.patch27
3 files changed, 40 insertions, 5 deletions
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index b066c772ed3b..51e17a60d651 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,7 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX man-pages/genmans.sh 1925 RMD160 97a28b5e8b074f8691f46fd9f17ade32be104782 SHA1 f55923837e7536e36c92a56e570ab4ef94eedca7 SHA256 4471387034c2ef6dd9e23bedddc1ec7ae12baf084704c18a842bea5e5a181322
+AUX man-pages/genmans.sh 2023 RMD160 c33ab937243d683a87693946a2eb6e63ff5df4b6 SHA1 c3bec5cf5481e9b816d0dcb7e5300f374c6c54bc SHA256 8f0867cbb66b30787a75ff1464765bb6d6bf541923c23d4aa33791c5b6b150de
+AUX man-pages/ntp.conf.5.patch 503 RMD160 f2180ead822ceef3248050e52f8fd4045d88db62 SHA1 8222a771b88002ed119b45f5d19060f9609d4eea SHA256 d26c1006d72d76591588fbd058000596b17b0b9bcbd184d4e6cedbc31c3b1027
AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d
AUX man-pages/ntpdc.html.patch 1620 RMD160 0d240cb9b547b7a056b4f08a93385f5c1f4dca6a SHA1 64376272f02c9027d3715b97ab88816b73f0b618 SHA256 3b7295dba123c9922c1e375228f82707582ffa0add0177ad000a123df3852578
AUX ntp-4.2.4_p5-adjtimex.patch 670 RMD160 54cb1f9e8bf872044cc6e9f2a8a469f03d29af00 SHA1 53b437ce6c200cb9a1d4a1f4b0e543ea6e2c268a SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38
@@ -24,9 +25,9 @@ EBUILD ntp-4.2.6_p3.ebuild 3749 RMD160 d525f29699f90021bdf74581995e39c29855c847
MISC ChangeLog 22592 RMD160 11b5ebee52f5e2db1af1ecc5e38387f611e72e90 SHA1 4642ffc153d29ee66801a2b76d13795e7909d618 SHA256 c36558e6bd61b00864d0e89eb169660b286081f129dd2994337435584dd7f902
MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk0mP84ACgkQaC/OocHi7JZbPwD/Wn5F0Orta1ySqvjFh/yzW1jm
-E00R6Owzcp3MUoDrM0gA/2D/ekyr5mSfenqZJoheZeXTcAs3NlwdEzRpELzBPWIs
-=qvsy
+iF4EAREIAAYFAk2ehCoACgkQaC/OocHi7Jb07QD/VdSbKgJpbk6DhOE5Vp0YOB1t
+Y7AxG9ykY+l7EOgKI0gA/0/TJ9OnF2aqijTuHHCRiC6NplW2wRttJSUc3lK0WItS
+=M13H
-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/man-pages/genmans.sh b/net-misc/ntp/files/man-pages/genmans.sh
index 78b0a00573b5..fb3c2896c109 100755
--- a/net-misc/ntp/files/man-pages/genmans.sh
+++ b/net-misc/ntp/files/man-pages/genmans.sh
@@ -66,6 +66,13 @@ done
echo
cp -vi /usr/local/src/freebsd/src/usr.sbin/ntp/doc/*.5 ${MANDIR}
+(
+d=${PWD}
+cd ${MANDIR}
+for p in $d/*.5.patch ; do
+ patch -F0 -p0 < $p || exit 1
+done
+) || exit 1
cp -vi ${SRCDIR}/*.patch ${SRCDIR}/genmans.sh ${SRCDIR}/ntp.xsl ${MANDIR}
tar -jcf ${VERSION}-manpages.tar.bz2 -C ${MANDIR}/.. man
diff --git a/net-misc/ntp/files/man-pages/ntp.conf.5.patch b/net-misc/ntp/files/man-pages/ntp.conf.5.patch
new file mode 100644
index 000000000000..c3d812302297
--- /dev/null
+++ b/net-misc/ntp/files/man-pages/ntp.conf.5.patch
@@ -0,0 +1,27 @@
+--- ntp.conf.5
++++ ntp.conf.5
+@@ -24,16 +24,6 @@
+ .Fl c
+ command line option).
+ .Pp
+-The
+-.Pa /etc/rc.d/ntpdate
+-script reads this file to get a list of NTP servers to use if the
+-variable
+-.Dq Li ntpdate_hosts
+-was not declared.
+-Refer to the
+-.Xr rc.conf 5
+-man page for further info about this.
+-.Pp
+ The file format is similar to other
+ .Ux
+ configuration files.
+@@ -2686,7 +2676,6 @@
+ Diffie-Hellman agreement parameters
+ .El
+ .Sh SEE ALSO
+-.Xr rc.conf 5 ,
+ .Xr ntpd 8 ,
+ .Xr ntpdc 8 ,
+ .Xr ntpq 8