From owner-svn-ports-head@FreeBSD.ORG Fri Jun 13 20:06:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC3F6DA; Fri, 13 Jun 2014 20:06:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9CD692164; Fri, 13 Jun 2014 20:06:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5DK6Zik095791; Fri, 13 Jun 2014 20:06:35 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5DK6ZvD095790; Fri, 13 Jun 2014 20:06:35 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406132006.s5DK6ZvD095790@svn.freebsd.org> From: John Marino Date: Fri, 13 Jun 2014 20:06:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357720 - head/www/tikiwiki 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.18 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: Fri, 13 Jun 2014 20:06:35 -0000 Author: marino Date: Fri Jun 13 20:06:35 2014 New Revision: 357720 URL: http://svnweb.freebsd.org/changeset/ports/357720 QAT: https://qat.redports.org/buildarchive/r357720/ Log: www/tikiwiki: Add Stage support, switch to autogen pkg list PR: 190954 Submitted by: Joe Benden The stage PR worked, but there were existing problems that weren't fixed, such as muted install commands, "cp -r" instead of install macros, the use of "-" prefix on commands that won't fail. A list of additional, "while we are here changes": * 16,000+ line, 1.1Mb pkg-plist removed, autogen instead * Remove now-unnecessary x-generate-plist maintainer target * Remove PLIST_SUB lines * Remove unnecessary roll-your-own extract target. Leave one original deletion as a post-extract target * Use COPYTREE_SHARE instead of "cp -r" * move CHOWN operations to pkg-plist generation Deleted: head/www/tikiwiki/pkg-plist Modified: head/www/tikiwiki/Makefile Modified: head/www/tikiwiki/Makefile ============================================================================== --- head/www/tikiwiki/Makefile Fri Jun 13 19:06:57 2014 (r357719) +++ head/www/tikiwiki/Makefile Fri Jun 13 20:06:35 2014 (r357720) @@ -17,35 +17,30 @@ USE_PHP= gettext pcre posix session xml WANT_PHP_WEB= yes NO_BUILD= yes +NO_MTREE= yes TIKIWIKI_DIR?= www/${PORTNAME}-${PORTVERSION} -PLIST_SUB= TIKIWIKI_DIR=${TIKIWIKI_DIR} -TEMP_PLIST= ${WRKDIR}/temp-pkg-plist SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} TIKIWIKI_DIR=${TIKIWIKI_DIR} -WRKSRC= ${WRKDIR}/${DISTNAME} -# This target is only meant to be used by the port maintainer. -# Stolen from dokuwiki sorry :) - -x-generate-plist: extract - @cd ${WRKSRC} && ${FIND} -s . -type f | \ - ${SED} -e 's|^./||;s|^|%%TIKIWIKI_DIR%%/|' > ${TEMP_PLIST} \ - && ${FIND} -s -d * -type d | \ - ${SED} -e 's|^|@dirrm %%TIKIWIKI_DIR%%/|' >> ${TEMP_PLIST} \ - && ${ECHO_CMD} "@dirrmtry %%TIKIWIKI_DIR%%" >> ${TEMP_PLIST} - -NO_STAGE= yes -do-extract: - ${MKDIR} ${WRKDIR} - ${TAR} -yxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR} +post-extract: @${FIND} ${WRKSRC} -name '.DS_Store' -delete do-install: - -${MKDIR} ${PREFIX}/${TIKIWIKI_DIR} - @${CP} -R ${WRKSRC}/ ${PREFIX}/${TIKIWIKI_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${TIKIWIKI_DIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR} + cd ${WRKSRC} && \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR} + +# pkg-plist would be over 15,000 lines, consuming 1.1Mb +# The benefits of a fixed pkg-plist aren't worth it, autogen! post-install: - @${CAT} ${PKGMESSAGE} + @echo "@owner ${WWWOWN}" >> ${TMPPLIST} + @echo "@group ${WWWGRP}" >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ + ${SORT} >> ${TMPPLIST} + @echo "@owner" >> ${TMPPLIST} + @echo "@group" >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | \ + ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST} .include