- Fix typo and added more information

- Fix xowiki URL

PR:             109225
Submitted by:   Martin Matuska <martin@matuska.org> (maintainer)

3 files changed, 18 insertions, 6 deletions

diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index 17380c50d17a..929459caa12b 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openacs
 PORTVERSION?=	5.3.0
+PORTREVISION?=	1
 CATEGORIES=	www
 MASTER_SITES?=	http://openacs.org/projects/openacs/download/download/
 EXTRACT_SUFX?=	.tgz?revision_id=583060
@@ -24,9 +25,9 @@ RUN_DEPENDS=	${AOLSERVERBASE}/bin/nscache.so:${PORTSDIR}/www/aolserver-nscache \
 USE_RC_SUBR?=	${PORTNAME}
 NO_BUILD=	yes
 
-OPENACS_USER?=  ${PORTNAME}
+OPENACS_USER?=	${PORTNAME}
 OPENACS_DB?=	${PORTNAME}
-OPENACS_GROUP?= www
+OPENACS_GROUP?=	www
 PGUSER?=	pgsql
 OPENACSBASE?=	${TARGETDIR}/openacs
 OPENACSNAME?=	OpenACS
@@ -44,7 +45,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=       ChangeLog readme.txt license.txt
+PORTDOCS=	ChangeLog readme.txt license.txt
 .endif
 
 OPTIONS=	EXAMPLES "Install various example files" on
diff --git a/www/openacs/files/create_sampledb.sh.in b/www/openacs/files/create_sampledb.sh.in
index 6321527d5beb..67401e266678 100644
--- a/www/openacs/files/create_sampledb.sh.in
+++ b/www/openacs/files/create_sampledb.sh.in
@@ -16,7 +16,7 @@ AWK=/usr/bin/awk
 CREATEUSERFLAGS="-A -d"
 
 # Check if PostgreSQL version is >= 8.1.0
-${LOCALBASE}/bin/postmaster -V | ${AWK} -F '[ .]' '{if ($3=8 && $4>=1) {exit 0} else {exit 1}}' && {
+${LOCALBASE}/bin/postmaster -V | ${AWK} -F '[ .]' '{if ($3==8 && $4>=1) {exit 0} else {exit 1}}' && {
 POSTGRESQL81=YES
 CREATEUSERFLAGS="-S -R -d"
 }
@@ -40,6 +40,6 @@ echo "**************************** NOTICE ****************************"
 echo "You have PostgreSQL 8.1 or greater installed."
 echo "Your may need to alter your PostgreSQL configuration."
 echo "Please read the instructions under the following URL:"
-echo "http://openacs.org/xowiki/en/How_to_install_in_Postgres_8.1.x"
+echo "http://openacs.org/xowiki/How_to_install_in_Postgres_8.x"
 echo "****************************************************************"
 }
diff --git a/www/openacs/files/pkg-message.in b/www/openacs/files/pkg-message.in
index c1d0dfd8e1fb..fc48e1d1f9a1 100644
--- a/www/openacs/files/pkg-message.in
+++ b/www/openacs/files/pkg-message.in
@@ -1,8 +1,19 @@
 Congratulations! You have just installed %%OPENACSNAME%%
 
-To create a sample default database run the script:
+To create a sample default database, you first need a PostgreSQL server
+installed and configured on your system. If the PostgreSQL server is started 
+and running, you can run the script:
 %%EXAMPLESDIR%%/create_sampledb.sh
 
+The create_sampledb.sh script works with the following servers with their
+default configurations:
+databases/postgresql74-server (7.4.x)
+databases/postgresql80-server (8.0.x)
+
+For PostgreSQL 8.1.x and 8.2.x, the database server configuration
+needs to be adjusted. Please visit the following webpage for more information:
+http://openacs.org/xowiki/How_to_install_in_Postgres_8.x
+
 You can start %%OPENACSNAME%% with the startup script:
 %%LOCALBASE%%/etc/rc.d/%%PORTNAME%%