Index: head/www/publicfile/Makefile
===================================================================
--- head/www/publicfile/Makefile	(revision 365544)
+++ head/www/publicfile/Makefile	(revision 365545)
@@ -1,93 +1,93 @@
 # Created by: Neil Blakey-Milner
 # $FreeBSD$
 
 PORTNAME=	publicfile
 PORTVERSION=	0.52
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ftp
 MASTER_SITES=	http://cr.yp.to/publicfile/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	uffe@uffe.org
 COMMENT=	Secure, read-only, anonymous HTTP/FTP server
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
 OPTIONS_DEFINE=	BASICAUTH COMMONLOG REDIRECT_SLASH ENV_FILETYPES SSL
 BASICAUTH_DESC=		basic HTTP authentication support
 COMMONLOG_DESC=		support for Apache common log format
 REDIRECT_SLASH_DESC=	do not require trailing slash on directories
 ENV_FILETYPES_DESC=	get mime types from the environment
 SSL_DESC=		provide SSL support through ucspi-ssl
 
 CONFLICTS=	xshttpd-3*
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 pre-everything::
 .if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MCOMMONLOG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Currently the common log and auth patches conflict."
 	@${ECHO_MSG}
 BROKEN=	Currently the common log and auth patches conflict.
 .endif
 
 .if ${PORT_OPTIONS:MBASICAUTH} && ${PORT_OPTIONS:MREDIRECT_SLASH}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Currently the redirect slash and auth patches conflict."
 	@${ECHO_MSG}
 BROKEN=	Currently the redirect slash and auth patches conflict.
 .endif
 
 .if ${PORT_OPTIONS:MREDIRECT_SLASH}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/redirect-slash-patch
 .endif
 
 .if ${PORT_OPTIONS:MENV_FILETYPES}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/publicfile-0.52-filetype-diff
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/publicfile.sslserver
 RUN_DEPENDS+=	sslserver:${PORTSDIR}/sysutils/ucspi-ssl
 .endif
 
 .if ${PORT_OPTIONS:MBASICAUTH}
 pre-configure::
 	@${SED} -e "s:__PORTSDIR__:${PORTSDIR}:g" \
 		-e "s:__WRKSRC__:${WRKSRC}:g" \
 		${PATCHDIR}/publicfile-0.52_basicauth.patch.in > \
 		${PATCHDIR}/publicfile-0.52_basicauth.patch
 	@${PATCH} ${PATCH_ARGS} -p1 < \
 		${PATCHDIR}/publicfile-0.52_basicauth.patch
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/databases/cdb:extract
 PLIST_SUB+=	BASICAUTH=""
 .else
 PLIST_SUB+=	BASICAUTH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCOMMONLOG}
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} -p1 < \
 		${PATCHDIR}/publicfile-0.52-commonlog-2.patch
 .endif
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 post-extract:
 .if ${PORT_OPTIONS:MBASICAUTH}
 	@${LN} -s ${PORTSDIR}/databases/cdb/work/cdb-0.75 ${WRKSRC}/cdb-0.75
 .endif
 
 post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
+	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-stage
 
 .include <bsd.port.mk>
Index: head/www/publicfile/files/patch-Makefile
===================================================================
--- head/www/publicfile/files/patch-Makefile	(nonexistent)
+++ head/www/publicfile/files/patch-Makefile	(revision 365545)
@@ -0,0 +1,49 @@
+--- Makefile.orig	1999-11-09 08:23:46.000000000 +0100
++++ Makefile	2014-08-21 12:29:41.000000000 +0200
+@@ -32,6 +32,14 @@
+ compile auto_home.c
+ 	./compile auto_home.c
+ 
++auto_home_stage.c: \
++auto-str conf-stage
++	./auto-str auto_home `head -1 conf-stage` > auto_home_stage.c
++
++auto_home_stage.o: \
++compile auto_home_stage.c
++	./compile auto_home_stage.c
++
+ byte_chr.o: \
+ compile byte_chr.c byte.h
+ 	./compile byte_chr.c
+@@ -231,7 +239,7 @@
+ 	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
+ 
+ hier.o: \
+-compile hier.c auto_home.h
++compile hier.c auto_home_stage.h
+ 	./compile hier.c
+ 
+ httpd: \
+@@ -257,9 +265,9 @@
+ 	./compile httpdate.c
+ 
+ install: \
+-load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
++load install.o hier.o auto_home_stage.o strerr.a substdio.a open.a error.a \
+ str.a
+-	./load install hier.o auto_home.o strerr.a substdio.a \
++	./load install hier.o auto_home_stage.o strerr.a substdio.a \
+ 	open.a error.a str.a 
+ 
+ install.o: \
+@@ -268,8 +276,8 @@
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
+-	./load instcheck hier.o auto_home.o strerr.a substdio.a \
++load instcheck.o hier.o auto_home_stage.o strerr.a substdio.a error.a str.a
++	./load instcheck hier.o auto_home_stage.o strerr.a substdio.a \
+ 	error.a str.a 
+ 
+ instcheck.o: \

Property changes on: head/www/publicfile/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/publicfile/files/patch-auto_home_stage.h
===================================================================
--- head/www/publicfile/files/patch-auto_home_stage.h	(nonexistent)
+++ head/www/publicfile/files/patch-auto_home_stage.h	(revision 365545)
@@ -0,0 +1,9 @@
+--- /dev/null	2014-08-21 12:22:00.000000000 +0200
++++ auto_home_stage.h	2014-08-21 12:25:14.000000000 +0200
+@@ -0,0 +1,6 @@
++#ifndef AUTO_HOME_STAGE_H_
++#define AUTO_HOME_STAGE_H_
++
++extern char auto_home[];
++
++#endif

Property changes on: head/www/publicfile/files/patch-auto_home_stage.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property