[arch-commits] Commit in tftp-hpa/repos (3 files)

[Eric Bélanger]

    Date: Saturday, May 2, 2009 @ 18:51:20
  Author: eric
Revision: 37555

Merged revisions 37550 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/tftp-hpa/trunk

........
  r37550 | eric | 2009-05-02 18:15:34 -0400 (Sat, 02 May 2009) | 2 lines
  
  upgpkg: tftp-hpa 5.0-2
      Removed termcap-compat depends, Added license, Added backup array
........

Added:
  tftp-hpa/repos/extra-i686/LICENSE
    (from rev 37550, tftp-hpa/trunk/LICENSE)
Modified:
  tftp-hpa/repos/extra-i686/	(properties)
  tftp-hpa/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   32 ++++++++++++++++++++++++++++++++
 PKGBUILD |   18 ++++++++++--------
 2 files changed, 42 insertions(+), 8 deletions(-)


Property changes on: tftp-hpa/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /tftp-hpa/trunk:1-28699
   + /tftp-hpa/trunk:1-37554

Copied: tftp-hpa/repos/extra-i686/LICENSE (from rev 37550, tftp-hpa/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-05-02 22:51:20 UTC (rev 37555)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-02 22:41:32 UTC (rev 37554)
+++ extra-i686/PKGBUILD	2009-05-02 22:51:20 UTC (rev 37555)
@@ -3,13 +3,17 @@
 # Contributor: Jose Javier  <jojapa at terra.es>
 pkgname=tftp-hpa
 pkgver=5.0
-pkgrel=1
-pkgdesc="official tftp server"
+pkgrel=2
+pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
-depends=('tcp_wrappers' 'termcap-compat')
+url="http://www.kernel.org/pub/software/network/tftp/"
+license=('BSD')
+depends=('tcp_wrappers')
 conflicts=('netkit-tftp')
-source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf)
-url="http://www.kernel.org/pub/software/network/tftp/"
+backup=('etc/conf.d/tftpd')
+source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE)
+md5sums=('1ae813a94670f0d8c294aafa9f5ecf65' 'a974d02526f19222146c8e3d3b598871'\
+         '414a79dc891bced056d99a9bb790fc9e' '6ce21e27b6fdc1a1adf85c81e42aeecf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +25,5 @@
   install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" || return 1
   install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" || return 1
   rm "${pkgdir}/usr/share/man/man8/tftpd.8"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('1ae813a94670f0d8c294aafa9f5ecf65'
-         'a974d02526f19222146c8e3d3b598871'
-         '414a79dc891bced056d99a9bb790fc9e')