[arch-commits] Commit in ntp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, March 24, 2009 @ 01:20:30
  Author: eric
Revision: 31035

Merged revisions 31034 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ntp/trunk

........
  r31034 | eric | 2009-03-24 01:20:10 -0400 (Tue, 24 Mar 2009) | 2 lines
  
  upgpkg: ntp 4.2.4p6-3
      Fixed man page conflict with openntpd (close FS#13917)
........

Modified:
  ntp/repos/extra-x86_64/	(properties)
  ntp/repos/extra-x86_64/PKGBUILD

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


Property changes on: ntp/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ntp/trunk:1-30836
   + /ntp/trunk:1-31034

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-24 05:20:10 UTC (rev 31034)
+++ extra-x86_64/PKGBUILD	2009-03-24 05:20:30 UTC (rev 31035)
@@ -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