--- b/www/autoindex2/Makefile	
+++ b/www/autoindex2/Makefile	
@@ -11,16 +11,15 @@ COMMENT=	PHP 5.x script that makes a table that lists the files in a directory
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 USE_PHP=	session
-DEFAULT_PHP_VER=	5
+DEFAULT_VERSIONS=	php=5
 CONFLICTS=	AutoIndex-1*
 LATEST_LINK=	AutoIndex2
 NO_BUILD=	yes
 
 PLIST_SUB+=	INSTALLDIR=${WWWDIR:S,^${PREFIX}/,,}
 
-NO_STAGE=	yes
 pre-fetch:
 .if !defined(INSTALLDIR)
 	@${ECHO_MSG} ""
@@ -31,14 +30,14 @@ pre-fetch:
 INSTALLDIR?=	${WWWDIR}
 
 do-install:
-	@${MKDIR} ${INSTALLDIR}
-	@${CP} -R ${WRKSRC}/* ${INSTALLDIR}
-	@${CP} -p ${WRKSRC}/.htpasswd.autoindex ${INSTALLDIR}/.htpasswd.autoindex-dist
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INSTALLDIR}
-	@${CHMOD} -R 644 ${INSTALLDIR}/* ${INSTALLDIR}/.htpasswd.autoindex-dist
-	@${CHMOD} 755 ${INSTALLDIR}/classes ${INSTALLDIR}/index_icons ${INSTALLDIR}/languages ${INSTALLDIR}/templates
-	@${CHMOD} 755 ${INSTALLDIR}/index_icons/* ${INSTALLDIR}/templates/default ${INSTALLDIR}/templates/simple_image_gallery
-	@${CHMOD} 664 ${INSTALLDIR}/config.php
+	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
+	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${INSTALLDIR}
+	@${CP} -p ${WRKSRC}/.htpasswd.autoindex ${STAGEDIR}${INSTALLDIR}/.htpasswd.autoindex-dist
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${INSTALLDIR}
+	@${CHMOD} -R 644 ${STAGEDIR}${INSTALLDIR}/* ${STAGEDIR}${INSTALLDIR}/.htpasswd.autoindex-dist
+	@${CHMOD} 755 ${STAGEDIR}${INSTALLDIR}/classes ${STAGEDIR}${INSTALLDIR}/index_icons ${STAGEDIR}${INSTALLDIR}/languages ${STAGEDIR}${INSTALLDIR}/templates
+	@${CHMOD} 755 ${STAGEDIR}${INSTALLDIR}/index_icons/* ${STAGEDIR}${INSTALLDIR}/templates/default ${STAGEDIR}${INSTALLDIR}/templates/simple_image_gallery
+	@${CHMOD} 664 ${STAGEDIR}${INSTALLDIR}/config.php
 	@${ECHO_CMD} ""
 
 post-install: