From owner-svn-ports-head@FreeBSD.ORG  Tue Sep 23 21:28:36 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F3CBF28F;
 Tue, 23 Sep 2014 21:28: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 C49EEBA3;
 Tue, 23 Sep 2014 21:28:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NLSZCv024819;
 Tue, 23 Sep 2014 21:28:35 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NLSZSb024817;
 Tue, 23 Sep 2014 21:28:35 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201409232128.s8NLSZSb024817@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ohauer set sender to
 ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 23 Sep 2014 21:28:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369124 - head/www/autoindex2
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: Tue, 23 Sep 2014 21:28:36 -0000

Author: ohauer
Date: Tue Sep 23 21:28:34 2014
New Revision: 369124
URL: http://svnweb.freebsd.org/changeset/ports/369124
QAT: https://qat.redports.org/buildarchive/r369124/

Log:
  - fix DEFAULT_VERSIONS usage
  - fix `make restage'
  - tim pkg-plist

Modified:
  head/www/autoindex2/Makefile
  head/www/autoindex2/pkg-plist

Modified: head/www/autoindex2/Makefile
==============================================================================
--- head/www/autoindex2/Makefile	Tue Sep 23 21:16:59 2014	(r369123)
+++ head/www/autoindex2/Makefile	Tue Sep 23 21:28:34 2014	(r369124)
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 USES=		dos2unix
 USE_PHP=	session
-DEFAULT_VERSIONS=	php=5
+DEFAULT_VERSIONS+=	php=5
 CONFLICTS=	AutoIndex-1*
 LATEST_LINK=	AutoIndex2
 NO_BUILD=	yes
@@ -23,10 +23,12 @@ INSTALLDIR?=	${WWWDIR}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
 		INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,}
 
+post-extract:
+	${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.sample
+	${MV} ${WRKSRC}/.htpasswd.autoindex ${WRKSRC}/.htpasswd.autoindex.sample
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
-	cd ${WRKSRC} && ${MV} config.php config.php.sample
-	cd ${WRKSRC} && ${MV} .htpasswd.autoindex .htpasswd.autoindex.sample
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR})
 
 .include <bsd.port.mk>

Modified: head/www/autoindex2/pkg-plist
==============================================================================
--- head/www/autoindex2/pkg-plist	Tue Sep 23 21:16:59 2014	(r369123)
+++ head/www/autoindex2/pkg-plist	Tue Sep 23 21:28:34 2014	(r369124)
@@ -230,16 +230,5 @@
 %%INSTALLDIR%%/templates/readme.html
 @owner
 @group
-@dirrm %%INSTALLDIR%%/classes
-@dirrm %%INSTALLDIR%%/index_icons/apache
-@dirrm %%INSTALLDIR%%/index_icons/kde
-@dirrm %%INSTALLDIR%%/index_icons/osx
-@dirrm %%INSTALLDIR%%/index_icons/winvista
-@dirrm %%INSTALLDIR%%/index_icons/winxp
-@dirrm %%INSTALLDIR%%/index_icons
-@dirrm %%INSTALLDIR%%/languages
-@dirrm %%INSTALLDIR%%/templates/default
-@dirrm %%INSTALLDIR%%/templates/simple_image_gallery
-@dirrm %%INSTALLDIR%%/templates
-@dirrmtry %%INSTALLDIR%%
+@dir %%INSTALLDIR%%