svn commit: r370102 - head/mail/rainloop

John Marino marino at FreeBSD.org
Sun Oct 5 18:35:34 UTC 2014


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 <bsd.port.mk>


More information about the svn-ports-head mailing list