Index: head/www/mod_backtrace/Makefile
===================================================================
--- head/www/mod_backtrace/Makefile	(revision 491914)
+++ head/www/mod_backtrace/Makefile	(revision 491915)
@@ -1,40 +1,40 @@
 # Created by: Frank Wall <fw@moov.de>
 # $FreeBSD$
 
 PORTNAME=	mod_backtrace
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://people.apache.org/~trawick/ \
 		http://dl.moov.de/freebsd/${PORTNAME}/
 DISTNAME=	${PORTNAME}.c
 EXTRACT_SUFX=	# none
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	fw@moov.de
 COMMENT=	Collects backtraces when a child process crashes
 
 LICENSE=	APACHE20
 
 MANUAL_PACKAGE_BUILD=	requires apache WITH_EXCEPTION_HOOK=yes
 
 USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-lexecinfo
 AP_LIB+=	${LOCALBASE}/lib
 SHORTMODNAME=	backtrace
 
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 
 pre-everything::
 	@${ECHO_MSG} "*********************** PLEASE NOTE! ***********************"
 	@${ECHO_MSG} "Apache httpd must be built with the --enable-exception-hook"
 	@${ECHO_MSG} "configure option and mod_so enabled."
 	@${ECHO_MSG} "*********************** PLEASE NOTE! ***********************"
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${PORTNAME}.c ${WRKSRC}
 
 .include <bsd.port.mk>
Index: head/www/sakai/Makefile
===================================================================
--- head/www/sakai/Makefile	(revision 491914)
+++ head/www/sakai/Makefile	(revision 491915)
@@ -1,46 +1,47 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	sakai
 PORTVERSION=	10.2
 CATEGORIES=	www java
 MASTER_SITES=	http://source.sakaiproject.org/release/${PORTVERSION}/artifacts/
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Online Collaboration and Learning Environment
 
 LICENSE=	ECLv2
 LICENSE_NAME=	Educational Community License version 2
-LICENSE_FILE=	${WRKDIR}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:www/tomcat7
 
 IGNORE=		does not work correctly
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
+
 SYSTEM_DIR=	common components licenses shared webapps
 TOMCAT_DIR=	${PREFIX}/apache-tomcat-7.0
-PLIST_SUB+=	TOMCAT_DIR=${TOMCAT_DIR:S|^${PREFIX}/||} \
+PLIST_SUB=	TOMCAT_DIR=${TOMCAT_DIR:S|^${PREFIX}/||} \
 		SAKAI_VER="${PORTVERSION}"
 
 post-extract:
 	@cd ${WRKSRC}/webapps && `${LS} -1 |${SED} 's/.war//' >> ${WRKSRC}/list`
 	@cd ${WRKSRC}/webapps && ${MKDIR} `${CAT} ${WRKSRC}/list`
 	@cd ${WRKSRC}/webapps && for i in `${CAT} ${WRKSRC}/list` ; do ${TAR} xf $$i.war -C $$i ; done
 	@${RM} ${WRKSRC}/webapps/*.war
 
 do-install:
 .for i in ${SYSTEM_DIR}
 	cd ${WRKSRC}/${i} && ${FIND} . -type d \
 		-exec ${INSTALL} -d ${STAGEDIR}${TOMCAT_DIR}/${i}/{} \;
 	cd ${WRKSRC}/${i} && ${FIND} . -type f \
 		-exec ${INSTALL} -m 644 {} ${STAGEDIR}${TOMCAT_DIR}/${i}/{} \;
 .endfor
 
 .include <bsd.port.mk>
Index: head/www/template_/Makefile
===================================================================
--- head/www/template_/Makefile	(revision 491914)
+++ head/www/template_/Makefile	(revision 491915)
@@ -1,29 +1,28 @@
 # Created by: Mun-Kyo Seo <munggo@pmy.lv>
 # $FreeBSD$
 
 PORTNAME=	template_
 PORTVERSION=	2.2.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.xtac.net/download/?file=
 DISTNAME=	Template_.2.2.3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance PHP compiling template engine
 
 LICENSE=	LGPL20+
 
-WRKSRC=		${WRKDIR}
 FETCH_ARGS+=	-o ${DISTNAME}.tar.gz
 
 USES=		php:web
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tpl_plugin
 .for f in Template_.class.php Template_.compiler.php
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/tpl_plugin/* ${STAGEDIR}${DATADIR}/tpl_plugin
 .endfor
 
 .include <bsd.port.mk>