Sun Dec 13 17:42:36 2009 UTC ()
Rename internal "getline" to unbreak build on NetBSD.
Support staged installation.


(asau)
diff -r1.42 -r1.43 pkgsrc/www/thttpd/Makefile
diff -r1.14 -r1.15 pkgsrc/www/thttpd/distinfo
diff -r1.3 -r1.4 pkgsrc/www/thttpd/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/www/thttpd/patches/patch-ac
diff -r0 -r1.1 pkgsrc/www/thttpd/patches/patch-ah
cvs diff -r1.42 -r1.43 pkgsrc/www/thttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/thttpd/Makefile 2007/09/07 22:12:26 1.42
+++ pkgsrc/www/thttpd/Makefile 2009/12/13 17:42:36 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2007/09/07 22:12:26 jlam Exp $ 1# $NetBSD: Makefile,v 1.43 2009/12/13 17:42:36 asau Exp $
2 2
3DISTNAME= thttpd-2.25b 3DISTNAME= thttpd-2.25b
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.acme.com/software/thttpd/ 6MASTER_SITES= http://www.acme.com/software/thttpd/
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
8 ${NETBSD_LOGO} 8 ${NETBSD_LOGO}
9DIST_SUBDIR= ${PKGNAME_NOREV} 9DIST_SUBDIR= ${PKGNAME_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.acme.com/software/thttpd/ 12HOMEPAGE= http://www.acme.com/software/thttpd/
13COMMENT= Tiny/turbo/throttling HTTP server 13COMMENT= Tiny/turbo/throttling HTTP server
14 14
@@ -20,43 +20,44 @@ SITES.${NETBSD_LOGO}= http://www.NetBSD. @@ -20,43 +20,44 @@ SITES.${NETBSD_LOGO}= http://www.NetBSD.
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21 21
22# Note: this pkg auto-detects IPv6. 22# Note: this pkg auto-detects IPv6.
23BUILD_DEFS+= IPV6_READY 23BUILD_DEFS+= IPV6_READY
24# thttpd syslogs at level LOG_DAEMON by default 24# thttpd syslogs at level LOG_DAEMON by default
25# change this to your preferred syslog level 25# change this to your preferred syslog level
26THTTPD_LOG_FACILITY?= LOG_DAEMON 26THTTPD_LOG_FACILITY?= LOG_DAEMON
27BUILD_DEFS+= THTTPD_LOG_FACILITY 27BUILD_DEFS+= THTTPD_LOG_FACILITY
28 28
29EGDIR= ${PREFIX}/share/examples 29EGDIR= ${PREFIX}/share/examples
30CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf 30CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
31RCD_SCRIPTS= thttpd 31RCD_SCRIPTS= thttpd
32 32
33INSTALLATION_DIRS= share/thttpd 33PKG_DESTDIR_SUPPORT= user-destdir
 34INSTALLATION_DIRS= $(PKGMANDIR)/man1 share/thttpd
34 35
35SUBST_CLASSES+= paths 36SUBST_CLASSES+= paths
36SUBST_FILES.paths= thttpd.conf 37SUBST_FILES.paths= thttpd.conf
37SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 38SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
38SUBST_STAGE.paths= post-patch 39SUBST_STAGE.paths= post-patch
39 40
40MAKE_JOBS_SAFE= no 41MAKE_JOBS_SAFE= no
41 42
42post-extract: 43post-extract:
43 ${CP} ${FILESDIR}/thttpd.conf ${WRKSRC} 44 ${CP} ${FILESDIR}/thttpd.conf ${WRKSRC}
44 45
45pre-configure: 46pre-configure:
46 ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1 47 ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1
47 ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c 48 ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c
48 for FILE in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \ 49 for FILE in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \
49 ${MV} -f ${WRKSRC}/$${FILE} ${WRKSRC}/$${FILE}.bak; \ 50 ${MV} -f ${WRKSRC}/$${FILE} ${WRKSRC}/$${FILE}.bak; \
50 ${SED} -e "s,\.htpasswd,XXX,g;s,htpasswd,thtpasswd,g;s,XXX,.htpasswd,g" \ 51 ${SED} -e "s,\.htpasswd,XXX,g;s,htpasswd,thtpasswd,g;s,XXX,.htpasswd,g" \
51 ${WRKSRC}/$${FILE}.bak > ${WRKSRC}/$${FILE}; \ 52 ${WRKSRC}/$${FILE}.bak > ${WRKSRC}/$${FILE}; \
52 done 53 done
53 ${MV} -f ${WRKSRC}/config.h ${WRKSRC}/config.h.bak 54 ${MV} -f ${WRKSRC}/config.h ${WRKSRC}/config.h.bak
54 ${SED} -e "s/LOG_DAEMON/${THTTPD_LOG_FACILITY}/" ${WRKSRC}/config.h.bak \ 55 ${SED} -e "s/LOG_DAEMON/${THTTPD_LOG_FACILITY}/" ${WRKSRC}/config.h.bak \
55 > ${WRKSRC}/config.h 56 > ${WRKSRC}/config.h
56 57
57post-install: 58post-install:
58 ${INSTALL_DATA} ${WRKSRC}/thttpd.conf ${PREFIX}/share/examples 59 ${INSTALL_DATA} ${WRKSRC}/thttpd.conf ${DESTDIR}${PREFIX}/share/examples
59 ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd 60 ${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/thttpd
60 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd 61 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/sitedrivenby.gif ${DESTDIR}${PREFIX}/share/thttpd
61 62
62.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/www/thttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/thttpd/distinfo 2005/12/06 14:09:29 1.14
+++ pkgsrc/www/thttpd/distinfo 2009/12/13 17:42:36 1.15
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.14 2005/12/06 14:09:29 rillig Exp $ 1$NetBSD: distinfo,v 1.15 2009/12/13 17:42:36 asau Exp $
2 2
3SHA1 (thttpd-2.25b/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52 3SHA1 (thttpd-2.25b/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
4RMD160 (thttpd-2.25b/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e 4RMD160 (thttpd-2.25b/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
5Size (thttpd-2.25b/thttpd-2.25b.tar.gz) = 132275 bytes 5Size (thttpd-2.25b/thttpd-2.25b.tar.gz) = 132275 bytes
6SHA1 (thttpd-2.25b/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 6SHA1 (thttpd-2.25b/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
7RMD160 (thttpd-2.25b/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa 7RMD160 (thttpd-2.25b/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
8Size (thttpd-2.25b/sitedrivenby.gif) = 8519 bytes 8Size (thttpd-2.25b/sitedrivenby.gif) = 8519 bytes
9SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66 9SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
10SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df 10SHA1 (patch-ab) = c6d6a20a00b4ceaf409b849982b8e963debf9530
11SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2 11SHA1 (patch-ac) = f7fe1fed88b4cb33c9456d6fdc13e2bbc175ced6
12SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac 12SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac
13SHA1 (patch-af) = 5160b635cdf9b3c997e93e039ef2764f77857018 13SHA1 (patch-af) = 5160b635cdf9b3c997e93e039ef2764f77857018
14SHA1 (patch-ag) = 01410f8d293e2d4033f2a1119b21c05e21dfefbe 14SHA1 (patch-ag) = 01410f8d293e2d4033f2a1119b21c05e21dfefbe
 15SHA1 (patch-ah) = 97c9ff3c4abc494b137e93f459f5b776f35879df
cvs diff -r1.3 -r1.4 pkgsrc/www/thttpd/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/thttpd/patches/patch-ab 2000/12/17 22:21:45 1.3
+++ pkgsrc/www/thttpd/patches/patch-ab 2009/12/13 17:42:36 1.4
@@ -1,37 +1,42 @@ @@ -1,37 +1,42 @@
1$NetBSD: patch-ab,v 1.3 2000/12/17 22:21:45 jlam Exp $ 1$NetBSD: patch-ab,v 1.4 2009/12/13 17:42:36 asau Exp $
2 2
3--- extras/Makefile.in.orig Wed Sep 15 12:00:14 1999 3--- extras/Makefile.in.orig 2005-06-29 21:53:20.000000000 +0400
4+++ extras/Makefile.in 4+++ extras/Makefile.in 2009-12-13 20:35:09.000000000 +0300
5@@ -35,7 +35,7 @@ 5@@ -35,7 +35,7 @@
6 CCOPT = @V_CCOPT@ 6 CCOPT = @V_CCOPT@
7 DEFS = @DEFS@ 7 DEFS = @DEFS@
8 INCLS = -I.. 8 INCLS = -I..
9-CFLAGS = $(CCOPT) $(DEFS) $(INCLS) 9-CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
10+CFLAGS += $(CCOPT) $(DEFS) $(INCLS) 10+CFLAGS += $(CCOPT) $(DEFS) $(INCLS)
11 STATICFLAG = @V_STATICFLAG@ 11 STATICFLAG = @V_STATICFLAG@
12 LDFLAGS = @LDFLAGS@ 12 LDFLAGS = @LDFLAGS@
13 LIBS = @LIBS@ 13 LIBS = @LIBS@
14@@ -67,17 +67,15 @@ 14@@ -66,18 +66,16 @@
 15
15  16
16 install: all 17 install: all
17 rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern 18- rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
18- cp makeweb $(BINDIR)/makeweb 19- cp makeweb $(BINDIR)/makeweb
19- chgrp $(WEBGROUP) $(BINDIR)/makeweb 20- chgrp $(WEBGROUP) $(BINDIR)/makeweb
20- chmod 2755 $(BINDIR)/makeweb 21- chmod 2755 $(BINDIR)/makeweb
21- cp htpasswd $(BINDIR)/htpasswd 22- cp htpasswd $(BINDIR)/htpasswd
22- cp syslogtocern $(BINDIR)/syslogtocern 23- cp syslogtocern $(BINDIR)/syslogtocern
23+ $(BSD_INSTALL_PROGRAM) makeweb $(BINDIR)/makeweb 24- rm -f $(MANDIR)/man1/makeweb.1
24+ $(BSD_INSTALL_PROGRAM) htpasswd $(BINDIR)/htpasswd 
25+ $(BSD_INSTALL_SCRIPT) syslogtocern $(BINDIR)/syslogtocern 
26 rm -f $(MANDIR)/man1/makeweb.1 
27- cp makeweb.1 $(MANDIR)/man1/makeweb.1 25- cp makeweb.1 $(MANDIR)/man1/makeweb.1
28+ $(BSD_INSTALL_MAN) makeweb.1 $(MANDIR)/man1/makeweb.1 26- rm -f $(MANDIR)/man1/htpasswd.1
29 rm -f $(MANDIR)/man1/htpasswd.1 
30- cp htpasswd.1 $(MANDIR)/man1/htpasswd.1 27- cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
31+ $(BSD_INSTALL_MAN) htpasswd.1 $(MANDIR)/man1/htpasswd.1 28- rm -f $(MANDIR)/man8/syslogtocern.8
32 rm -f $(MANDIR)/man8/syslogtocern.8 
33- cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8 29- cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
34+ $(BSD_INSTALL_MAN) syslogtocern.8 $(MANDIR)/man8/syslogtocern.8 30+ rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/htpasswd $(DESTDIR)$(BINDIR)/syslogtocern
 31+ $(BSD_INSTALL_PROGRAM) makeweb $(DESTDIR)$(BINDIR)/makeweb
 32+ $(BSD_INSTALL_PROGRAM) htpasswd $(DESTDIR)$(BINDIR)/htpasswd
 33+ $(BSD_INSTALL_SCRIPT) syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
 34+ rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
 35+ $(BSD_INSTALL_MAN) makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
 36+ rm -f $(DESTDIR)$(MANDIR)/man1/htpasswd.1
 37+ $(BSD_INSTALL_MAN) htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
 38+ rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
 39+ $(BSD_INSTALL_MAN) syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
35  40
36 clean: 41 clean:
37 rm -f $(CLEANFILES) 42 rm -f $(CLEANFILES)
cvs diff -r1.6 -r1.7 pkgsrc/www/thttpd/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/www/thttpd/patches/patch-ac 2002/06/16 19:10:26 1.6
+++ pkgsrc/www/thttpd/patches/patch-ac 2009/12/13 17:42:36 1.7
@@ -1,34 +1,42 @@ @@ -1,34 +1,42 @@
1$NetBSD: patch-ac,v 1.6 2002/06/16 19:10:26 wiz Exp $ 1$NetBSD: patch-ac,v 1.7 2009/12/13 17:42:36 asau Exp $
2 2
3--- cgi-src/Makefile.in.orig Mon Nov 12 22:52:00 2001 3--- cgi-src/Makefile.in.orig 2005-06-29 21:53:04.000000000 +0400
4+++ cgi-src/Makefile.in 4+++ cgi-src/Makefile.in 2009-12-13 20:29:23.000000000 +0300
5@@ -34,7 +34,7 @@ 5@@ -34,7 +34,7 @@
6 CCOPT = @V_CCOPT@ 6 CCOPT = @V_CCOPT@
7 DEFS = @DEFS@ 7 DEFS = @DEFS@
8 INCLS = -I.. 8 INCLS = -I..
9-CFLAGS = $(CCOPT) $(DEFS) $(INCLS) 9-CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
10+CFLAGS += $(CCOPT) $(DEFS) $(INCLS) 10+CFLAGS += $(CCOPT) $(DEFS) $(INCLS)
11 LDFLAGS = @LDFLAGS@ @V_STATICFLAG@ 11 LDFLAGS = @LDFLAGS@ @V_STATICFLAG@
12 LIBS = @LIBS@ 12 LIBS = @LIBS@
13 NETLIBS = @V_NETLIBS@ 13 NETLIBS = @V_NETLIBS@
14@@ -69,15 +69,15 @@ 14@@ -67,17 +67,17 @@
 15 cd .. ; $(MAKE) $(MFLAGS) strerror.o
 16
15 install: all 17 install: all
16 -mkdir -p $(CGIBINDIR) 18- -mkdir -p $(CGIBINDIR)
17 rm -f $(CGIBINDIR)/redirect 19- rm -f $(CGIBINDIR)/redirect
18- cp redirect $(CGIBINDIR)/redirect 20- cp redirect $(CGIBINDIR)/redirect
19+ $(BSD_INSTALL_PROGRAM) redirect $(CGIBINDIR)/redirect 21- rm -f $(MANDIR)/man8/redirect.8
20 rm -f $(MANDIR)/man8/redirect.8 
21- cp redirect.8 $(MANDIR)/man8/redirect.8 22- cp redirect.8 $(MANDIR)/man8/redirect.8
22+ $(BSD_INSTALL_MAN) redirect.8 $(MANDIR)/man8/redirect.8 23- rm -f $(CGIBINDIR)/ssi
23 rm -f $(CGIBINDIR)/ssi 
24- cp ssi $(CGIBINDIR)/ssi 24- cp ssi $(CGIBINDIR)/ssi
25+ $(BSD_INSTALL_PROGRAM) ssi $(CGIBINDIR)/ssi 25- rm -f $(MANDIR)/man8/ssi.8
26 rm -f $(MANDIR)/man8/ssi.8 
27- cp ssi.8 $(MANDIR)/man8/ssi.8 26- cp ssi.8 $(MANDIR)/man8/ssi.8
28+ $(BSD_INSTALL_MAN) ssi.8 $(MANDIR)/man8/ssi.8 27- rm -f $(CGIBINDIR)/phf
29 rm -f $(CGIBINDIR)/phf 
30- cp phf $(CGIBINDIR)/phf 28- cp phf $(CGIBINDIR)/phf
31+ $(BSD_INSTALL_PROGRAM) phf $(CGIBINDIR)/phf 29+ -mkdir -p $(DESTDIR)$(CGIBINDIR)
 30+ rm -f $(DESTDIR)$(CGIBINDIR)/redirect
 31+ $(BSD_INSTALL_PROGRAM) redirect $(DESTDIR)$(CGIBINDIR)/redirect
 32+ rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
 33+ $(BSD_INSTALL_MAN) redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
 34+ rm -f $(DESTDIR)$(CGIBINDIR)/ssi
 35+ $(BSD_INSTALL_PROGRAM) ssi $(DESTDIR)$(CGIBINDIR)/ssi
 36+ rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
 37+ $(BSD_INSTALL_MAN) ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
 38+ rm -f $(DESTDIR)$(CGIBINDIR)/phf
 39+ $(BSD_INSTALL_PROGRAM) phf $(DESTDIR)$(CGIBINDIR)/phf
32  40
33 clean: 41 clean:
34 rm -f $(CLEANFILES) 42 rm -f $(CLEANFILES)
File Added: pkgsrc/www/thttpd/patches/Attic/patch-ah
$NetBSD: patch-ah,v 1.1 2009/12/13 17:42:36 asau Exp $

NetBSD provides another "getline".

--- extras/htpasswd.c.orig	2009-12-13 20:24:50.000000000 +0300
+++ extras/htpasswd.c	2009-12-13 20:26:45.000000000 +0300
@@ -49,7 +49,7 @@
     while((line[y++] = line[x++]));
 }
 
-static int getline(char *s, int n, FILE *f) {
+static int get_line(char *s, int n, FILE *f) {
     register int i=0;
 
     while(1) {
@@ -189,7 +189,7 @@
     strcpy(user,argv[2]);
 
     found = 0;
-    while(!(getline(line,MAX_STRING_LEN,f))) {
+    while(!(get_line(line,MAX_STRING_LEN,f))) {
         if(found || (line[0] == '#') || (!line[0])) {
             putline(tfp,line);
             continue;