From owner-svn-ports-all@freebsd.org Tue Oct 27 08:19:09 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F20C4A1F4D5; Tue, 27 Oct 2015 08:19:09 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA1031EC0; Tue, 27 Oct 2015 08:19:09 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9R8J8xS011314; Tue, 27 Oct 2015 08:19:08 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9R8J8ms011312; Tue, 27 Oct 2015 08:19:08 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201510270819.t9R8J8ms011312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Tue, 27 Oct 2015 08:19:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400220 - in head/www/yabb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2015 08:19:10 -0000 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@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 - 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 +.include 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 @@ +@owner %%WWWOWN%% +@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 -@dir %%YABBDIR%%/Attachments -@dir %%YABBDIR%%/ModImages -@dir %%YABBDIR%%/Templates/Forum/default/Boards +@dir %%YABBDIR%%/shjs/styles +@dir %%YABBDIR%%/shjs +@dir %%YABBDIR%%/greybox +@dir %%YABBDIR%%/googiespell @dir %%YABBDIR%%/avatars/UserAvatars +@dir %%YABBDIR%%/avatars +@dir %%YABBDIR%%/Variables +@dir %%YABBDIR%%/UBBCbuttons +@dir %%YABBDIR%%/Templates/default +@dir %%YABBDIR%%/Templates/Forum/default/Boards +@dir %%YABBDIR%%/Templates/Forum/default +@dir %%YABBDIR%%/Templates/Forum +@dir %%YABBDIR%%/Templates/Admin/default +@dir %%YABBDIR%%/Templates/Admin +@dir %%YABBDIR%%/Templates +@dir %%YABBDIR%%/Sources +@dir %%YABBDIR%%/Smilies +@dir %%YABBDIR%%/PMAttachments +@dir %%YABBDIR%%/ModImages +@dir %%YABBDIR%%/Messages +@dir %%YABBDIR%%/Members +@dir %%YABBDIR%%/Languages/English +@dir %%YABBDIR%%/Languages +@dir %%YABBDIR%%/Help/English/User +@dir %%YABBDIR%%/Help/English/Moderator +@dir %%YABBDIR%%/Help/English/Gmod +@dir %%YABBDIR%%/Help/English/Admin +@dir %%YABBDIR%%/Help +@dir %%YABBDIR%%/EventIcons +@dir %%YABBDIR%%/Buttons +@dir %%YABBDIR%%/Bookmarks +@dir %%YABBDIR%%/Boards +@dir %%YABBDIR%%/Backups +@dir %%YABBDIR%%/Attachments +@dir %%YABBDIR%%/Admin +@dir %%YABBDIR%% +@owner +@group