From a0f40a2316c1d1c594dc23ba07a269b194c0d957 Mon Sep 17 00:00:00 2001
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 7 Apr 2010 10:12:09 +0000
Subject: Fix build

---
 www/limesurvey/Makefile             | 15 ++++++++-------
 www/limesurvey/files/pkg-message.in | 15 +++++++++++++++
 www/limesurvey/pkg-message          | 15 ---------------
 3 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 www/limesurvey/files/pkg-message.in
 delete mode 100644 www/limesurvey/pkg-message

(limited to 'www/limesurvey')

diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index c7414f55f7eb..15ffb7d7ce9c 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	limesurvey
 PORTVERSION=	1.80
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME}${PORTVERSION:S^.^^}_build6506_20090310
@@ -15,18 +16,17 @@ MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	A PHP-based survey building and runing system
 
 USE_PHP=	mysql session mbstring pcre iconv gd ldap
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
+WWWDOCROOT?=		www
 PHPSURVEYORURL?=	${PORTNAME}
-PHPSURVEYORDIR=		${WWWDOCROOT}/${PHPSURVEYORURL}
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
+SUB_FILES=	pkg-message
+SUB_LIST=	PHPSURVEYORURL="${PHPSURVEYORURL}" \
+		PHPSURVEYORDIR="${PHPSURVEYORDIR}"
 
-post-configure:
-	@ ${SED} \
-	-e 's#%%PREFIX%%#${PREFIX}#g' \
-	-e 's#%%PHPSURVEYORURL%%#${PHPSURVEYORURL}#g' \
-	-e 's#%%PHPSURVEYORDIR%%#${PHPSURVEYORDIR}#g' \
+PHPSURVEYORDIR=	${WWWDOCROOT}/${PHPSURVEYORURL}
 
 do-install:
 	${MKDIR} ${WWWDIR}
@@ -38,6 +38,7 @@ do-install:
 	${CHMOD} 755 ${WWWDIR}/upload
 
 post-install:
+	@${CAT} ${PKGMESSAGE}
 	@${FIND} -s -d ${WWWDIR} -type f -print | \
 		${SED} -e "s#${PREFIX}/##g" >> ${TMPPLIST}
 	@${FIND} -s -d ${WWWDIR} -type d  -print | \
diff --git a/www/limesurvey/files/pkg-message.in b/www/limesurvey/files/pkg-message.in
new file mode 100644
index 000000000000..bf36d56604e3
--- /dev/null
+++ b/www/limesurvey/files/pkg-message.in
@@ -0,0 +1,15 @@
+----------------------------------------------------------------------------
+phpsurveyor has been installed, but is not quite ready to be used yet!
+
+You have to ensure that you have a mysql server installed and configured. 
+Further information on these installation procedures may 
+be found in:
+
+  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/manual.html
+
+Once these steps have been taken, you may connect to the following URL to
+configure your installation of phpsurveyor:
+
+  http://localhost/%%PHPSURVEYORURL%%/
+
+----------------------------------------------------------------------------
diff --git a/www/limesurvey/pkg-message b/www/limesurvey/pkg-message
deleted file mode 100644
index bf36d56604e3..000000000000
--- a/www/limesurvey/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-----------------------------------------------------------------------------
-phpsurveyor has been installed, but is not quite ready to be used yet!
-
-You have to ensure that you have a mysql server installed and configured. 
-Further information on these installation procedures may 
-be found in:
-
-  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/manual.html
-
-Once these steps have been taken, you may connect to the following URL to
-configure your installation of phpsurveyor:
-
-  http://localhost/%%PHPSURVEYORURL%%/
-
-----------------------------------------------------------------------------
-- 
cgit v1.2.3