Import of pkgsrc-2016Q3

net/publicfile-run/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 
 DISTNAME=		publicfile-run-20150109
 CATEGORIES=		net
@@ -26,20 +26,13 @@ RCD_SCRIPTS=		pubfile pubftpd pubhttpd
 
 MESSAGE_SUBST+=		VARBASE=${VARBASE:Q}
 
-EVAL_PREFIX+=		DAEMONTOOLS_PREFIX=daemontools
-EVAL_PREFIX+=		PUBLICFILE_PREFIX=publicfile
-EVAL_PREFIX+=		UCSPI_TCP_PREFIX=ucspi-tcp
-
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
-FILES_SUBST+=		DAEMONTOOLS_PREFIX=${DAEMONTOOLS_PREFIX:Q}
-FILES_SUBST+=		PUBLICFILE_PREFIX=${PUBLICFILE_PREFIX:Q}
-FILES_SUBST+=		UCSPI_TCP_PREFIX=${UCSPI_TCP_PREFIX:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Substituting paths.
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	libexec-pubftpd
-SUBST_VARS.paths=	UCSPI_TCP_PREFIX
+SUBST_VARS.paths=	PREFIX
 
 BUILD_DEFS+=		VARBASE
 

net/publicfile-run/files/libexec-pubftpd.sh

@@ -11,6 +11,6 @@
 # constructed command.
 #
 
-exec @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver pubftpd \
+exec @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver pubftpd \
 -B'220 Features: a p .
 ' "$@"

net/publicfile-run/files/pubftpd.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pubftpd.sh,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: pubftpd.sh,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control publicfile ftpd (FTP server)
 #
@@ -22,7 +22,7 @@ name="pubftpd"
 : ${pubftpd_port:="21"}
 : ${pubftpd_log:="YES"}
 : ${pubftpd_logcmd:="logger -t nb${name} -p ftp.info"}
-: ${pubftpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${pubftpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -39,7 +39,7 @@ pubftpd_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno pubftpd_log || pubftpd_logcmd=${pubftpd_nologcmd}
 	fi
- 	command="@SETENV@ - ${pubftpd_postenv} @DAEMONTOOLS_PREFIX@/bin/envuidgid pubftp @DAEMONTOOLS_PREFIX@/bin/softlimit -o20 -d${pubftpd_datalimit} @PREFIX@/libexec/pubftpd -vDRH -l${pubftpd_localname} -b${pubftpd_backlog} -c${pubftpd_conlimit} ${pubftpd_host} ${pubftpd_port} @PUBLICFILE_PREFIX@/publicfile/bin/ftpd ${pubftpd_root} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid publog ${pubftpd_logcmd}"
+ 	command="@SETENV@ - ${pubftpd_postenv} @PREFIX@/bin/envuidgid pubftp @PREFIX@/bin/softlimit -o20 -d${pubftpd_datalimit} @PREFIX@/libexec/pubftpd -vDRH -l${pubftpd_localname} -b${pubftpd_backlog} -c${pubftpd_conlimit} ${pubftpd_host} ${pubftpd_port} @PREFIX@/publicfile/bin/ftpd ${pubftpd_root} 2>&1 | @PREFIX@/bin/setuidgid publog ${pubftpd_logcmd}"
 	command_args="&"
 	rc_flags=""
 }

net/publicfile-run/files/pubhttpd.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pubhttpd.sh,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: pubhttpd.sh,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control publicfile httpd (HTTP server)
 #
@@ -22,7 +22,7 @@ name="pubhttpd"
 : ${pubhttpd_port:="80"}
 : ${pubhttpd_log:="YES"}
 : ${pubhttpd_logcmd:="logger -t nb${name} -p ftp.info"}
-: ${pubhttpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${pubhttpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -30,7 +30,7 @@ fi
 
 rcvar=${name}
 required_dirs="${pubhttpd_root}"
-command="@UCSPI_TCP_PREFIX@/bin/tcpserver"
+command="@PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="pubhttpd_precmd"
 
@@ -42,7 +42,7 @@ pubhttpd_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno pubhttpd_log || pubhttpd_logcmd=${pubhttpd_nologcmd}
 	fi
- 	command="@SETENV@ - ${pubhttpd_postenv} @DAEMONTOOLS_PREFIX@/bin/envuidgid pubhttp @DAEMONTOOLS_PREFIX@/bin/softlimit -o20 -d${pubhttpd_datalimit} @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver ${name} -vDRH -l${pubhttpd_localname} -b${pubhttpd_backlog} -c${pubhttpd_conlimit} ${pubhttpd_host} ${pubhttpd_port} @PUBLICFILE_PREFIX@/publicfile/bin/httpd ${pubhttpd_root} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid publog ${pubhttpd_logcmd}"
+ 	command="@SETENV@ - ${pubhttpd_postenv} @PREFIX@/bin/envuidgid pubhttp @PREFIX@/bin/softlimit -o20 -d${pubhttpd_datalimit} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} -vDRH -l${pubhttpd_localname} -b${pubhttpd_backlog} -c${pubhttpd_conlimit} ${pubhttpd_host} ${pubhttpd_port} @PREFIX@/publicfile/bin/httpd ${pubhttpd_root} 2>&1 | @PREFIX@/bin/setuidgid publog ${pubhttpd_logcmd}"
 	command_args="&"
 	rc_flags=""
 }