15 files changed, 330 insertions, 354 deletions
diff --git a/www/crp/Makefile b/www/crp/Makefile
index 28a3ce1a2c48..c08149f5b259 100644
--- a/www/crp/Makefile
+++ b/www/crp/Makefile
@@ -20,7 +20,6 @@ USE_PHP=	yes
 WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 
-WWWDIR?=	${PREFIX}/www
 SPOOLDIR?=	/var/spool/conference
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -31,10 +30,10 @@ post-patch:
 
 do-install:
 	@${MKDIR} -m 755 ${WWWDIR} ${SPOOLDIR}
-	@${CP} -R ${WRKSRC} ${WWWDIR}
-	@${SED} -e 's#/var/www/html#${PREFIX}/www/${DISTNAME}#' \
-	  ${WRKSRC}/Code/confHeader.inc > ${WWWDIR}/${DISTNAME}/Code/confHeader.inc
-	@${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${WWWDIR}/${DISTNAME} ${SPOOLDIR}
+	@${CP} -R ${WRKSRC}/ ${WWWDIR}/
+	@${SED} -e 's#/var/www/html#${WWWDIR}#' \
+	  ${WRKSRC}/Code/confHeader.inc > ${WWWDIR}/Code/confHeader.inc
+	@${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${WWWDIR} ${SPOOLDIR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/crp/pkg-message b/www/crp/pkg-message
index 20030b1e5f02..45d9c5f44272 100644
--- a/www/crp/pkg-message
+++ b/www/crp/pkg-message
@@ -1,4 +1,4 @@
 *************************************************************
-You must edit %%WWWDIR%%/%%DISTNAME%%/Code/confConfig.inc for your setup,
+You must edit %%WWWDIR%%/Code/confConfig.inc for your setup,
 and follow the other directions at http://crp.sourceforge.net/installation.html
 *************************************************************
diff --git a/www/crp/pkg-plist b/www/crp/pkg-plist
index 1d534a045692..5f2937215cd8 100644
--- a/www/crp/pkg-plist
+++ b/www/crp/pkg-plist
@@ -1,239 +1,239 @@
-www/CRP/.htaccess
-www/CRP/All/ImportantDates.php
-www/CRP/All/Logout.php
-www/CRP/All/MergeAccounts.php
-www/CRP/All/UpdateContactInfo.php
-www/CRP/All/authAccount.php
-www/CRP/All/index.php
-www/CRP/All/login.php
-www/CRP/All/register.php
-www/CRP/All/registerAccount.php
-www/CRP/All/target.php
-www/CRP/Assistant/AssistantListPapers.php
-www/CRP/Assistant/AssistantViewSinglePaper.php
-www/CRP/Assistant/DownloadPaper.php
-www/CRP/Assistant/DumpAllReviews.php
-www/CRP/Assistant/DumpPapers.php
-www/CRP/Assistant/ListFirstAuthors.php
-www/CRP/Assistant/ListReviewers.php
-www/CRP/Assistant/ModifyUserNames.php
-www/CRP/Assistant/PrepareFacesheets.php
-www/CRP/Assistant/PrintAllAbstracts.php
-www/CRP/Assistant/PrintAllReviews.php
-www/CRP/Assistant/PrintSomeReviews.php
-www/CRP/Assistant/foo.php
-www/CRP/Assistant/index.php
-www/CRP/Author/AuthorViewPaper.php
-www/CRP/Author/DeletePaper.php
-www/CRP/Author/FinalizePaper.php
-www/CRP/Author/ModifyPaper.php
-www/CRP/Author/PaperActions.php
-www/CRP/Author/PaperForm.inc
-www/CRP/Author/PaperTable.inc
-www/CRP/Author/SubmitPaper.old.php
-www/CRP/Author/SubmitPaper.php
-www/CRP/Author/SubmitPaper2.old.php
-www/CRP/Author/SubmitPaper2.php
-www/CRP/Author/SubmitResponse.php
-www/CRP/Author/UploadPaper.php
-www/CRP/Author/ViewDecision.php
-www/CRP/Author/ViewReview.php
-www/CRP/Author/copy_authorviewpaper
-www/CRP/Author/copy_paperform
-www/CRP/Author/copy_submitpaper2
-www/CRP/Author/index.php
-www/CRP/Chair/AskForReview.php
-www/CRP/Chair/AssignConflicts.php
-www/CRP/Chair/AssignPapers.php
-www/CRP/Chair/AveragePaperScore.php
-www/CRP/Chair/AverageReviewerScore.php
-www/CRP/Chair/BecomeSomeoneElse.php
-www/CRP/Chair/ChairAddContact.php
-www/CRP/Chair/ChairRemoveReviewer.php
-www/CRP/Chair/ChairViewSinglePaper.php
-www/CRP/Chair/CheckOnPCProgress.php
-www/CRP/Chair/CheckOnSinglePCProgress.php
-www/CRP/Chair/Code.inc
-www/CRP/Chair/CommonAddToCommittee.inc
-www/CRP/Chair/DeletePaper.php
-www/CRP/Chair/DeletePaper2.php
-www/CRP/Chair/DeletePaper3.php
-www/CRP/Chair/DumpDatabase.php
-www/CRP/Chair/FindPCConflicts.php
-www/CRP/Chair/GradeAllPapers.php
-www/CRP/Chair/ListFirstAuthors.php
-www/CRP/Chair/ListPC.php
-www/CRP/Chair/ListPapersAssignedToPC.php
-www/CRP/Chair/ListReviewers.php
-www/CRP/Chair/ListReviews.php
-www/CRP/Chair/ModifyPaper.php
-www/CRP/Chair/ModifyPaper.php.orig
-www/CRP/Chair/NewAssignPapers.php
-www/CRP/Chair/OldAssignPapers.php
-www/CRP/Chair/ReviewAssistants.php
-www/CRP/Chair/ReviewChairs.php
-www/CRP/Chair/ReviewContacts.php
-www/CRP/Chair/ReviewPC.php
-www/CRP/Chair/SearchPapers.php
-www/CRP/Chair/SendMail.php
-www/CRP/Chair/SendMail2.php
-www/CRP/Chair/SetDates.php
-www/CRP/Chair/SetPCPaper.php
-www/CRP/Chair/SetTopics.php
-www/CRP/Chair/ShowCalendar.php
-www/CRP/Chair/SpotProblems.php
-www/CRP/Chair/SubmitPaper.php
-www/CRP/Chair/SubmitPaper2.php
-www/CRP/Chair/UnfinalizeReview.php
-www/CRP/Chair/ViewActionLog.php
-www/CRP/Chair/ViewButtons.php
-www/CRP/Chair/index.php
-www/CRP/ChangeLog
-www/CRP/Code/.htaccess
-www/CRP/Code/Calendar.inc
-www/CRP/Code/ClassCGO2004Review.inc
-www/CRP/Code/ClassConference.inc
-www/CRP/Code/ClassContact.inc
-www/CRP/Code/ClassHYPO2010Review.inc
-www/CRP/Code/ClassISCA2002Review.inc
-www/CRP/Code/ClassMICRO36Review.inc
-www/CRP/Code/ClassPaper.inc
-www/CRP/Code/ClassReview.inc
-www/CRP/Code/CreateDatabase.sh
-www/CRP/Code/DumpAllReviews.php-not-via-apache
-www/CRP/Code/DumpSingleReview.php-not-via-apache
-www/CRP/Code/PEAR-DB/DB.inc
-www/CRP/Code/PEAR-DB/PEAR.inc
-www/CRP/Code/PEAR-DB/README
-www/CRP/Code/PEAR-DB/common.inc
-www/CRP/Code/PEAR-DB/mysql.inc
-www/CRP/Code/PEAR-DB/pgsql.inc
-www/CRP/Code/SuckInOSDIPaper.php-not-via-apache
-www/CRP/Code/animate.js
-www/CRP/Code/committee.sql
-www/CRP/Code/confConfig.inc
-www/CRP/Code/confConfig.inc.dist
-www/CRP/Code/confConfigReview.inc
-www/CRP/Code/confConfigReview.inc.dist
-www/CRP/Code/confHeader.inc
-www/CRP/Code/confHeader.inc.dist
-www/CRP/Code/confJavaScript.inc
-www/CRP/Code/conference.sql
-www/CRP/Code/topics
-www/CRP/Download/.htaccess
-www/CRP/Download/GetConfStuff.php
-www/CRP/Download/GetPaper
-www/CRP/Download/GetPaper.php
-www/CRP/Download/copy_getpaper
-www/CRP/Download/index.html
-www/CRP/PC/AskForPrimaryReview.php
-www/CRP/PC/AskForReviewCommon.inc
-www/CRP/PC/AskForSecondaryReview.php
-www/CRP/PC/CheckAssignedPapers.php
-www/CRP/PC/CheckOnPCProgress.php
-www/CRP/PC/CheckReviewStatus.php
-www/CRP/PC/GradePapers.php
-www/CRP/PC/ListReviews.php
-www/CRP/PC/PCAllAnonReviewsForPaper.php
-www/CRP/PC/PCListPapers.php
-www/CRP/PC/PCNotes.php
-www/CRP/PC/PCReviewsForPaper.php
-www/CRP/PC/PCSubmitReview.php
-www/CRP/PC/RemoveAskReview.php
-www/CRP/PC/ReviewAnyPaper.php
-www/CRP/PC/ReviewPapers.php
-www/CRP/PC/SeeAcceptedPapers.php
-www/CRP/PC/SeeAllGrades.php
-www/CRP/PC/ShowAbstract.php
-www/CRP/PC/SpotMyProblems.php
-www/CRP/PC/ValidPapers.inc
-www/CRP/PC/gradeNames.inc
-www/CRP/PC/index.php
-www/CRP/Reviewer/CommonPrintReview.php
-www/CRP/Reviewer/CommonSubmitReview.php
-www/CRP/Reviewer/RequestedReviews.php
-www/CRP/Reviewer/RequestedReviewsFromIndex.inc
-www/CRP/Reviewer/ReviewerSubmitReview.php
-www/CRP/Reviewer/SeeDecision.php
-www/CRP/Reviewer/SeeDecisions.php
-www/CRP/Reviewer/ratings.html
-www/CRP/Reviewer/ratings.php
-www/CRP/Tasks-All.inc
-www/CRP/Tasks-Assistant.inc
-www/CRP/Tasks-Author.inc
-www/CRP/Tasks-Chair.inc
-www/CRP/Tasks-PC.inc
-www/CRP/Tasks-Reviewer.inc
-www/CRP/YouMustAllowCookies.php
-www/CRP/count.php
-www/CRP/foo.php
-www/CRP/genericPopup.php
-www/CRP/images/CheckMark.gif
-www/CRP/images/GenChart.php
-www/CRP/images/GeneralChart.php
-www/CRP/index.php
-www/CRP/javascript.inc
-www/CRP/testcookie.php
-www/CRP/themes/modular-with-arial-fonts/amodbanr.gif
-www/CRP/themes/modular-with-arial-fonts/amodbck.gif
-www/CRP/themes/modular-with-arial-fonts/amodbckh.gif
-www/CRP/themes/modular-with-arial-fonts/amodbul1.gif
-www/CRP/themes/modular-with-arial-fonts/amodbul2.gif
-www/CRP/themes/modular-with-arial-fonts/amodbul3.gif
-www/CRP/themes/modular-with-arial-fonts/amodhbtn.gif
-www/CRP/themes/modular-with-arial-fonts/amodhhov.gif
-www/CRP/themes/modular-with-arial-fonts/amodhom.gif
-www/CRP/themes/modular-with-arial-fonts/amodhomh.gif
-www/CRP/themes/modular-with-arial-fonts/amodhsel.gif
-www/CRP/themes/modular-with-arial-fonts/amodnxt.gif
-www/CRP/themes/modular-with-arial-fonts/amodnxth.gif
-www/CRP/themes/modular-with-arial-fonts/amodrule.gif
-www/CRP/themes/modular-with-arial-fonts/amodup.gif
-www/CRP/themes/modular-with-arial-fonts/amoduph.gif
-www/CRP/themes/modular-with-arial-fonts/amodvbtn.gif
-www/CRP/themes/modular-with-arial-fonts/amodvhov.gif
-www/CRP/themes/modular-with-arial-fonts/amodvsel.gif
-www/CRP/themes/modular-with-arial-fonts/color0.css
-www/CRP/themes/modular-with-arial-fonts/color1.css
-www/CRP/themes/modular-with-arial-fonts/custom.css
-www/CRP/themes/modular-with-arial-fonts/graph0.css
-www/CRP/themes/modular-with-arial-fonts/graph1.css
-www/CRP/themes/modular-with-arial-fonts/modbanr.gif
-www/CRP/themes/modular-with-arial-fonts/modbck.gif
-www/CRP/themes/modular-with-arial-fonts/modbkgnd.jpg
-www/CRP/themes/modular-with-arial-fonts/modbul1.gif
-www/CRP/themes/modular-with-arial-fonts/modbul2.gif
-www/CRP/themes/modular-with-arial-fonts/modbul3.gif
-www/CRP/themes/modular-with-arial-fonts/modglobl.gif
-www/CRP/themes/modular-with-arial-fonts/modhbtn.gif
-www/CRP/themes/modular-with-arial-fonts/modhom.gif
-www/CRP/themes/modular-with-arial-fonts/modhsel.gif
-www/CRP/themes/modular-with-arial-fonts/modnxt.gif
-www/CRP/themes/modular-with-arial-fonts/modrule.gif
-www/CRP/themes/modular-with-arial-fonts/modu1110.css
-www/CRP/themes/modular-with-arial-fonts/modu1515.css
-www/CRP/themes/modular-with-arial-fonts/modular-with-arial-fonts.inf
-www/CRP/themes/modular-with-arial-fonts/modular-with-arial-fonts.utf8
-www/CRP/themes/modular-with-arial-fonts/modup.gif
-www/CRP/themes/modular-with-arial-fonts/modvbtn.gif
-www/CRP/themes/modular-with-arial-fonts/modvsel.gif
-www/CRP/themes/modular-with-arial-fonts/theme.css
-@dirrm www/CRP/themes/modular-with-arial-fonts
-@dirrm www/CRP/themes
-@dirrm www/CRP/images
-@dirrm www/CRP/_vti_cnf
-@dirrm www/CRP/Reviewer/_vti_cnf
-@dirrm www/CRP/Reviewer
-@dirrm www/CRP/PC/_vti_cnf
-@dirrm www/CRP/PC/SkiDeal_files/_vti_cnf
-@dirrm www/CRP/PC/SkiDeal_files
-@dirrm www/CRP/PC
-@dirrm www/CRP/Download
-@dirrm www/CRP/Code/PEAR-DB
-@dirrm www/CRP/Code
-@dirrm www/CRP/Chair
-@dirrm www/CRP/Author
-@dirrm www/CRP/Assistant/_vti_cnf
-@dirrm www/CRP/Assistant
-@dirrm www/CRP/All
-@dirrm www/CRP
+%%WWWDIR%%/.htaccess
+%%WWWDIR%%/All/ImportantDates.php
+%%WWWDIR%%/All/Logout.php
+%%WWWDIR%%/All/MergeAccounts.php
+%%WWWDIR%%/All/UpdateContactInfo.php
+%%WWWDIR%%/All/authAccount.php
+%%WWWDIR%%/All/index.php
+%%WWWDIR%%/All/login.php
+%%WWWDIR%%/All/register.php
+%%WWWDIR%%/All/registerAccount.php
+%%WWWDIR%%/All/target.php
+%%WWWDIR%%/Assistant/AssistantListPapers.php
+%%WWWDIR%%/Assistant/AssistantViewSinglePaper.php
+%%WWWDIR%%/Assistant/DownloadPaper.php
+%%WWWDIR%%/Assistant/DumpAllReviews.php
+%%WWWDIR%%/Assistant/DumpPapers.php
+%%WWWDIR%%/Assistant/ListFirstAuthors.php
+%%WWWDIR%%/Assistant/ListReviewers.php
+%%WWWDIR%%/Assistant/ModifyUserNames.php
+%%WWWDIR%%/Assistant/PrepareFacesheets.php
+%%WWWDIR%%/Assistant/PrintAllAbstracts.php
+%%WWWDIR%%/Assistant/PrintAllReviews.php
+%%WWWDIR%%/Assistant/PrintSomeReviews.php
+%%WWWDIR%%/Assistant/foo.php
+%%WWWDIR%%/Assistant/index.php
+%%WWWDIR%%/Author/AuthorViewPaper.php
+%%WWWDIR%%/Author/DeletePaper.php
+%%WWWDIR%%/Author/FinalizePaper.php
+%%WWWDIR%%/Author/ModifyPaper.php
+%%WWWDIR%%/Author/PaperActions.php
+%%WWWDIR%%/Author/PaperForm.inc
+%%WWWDIR%%/Author/PaperTable.inc
+%%WWWDIR%%/Author/SubmitPaper.old.php
+%%WWWDIR%%/Author/SubmitPaper.php
+%%WWWDIR%%/Author/SubmitPaper2.old.php
+%%WWWDIR%%/Author/SubmitPaper2.php
+%%WWWDIR%%/Author/SubmitResponse.php
+%%WWWDIR%%/Author/UploadPaper.php
+%%WWWDIR%%/Author/ViewDecision.php
+%%WWWDIR%%/Author/ViewReview.php
+%%WWWDIR%%/Author/copy_authorviewpaper
+%%WWWDIR%%/Author/copy_paperform
+%%WWWDIR%%/Author/copy_submitpaper2
+%%WWWDIR%%/Author/index.php
+%%WWWDIR%%/Chair/AskForReview.php
+%%WWWDIR%%/Chair/AssignConflicts.php
+%%WWWDIR%%/Chair/AssignPapers.php
+%%WWWDIR%%/Chair/AveragePaperScore.php
+%%WWWDIR%%/Chair/AverageReviewerScore.php
+%%WWWDIR%%/Chair/BecomeSomeoneElse.php
+%%WWWDIR%%/Chair/ChairAddContact.php
+%%WWWDIR%%/Chair/ChairRemoveReviewer.php
+%%WWWDIR%%/Chair/ChairViewSinglePaper.php
+%%WWWDIR%%/Chair/CheckOnPCProgress.php
+%%WWWDIR%%/Chair/CheckOnSinglePCProgress.php
+%%WWWDIR%%/Chair/Code.inc
+%%WWWDIR%%/Chair/CommonAddToCommittee.inc
+%%WWWDIR%%/Chair/DeletePaper.php
+%%WWWDIR%%/Chair/DeletePaper2.php
+%%WWWDIR%%/Chair/DeletePaper3.php
+%%WWWDIR%%/Chair/DumpDatabase.php
+%%WWWDIR%%/Chair/FindPCConflicts.php
+%%WWWDIR%%/Chair/GradeAllPapers.php
+%%WWWDIR%%/Chair/ListFirstAuthors.php
+%%WWWDIR%%/Chair/ListPC.php
+%%WWWDIR%%/Chair/ListPapersAssignedToPC.php
+%%WWWDIR%%/Chair/ListReviewers.php
+%%WWWDIR%%/Chair/ListReviews.php
+%%WWWDIR%%/Chair/ModifyPaper.php
+%%WWWDIR%%/Chair/ModifyPaper.php.orig
+%%WWWDIR%%/Chair/NewAssignPapers.php
+%%WWWDIR%%/Chair/OldAssignPapers.php
+%%WWWDIR%%/Chair/ReviewAssistants.php
+%%WWWDIR%%/Chair/ReviewChairs.php
+%%WWWDIR%%/Chair/ReviewContacts.php
+%%WWWDIR%%/Chair/ReviewPC.php
+%%WWWDIR%%/Chair/SearchPapers.php
+%%WWWDIR%%/Chair/SendMail.php
+%%WWWDIR%%/Chair/SendMail2.php
+%%WWWDIR%%/Chair/SetDates.php
+%%WWWDIR%%/Chair/SetPCPaper.php
+%%WWWDIR%%/Chair/SetTopics.php
+%%WWWDIR%%/Chair/ShowCalendar.php
+%%WWWDIR%%/Chair/SpotProblems.php
+%%WWWDIR%%/Chair/SubmitPaper.php
+%%WWWDIR%%/Chair/SubmitPaper2.php
+%%WWWDIR%%/Chair/UnfinalizeReview.php
+%%WWWDIR%%/Chair/ViewActionLog.php
+%%WWWDIR%%/Chair/ViewButtons.php
+%%WWWDIR%%/Chair/index.php
+%%WWWDIR%%/ChangeLog
+%%WWWDIR%%/Code/.htaccess
+%%WWWDIR%%/Code/Calendar.inc
+%%WWWDIR%%/Code/ClassCGO2004Review.inc
+%%WWWDIR%%/Code/ClassConference.inc
+%%WWWDIR%%/Code/ClassContact.inc
+%%WWWDIR%%/Code/ClassHYPO2010Review.inc
+%%WWWDIR%%/Code/ClassISCA2002Review.inc
+%%WWWDIR%%/Code/ClassMICRO36Review.inc
+%%WWWDIR%%/Code/ClassPaper.inc
+%%WWWDIR%%/Code/ClassReview.inc
+%%WWWDIR%%/Code/CreateDatabase.sh
+%%WWWDIR%%/Code/DumpAllReviews.php-not-via-apache
+%%WWWDIR%%/Code/DumpSingleReview.php-not-via-apache
+%%WWWDIR%%/Code/PEAR-DB/DB.inc
+%%WWWDIR%%/Code/PEAR-DB/PEAR.inc
+%%WWWDIR%%/Code/PEAR-DB/README
+%%WWWDIR%%/Code/PEAR-DB/common.inc
+%%WWWDIR%%/Code/PEAR-DB/mysql.inc
+%%WWWDIR%%/Code/PEAR-DB/pgsql.inc
+%%WWWDIR%%/Code/SuckInOSDIPaper.php-not-via-apache
+%%WWWDIR%%/Code/animate.js
+%%WWWDIR%%/Code/committee.sql
+%%WWWDIR%%/Code/confConfig.inc
+%%WWWDIR%%/Code/confConfig.inc.dist
+%%WWWDIR%%/Code/confConfigReview.inc
+%%WWWDIR%%/Code/confConfigReview.inc.dist
+%%WWWDIR%%/Code/confHeader.inc
+%%WWWDIR%%/Code/confHeader.inc.dist
+%%WWWDIR%%/Code/confJavaScript.inc
+%%WWWDIR%%/Code/conference.sql
+%%WWWDIR%%/Code/topics
+%%WWWDIR%%/Download/.htaccess
+%%WWWDIR%%/Download/GetConfStuff.php
+%%WWWDIR%%/Download/GetPaper
+%%WWWDIR%%/Download/GetPaper.php
+%%WWWDIR%%/Download/copy_getpaper
+%%WWWDIR%%/Download/index.html
+%%WWWDIR%%/PC/AskForPrimaryReview.php
+%%WWWDIR%%/PC/AskForReviewCommon.inc
+%%WWWDIR%%/PC/AskForSecondaryReview.php
+%%WWWDIR%%/PC/CheckAssignedPapers.php
+%%WWWDIR%%/PC/CheckOnPCProgress.php
+%%WWWDIR%%/PC/CheckReviewStatus.php
+%%WWWDIR%%/PC/GradePapers.php
+%%WWWDIR%%/PC/ListReviews.php
+%%WWWDIR%%/PC/PCAllAnonReviewsForPaper.php
+%%WWWDIR%%/PC/PCListPapers.php
+%%WWWDIR%%/PC/PCNotes.php
+%%WWWDIR%%/PC/PCReviewsForPaper.php
+%%WWWDIR%%/PC/PCSubmitReview.php
+%%WWWDIR%%/PC/RemoveAskReview.php
+%%WWWDIR%%/PC/ReviewAnyPaper.php
+%%WWWDIR%%/PC/ReviewPapers.php
+%%WWWDIR%%/PC/SeeAcceptedPapers.php
+%%WWWDIR%%/PC/SeeAllGrades.php
+%%WWWDIR%%/PC/ShowAbstract.php
+%%WWWDIR%%/PC/SpotMyProblems.php
+%%WWWDIR%%/PC/ValidPapers.inc
+%%WWWDIR%%/PC/gradeNames.inc
+%%WWWDIR%%/PC/index.php
+%%WWWDIR%%/Reviewer/CommonPrintReview.php
+%%WWWDIR%%/Reviewer/CommonSubmitReview.php
+%%WWWDIR%%/Reviewer/RequestedReviews.php
+%%WWWDIR%%/Reviewer/RequestedReviewsFromIndex.inc
+%%WWWDIR%%/Reviewer/ReviewerSubmitReview.php
+%%WWWDIR%%/Reviewer/SeeDecision.php
+%%WWWDIR%%/Reviewer/SeeDecisions.php
+%%WWWDIR%%/Reviewer/ratings.html
+%%WWWDIR%%/Reviewer/ratings.php
+%%WWWDIR%%/Tasks-All.inc
+%%WWWDIR%%/Tasks-Assistant.inc
+%%WWWDIR%%/Tasks-Author.inc
+%%WWWDIR%%/Tasks-Chair.inc
+%%WWWDIR%%/Tasks-PC.inc
+%%WWWDIR%%/Tasks-Reviewer.inc
+%%WWWDIR%%/YouMustAllowCookies.php
+%%WWWDIR%%/count.php
+%%WWWDIR%%/foo.php
+%%WWWDIR%%/genericPopup.php
+%%WWWDIR%%/images/CheckMark.gif
+%%WWWDIR%%/images/GenChart.php
+%%WWWDIR%%/images/GeneralChart.php
+%%WWWDIR%%/index.php
+%%WWWDIR%%/javascript.inc
+%%WWWDIR%%/testcookie.php
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbanr.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbck.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbckh.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbul1.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbul2.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodbul3.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodhbtn.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodhhov.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodhom.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodhomh.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodhsel.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodnxt.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodnxth.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodrule.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodup.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amoduph.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodvbtn.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodvhov.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/amodvsel.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/color0.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/color1.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/custom.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/graph0.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/graph1.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbanr.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbck.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbkgnd.jpg
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbul1.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbul2.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modbul3.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modglobl.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modhbtn.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modhom.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modhsel.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modnxt.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modrule.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modu1110.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/modu1515.css
+%%WWWDIR%%/themes/modular-with-arial-fonts/modular-with-arial-fonts.inf
+%%WWWDIR%%/themes/modular-with-arial-fonts/modular-with-arial-fonts.utf8
+%%WWWDIR%%/themes/modular-with-arial-fonts/modup.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modvbtn.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/modvsel.gif
+%%WWWDIR%%/themes/modular-with-arial-fonts/theme.css
+@dirrm %%WWWDIR%%/themes/modular-with-arial-fonts
+@dirrm %%WWWDIR%%/themes
+@dirrm %%WWWDIR%%/images
+@dirrm %%WWWDIR%%/_vti_cnf
+@dirrm %%WWWDIR%%/Reviewer/_vti_cnf
+@dirrm %%WWWDIR%%/Reviewer
+@dirrm %%WWWDIR%%/PC/_vti_cnf
+@dirrm %%WWWDIR%%/PC/SkiDeal_files/_vti_cnf
+@dirrm %%WWWDIR%%/PC/SkiDeal_files
+@dirrm %%WWWDIR%%/PC
+@dirrm %%WWWDIR%%/Download
+@dirrm %%WWWDIR%%/Code/PEAR-DB
+@dirrm %%WWWDIR%%/Code
+@dirrm %%WWWDIR%%/Chair
+@dirrm %%WWWDIR%%/Author
+@dirrm %%WWWDIR%%/Assistant/_vti_cnf
+@dirrm %%WWWDIR%%/Assistant
+@dirrm %%WWWDIR%%/All
+@dirrm %%WWWDIR%%
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 02d2703559a0..921957b76240 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -22,13 +22,12 @@ NO_BUILD=	yes
 
 PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS WISHLIST
 
-WWWDIR?=	www
 CONFDIR?=	etc
 DATADIRS?=	"/var/db/rrdtool" => "[Label1] "
 SAVEDDIR?=	/var/db/${PORTNAME}/saved
 TMPDIR?=	/var/db/${PORTNAME}/tmp
 
-PLIST_SUB+=	WWWDIR=${WWWDIR} CONFDIR=${CONFDIR}
+PLIST_SUB+=	CONFDIR=${CONFDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CONFDIR%%|${PREFIX}/${CONFDIR}|g' ${WRKSRC}/drraw.cgi
@@ -43,12 +42,12 @@ post-patch:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/drraw.conf-dist ${PREFIX}/${CONFDIR}
 
-	${MKDIR} ${PREFIX}/${WWWDIR}/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${PREFIX}/${WWWDIR}/${PORTNAME}
+	${MKDIR} ${WWWDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${WWWDIR}
 
-	${MKDIR} ${PREFIX}/${WWWDIR}/${PORTNAME}/icons
+	${MKDIR} ${WWWDIR}/icons
 .for theFile in bomb.gif folder.gif folder.open.gif generic.gif link.gif text.gif unknown.gif
-	${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${PREFIX}/${WWWDIR}/${PORTNAME}/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${WWWDIR}/icons
 .endfor
 
 .if !defined(NOPORTDOCS)
diff --git a/www/drraw/pkg-plist b/www/drraw/pkg-plist
index 87b9c46633d0..59ef376044ed 100644
--- a/www/drraw/pkg-plist
+++ b/www/drraw/pkg-plist
@@ -2,13 +2,13 @@
 @unexec if cmp -s %D/%%CONFDIR%%/drraw.conf-dist %D/%%CONFDIR%%/drraw.conf; then rm -f %D/%%CONFDIR%%/drraw.conf; fi
 %%CONFDIR%%/drraw.conf-dist
 @exec if [ ! -f %D/%%CONFDIR%%/drraw.conf ]; then cp -p %D/%F %B/drraw.conf; fi
-%%WWWDIR%%/drraw/drraw.cgi
-%%WWWDIR%%/drraw/icons/bomb.gif
-%%WWWDIR%%/drraw/icons/folder.gif
-%%WWWDIR%%/drraw/icons/folder.open.gif
-%%WWWDIR%%/drraw/icons/generic.gif
-%%WWWDIR%%/drraw/icons/link.gif
-%%WWWDIR%%/drraw/icons/text.gif
-%%WWWDIR%%/drraw/icons/unknown.gif
-@dirrm %%WWWDIR%%/drraw/icons
-@dirrm %%WWWDIR%%/drraw
+%%WWWDIR%%/drraw.cgi
+%%WWWDIR%%/icons/bomb.gif
+%%WWWDIR%%/icons/folder.gif
+%%WWWDIR%%/icons/folder.open.gif
+%%WWWDIR%%/icons/generic.gif
+%%WWWDIR%%/icons/link.gif
+%%WWWDIR%%/icons/text.gif
+%%WWWDIR%%/icons/unknown.gif
+@dirrm %%WWWDIR%%/icons
+@dirrm %%WWWDIR%%
diff --git a/www/gregarius/Makefile b/www/gregarius/Makefile
index 9a2a986e8608..9441b0563bcb 100644
--- a/www/gregarius/Makefile
+++ b/www/gregarius/Makefile
@@ -16,10 +16,9 @@ COMMENT=	Web-based RSS/RDF/ATOM news aggregator
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-WWWDIR=		${PREFIX}/www
 
 do-install:
-	${MKDIR} ${WWWDIR}/${PORTNAME}
-	${CP} -R ${WRKSRC} ${WWWDIR}
+	${MKDIR} ${WWWDIR}
+	${CP} -R ${WRKSRC}/ ${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/www/iwebcal/Makefile b/www/iwebcal/Makefile
index 58a7e5a40d45..640e3bab1d97 100644
--- a/www/iwebcal/Makefile
+++ b/www/iwebcal/Makefile
@@ -17,10 +17,7 @@ COMMENT=	Webbased iCal calendar viewer
 
 NO_BUILD=	yes
 USE_PHP=	yes
-IWEBCAL=	www/iwebcal
-WWWDIR=		${PREFIX}/${IWEBCAL}
 WRKSRC=		${WRKDIR}/iWebCal
-PLIST_SUB=	IWEBCAL=${IWEBCAL}
 
 post-extract:
 	-@${FIND} ${WRKSRC}/ -type d -name '.svn' | ${XARGS} ${RM} -rf
diff --git a/www/iwebcal/pkg-plist b/www/iwebcal/pkg-plist
index dd432dba1dab..a52e43aba8a4 100644
--- a/www/iwebcal/pkg-plist
+++ b/www/iwebcal/pkg-plist
@@ -1,45 +1,45 @@
-%%IWEBCAL%%/README.txt
-%%IWEBCAL%%/Sample.ics
-%%IWEBCAL%%/base/main.inc
-%%IWEBCAL%%/base/popup-event-info.php
-%%IWEBCAL%%/base/time-zones.inc
-%%IWEBCAL%%/class/CalItem.inc
-%%IWEBCAL%%/class/Calendar.inc
-%%IWEBCAL%%/class/Property.inc
-%%IWEBCAL%%/class/iWebCal.inc
-%%IWEBCAL%%/config.inc
-%%IWEBCAL%%/img/btn-bg-over.gif
-%%IWEBCAL%%/img/btn-bg-sel.gif
-%%IWEBCAL%%/img/btn-bg.gif
-%%IWEBCAL%%/img/btn-change-cal.gif
-%%IWEBCAL%%/img/btn-left-over.gif
-%%IWEBCAL%%/img/btn-left-sel.gif
-%%IWEBCAL%%/img/btn-left.gif
-%%IWEBCAL%%/img/btn-next-over.gif
-%%IWEBCAL%%/img/btn-next.gif
-%%IWEBCAL%%/img/btn-prev-over.gif
-%%IWEBCAL%%/img/btn-prev.gif
-%%IWEBCAL%%/img/btn-right-over.gif
-%%IWEBCAL%%/img/btn-right-sel.gif
-%%IWEBCAL%%/img/btn-right.gif
-%%IWEBCAL%%/img/btn-today.gif
-%%IWEBCAL%%/img/completed-check.gif
-%%IWEBCAL%%/img/completed-header.gif
-%%IWEBCAL%%/img/day-bg.gif
-%%IWEBCAL%%/img/event-bg.gif
-%%IWEBCAL%%/img/event-header-bg.gif
-%%IWEBCAL%%/img/note-button.gif
-%%IWEBCAL%%/img/pix-transparent.gif
-%%IWEBCAL%%/img/powered-by-logo.gif
-%%IWEBCAL%%/img/untimed-event-bg.gif
-%%IWEBCAL%%/include/GNU General Public License.txt
-%%IWEBCAL%%/include/iWebCal-ie6.css
-%%IWEBCAL%%/include/iWebCal.css
-%%IWEBCAL%%/include/iWebCal.js
-%%IWEBCAL%%/index.php
-@dirrm %%IWEBCAL%%/include
-@dirrm %%IWEBCAL%%/img
-@dirrm %%IWEBCAL%%/class
-@dirrm %%IWEBCAL%%/base
-@dirrmtry %%IWEBCAL%%/cache
-@dirrmtry %%IWEBCAL%%
+%%WWWDIR%%/README.txt
+%%WWWDIR%%/Sample.ics
+%%WWWDIR%%/base/main.inc
+%%WWWDIR%%/base/popup-event-info.php
+%%WWWDIR%%/base/time-zones.inc
+%%WWWDIR%%/class/CalItem.inc
+%%WWWDIR%%/class/Calendar.inc
+%%WWWDIR%%/class/Property.inc
+%%WWWDIR%%/class/iWebCal.inc
+%%WWWDIR%%/config.inc
+%%WWWDIR%%/img/btn-bg-over.gif
+%%WWWDIR%%/img/btn-bg-sel.gif
+%%WWWDIR%%/img/btn-bg.gif
+%%WWWDIR%%/img/btn-change-cal.gif
+%%WWWDIR%%/img/btn-left-over.gif
+%%WWWDIR%%/img/btn-left-sel.gif
+%%WWWDIR%%/img/btn-left.gif
+%%WWWDIR%%/img/btn-next-over.gif
+%%WWWDIR%%/img/btn-next.gif
+%%WWWDIR%%/img/btn-prev-over.gif
+%%WWWDIR%%/img/btn-prev.gif
+%%WWWDIR%%/img/btn-right-over.gif
+%%WWWDIR%%/img/btn-right-sel.gif
+%%WWWDIR%%/img/btn-right.gif
+%%WWWDIR%%/img/btn-today.gif
+%%WWWDIR%%/img/completed-check.gif
+%%WWWDIR%%/img/completed-header.gif
+%%WWWDIR%%/img/day-bg.gif
+%%WWWDIR%%/img/event-bg.gif
+%%WWWDIR%%/img/event-header-bg.gif
+%%WWWDIR%%/img/note-button.gif
+%%WWWDIR%%/img/pix-transparent.gif
+%%WWWDIR%%/img/powered-by-logo.gif
+%%WWWDIR%%/img/untimed-event-bg.gif
+%%WWWDIR%%/include/GNU General Public License.txt
+%%WWWDIR%%/include/iWebCal-ie6.css
+%%WWWDIR%%/include/iWebCal.css
+%%WWWDIR%%/include/iWebCal.js
+%%WWWDIR%%/index.php
+@dirrm %%WWWDIR%%/include
+@dirrm %%WWWDIR%%/img
+@dirrm %%WWWDIR%%/class
+@dirrm %%WWWDIR%%/base
+@dirrmtry %%WWWDIR%%/cache
+@dirrmtry %%WWWDIR%%
diff --git a/www/phpSysInfo/Makefile b/www/phpSysInfo/Makefile
index cdfb91e3c9ea..53e055e2854e 100644
--- a/www/phpSysInfo/Makefile
+++ b/www/phpSysInfo/Makefile
@@ -19,26 +19,22 @@ USE_PHP=	pcre xml
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}
-WWWOWN?=	www
-WWWGRP?=	www
-WWWDIR?=	www/${PORTNAME}
-DATADIR=	${PREFIX}/${WWWDIR}
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 
 post-patch:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC};\
-	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR}|"\
+	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR_REL}|"\
 		>${PLIST};\
-	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR}|"\
+	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR_REL}|"\
 		>>${PLIST}
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${WWWDIR}
 	cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${CHMOD} -R ${BINMODE} ${DATADIR}
-	${FIND} ${DATADIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
+		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHMOD} -R ${BINMODE} ${WWWDIR}
+	${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
 .include <bsd.port.mk>
diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile
index cdfb91e3c9ea..53e055e2854e 100644
--- a/www/phpsysinfo-dev/Makefile
+++ b/www/phpsysinfo-dev/Makefile
@@ -19,26 +19,22 @@ USE_PHP=	pcre xml
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}
-WWWOWN?=	www
-WWWGRP?=	www
-WWWDIR?=	www/${PORTNAME}
-DATADIR=	${PREFIX}/${WWWDIR}
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 
 post-patch:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC};\
-	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR}|"\
+	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR_REL}|"\
 		>${PLIST};\
-	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR}|"\
+	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR_REL}|"\
 		>>${PLIST}
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${WWWDIR}
 	cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${CHMOD} -R ${BINMODE} ${DATADIR}
-	${FIND} ${DATADIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
+		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHMOD} -R ${BINMODE} ${WWWDIR}
+	${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
 .include <bsd.port.mk>
diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile
index cdfb91e3c9ea..53e055e2854e 100644
--- a/www/phpsysinfo/Makefile
+++ b/www/phpsysinfo/Makefile
@@ -19,26 +19,22 @@ USE_PHP=	pcre xml
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}
-WWWOWN?=	www
-WWWGRP?=	www
-WWWDIR?=	www/${PORTNAME}
-DATADIR=	${PREFIX}/${WWWDIR}
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 
 post-patch:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC};\
-	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR}|"\
+	${FIND} . ! -type d | ${SORT} | ${SED} "s|^\.|${WWWDIR_REL}|"\
 		>${PLIST};\
-	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR}|"\
+	${FIND} . -type d | ${SORT} -r | ${SED} "s|^\.|@dirrm ${WWWDIR_REL}|"\
 		>>${PLIST}
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${WWWDIR}
 	cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${CHMOD} -R ${BINMODE} ${DATADIR}
-	${FIND} ${DATADIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
+		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHMOD} -R ${BINMODE} ${WWWDIR}
+	${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
 .include <bsd.port.mk>
diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 959864ae963c..d5981a038e84 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -28,10 +28,6 @@ MAN1=		quickie-config.1 quickie_prime.1 quickie.1 quickie_svt.1 \
 
 SUB_FILES=	pkg-message
 
-WWWOWN?=	www
-WWWGRP?=	www
-WWWDIR?=	${PREFIX}/www
-
 PORTDOCS=	${DISTNAME}.pdf
 
 .if !defined(NOPORTDOCS)
@@ -51,11 +47,11 @@ pre-install:
 post-install:
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
 .if !defined(WITHOUT_CGICOPY)
-	@if [ -d ${WWWDIR}/cgi-bin/ ]; then \
-	    if [ ! -f ${WWWDIR}/cgi-bin/${PORTNAME} ]; then \
+	@if [ -d ${PREFIX}/www/cgi-bin/ ]; then \
+	    if [ ! -f ${PREFIX}/www/cgi-bin/${PORTNAME} ]; then \
 	        ${ECHO_MSG} "===> Copying CGI binary..." ; \
-	        ${CP} -p ${PREFIX}/bin/${PORTNAME} ${WWWDIR}/cgi-bin/${PORTNAME} ; \
-	        ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/cgi-bin/${PORTNAME} ; \
+	        ${CP} -p ${PREFIX}/bin/${PORTNAME} ${PREFIX}/www/cgi-bin/${PORTNAME} ; \
+	        ${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/www/cgi-bin/${PORTNAME} ; \
 	    fi ; \
 	fi
 .endif
diff --git a/www/siteframe/Makefile b/www/siteframe/Makefile
index c4e8e0f2f1c9..de8cc2587332 100644
--- a/www/siteframe/Makefile
+++ b/www/siteframe/Makefile
@@ -27,12 +27,11 @@ IGNORE_WITH_MYSQL=	40
 # where to install
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-WWWDIR?=	${PREFIX}/www
 .ifndef SITEFRAMEDIR
 .ifdef APACHE_DATADIR
 SITEFRAMEDIR=	${APACHE_DATADIR}/siteframe
 .else
-SITEFRAMEDIR=	${WWWDIR}/siteframe
+SITEFRAMEDIR=	${WWWDIR}
 .endif
 .endif
 
diff --git a/www/vtiger/Makefile b/www/vtiger/Makefile
index a2af8e2e6d56..914870f41768 100644
--- a/www/vtiger/Makefile
+++ b/www/vtiger/Makefile
@@ -24,7 +24,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	50
 
-WWWDIR?=	${PREFIX}/www/vtiger
 WRKSRC=		${WRKDIR}/vtigercrm
 
 post-extract:
diff --git a/www/vtiger4/Makefile b/www/vtiger4/Makefile
index e37c154ec767..155d76801a23 100644
--- a/www/vtiger4/Makefile
+++ b/www/vtiger4/Makefile
@@ -20,7 +20,7 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-WWWDIR?=	${PREFIX}/www/vtiger
+WWWDIR=		${PREFIX}/www/vtiger
 WRKSRC=		${WRKDIR}/vtiger_crm
 
 post-extract: