Attachment 162052 Details for Bug 203779 – Patch

[patch] Patch

yabb.patch (text/plain), 3.71 KB, created by Dmitry Marakasov on 2015-10-14 20:26:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-10-14 20:26:30 UTC

Size: 3.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 395797)
>+++ Makefile	(working copy)
>@@ -17,14 +17,16 @@
> 
> 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,10 +42,15 @@
> 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
>@@ -50,28 +57,15 @@
> 	@${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}
> 	@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}
>+	@${INSTALL_DATA} ${FILESDIR}/checksum.sha256 ${STAGEDIR}${DIR}/
> 	@${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>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 395797)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,5 @@
>+@owner %%WWWOWN%%
>+@group %%WWWOWN%%
> %%YABBDIR%%/AJS.js
> %%YABBDIR%%/AJS_fx.js
> %%YABBDIR%%/Admin/.htaccess
>@@ -836,7 +838,41 @@
> %%YABBDIR%%/shjs/sh_sql.js
> %%YABBDIR%%/shjs/styles/sh_style.css
> %%YABBDIR%%/ubbc.js
>+@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%%/ModImages
>-@dir %%YABBDIR%%/Templates/Forum/default/Boards
>-@dir %%YABBDIR%%/avatars/UserAvatars
>+@dir %%YABBDIR%%/Admin
>+@dir %%YABBDIR%%
>+@owner
>+@group

Actions: View | Diff

Attachments on bug 203779: 162052