- Now installs into /usr/local/www instead of /usr/local/www/{data,cgi-bin}

- Data flatfiles are now cautiously left behind whether they have changed or not
- Beta UTF-8 support
- Use external Perl modules instead of the bundled ones
- Tighter security through more carefully set file permissions

PR:		ports/92316
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com> (maintainer)

www/yabb/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	yabb
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,57 +19,56 @@ COMMENT=	The original free open-source forum written in Perl
 USE_ZIP=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
-WWWDOCROOT?=	www/data
-WWWCGIROOT?=	www/cgi-bin
-YABBFILES?=	${WWWDOCROOT}/yabbfiles
-YABBGUIDE?=	${WWWDOCROOT}/yabb-guide
-YABBCGI?=	${WWWCGIROOT}/yabb2
+WWWDOCROOT?=	www
+YABBSUBDIR?=	yabb
+YABBDIR?=	${WWWDOCROOT}/${YABBSUBDIR}
+PLIST_SUB=	YABBDIR=${YABBDIR}
+DIR=		${PREFIX}/${YABBDIR}
+WDIR=		${WRKDIR}/public_html/yabbfiles
+WCGI=		${WRKDIR}/cgi-bin/yabb2
 
-.if !defined(WITHOUT_YABB_GUIDE)
-PLIST_SUB+=	NOYABBGUIDE=""
-.else
-PLIST_SUB+=	NOYABBGUIDE="@comment "
-.endif
+RUN_DEPENDS+=	${SITE_PERL}/CGI/Util.pm:${PORTSDIR}/www/p5-CGI.pm \
+	${SITE_PERL}/mach/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+	${SITE_PERL}/mach/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+	${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
 
-PLIST_SUB+=	YABBFILES=${YABBFILES}
-PLIST_SUB+=	YABBCGI=${YABBCGI}
-PLIST_SUB+=	YABBGUIDE=${YABBGUIDE}
-PLIST_SUB+=	DOCSDIR=${DOCSDIR}
-PLIST_SUB+=	INSTALL=${INSTALL}
-
-YFILES=		${PREFIX}/${YABBFILES}
-YGUIDE=		${PREFIX}/${YABBGUIDE}
-YCGI=		${PREFIX}/${YABBCGI}
-
-PORTDOCS=	VERSION.txt README.txt
 SUB_FILES=	pkg-message
+SUB_LIST=	DIR=${DIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+ISOFILES=	Setup.pl Admin/ManageTemplates.pl Languages/English/Admin.lng \
+	Languages/English/Main.lng Templates/default/AdminCentre.template
+
+post-extract:
+	@${RM} -rf ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl
+	@${CHMOD} -R a=,u+rwX ${WCGI}/*
+	@${CHMOD} a=rx ${WCGI}/AdminIndex.pl ${WCGI}/Setup.pl ${WCGI}/YaBB.pl
+	@${CHMOD} -R a-w ${WCGI}/Admin ${WCGI}/Languages ${WCGI}/Sources
+	@${CHMOD} -R a=rX ${WDIR}/*
+	@${CHMOD} -R u+w ${WDIR}/Attachments ${WDIR}/Templates
+
+do-patch:
+	@${SED} -i.tmp -e 's/Upload:://' ${WCGI}/Sources/Subs.pl && \
+	${RM} -f ${WCGI}/Sources/Subs.pl.tmp
+.ifdef WITH_UTF8
+.	for _I in ${ISOFILES}
+	@${SED} -i.tmp -e 's/[iI][sS][oO]-8859-1/UTF-8/' ${WCGI}/${_I} && \
+	${RM} -f ${WCGI}/${_I}.tmp
+.	endfor
+.endif
 
 do-install:
-	${MKDIR} ${YFILES} ${YGUIDE} ${YCGI}
-	${CP} -R ${WRKDIR}/public_html/yabbfiles/ ${YFILES}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${YFILES}
-	${CHMOD} -R a+r,o-w,ug+w ${YFILES}
-
-	${CP} -R ${WRKDIR}/cgi-bin/yabb2/ ${YCGI}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${YCGI}
-	${CHMOD} -R a+r,ug+w ${YCGI}
-	${CHMOD} 755 ${YCGI}/*pl
-	${CHMOD} 664 ${YCGI}/Paths.pl
-
-.if !defined(WITHOUT_YABB_GUIDE)
-	${CP} -R ${WRKDIR}/Quick-Guide/ ${YGUIDE}
-	${LN} -fs ${YGUIDE}/Quick-Guide.html ${YGUIDE}/index.html
-	${CHOWN} -R ${YABB_USER}:${WWWGRP} ${YGUIDE}
-	${CHMOD} -R go-w,a+r ${YGUIDE}
-.endif
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/VERSION.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
-.endif
-
+	@${INSTALL} -d ${DIR}
+	@${CP} -npR ${WCGI}/ ${DIR}/
+	@${CP} -npR ${WDIR}/ ${DIR}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}
+	@${CHMOD} a=rx ${DIR}
 	@${CAT} ${PKGMESSAGE}
 
+pre-clean:
+	@${CHMOD} -R =rwX ${WRKDIR}/*
+
+# Maintainer section
+#
+#grep -l 8859 `find yabb -type f`
+
 .include <bsd.port.mk>

www/yabb/files/pkg-message.in

@@ -1,18 +1,11 @@
-YaBB is now installed. It requires further
-configuration, though.
+===============================================
+YaBB is now installed in %%DIR%%
 
-If you didn't specify otherwise a quick guide
-is available at: http://yourserver/yabb-quide/
-
-A readme and is available at:
-%%DOCSDIR%%
+Make it available through your web server and
+visit http://<path-to-yabb>/Setup.pl to
+configure it. You must remove Setup.pl when
+you're done for security reasons.
 
 For additional documentation please visit the
 official site at: http://www.yabbforum.com/
-
-To start a setup process browse to:
-http://yourserver/cgi-bin/yabb2/Setup.pl
-
-Please note that this port is still a work in
-progress. Use it carefully and make a backup
-before you upgrade.
+===============================================