svn commit: r369124 - head/www/autoindex2

[Olli Hauer]

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
- at dirrm %%INSTALLDIR%%/classes
- at dirrm %%INSTALLDIR%%/index_icons/apache
- at dirrm %%INSTALLDIR%%/index_icons/kde
- at dirrm %%INSTALLDIR%%/index_icons/osx
- at dirrm %%INSTALLDIR%%/index_icons/winvista
- at dirrm %%INSTALLDIR%%/index_icons/winxp
- at dirrm %%INSTALLDIR%%/index_icons
- at dirrm %%INSTALLDIR%%/languages
- at dirrm %%INSTALLDIR%%/templates/default
- at dirrm %%INSTALLDIR%%/templates/simple_image_gallery
- at dirrm %%INSTALLDIR%%/templates
- at dirrmtry %%INSTALLDIR%%
+ at dir %%INSTALLDIR%%