From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 23 01:37:27 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 D9B3A40F;
 Sat, 23 Aug 2014 01:37:27 +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 C50433ABA;
 Sat, 23 Aug 2014 01:37:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7N1bRYH088319;
 Sat, 23 Aug 2014 01:37:27 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7N1bRVv088318;
 Sat, 23 Aug 2014 01:37:27 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201408230137.s7N1bRVv088318@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 23 Aug 2014 01:37:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r365706 - head/www/siteframe
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-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Aug 2014 01:37:28 -0000

Author: marino
Date: Sat Aug 23 01:37:27 2014
New Revision: 365706
URL: http://svnweb.freebsd.org/changeset/ports/365706
QAT: https://qat.redports.org/buildarchive/r365706/

Log:
  www/siteframe: Rework so that overriding extract target is unnecessary

Modified:
  head/www/siteframe/Makefile

Modified: head/www/siteframe/Makefile
==============================================================================
--- head/www/siteframe/Makefile	Sat Aug 23 00:20:48 2014	(r365705)
+++ head/www/siteframe/Makefile	Sat Aug 23 01:37:27 2014	(r365706)
@@ -19,7 +19,7 @@ USE_MYSQL=	yes
 
 # where to install
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/__site
 .ifndef SITEFRAMEDIR
 .ifdef APACHE_DATADIR
 SITEFRAMEDIR=	${APACHE_DATADIR}/siteframe
@@ -32,12 +32,12 @@ SUB_FILES=	pkg-message
 SUB_LIST=	DIR=${SITEFRAMEDIR}
 PLIST_SUB=	WWWOWN="${WWWOWN}"
 
-do-extract:
-	@${MKDIR} ${WRKDIR}/${PORTNAME}
-	@ cd ${WRKDIR}/${PORTNAME}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} ${EXTRACT_AFTER_ARGS}
+post-extract:
+	@${MKDIR} ${WRKSRC}
+	@(cd ${WRKDIR} && ${MV} [CLRa-z]* _htaccess ${WRKSRC})
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SITEFRAMEDIR}/
-	${CP} -R ${WRKDIR}/${PORTNAME}/* ${STAGEDIR}${SITEFRAMEDIR}/
+	${MKDIR} ${STAGEDIR}${SITEFRAMEDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SITEFRAMEDIR})
 
 .include <bsd.port.mk>