From owner-svn-ports-all@FreeBSD.ORG Sun Oct 5 18:35:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC91FA9C; Sun, 5 Oct 2014 18:35:33 +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 BD5A9A1B; Sun, 5 Oct 2014 18:35:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s95IZXbH040427; Sun, 5 Oct 2014 18:35:33 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s95IZXRC040426; Sun, 5 Oct 2014 18:35:33 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410051835.s95IZXRC040426@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 5 Oct 2014 18:35:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370102 - head/mail/rainloop 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.18-1 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: Sun, 05 Oct 2014 18:35:34 -0000 Author: marino Date: Sun Oct 5 18:35:33 2014 New Revision: 370102 URL: https://svnweb.freebsd.org/changeset/ports/370102 QAT: https://qat.redports.org/buildarchive/r370102/ Log: mail/rainloop: Rework to avoid unnecessary overriding do-extracts target There's no reason to roll-your-own extraction target, the stock target works fine. Remove and and adjust do-install accordingly; there's not change the pkg-plist. While here, remove RVER derivative of PORTVERSION. This looked wrong to me -- I doubt the RVER will end in ".164" after the PORTVERSION is incremented. If anything, the PORTVERSION would be derivative of RVER, but for now I just have two seprately defined variables. Also, unmask installation commands. Modified: head/mail/rainloop/Makefile Modified: head/mail/rainloop/Makefile ============================================================================== --- head/mail/rainloop/Makefile Sun Oct 5 18:25:26 2014 (r370101) +++ head/mail/rainloop/Makefile Sun Oct 5 18:35:33 2014 (r370102) @@ -10,20 +10,17 @@ COMMENT= Modern and interactive webmail USES= zip NO_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME} +NO_WRKSUBDIR= yes WANT_PHP_WEB= yes USE_PHP= curl iconv json xml dom openssl pcre spl zlib -RVER= ${PORTVERSION}.164 +RVER= 1.6.9.164 PLIST_SUB= VER="${RVER}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" # @TODO: PDO also for different backends -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKSRC} - @${EXTRACT_CMD} -d ${WRKSRC} ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} > /dev/null - do-install: - @${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR}/data + ${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${WWWDIR}/data + ${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} rainloop ${STAGEDIR}${WWWDIR}) .include