[pkgsrc/pkgsrc-2005Q2]: pkgsrc/www/thttpd Pullup tickets 699 and 700 - reques...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2947a1c063aa
branches:  pkgsrc-2005Q2
changeset: 496014:2947a1c063aa
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 20 18:44:07 2005 +0000

description:
Pullup tickets 699 and 700 - requested by Quentin Garnier
distfile update for thttpd

Revisions pulled up:
- pkgsrc/www/thttpd/Makefile            1.31, 1.32
- pkgsrc/www/thttpd/distinfo            1.10, 1.11
- pkgsrc/www/thttpd/patches/patch-ad    1.4

   Module Name:         pkgsrc
   Committed By:        cube
   Date:                Fri Aug 19 07:30:51 UTC 2005

   Modified Files:
        pkgsrc/www/thttpd: Makefile distinfo
        pkgsrc/www/thttpd/patches: patch-ad

   Log Message:
   The thttpd tarball has changed (the e-mail address of the author was
   changed all through it).  While there, make the package correctly fetch
   the NetBSD logo.

   Bump PKGREVISION, and after that I'll delete the copy ftp.netbsd.org
   currently has.  The tarball change doesn't happen often enough for this
   package to justify the use of DIST_SUBDIR (and that avoids the hairy
   problem of sharing the sitedrivenby.gif file).

   PR#30641 by Jared Momose.
---
   Module Name:         pkgsrc
   Committed By:        cube
   Date:                Fri Aug 19 13:38:58 UTC 2005

   Modified Files:
        pkgsrc/www/thttpd: Makefile distinfo

   Log Message:
   Do the DIST_SUBDIR dance because of already-downloaded files.  *Sigh*

   Pointed out by Thomas Klausner and Jeremy C. Reed.

diffstat:

 www/thttpd/Makefile         |  10 +++++++---
 www/thttpd/distinfo         |  16 ++++++++--------
 www/thttpd/patches/patch-ad |  14 +++++++-------
 3 files changed, 22 insertions(+), 18 deletions(-)

diffs (79 lines):

diff -r e0c54af34be2 -r 2947a1c063aa www/thttpd/Makefile
--- a/www/thttpd/Makefile       Sat Aug 20 16:04:22 2005 +0000
+++ b/www/thttpd/Makefile       Sat Aug 20 18:44:07 2005 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2005/08/20 18:44:07 salo Exp $
 
 DISTNAME=      thttpd-2.25b
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  http://www.acme.com/software/thttpd/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} \
-               sitedrivenby.gif
+               ${NETBSD_LOGO}
+DIST_SUBDIR=   ${PKGNAME}
 
 MAINTAINER=    mike%ethmoid.org@localhost
 HOMEPAGE=      http://www.acme.com/software/thttpd/
@@ -13,6 +14,9 @@
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
+NETBSD_LOGO=           sitedrivenby.gif
+SITES_${NETBSD_LOGO}=  http://www.NetBSD.org/images/logos/
+
 GNU_CONFIGURE= yes
 USE_PKGINSTALL=        yes
 
diff -r e0c54af34be2 -r 2947a1c063aa www/thttpd/distinfo
--- a/www/thttpd/distinfo       Sat Aug 20 16:04:22 2005 +0000
+++ b/www/thttpd/distinfo       Sat Aug 20 18:44:07 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 14:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.9.4.1 2005/08/20 18:44:07 salo Exp $
 
-SHA1 (thttpd-2.25b.tar.gz) = 51bc25ef035d7557c869a02ce353580a1cadfa2c
-RMD160 (thttpd-2.25b.tar.gz) = 15020e8d04d27b30c4da3104387a281e35d58025
-Size (thttpd-2.25b.tar.gz) = 132363 bytes
-SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-RMD160 (sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
-Size (sitedrivenby.gif) = 8519 bytes
+SHA1 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
+RMD160 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
+Size (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 132275 bytes
+SHA1 (thttpd-2.25bnb3/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
+RMD160 (thttpd-2.25bnb3/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
+Size (thttpd-2.25bnb3/sitedrivenby.gif) = 8519 bytes
 SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
 SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df
 SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2
-SHA1 (patch-ad) = 1d7777516ff0c5e7b03643809854bf96707759ec
+SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac
 SHA1 (patch-af) = 2fa1603964383a745a82f1760faa947193764079
diff -r e0c54af34be2 -r 2947a1c063aa www/thttpd/patches/patch-ad
--- a/www/thttpd/patches/patch-ad       Sat Aug 20 16:04:22 2005 +0000
+++ b/www/thttpd/patches/patch-ad       Sat Aug 20 18:44:07 2005 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.3 2000/08/01 12:38:46 jlam Exp $
+$NetBSD: patch-ad,v 1.3.22.1 2005/08/20 18:44:07 salo Exp $
 
---- index.html.orig    Wed Feb  9 16:52:20 2000
-+++ index.html Thu Jul 27 07:25:55 2000
-@@ -12,5 +12,9 @@
+--- index.html.orig    2005-06-29 19:50:33.000000000 +0200
++++ index.html
+@@ -9,6 +9,9 @@ Looks like you got it working.  Congrats
  
- <HR>
- <ADDRESS><A HREF="mailto:webmaster%acme.com@localhost";>ACME Labs Webmaster &lt;webmaster%acme.com@localhost&gt;</A></ADDRESS>
+ <P>
+ Here's a link to the <A HREF="http://www.acme.com/software/thttpd/";>thttpd web pages</A>.
 +<A HREF="http://www.netbsd.org/";>
 +<IMG ALIGN=RIGHT SRC="sitedrivenby.gif" border=0 ALT="Site driven by NetBSD">
 +</A>
-+
+ 
  </BODY>
  </HTML>