svn commit: r400220 - in head/www/yabb: . files

[Rodrigo Osorio]

Author: rodrigo
Date: Tue Oct 27 08:19:08 2015
New Revision: 400220
URL: https://svnweb.freebsd.org/changeset/ports/400220

Log:
  Fix installation for non-root users
  Remove useless checkusm file
  
  PR:		203779
  Submitted by:	amdmi3

Deleted:
  head/www/yabb/files/checksum.sha256
Modified:
  head/www/yabb/Makefile
  head/www/yabb/pkg-plist

Modified: head/www/yabb/Makefile
==============================================================================
--- head/www/yabb/Makefile	Tue Oct 27 07:50:02 2015	(r400219)
+++ head/www/yabb/Makefile	Tue Oct 27 08:19:08 2015	(r400220)
@@ -3,12 +3,13 @@
 
 PORTNAME=	yabb
 PORTVERSION=	2.6.11
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.yabbforum.com/downloads/release/
 DISTNAME=	YaBB_${PORTVERSION}
 
 MAINTAINER=	rodrigo at FreeBSD.org
-COMMENT=	The original free open-source forum written in Perl
+COMMENT=	Original free open-source forum written in Perl
 
 LICENSE=	YABB_PUBLIC_LICENCE
 LICENSE_NAME=	YABB PUBLIC LICENCE
@@ -17,14 +18,16 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 
 RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
 
-NO_PACKAGE=	complicated (de)installation paradigm
-USES=		perl5 zip
+USES=		perl5 shebangfix zip
 USE_PERL5=	run
 NO_BUILD=	yes
+NO_ARCH=	yes
 WWWDOCROOT?=	www
 YABBSUBDIR?=	yabb
 YABBDIR?=	${WWWDOCROOT}/${YABBSUBDIR}
-PLIST_SUB=	YABBDIR=${YABBDIR}
+PLIST_SUB=	YABBDIR=${YABBDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 DIR=		${PREFIX}/${YABBDIR}
 WDIR=		${WRKSRC}/public_html/yabbfiles
 WCGI=		${WRKSRC}/cgi-bin/yabb2
@@ -40,38 +43,29 @@ ISOFILES=	Admin/NewSettings.pm \
 PERLFILES=	AdminIndex.pl BoardConvert.pl Convert.pl \
 		Convert2x.pl Setup.pl Sources/SpellChecker.pl YaBB.pl
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@${RM} -rf ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl
+
+do-patch:
+.for _I in ${PERLFILES}
+	@${SED} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' ${WCGI}/${_I}
+.endfor
+
+post-patch:
 	@${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:
-.for _I in ${PERLFILES}
-	@${SED} -i.tmp -e 's|/usr/bin/perl|/usr/local/bin/perl|' ${WCGI}/${_I} && \
-	${RM} -f ${_I}.tmp
-.endfor
-
 do-install:
-	@${INSTALL} -d ${STAGEDIR}${DIR}
+	${INSTALL} -d ${STAGEDIR}${DIR}
 	@cd ${WCGI} && ${COPYTREE_SHARE} . ${STAGEDIR}${DIR}/
 	@cd ${WDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DIR}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${DIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}' \
-		>>${TMPPLIST}
 	@${CHMOD} a=rx ${STAGEDIR}${DIR}
-	@${ECHO_CMD} '@exec ${CHMOD} a=rx ${DIR}' >>${TMPPLIST}
-	@${CP} -fpR ${FILESDIR}/checksum.sha256 ${STAGEDIR}${DIR}/
-
-pre-clean:
-	@${CHMOD} -Rf +rwX ${WRKDIR}/* 2>/dev/null || true
 
 # Maintainer section
 # The result goest to ISOFILES
 #grep -l 8859 `find yabb -type f`
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/yabb/pkg-plist
==============================================================================
--- head/www/yabb/pkg-plist	Tue Oct 27 07:50:02 2015	(r400219)
+++ head/www/yabb/pkg-plist	Tue Oct 27 08:19:08 2015	(r400220)
@@ -1,3 +1,5 @@
+ at owner %%WWWOWN%%
+ at group %%WWWOWN%%
 %%YABBDIR%%/AJS.js
 %%YABBDIR%%/AJS_fx.js
 %%YABBDIR%%/Admin/.htaccess
@@ -797,7 +799,6 @@
 %%YABBDIR%%/avatars/winnie.gif
 %%YABBDIR%%/avatars/xena.gif
 %%YABBDIR%%/cache.js
-%%YABBDIR%%/checksum.sha256
 %%YABBDIR%%/googiespell/GPL.txt
 %%YABBDIR%%/googiespell/blank.gif
 %%YABBDIR%%/googiespell/change_lang.gif
@@ -836,7 +837,41 @@
 %%YABBDIR%%/shjs/sh_sql.js
 %%YABBDIR%%/shjs/styles/sh_style.css
 %%YABBDIR%%/ubbc.js
- at dir %%YABBDIR%%/Attachments
- at dir %%YABBDIR%%/ModImages
- at dir %%YABBDIR%%/Templates/Forum/default/Boards
+ at dir %%YABBDIR%%/shjs/styles
+ at dir %%YABBDIR%%/shjs
+ at dir %%YABBDIR%%/greybox
+ at dir %%YABBDIR%%/googiespell
 @dir %%YABBDIR%%/avatars/UserAvatars
+ at dir %%YABBDIR%%/avatars
+ at dir %%YABBDIR%%/Variables
+ at dir %%YABBDIR%%/UBBCbuttons
+ at dir %%YABBDIR%%/Templates/default
+ at dir %%YABBDIR%%/Templates/Forum/default/Boards
+ at dir %%YABBDIR%%/Templates/Forum/default
+ at dir %%YABBDIR%%/Templates/Forum
+ at dir %%YABBDIR%%/Templates/Admin/default
+ at dir %%YABBDIR%%/Templates/Admin
+ at dir %%YABBDIR%%/Templates
+ at dir %%YABBDIR%%/Sources
+ at dir %%YABBDIR%%/Smilies
+ at dir %%YABBDIR%%/PMAttachments
+ at dir %%YABBDIR%%/ModImages
+ at dir %%YABBDIR%%/Messages
+ at dir %%YABBDIR%%/Members
+ at dir %%YABBDIR%%/Languages/English
+ at dir %%YABBDIR%%/Languages
+ at dir %%YABBDIR%%/Help/English/User
+ at dir %%YABBDIR%%/Help/English/Moderator
+ at dir %%YABBDIR%%/Help/English/Gmod
+ at dir %%YABBDIR%%/Help/English/Admin
+ at dir %%YABBDIR%%/Help
+ at dir %%YABBDIR%%/EventIcons
+ at dir %%YABBDIR%%/Buttons
+ at dir %%YABBDIR%%/Bookmarks
+ at dir %%YABBDIR%%/Boards
+ at dir %%YABBDIR%%/Backups
+ at dir %%YABBDIR%%/Attachments
+ at dir %%YABBDIR%%/Admin
+ at dir %%YABBDIR%%
+ at owner
+ at group