- Make it possible to 'make stage' without needing superuser powers

- Make the saved configuation parameters for extensions match the
  equivalents from www/rt40 or www/rt38

- Set default DBA user to pgsql when backend database is chosen as
  postgresql.

5 files changed, 65 insertions, 16 deletions

diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index efc514ff2f22..8a340066e28f 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 DISTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	42
@@ -10,7 +11,6 @@ MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	RT is an industrial-grade ticketing system written in Perl
 
 CONFLICTS=	rt-3.8* rt40-4.0* brlcad-[0-9]*
-NEED_ROOT=	yes
 
 # See doc/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.2+ is
@@ -172,7 +172,11 @@ RT_ETC_PATH?=	${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}
 RT_LAYOUT=	FreeBSD
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
+.if ${PORT_OPTIONS:MPGSQL}
+DB_DBA_USER?=	pgsql
+.else
 DB_DBA_USER?=	root
+.endif
 DB_DBA_PASSWORD?=
 DB_USER?=	rt_user
 DB_PASSWORD?=	rt_pass
diff --git a/www/rt42/files/patch-Makefile.in b/www/rt42/files/patch-Makefile.in
index 3485bf641f46..b3bac7e1195e 100644
--- a/www/rt42/files/patch-Makefile.in
+++ b/www/rt42/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- ./Makefile.in.orig	2013-11-13 18:25:50.000000000 +0000
-+++ ./Makefile.in	2013-11-25 07:19:20.572253485 +0000
++++ ./Makefile.in	2013-12-01 12:21:47.561534855 +0000
 @@ -59,7 +59,7 @@
  
  CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH_R@
@@ -51,7 +51,7 @@
  	# Make the web ui readable by all. 
  	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(MASON_HTML_PATH) \
  					$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
-@@ -352,9 +341,9 @@
+@@ -352,14 +341,14 @@
  	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
  	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_STATIC_PATH)
  
@@ -62,8 +62,16 @@
 +files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install static-install
  
  config-install:
- @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
-@@ -449,13 +438,6 @@
+-@COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
+-@COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0440 -o $(BIN_OWNER) -g $(RTGROUP)  etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
+-@COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
++@COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(CONFIG_FILE_PATH)
++@COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0440 etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
++@COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
+ @COMMENT_INPLACE_LAYOUT@	@echo "Installed configuration. About to install RT in  $(RT_PATH)"
+ 
+ test: 
+@@ -449,19 +438,12 @@
  @COMMENT_INPLACE_LAYOUT@	for file in $(ETC_FILES) ; do \
  @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
  @COMMENT_INPLACE_LAYOUT@	done
@@ -77,3 +85,19 @@
  
  
  sbin-install:
+ @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_SBIN_PATH)
+ @COMMENT_INPLACE_LAYOUT@	for file in $(SYSTEM_BINARIES) ; do \
+-@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "sbin/$$file" "$(DESTDIR)$(RT_SBIN_PATH)/" ; \
++@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 "sbin/$$file" "$(DESTDIR)$(RT_SBIN_PATH)/" ; \
+ @COMMENT_INPLACE_LAYOUT@	done
+ 
+ 
+@@ -469,7 +451,7 @@
+ bin-install:
+ @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
+ @COMMENT_INPLACE_LAYOUT@	for file in $(BINARIES) ; do \
+-@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
++@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
+ @COMMENT_INPLACE_LAYOUT@	done
+ 
+ local-install:
diff --git a/www/rt42/files/patch-aclocal.m4 b/www/rt42/files/patch-aclocal.m4
index 16792bf177e8..a09bf099e6ed 100644
--- a/www/rt42/files/patch-aclocal.m4
+++ b/www/rt42/files/patch-aclocal.m4
@@ -1,5 +1,5 @@
 --- ./aclocal.m4.orig	2013-11-13 18:25:50.000000000 +0000
-+++ ./aclocal.m4	2013-11-24 17:58:35.428302772 +0000
++++ ./aclocal.m4	2013-12-01 12:21:47.563534653 +0000
 @@ -79,7 +79,7 @@
  		s/^#.*$//m;
  		s/^\s+//gim;
diff --git a/www/rt42/files/patch-config.layout b/www/rt42/files/patch-config.layout
index 74d03c21cad5..16e3afba6a9e 100644
--- a/www/rt42/files/patch-config.layout
+++ b/www/rt42/files/patch-config.layout
@@ -1,6 +1,6 @@
 --- ./config.layout.orig	2013-11-13 18:25:50.000000000 +0000
-+++ ./config.layout	2013-11-24 17:58:35.433301257 +0000
-@@ -110,7 +110,7 @@
++++ ./config.layout	2013-12-01 12:29:19.357557589 +0000
+@@ -110,24 +110,24 @@
    sysconfdir:		${prefix}/etc+
    mandir:		${prefix}/man
    plugindir:		${prefix}/plugins
@@ -9,6 +9,31 @@
    datadir:		${prefix}/share+
    htmldir:		${datadir}/html
    lexdir:		${datadir}/po
+-  staticdir:	${datadir}/static
++  staticdir:		${datadir}/static
+   fontdir:		${datadir}/fonts
+   manualdir:		${prefix}/share/doc+
+   logfiledir:		/var/log
+   localstatedir:	/var/run+
+   masonstatedir:	${localstatedir}/mason_data
+   sessionstatedir:	${localstatedir}/session_data
+-  customdir:		${prefix}/share+
+-  custometcdir:		${customdir}/local/etc
+-  customhtmldir:	${customdir}/local/html
+-  customlexdir:		${customdir}/local/po
+-  customstaticdir:	${customdir}/static
+-  customlibdir:		${customdir}/local/lib
+-  customplugindir:  ${customdir}/local/plugins
++  customdir:		${prefix}
++  custometcdir:		${datadir}/etc
++  customhtmldir:	${customdir}/www+
++  customlexdir:		${datadir}/po
++  customstaticdir:	${datadir}/static
++  customlibdir:		${datadir}/lib
++  customplugindir:	${datadir}/plugins
+ </Layout>
+ 
+ <Layout Win32>
 @@ -149,13 +149,13 @@
    logfiledir:		${localstatedir}/log
    masonstatedir:	${localstatedir}/mason_data
diff --git a/www/rt42/pkg-plist b/www/rt42/pkg-plist
index 5b1121df4a63..1ed468e79a5a 100644
--- a/www/rt42/pkg-plist
+++ b/www/rt42/pkg-plist
@@ -1496,6 +1496,7 @@ sbin/standalone_httpd
 @unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data/cache || :
 @unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data || :
 @unexec rmdir >/dev/null 2>&1 /var/run/rt42 || :
+@dirrmtry www/rt42
 @dirrmtry %%DATADIR%%/static/js
 @dirrmtry %%DATADIR%%/static/images/tablesorter
 @dirrmtry %%DATADIR%%/static/images/jquery_ui
@@ -1576,15 +1577,9 @@ sbin/standalone_httpd
 @dirrmtry %%DATADIR%%/static/RichText/lang
 @dirrmtry %%DATADIR%%/static/RichText
 @dirrmtry %%DATADIR%%/static
-@dirrmtry %%DATADIR%%/share/rt42/plugins
-@dirrmtry %%DATADIR%%/share/rt42
-@dirrmtry %%DATADIR%%/share
 @dirrmtry %%DATADIR%%/po
-@dirrmtry %%DATADIR%%/local/po
-@dirrmtry %%DATADIR%%/local/lib
-@dirrmtry %%DATADIR%%/local/html
-@dirrmtry %%DATADIR%%/local/etc
-@dirrmtry %%DATADIR%%/local
+@dirrmtry %%DATADIR%%/plugins
+@dirrmtry %%DATADIR%%/lib
 @dirrmtry %%DATADIR%%/html/m/tickets
 @dirrmtry %%DATADIR%%/html/m/ticket
 @dirrmtry %%DATADIR%%/html/m/_elements
@@ -1688,6 +1683,7 @@ sbin/standalone_httpd
 @dirrmtry %%DATADIR%%/html/Admin
 @dirrmtry %%DATADIR%%/html
 @dirrmtry %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%/etc
 @dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/upgrade/4.2.1
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/upgrade/4.1.9