From owner-svn-ports-head@freebsd.org Sun Jan 17 21:58:53 2016 Return-Path: Delivered-To: svn-ports-head@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 1AA10A86535; Sun, 17 Jan 2016 21:58:53 +0000 (UTC) (envelope-from adamw@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 E568B1DF8; Sun, 17 Jan 2016 21:58:52 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HLwpp1088265; Sun, 17 Jan 2016 21:58:51 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HLwpeM088262; Sun, 17 Jan 2016 21:58:51 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201601172158.u0HLwpeM088262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 17 Jan 2016 21:58:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406537 - in head/www/tikiwiki: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2016 21:58:53 -0000 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 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/