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

[Kevin Piché]

    Date: Saturday, October 16, 2010 @ 21:43:50
  Author: kevin
Revision: 95196

upgpkg: ntp 4.2.6.p2-1
Updated to 4.2.6p2

Added:
  ntp/trunk/changelog
Modified:
  ntp/trunk/PKGBUILD

-----------+
 PKGBUILD  |   83 +++++++++++++++++++++++++++++++-----------------------------
 changelog |    7 +++++
 2 files changed, 51 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-16 23:12:39 UTC (rev 95195)
+++ PKGBUILD	2010-10-17 01:43:50 UTC (rev 95196)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: kevin <kevin at archlinux.org>
 
 pkgname=ntp
-pkgver=4.2.6
-pkgrel=3
+pkgver=4.2.6.p2
+_realver=4.2.6p2
+pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,66 +13,70 @@
 makedepends=('perl-html-parser')
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
-source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
-        ntp-4.2.4_p7-nano.patch
+changelog=changelog
+source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz
+	ntp-4.2.4_p7-nano.patch
 	fix-ipv6.patch
 	ntp-4.2.4-html2man.patch
-        ntp.conf
-        ntp-client.conf
-        ntpd
-        ntpdate)
-md5sums=('4d64a99592b818aa9419fc9dcb149746' '36c5711228cb0cf48966daa993e06f55'\
-         '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'\
-         '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'\
+	ntp.conf
+	ntp-client.conf
+	ntpd
+	ntpdate)
+md5sums=('cf73cd85f248232c62f8029e6eb05938' '36c5711228cb0cf48966daa993e06f55'
+         '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'
+         '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'
          '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
-sha1sums=('a1f21b23c8c80f35801d59e30ba30779f2025a72' '4de6cd3fad1946146107f86d1f161eb835fbb2d3'\
-         '3632f8a00838f48e484bca24de06db443cc14fff' '7f8783e243e23c8853a9f9fb5b36f467aab8dc15'\
-         '3625ed2aa71d9e0dd04634f32e65d83b76cfe780' 'c8e388f2577b4329da5e77f0455083db6dd97fa8'\
-         'd9b09de9d718a864270e9330e20109e182dfbdd9' '6dfc3b6996f591123ee8938fd0fe7c27eb5c7552')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver" || return 1
+  cd "$srcdir/$pkgname-$_realver"
   # fix glibc build issue
-  patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1
+  patch -Np1 -i ../ntp-4.2.4_p7-nano.patch
   # fix ipv6 support
-  patch -Np1 -i ../fix-ipv6.patch || return 1
+  patch -Np1 -i ../fix-ipv6.patch
   # fix man page generation
-  patch -Np1 -i ../ntp-4.2.4-html2man.patch || return 1
+  patch -Np1 -i ../ntp-4.2.4-html2man.patch
   # configure
+  # 4.2.6p2 not finding rt lib: added LIS
   export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  libtoolize --copy  --force || return 1
-  ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man --enable-linux-caps || return 1
+  libtoolize --copy  --force
+  ac_cv_header_dns_sd_h=0 ./configure LIBS=-lrt --prefix=/usr --mandir=/usr/share/man --enable-linux-caps
 
-  # build and install
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  # build
+  make
+}
 
+package() {
+  cd "$srcdir/$pkgname-$_realver"
+
+  # install
+  make DESTDIR="$pkgdir" install
+
   # install conf files
-  mkdir -p "$pkgdir/usr/share/ntp" || return 1
-  install -D -m644 conf/* "$pkgdir/usr/share/ntp/" || return 1
+  mkdir -p "$pkgdir/usr/share/ntp"
+  install -D -m644 conf/* "$pkgdir/usr/share/ntp/"
 
   # install launch scripts 
-  mkdir -p "$pkgdir/etc/rc.d" || return 1
-  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/" || return 1
+  mkdir -p "$pkgdir/etc/rc.d"
+  install -D -m755 "$srcdir"/{ntpd,ntpdate} "$pkgdir/etc/rc.d/"
 
   # install man pages
   cd html
-  ../scripts/html2man || return 1
-  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] || return 1
+  ../scripts/html2man
+  sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58]
   install -d "$pkgdir"/usr/share/man/man{5,8}
-  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
-  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
-  mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1
+  install -m644 man/man5/* "$pkgdir/usr/share/man/man5/"
+  install -m644 man/man8/* "$pkgdir/usr/share/man/man8/"
+  mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8"
   cd ..
 
   # install sample configs
-  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" || return 1
+  install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf"
   install -D -m644 "$srcdir/ntp-client.conf" \
-  	"$pkgdir/etc/conf.d/ntp-client.conf" || return 1
+  	"$pkgdir/etc/conf.d/ntp-client.conf"
 
   # create /var/lib/ntp
-  mkdir -p "$pkgdir/var/lib/ntp" || return 1
-  touch "$pkgdir/var/lib/ntp/.placeholder" || return 1
+  mkdir -p "$pkgdir/var/lib/ntp"
+  touch "$pkgdir/var/lib/ntp/.placeholder"
 
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+  install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
 }

Added: changelog
===================================================================
--- changelog	                        (rev 0)
+++ changelog	2010-10-17 01:43:50 UTC (rev 95196)
@@ -0,0 +1,7 @@
+2010-10-16  kevin  <kevin at archlinux.org>
+
+    * ntp 4.2.6p2
+    - Added changelog
+    - Set LIBS to use librt since configure doesn't set it
+    - Convert PKGBUILD to build()/package() format
+    - removed "|| return 1"