- Remove configuration files if they are not modified, otherwise print a

  warning that there are left over files (fixes plist errors).
- Unconditionally enable UTF8 support

Submitted by:	infofarmer@gmail.com (maintainer)
PR:		ports/92546

3 files changed, 77 insertions, 12 deletions

diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index 21520c8a46ae..aef2a0fe1fca 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yabb
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +16,7 @@ DISTNAME=	YaBB_${PORTVERSION}
 MAINTAINER=	infofarmer@gmail.com
 COMMENT=	The original free open-source forum written in Perl
 
-BROKEN=		Left over files
-
+NO_PACKAGE=	complicated (de)installation paradigm
 USE_ZIP=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
@@ -29,6 +28,7 @@ DIR=		${PREFIX}/${YABBDIR}
 WDIR=		${WRKDIR}/public_html/yabbfiles
 WCGI=		${WRKDIR}/cgi-bin/yabb2
 
+RUN_DEPENDS+=	sha256:${PORTSDIR}/sysutils/freebsd-sha256
 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 \
@@ -51,12 +51,10 @@ post-extract:
 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}
+.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
+.endfor
 
 do-install:
 	@${INSTALL} -d ${DIR}
@@ -64,13 +62,18 @@ do-install:
 	@${CP} -npR ${WDIR}/ ${DIR}/
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}
 	@${CHMOD} a=rx ${DIR}
+	@${CP} -fpR ${FILESDIR}/checksum.sha256 ${DIR}/
 	@${CAT} ${PKGMESSAGE}
 
 pre-clean:
-	@${CHMOD} -R =rwX ${WRKDIR}/*
+	@${CHMOD} -Rf +rwX ${WRKDIR}/* 2>/dev/null || true
 
 # Maintainer section
 #
 #grep -l 8859 `find yabb -type f`
+#echo '@unexec [ k`sha256 -q %D/%%YABBDIR%%/'$i'` = k`grep '\'$i\'' %D/%%YABBDIR%%/checksum.sha256 | cut -c-64` ] && rm -f %D/%%YABBDIR%%/'$i
+#echo '@unexec i='\'$i\'' ; if [ k`sha256 -q %D/%%YABBDIR%%/$i` = k`grep "$i" %D/%%YABBDIR%%/checksum.sha256 | cut -c-64` ] && rm -f %D/%%YABBDIR%%/$i'
+#echo '@unexec i='\'$i\''; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi'
+#@cd ${DIR} && ${SHA256} -r `${FIND} * -not -type d` > checksum.sha256
 
 .include <bsd.port.mk>
diff --git a/www/yabb/files/checksum.sha256 b/www/yabb/files/checksum.sha256
new file mode 100644
index 000000000000..ed62297572b9
--- /dev/null
+++ b/www/yabb/files/checksum.sha256
@@ -0,0 +1,30 @@
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 Boards/test.txt
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 Boards/announcements.txt
+01c226eac075fa3fa7212a9bc282301743d43297983f2c6b63ff5f59feb5cd7b Boards/forum.control
+7c54d4af1cd0e85d7c03965b684589317068ba444246e8919ae9a651eab11e6f Boards/forum.master
+85dc0fc6417b23d5920dbbec35cbaa2f335ffa1aa27fe8d8663475ccc14f78a0 Boards/forum.totals
+63a9493a390bc9a439b9930d7d67b4f3d28095a9f39dba71971b6fd1b75c5ee5 Boards/general.txt
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 Boards/recycle.txt
+433e11c295c51b94a074a17b8a0a192debc0f8958f10b61581c84d0ac83fcf21 Members/members.ttl
+53890dd1f22a8dd2b72e448744cd342abfb75e1ce485ce4b936881f8e77b597d Members/admin.ims
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 Members/admin.imstore
+0c7a3212a695729b3b8f2db5da534706148c54262100e5166eb0e43492530098 Members/admin.log
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 Members/admin.outbox
+4f939911e1271bb65be04d570713093b2c38249eae9791a0c254daa4b9cda986 Members/admin.rlog
+4df1baeeb618b78cf8f9e8c1599cdb28bf9c29f304e345984da71c096e3439e5 Members/admin.vars
+6e1910f6782c4df771f1c882f6fc9a0666d76a484927b28d349f4c108ea40a7c Members/memberinfo.txt
+580e27059c2185babff3e64310eabf5ca61f59eecade454aa3f8ecaef682716a Members/memberlist.txt
+6407bad0e98e0402f784289a77d2f7dcaa9be738da65e4f6cb552ba714091e74 Messages/1131465600.ctb
+245578aa030720e6651e12c846da8fcb45ae179ade0a8c6aa8bfc771741d0ffa Messages/1131465600.txt
+5523b24312fe1d09964c56ffe593686bedd4273efc654d81fc0e6ef844ef383e Paths.pl
+00e777b23902847665e6f3fe2d52ce7ea27beafe41fd37087e24d02485d1c088 Templates/default/AdminCentre.template
+7628c08d7f7d8e38dfabc4a336f55b8b849bd5c708ef87a44fa0ca32129691dc Templates/default/BoardIndex.template
+426af9fb29ac9cf08faf61f75c1ec06d032c141565272e816ac614f2192ed25d Templates/default/default.html
+f4bb6fccbc8961f5545e002fda424ceea9e69dbbac4a68870479d16611c4e610 Templates/default/Display.template
+efd84e02b7726347ef205c3e7d3adbb13b8c7d06c5f812c4374f6300484dd41f Templates/default/HelpCentre.template
+e70e882f5ca7a81f73cd69cb51257bd81c038384f4389c5c18101234be5fdd35 Templates/default/MessageIndex.template
+a19924036cd65363a5ffdf4ce54e154b6e3e069c10429ba0b6db6896af778100 Templates/Admin/default.css
+76f032b7895a2886fe9786e98c7035243ec5b501d1a01d8cdebc4bf959db88d4 Templates/Forum/default.css
+9b6e8bf38e1d05e7f52253132bf4d5b33bfeb64e1f48694d3c7920d00a6a91af Variables/Menu0.def
+e53814de36a0d47692db896563052ffb3ccfb8bc01178e549aff5da3871c64bb Variables/Menu1.def
+581d7971eafeb93f65e7da931a04ce5333c6a12ad1f3ffc0aa9caa2da0665646 Variables/Menu2.def
diff --git a/www/yabb/pkg-plist b/www/yabb/pkg-plist
index 54e873cd427d..1ba584c7ae7a 100644
--- a/www/yabb/pkg-plist
+++ b/www/yabb/pkg-plist
@@ -512,6 +512,37 @@
 %%YABBDIR%%/fader.js
 %%YABBDIR%%/post.js
 %%YABBDIR%%/ubbc.js
+@unexec i='Boards/test.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/announcements.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/forum.control'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/forum.master'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/forum.totals'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/general.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Boards/recycle.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/members.ttl'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.imstore'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.ims'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.log'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.outbox'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.rlog'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/admin.vars'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/memberinfo.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Members/memberlist.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Messages/1131465600.ctb'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Messages/1131465600.txt'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Paths.pl'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep  "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/AdminCentre.template'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/BoardIndex.template'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/default.html'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/Display.template'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/HelpCentre.template'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/default/MessageIndex.template'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/Admin/default.css'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Templates/Forum/default.css'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Variables/Menu0.def'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Variables/Menu1.def'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+@unexec i='Variables/Menu2.def'; cd %D/%%YABBDIR%% && if [ k`sha256 -q $i` = k`grep "$i\$" checksum.sha256 | cut -c-64` ]; then rm -f $i; fi
+%%YABBDIR%%/checksum.sha256
 @dirrmtry %%YABBDIR%%/Templates/default
 @dirrmtry %%YABBDIR%%/Templates/Admin/default
 @dirrmtry %%YABBDIR%%/Templates/Admin
@@ -538,7 +569,8 @@
 @dirrmtry %%YABBDIR%%/ModImages
 @dirrmtry %%YABBDIR%%/Buttons/English
 @dirrmtry %%YABBDIR%%/Buttons
-@unexec echo "================================================"
-@unexec echo "Note: %D/%%YABBDIR%% was not deleted."
-@unexec echo "Backup your data and remove it yourself, please."
-@unexec echo "================================================"
+@dirrmtry %%YABBDIR%%
+@unexec if [ -d %D/%%YABBDIR%% ]; then echo "================================================"; fi
+@unexec if [ -d %D/%%YABBDIR%% ]; then echo "Note: %D/%%YABBDIR%% was not deleted."           ; fi
+@unexec if [ -d %D/%%YABBDIR%% ]; then echo "Backup your data and remove it yourself, please."; fi
+@unexec if [ -d %D/%%YABBDIR%% ]; then echo "================================================"; fi