Without options, assume it is an upgrade and do not re-initialize DB.

Provide INITIAL_INSTALL knob for that.

Approved by:	maintainer

4 files changed, 8 insertions, 8 deletions

diff --git a/www/rt3/Makefile b/www/rt3/Makefile
index 00b7d0462391..ec61cf61f700 100644
--- a/www/rt3/Makefile
+++ b/www/rt3/Makefile
@@ -122,7 +122,7 @@ pre-fetch:
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of mod_perl"
 	@${ECHO} "      WITH_APACHE2                    Use Apache2 as the web server"
-	@${ECHO} "      UPGRADE                         Upgrade only, don't initialize DB"
+	@${ECHO} "      INITIAL_INSTALL                 Do initialize DB (for initial install only)"
 	@${ECHO} ""
 
 pre-install:
@@ -132,7 +132,7 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README
 	@${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin
-.if defined(UPGRADE)
+.if !defined(INITIAL_INSTALL)
 	@echo Upgrade of RT3 complete.
 .else
 	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba ${DB_DBA_USER} --dba-password ${DB_DBA_PASSWORD}
diff --git a/www/rt32/Makefile b/www/rt32/Makefile
index 00b7d0462391..ec61cf61f700 100644
--- a/www/rt32/Makefile
+++ b/www/rt32/Makefile
@@ -122,7 +122,7 @@ pre-fetch:
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of mod_perl"
 	@${ECHO} "      WITH_APACHE2                    Use Apache2 as the web server"
-	@${ECHO} "      UPGRADE                         Upgrade only, don't initialize DB"
+	@${ECHO} "      INITIAL_INSTALL                 Do initialize DB (for initial install only)"
 	@${ECHO} ""
 
 pre-install:
@@ -132,7 +132,7 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README
 	@${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin
-.if defined(UPGRADE)
+.if !defined(INITIAL_INSTALL)
 	@echo Upgrade of RT3 complete.
 .else
 	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba ${DB_DBA_USER} --dba-password ${DB_DBA_PASSWORD}
diff --git a/www/rt34/Makefile b/www/rt34/Makefile
index 00b7d0462391..ec61cf61f700 100644
--- a/www/rt34/Makefile
+++ b/www/rt34/Makefile
@@ -122,7 +122,7 @@ pre-fetch:
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of mod_perl"
 	@${ECHO} "      WITH_APACHE2                    Use Apache2 as the web server"
-	@${ECHO} "      UPGRADE                         Upgrade only, don't initialize DB"
+	@${ECHO} "      INITIAL_INSTALL                 Do initialize DB (for initial install only)"
 	@${ECHO} ""
 
 pre-install:
@@ -132,7 +132,7 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README
 	@${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin
-.if defined(UPGRADE)
+.if !defined(INITIAL_INSTALL)
 	@echo Upgrade of RT3 complete.
 .else
 	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba ${DB_DBA_USER} --dba-password ${DB_DBA_PASSWORD}
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 00b7d0462391..ec61cf61f700 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -122,7 +122,7 @@ pre-fetch:
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of mod_perl"
 	@${ECHO} "      WITH_APACHE2                    Use Apache2 as the web server"
-	@${ECHO} "      UPGRADE                         Upgrade only, don't initialize DB"
+	@${ECHO} "      INITIAL_INSTALL                 Do initialize DB (for initial install only)"
 	@${ECHO} ""
 
 pre-install:
@@ -132,7 +132,7 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README
 	@${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin
-.if defined(UPGRADE)
+.if !defined(INITIAL_INSTALL)
 	@echo Upgrade of RT3 complete.
 .else
 	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba ${DB_DBA_USER} --dba-password ${DB_DBA_PASSWORD}