Date: Sunday, February 8, 2009 @ 00:32:23
Author: eric
Revision: 26492
Merged revisions 26491 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/thttpd/trunk
........
r26491 | eric | 2009-02-08 00:32:03 -0500 (Sun, 08 Feb 2009) | 2 lines
upgpkg: thttpd 2.25b-2
Fixed backup array (close FS#11934), Added license, FHS man pages
........
Added:
thttpd/repos/extra-x86_64/LICENSE
(from rev 26491, thttpd/trunk/LICENSE)
Modified:
thttpd/repos/extra-x86_64/ (properties)
thttpd/repos/extra-x86_64/PKGBUILD
----------+
LICENSE | 26 ++++++++++++++++++++++++++
PKGBUILD | 27 +++++++++++++++++----------
2 files changed, 43 insertions(+), 10 deletions(-)
Property changes on: thttpd/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /thttpd/trunk:1-9059
+ /thttpd/trunk:1-26491
Copied: thttpd/repos/extra-x86_64/LICENSE (from rev 26491, thttpd/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2009-02-08 05:32:23 UTC (rev 26492)
@@ -0,0 +1,26 @@
+/* thttpd.c - tiny/turbo/throttling HTTP server
+**
+** Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer <jef at mail.acme.com>.
+** 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.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-02-08 05:32:03 UTC (rev 26491)
+++ extra-x86_64/PKGBUILD 2009-02-08 05:32:23 UTC (rev 26492)
@@ -1,27 +1,34 @@
# $Id$
-# Maintainter: Damir Perisa <damir.perisa at bluewin.ch>
+# Maintainer: Damir Perisa <damir.perisa at bluewin.ch>
pkgname=thttpd
pkgver=2.25b
-pkgrel=1
+pkgrel=2
pkgdesc="tiny/turbo/throttling HTTP server"
arch=(i686 x86_64)
url="http://www.acme.com/software/thttpd/"
-backup=('/usr/www/thttpd_config')
+license=('BSD')
+depends=('bash')
+backup=('usr/www/thttpd_config')
conflicts=('apache')
-source=($url/$pkgname-$pkgver.tar.gz \
- thttpd \
- thttpd_config)
+source=(http://www.acme.com/software/thttpd/$pkgname-$pkgver.tar.gz \
+ thttpd thttpd_config LICENSE)
md5sums=('156b249b3b0bcd48b06badd2db0d56c5' '256b995472c8f0fea235b46fdd97e6ec'\
- 'b899c226895dcaa3fb131e98720843c1')
+ 'b899c226895dcaa3fb131e98720843c1' '0c5762c2c34dcbe9eb18815516502872')
build() {
cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --mandir=/usr/share/man || return 1
make || return 1
- mkdir -p $startdir/pkg/usr/{man/man1/,www/data/log}
- make prefix=$startdir/pkg/usr WEBGROUP=root install || return 1
+ install -d $startdir/pkg/usr/sbin
+ install -d $startdir/pkg/usr/share/man/man{1,8}
+ install -d $startdir/pkg/usr/www/data/log
+ make BINDIR=$startdir/pkg/usr/sbin \
+ MANDIR=$startdir/pkg/usr/share/man WEBDIR=$startdir/pkg/usr/www \
+ WEBGROUP=root install || return 1
+ chown root:root $startdir/pkg/usr/share/man/man8/thttpd.8
install -D -m755 ../thttpd $startdir/pkg/etc/rc.d/thttpd
install -D -m755 ../thttpd_config $startdir/pkg/usr/www/thttpd_config
+ install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
}