summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2003-06-21 09:30:41 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2003-06-21 09:30:41 +0000
commit1f4d006194c9cd1910ae2527b9eb377b2ebf1bc5 (patch)
tree5378645910ae8ebd03fa05a312f09a59a9e8276b
parentFix for perl 5.005_03 (diff)
Without options, assume it is an upgrade and do not re-initialize DB.
Provide INITIAL_INSTALL knob for that. Approved by: maintainer
Notes
Notes: svn path=/head/; revision=83402
Diffstat (limited to '')
-rw-r--r--www/rt3/Makefile4
-rw-r--r--www/rt32/Makefile4
-rw-r--r--www/rt34/Makefile4
-rw-r--r--www/rt36/Makefile4
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}