[arch-commits] Commit in ntp/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, March 24, 2009 @ 01:20:10
  Author: eric
Revision: 31034

upgpkg: ntp 4.2.4p6-3
    Fixed man page conflict with openntpd (close FS#13917)

Modified:
  ntp/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-24 04:10:51 UTC (rev 31033)
+++ PKGBUILD	2009-03-24 05:20:10 UTC (rev 31034)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=ntp
 pkgver=4.2.4p6
-pkgrel=2
+pkgrel=3
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -34,15 +34,14 @@
   mkdir -p $startdir/pkg/etc/rc.d || return 1
   install -D -m755 $startdir/src/{ntpd,ntpdate} $startdir/pkg/etc/rc.d/ || return 1
 
-  # install and remove duplicate man pages
-  install -d $startdir/pkg/usr/share/man/man{5,8}
-  install -D -m644 $startdir/src/man/*.5 \
+  # install man pages
+  install -d $startdir/pkg/usr/share/man/man{1,5}
+  install -m644 $startdir/src/man/*.5 \
   	$startdir/pkg/usr/share/man/man5/ || return 1
-  install -D -m644 $startdir/src/man/*.8 \
-  	$startdir/pkg/usr/share/man/man8/ || return 1
-  rm $startdir/pkg/usr/share/man/man1/{ntpd.1,ntpdc.1,ntpdsim.1,ntpq.1,ntp-keygen.1}
-  rm $startdir/pkg/usr/share/man/man8/ntpdsim.8
-  mv $startdir/pkg/usr/share/man/man8/keygen.8 $startdir/pkg/usr/share/man/man8/ntp-keygen.8
+  for i in $startdir/src/man/*.8 ; do
+    install -m644 $i $startdir/pkg/usr/share/man/man1/$(basename $i .8).1 || return 1
+  done
+  mv $startdir/pkg/usr/share/man/man1/keygen.1 $startdir/pkg/usr/share/man/man1/ntp-keygen.1 || return 1
 
   # install sample configs
   install -D -m644 $startdir/src/ntp.conf $startdir/pkg/etc/ntp.conf || return 1