Rename internal "getline" to unbreak build on NetBSD.

Support staged installation.

5 files changed, 76 insertions, 37 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 32a37efbb23..83ba9e9537d 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/09/07 22:12:26 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2009/12/13 17:42:36 asau Exp $
 
 DISTNAME=	thttpd-2.25b
 PKGREVISION=	5
@@ -30,7 +30,8 @@ EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
 RCD_SCRIPTS=	thttpd
 
-INSTALLATION_DIRS=	share/thttpd
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	$(PKGMANDIR)/man1 share/thttpd
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	thttpd.conf
@@ -55,8 +56,8 @@ pre-configure:
 			> ${WRKSRC}/config.h
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/thttpd.conf ${PREFIX}/share/examples
-	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd
+	${INSTALL_DATA} ${WRKSRC}/thttpd.conf ${DESTDIR}${PREFIX}/share/examples
+	${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/thttpd
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/sitedrivenby.gif ${DESTDIR}${PREFIX}/share/thttpd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
index d76ed476536..a486147b4d6 100644
--- a/www/thttpd/distinfo
+++ b/www/thttpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/12/06 14:09:29 rillig Exp $
+$NetBSD: distinfo,v 1.15 2009/12/13 17:42:36 asau Exp $
 
 SHA1 (thttpd-2.25b/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
 RMD160 (thttpd-2.25b/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
@@ -7,8 +7,9 @@ SHA1 (thttpd-2.25b/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 RMD160 (thttpd-2.25b/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
 Size (thttpd-2.25b/sitedrivenby.gif) = 8519 bytes
 SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
-SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df
-SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2
+SHA1 (patch-ab) = c6d6a20a00b4ceaf409b849982b8e963debf9530
+SHA1 (patch-ac) = f7fe1fed88b4cb33c9456d6fdc13e2bbc175ced6
 SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac
 SHA1 (patch-af) = 5160b635cdf9b3c997e93e039ef2764f77857018
 SHA1 (patch-ag) = 01410f8d293e2d4033f2a1119b21c05e21dfefbe
+SHA1 (patch-ah) = 97c9ff3c4abc494b137e93f459f5b776f35879df
diff --git a/www/thttpd/patches/patch-ab b/www/thttpd/patches/patch-ab
index 4658503e53c..b2ffcd37153 100644
--- a/www/thttpd/patches/patch-ab
+++ b/www/thttpd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2000/12/17 22:21:45 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/13 17:42:36 asau Exp $
 
---- extras/Makefile.in.orig	Wed Sep 15 12:00:14 1999
-+++ extras/Makefile.in
+--- extras/Makefile.in.orig	2005-06-29 21:53:20.000000000 +0400
++++ extras/Makefile.in	2009-12-13 20:35:09.000000000 +0300
 @@ -35,7 +35,7 @@
  CCOPT =		@V_CCOPT@
  DEFS =		@DEFS@
@@ -11,27 +11,32 @@ $NetBSD: patch-ab,v 1.3 2000/12/17 22:21:45 jlam Exp $
  STATICFLAG =	@V_STATICFLAG@
  LDFLAGS =	@LDFLAGS@
  LIBS =		@LIBS@
-@@ -67,17 +67,15 @@
+@@ -66,18 +66,16 @@
+ 
  
  install:	all
- 	rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
+-	rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
 -	cp makeweb $(BINDIR)/makeweb
 -	chgrp $(WEBGROUP) $(BINDIR)/makeweb
 -	chmod 2755 $(BINDIR)/makeweb
 -	cp htpasswd $(BINDIR)/htpasswd
 -	cp syslogtocern $(BINDIR)/syslogtocern
-+	$(BSD_INSTALL_PROGRAM) makeweb $(BINDIR)/makeweb
-+	$(BSD_INSTALL_PROGRAM) htpasswd $(BINDIR)/htpasswd
-+	$(BSD_INSTALL_SCRIPT) syslogtocern $(BINDIR)/syslogtocern
- 	rm -f $(MANDIR)/man1/makeweb.1
+-	rm -f $(MANDIR)/man1/makeweb.1
 -	cp makeweb.1 $(MANDIR)/man1/makeweb.1
-+	$(BSD_INSTALL_MAN) makeweb.1 $(MANDIR)/man1/makeweb.1
- 	rm -f $(MANDIR)/man1/htpasswd.1
+-	rm -f $(MANDIR)/man1/htpasswd.1
 -	cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
-+	$(BSD_INSTALL_MAN) htpasswd.1 $(MANDIR)/man1/htpasswd.1
- 	rm -f $(MANDIR)/man8/syslogtocern.8
+-	rm -f $(MANDIR)/man8/syslogtocern.8
 -	cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
-+	$(BSD_INSTALL_MAN) syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
++	rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/htpasswd $(DESTDIR)$(BINDIR)/syslogtocern
++	$(BSD_INSTALL_PROGRAM) makeweb $(DESTDIR)$(BINDIR)/makeweb
++	$(BSD_INSTALL_PROGRAM) htpasswd $(DESTDIR)$(BINDIR)/htpasswd
++	$(BSD_INSTALL_SCRIPT) syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
++	rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
++	$(BSD_INSTALL_MAN) makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
++	rm -f $(DESTDIR)$(MANDIR)/man1/htpasswd.1
++	$(BSD_INSTALL_MAN) htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
++	rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
++	$(BSD_INSTALL_MAN) syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
  
  clean:
  	rm -f $(CLEANFILES)
diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac
index b08efe27de7..9ae6628afc2 100644
--- a/www/thttpd/patches/patch-ac
+++ b/www/thttpd/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2002/06/16 19:10:26 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2009/12/13 17:42:36 asau Exp $
 
---- cgi-src/Makefile.in.orig	Mon Nov 12 22:52:00 2001
-+++ cgi-src/Makefile.in
+--- cgi-src/Makefile.in.orig	2005-06-29 21:53:04.000000000 +0400
++++ cgi-src/Makefile.in	2009-12-13 20:29:23.000000000 +0300
 @@ -34,7 +34,7 @@
  CCOPT =		@V_CCOPT@
  DEFS =		@DEFS@
@@ -11,24 +11,32 @@ $NetBSD: patch-ac,v 1.6 2002/06/16 19:10:26 wiz Exp $
  LDFLAGS =	@LDFLAGS@ @V_STATICFLAG@
  LIBS =		@LIBS@
  NETLIBS =	@V_NETLIBS@
-@@ -69,15 +69,15 @@
+@@ -67,17 +67,17 @@
+ 	cd .. ; $(MAKE) $(MFLAGS) strerror.o
+ 
  install:	all
- 	-mkdir -p $(CGIBINDIR)
- 	rm -f $(CGIBINDIR)/redirect
+-	-mkdir -p $(CGIBINDIR)
+-	rm -f $(CGIBINDIR)/redirect
 -	cp redirect $(CGIBINDIR)/redirect
-+	$(BSD_INSTALL_PROGRAM) redirect $(CGIBINDIR)/redirect
- 	rm -f $(MANDIR)/man8/redirect.8
+-	rm -f $(MANDIR)/man8/redirect.8
 -	cp redirect.8 $(MANDIR)/man8/redirect.8
-+	$(BSD_INSTALL_MAN) redirect.8 $(MANDIR)/man8/redirect.8
- 	rm -f $(CGIBINDIR)/ssi
+-	rm -f $(CGIBINDIR)/ssi
 -	cp ssi $(CGIBINDIR)/ssi
-+	$(BSD_INSTALL_PROGRAM) ssi $(CGIBINDIR)/ssi
- 	rm -f $(MANDIR)/man8/ssi.8
+-	rm -f $(MANDIR)/man8/ssi.8
 -	cp ssi.8 $(MANDIR)/man8/ssi.8
-+	$(BSD_INSTALL_MAN) ssi.8 $(MANDIR)/man8/ssi.8
- 	rm -f $(CGIBINDIR)/phf
+-	rm -f $(CGIBINDIR)/phf
 -	cp phf $(CGIBINDIR)/phf
-+	$(BSD_INSTALL_PROGRAM) phf $(CGIBINDIR)/phf
++	-mkdir -p $(DESTDIR)$(CGIBINDIR)
++	rm -f $(DESTDIR)$(CGIBINDIR)/redirect
++	$(BSD_INSTALL_PROGRAM) redirect $(DESTDIR)$(CGIBINDIR)/redirect
++	rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
++	$(BSD_INSTALL_MAN) redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
++	rm -f $(DESTDIR)$(CGIBINDIR)/ssi
++	$(BSD_INSTALL_PROGRAM) ssi $(DESTDIR)$(CGIBINDIR)/ssi
++	rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
++	$(BSD_INSTALL_MAN) ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
++	rm -f $(DESTDIR)$(CGIBINDIR)/phf
++	$(BSD_INSTALL_PROGRAM) phf $(DESTDIR)$(CGIBINDIR)/phf
  
  clean:
  	rm -f $(CLEANFILES)
diff --git a/www/thttpd/patches/patch-ah b/www/thttpd/patches/patch-ah
new file mode 100644
index 00000000000..b70bfc55680
--- /dev/null
+++ b/www/thttpd/patches/patch-ah
@@ -0,0 +1,24 @@
+$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;