- Utilize DOCSDIR

- ${ECHO} -> ${ECHO_MSG}
- make portlint hapy: change spaces with tabs, change ${file}
  with ${f}

PR:		55905
Submitted by:	maintainer

2 files changed, 28 insertions, 28 deletions

diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index b712478f0dbe..c749e9947964 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	frox
 PORTVERSION=	0.7.8
 CATEGORIES=	ftp
-MASTER_SITES= 	http://www.hollo.org/frox/download/ \
+MASTER_SITES=	http://www.hollo.org/frox/download/ \
 		http://frox.sourceforge.net/download/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,40 +27,40 @@ DOCS=	FAQ SECURITY CREDITS ChangeLog
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-CONFIGURE_ARGS= --enable-configfile=${PREFIX}/etc/frox.conf
+CONFIGURE_ARGS=	--enable-configfile=${PREFIX}/etc/frox.conf
 
 .if defined(WITH_IPFILTER)
-CONFIGURE_ARGS+= --enable-ipfilter
+CONFIGURE_ARGS+=	--enable-ipfilter
 .endif
 .if defined(WITH_VIRUS_SCAN)
-CONFIGURE_ARGS+= --enable-virus-scan
+CONFIGURE_ARGS+=	--enable-virus-scan
 .endif
 .if !defined(WITHOUT_HTTP_CACHE)
-CONFIGURE_ARGS+= --enable-http-cache
+CONFIGURE_ARGS+=	--enable-http-cache
 .endif
 .if !defined(WITHOUT_LOCAL_CACHE)
-CONFIGURE_ARGS+= --enable-local-cache
+CONFIGURE_ARGS+=	--enable-local-cache
 .endif
 .if !defined(WITHOUT_CCP)
-CONFIGURE_ARGS+= --enable-ccp
+CONFIGURE_ARGS+=	--enable-ccp
 .endif
 .if defined(RUN_AS_ROOT)
-CONFIGURE_ARGS+= --enable-run-as-root
+CONFIGURE_ARGS+=	--enable-run-as-root
 .endif
 
 pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You can use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_IPFILTER=yes	use ipfilter instead of ipfw;"
-	@${ECHO} "	WITH_VIRUS_SCAN=yes	enable to run external virus scaner on each"
-	@${ECHO} "				download (experimental);"
-	@${ECHO} "	WITHOUT_HTTP_CACHE=yes	disable use of external cache;"
-	@${ECHO} "	WITHOUT_LOCAL_CACHE=yes	disable use of local cache;"
-	@${ECHO} "	WITHOUT_CCP=yes		disable ftp-proxy style command control programs;"
-	@${ECHO} "	RUN_AS_ROOT=yes		allow frox running as root for using"
-	@${ECHO} "				port number <1024 (not recomended)."
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You can use the following build options:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "	WITH_IPFILTER=yes	use ipfilter instead of ipfw;"
+	@${ECHO_MSG} "	WITH_VIRUS_SCAN=yes	enable to run external virus scaner on each"
+	@${ECHO_MSG} "				download (experimental);"
+	@${ECHO_MSG} "	WITHOUT_HTTP_CACHE=yes	disable use of external cache;"
+	@${ECHO_MSG} "	WITHOUT_LOCAL_CACHE=yes	disable use of local cache;"
+	@${ECHO_MSG} "	WITHOUT_CCP=yes		disable ftp-proxy style command control programs;"
+	@${ECHO_MSG} "	RUN_AS_ROOT=yes		allow frox running as root for using"
+	@${ECHO_MSG} "				port number <1024 (not recomended)."
+	@${ECHO_MSG} ""
 
 pre-patch:
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE}
@@ -74,13 +74,13 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
 .endfor
 .endif
 	@${STRIP_CMD} ${PREFIX}/sbin/frox
 	@if [ ! -f ${PREFIX}/etc/rc.d/${PORTNAME}.sh ]; then \
-		${ECHO_CMD} "Install ${PREFIX}/etc/rc.d/${PORTNAME}.sh startup file."; \
+		${ECHO_MSG} "Install ${PREFIX}/etc/rc.d/${PORTNAME}.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/${PORTNAME}.sh; \
 	fi
 	@${CAT} ${PKGMESSAGE}
diff --git a/ftp/frox/pkg-plist b/ftp/frox/pkg-plist
index e9891cce765c..c4abd85381a0 100644
--- a/ftp/frox/pkg-plist
+++ b/ftp/frox/pkg-plist
@@ -1,8 +1,8 @@
 sbin/frox
 etc/frox.conf.sample
 etc/rc.d/frox.sh
-%%PORTDOCS%%share/doc/frox/FAQ
-%%PORTDOCS%%share/doc/frox/SECURITY
-%%PORTDOCS%%share/doc/frox/CREDITS
-%%PORTDOCS%%share/doc/frox/ChangeLog
-%%PORTDOCS%%@dirrm share/doc/frox
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%