Date: Sun, 17 Jan 2016 21:58:51 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406537 - in head/www/tikiwiki: . files Message-ID: <201601172158.u0HLwpeM088262@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Jan 17 21:58:51 2016 New Revision: 406537 URL: https://svnweb.freebsd.org/changeset/ports/406537 Log: Update to 14.1. While here, simplify the plist generation process. Also, remove "%%PORTNAME%%" from pkg-message. It was silly, only used in one place and every other usage of "tikiwiki" in the same file was hardcoded. Besides, tikiwiki has been around for 14 years, and if they haven't changed the name yet they're probably not just biding their time. Modified: head/www/tikiwiki/Makefile head/www/tikiwiki/distinfo head/www/tikiwiki/files/pkg-message.in Modified: head/www/tikiwiki/Makefile ============================================================================== --- head/www/tikiwiki/Makefile Sun Jan 17 20:12:20 2016 (r406536) +++ head/www/tikiwiki/Makefile Sun Jan 17 21:58:51 2016 (r406537) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= tikiwiki -PORTVERSION= 13.1 +PORTVERSION= 14.1 CATEGORIES= www -MASTER_SITES= SF/${PORTNAME}/Tiki_13.x_Fomalhaut/${PORTVERSION}/ +MASTER_SITES= SF/${PORTNAME}/Tiki_14.x_Peony/${PORTVERSION}/ DISTNAME= tiki-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -20,10 +20,7 @@ NO_BUILD= yes NO_MTREE= yes TIKIWIKI_DIR?= www/${PORTNAME}-${PORTVERSION} SUB_FILES= pkg-message -SUB_LIST+= PORTNAME=${PORTNAME} TIKIWIKI_DIR=${TIKIWIKI_DIR} - -post-extract: - @${FIND} ${WRKSRC} -name '.DS_Store' -o -name '.git' | ${XARGS} ${RM} -rf +SUB_LIST+= TIKIWIKI_DIR=${TIKIWIKI_DIR} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR} @@ -34,16 +31,9 @@ do-install: # The benefits of a fixed pkg-plist aren't worth it, autogen! post-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST} @(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ - ${SORT} >> ${TMPPLIST}) - @${ECHO_CMD} "@owner" >> ${TMPPLIST} - @${ECHO_CMD} "@group" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/lib/test/core/Profile" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_755" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_775" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_777" >> ${TMPPLIST} - @${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/vendor_extra/elfinder/files" >> ${TMPPLIST} + ${SORT} | ${SED} -e 's/^/@(${WWWOWN},${WWWGRP},) /' >> ${TMPPLIST}) + @(cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \ + ${SORT} -r | ${SED} -e 's/^/@dir /' >> ${TMPPLIST}) .include <bsd.port.mk> Modified: head/www/tikiwiki/distinfo ============================================================================== --- head/www/tikiwiki/distinfo Sun Jan 17 20:12:20 2016 (r406536) +++ head/www/tikiwiki/distinfo Sun Jan 17 21:58:51 2016 (r406537) @@ -1,2 +1,2 @@ -SHA256 (tiki-13.1.tar.gz) = 8eff5bd7d885e54e948c771c0b0f6e92a7b5494e5b951c922208141639129a33 -SIZE (tiki-13.1.tar.gz) = 54640100 +SHA256 (tiki-14.1.tar.gz) = bcca2e72d89a5c11d32fad4e741c71c3b8d2c2bd4c29601d58c17864345037b2 +SIZE (tiki-14.1.tar.gz) = 48436906 Modified: head/www/tikiwiki/files/pkg-message.in ============================================================================== --- head/www/tikiwiki/files/pkg-message.in Sun Jan 17 20:12:20 2016 (r406536) +++ head/www/tikiwiki/files/pkg-message.in Sun Jan 17 21:58:51 2016 (r406537) @@ -4,7 +4,7 @@ # # Directives to allow use of tikiwiki # - Alias /%%PORTNAME%% "%%PREFIX%%/%%TIKIWIKI_DIR%%/" + Alias /tikiwiki "%%PREFIX%%/%%TIKIWIKI_DIR%%/" 2) Open the following page in your browser and follow the instructions: http://www.your.host/tikiwiki/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601172158.u0HLwpeM088262>