Fix PKG_SYSCONFDIR and VARDIR handling, similar to rt3 package.

Fix installing of update scripts (find using the non portable "-not")
Bump PKGREVISION.   OK'ed by ryoon.

7 files changed, 239 insertions, 99 deletions

diff --git a/devel/rt4/MESSAGE b/devel/rt4/MESSAGE
index 4b356c08788..2e752c1f8ad 100644
--- a/devel/rt4/MESSAGE
+++ b/devel/rt4/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/01/01 03:31:50 ryoon Exp $
+$NetBSD: MESSAGE,v 1.3 2014/06/17 11:10:40 markd Exp $
 
 To use RT 4, you will need to perform the following steps.
 
@@ -58,7 +58,7 @@ To use RT 4, you will need to perform the following steps.
 
 Note:
 You may have the following lines
-in your ${PREFIX}/share/rt4/etc/RT_SiteConfig.pm .
+in your ${PKG_SYSCONFDIR}/RT_SiteConfig.pm .
 
 Set( $NotifyActor, 1 );
 Set( $SetOutgoingMailFrom, 1);
diff --git a/devel/rt4/Makefile b/devel/rt4/Makefile
index 724a733bbf0..7400d146eef 100644
--- a/devel/rt4/Makefile
+++ b/devel/rt4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2014/06/02 10:12:19 obache Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/17 11:10:40 markd Exp $
 
 DISTNAME=	rt-4.2.1
 PKGNAME=	${DISTNAME:S/rt/rt4/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 
@@ -52,7 +52,7 @@ DEPENDS+=	p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
 DEPENDS+=	p5-IPC-Run3-[0-9]*:../../devel/p5-IPC-Run3
 DEPENDS+=	p5-JSON-[0-9]*:../../converters/p5-JSON
 DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
-DEPENDS+=	p5-Locale-Maketext>=1.06:../../misc/p5-Locale-Maketext
+DEPENDS+=	{perl>=5.20.0,p5-Locale-Maketext>=1.06}:../../misc/p5-Locale-Maketext
 DEPENDS+=	p5-Locale-Maketext-Fuzzy-[0-9]*:../../misc/p5-Locale-Maketext-Fuzzy
 DEPENDS+=	p5-Locale-Maketext-Lexicon>=0.32:../../misc/p5-Locale-Maketext-Lexicon
 DEPENDS+=	p5-Log-Dispatch>=2.30:../../devel/p5-Log-Dispatch
@@ -139,6 +139,7 @@ DEPENDS+=	p5-Crypt-X509-[0-9]*:../../security/p5-Crypt-X509
 DEPENDS+=	p5-Module-Pluggable-[0-9]*:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-Convert-Color-[0-9]*:../../converters/p5-Convert-Color
 
+.include "dirs.mk"
 .include "options.mk"
 
 RT4DIR=		${PREFIX}/share/rt4
@@ -153,11 +154,24 @@ SUBST_MESSAGE.prefix=	Setting prefix.
 SUBST_FILES.prefix=	config.layout
 SUBST_VARS.prefix=	PREFIX PKG_SYSCONFDIR PKGMANDIR
 SUBST_VARS.prefix+=	RT4DIR
+SUBST_VARS.prefix+=	RT_VAR_DIR RT_LOCAL_DIR
+
+SUBST_CLASSES+=		etcpath
+SUBST_FILES.etcpath=	sbin/rt-setup-database.in share/html/Install/Initialize.html
+SUBST_SED.etcpath=	-e 's,\$$RT::EtcPath,"${RT4DIR}/etc",'
+SUBST_STAGE.etcpath=	post-patch
+
+SUBST_CLASSES+=		egpath
+SUBST_FILES.egpath=	Makefile.in
+SUBST_SED.egpath=	-e 's,@CONFIG_FILE_PATH_R@,${RT_EXAMPLE_DIR},'
+SUBST_SED.egpath+=	-e 's,@RT_ETC_PATH_R@,${RT4DIR}/etc,'
+SUBST_STAGE.egpath=	post-patch
 
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	c
 USE_TOOLS+=	perl:run
+PKG_SYSCONFSUBDIR=	rt4
 
 USE_PKGLOCALEDIR=	yes
 
@@ -165,14 +179,29 @@ CONFIGURE_ARGS+=	--enable-layout=pkgsrc
 CONFIGURE_ARGS+=	--with-db-type=${RT_DB_TYPE}
 CONFIGURE_ARGS+=	--with-my-user-group
 
-CONF_FILES_PERMS=	share/rt4/etc/RT_SiteConfig.pm.dist \
-			share/rt4/etc/RT_SiteConfig.pm \
+RT_CONFIG_FILES=	RT_Config.pm RT_SiteConfig.pm
+
+.for _file_ in ${RT_CONFIG_FILES}
+CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_} \
+			${PKG_SYSCONFDIR}/${_file_} \
 			${APACHE_USER} ${APACHE_GROUP} \
 			640
+.endfor
+
+OWN_DIRS+=              ${RT_VAR_DIR} ${RT_LOCAL_DIR} ${RT_LOCAL_DIR}/etc
+OWN_DIRS+=              ${RT_LOCAL_DIR}/lib ${RT_LOCAL_DIR}/po ${RT_LOCAL_DIR}/plugins
+OWN_DIRS+=              ${RT_LOCAL_DIR}/html ${RT_LOCAL_DIR}/static
+
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/cache	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/etc	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/obj	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/session_data	${APACHE_USER}	${APACHE_GROUP}	0770
+
+REPLACE_PERL+=		etc/upgrade/shrink_cgm_table.pl etc/upgrade/shrink_transactions_table.pl
+REPLACE_PERL+=		etc/upgrade/time-worked-history.pl etc/upgrade/upgrade-mysql-schema.pl
 
 post-install:
-	mv ${DESTDIR}${PREFIX}/share/rt4/etc/RT_SiteConfig.pm \
-		${DESTDIR}${PREFIX}/share/rt4/etc/RT_SiteConfig.pm.dist
 	rm ${DESTDIR}${PREFIX}/share/rt4/data/html/Install/Initialize.html.orig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rt4/PLIST b/devel/rt4/PLIST
index cc8f2f28171..f1d38a5f5bc 100644
--- a/devel/rt4/PLIST
+++ b/devel/rt4/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/01 03:31:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/06/17 11:10:40 markd Exp $
+share/examples/rt4/RT_Config.pm
+share/examples/rt4/RT_SiteConfig.pm
 share/rt4/bin/rt
 share/rt4/bin/rt-crontool
 share/rt4/bin/rt-mailgate
@@ -1061,8 +1063,6 @@ share/rt4/data/static/js/superfish.js
 share/rt4/data/static/js/supersubs.js
 share/rt4/data/static/js/titlebox-state.js
 share/rt4/data/static/js/util.js
-share/rt4/etc/RT_Config.pm
-share/rt4/etc/RT_SiteConfig.pm.dist
 share/rt4/etc/acl.Oracle
 share/rt4/etc/acl.Pg
 share/rt4/etc/acl.mysql
@@ -1071,6 +1071,166 @@ share/rt4/etc/schema.Oracle
 share/rt4/etc/schema.Pg
 share/rt4/etc/schema.SQLite
 share/rt4/etc/schema.mysql
+share/rt4/etc/upgrade/3.1.0/acl.Oracle
+share/rt4/etc/upgrade/3.1.0/acl.Pg
+share/rt4/etc/upgrade/3.1.0/acl.SQLite
+share/rt4/etc/upgrade/3.1.0/acl.mysql
+share/rt4/etc/upgrade/3.1.0/schema.Oracle
+share/rt4/etc/upgrade/3.1.0/schema.Pg
+share/rt4/etc/upgrade/3.1.0/schema.SQLite
+share/rt4/etc/upgrade/3.1.0/schema.mysql
+share/rt4/etc/upgrade/3.1.15/content
+share/rt4/etc/upgrade/3.1.17/content
+share/rt4/etc/upgrade/3.3.0/acl.Oracle
+share/rt4/etc/upgrade/3.3.0/acl.Pg
+share/rt4/etc/upgrade/3.3.0/acl.SQLite
+share/rt4/etc/upgrade/3.3.0/acl.mysql
+share/rt4/etc/upgrade/3.3.0/schema.Oracle
+share/rt4/etc/upgrade/3.3.0/schema.Pg
+share/rt4/etc/upgrade/3.3.0/schema.mysql
+share/rt4/etc/upgrade/3.3.11/acl.Oracle
+share/rt4/etc/upgrade/3.3.11/acl.Pg
+share/rt4/etc/upgrade/3.3.11/acl.SQLite
+share/rt4/etc/upgrade/3.3.11/acl.mysql
+share/rt4/etc/upgrade/3.3.11/schema.Oracle
+share/rt4/etc/upgrade/3.3.11/schema.Pg
+share/rt4/etc/upgrade/3.3.11/schema.SQLite
+share/rt4/etc/upgrade/3.3.11/schema.mysql
+share/rt4/etc/upgrade/3.5.1/content
+share/rt4/etc/upgrade/3.7.1/content
+share/rt4/etc/upgrade/3.7.10/content
+share/rt4/etc/upgrade/3.7.15/content
+share/rt4/etc/upgrade/3.7.19/content
+share/rt4/etc/upgrade/3.7.3/schema.Oracle
+share/rt4/etc/upgrade/3.7.3/schema.Pg
+share/rt4/etc/upgrade/3.7.3/schema.mysql
+share/rt4/etc/upgrade/3.7.81/schema.Oracle
+share/rt4/etc/upgrade/3.7.81/schema.mysql
+share/rt4/etc/upgrade/3.7.82/content
+share/rt4/etc/upgrade/3.7.85/content
+share/rt4/etc/upgrade/3.7.86/content
+share/rt4/etc/upgrade/3.7.87/content
+share/rt4/etc/upgrade/3.8-ical-extension
+share/rt4/etc/upgrade/3.8.0/content
+share/rt4/etc/upgrade/3.8.1/content
+share/rt4/etc/upgrade/3.8.2/content
+share/rt4/etc/upgrade/3.8.3/content
+share/rt4/etc/upgrade/3.8.3/schema.Pg
+share/rt4/etc/upgrade/3.8.4/content
+share/rt4/etc/upgrade/3.8.6/content
+share/rt4/etc/upgrade/3.8.8/content
+share/rt4/etc/upgrade/3.8.9/content
+share/rt4/etc/upgrade/3.9.1/content
+share/rt4/etc/upgrade/3.9.2/content
+share/rt4/etc/upgrade/3.9.3/schema.Oracle
+share/rt4/etc/upgrade/3.9.3/schema.Pg
+share/rt4/etc/upgrade/3.9.3/schema.SQLite
+share/rt4/etc/upgrade/3.9.3/schema.mysql
+share/rt4/etc/upgrade/3.9.5/backcompat
+share/rt4/etc/upgrade/3.9.5/schema.Oracle
+share/rt4/etc/upgrade/3.9.5/schema.Pg
+share/rt4/etc/upgrade/3.9.5/schema.SQLite
+share/rt4/etc/upgrade/3.9.5/schema.mysql
+share/rt4/etc/upgrade/3.9.6/schema.Oracle
+share/rt4/etc/upgrade/3.9.6/schema.Pg
+share/rt4/etc/upgrade/3.9.6/schema.SQLite
+share/rt4/etc/upgrade/3.9.6/schema.mysql
+share/rt4/etc/upgrade/3.9.7/content
+share/rt4/etc/upgrade/3.9.7/schema.Oracle
+share/rt4/etc/upgrade/3.9.7/schema.Pg
+share/rt4/etc/upgrade/3.9.7/schema.SQLite
+share/rt4/etc/upgrade/3.9.7/schema.mysql
+share/rt4/etc/upgrade/3.9.8/content
+share/rt4/etc/upgrade/3.9.8/schema.Oracle
+share/rt4/etc/upgrade/3.9.8/schema.Pg
+share/rt4/etc/upgrade/3.9.8/schema.SQLite
+share/rt4/etc/upgrade/3.9.8/schema.mysql
+share/rt4/etc/upgrade/4.0.0rc2/schema.mysql
+share/rt4/etc/upgrade/4.0.0rc4/schema.Oracle
+share/rt4/etc/upgrade/4.0.0rc4/schema.Pg
+share/rt4/etc/upgrade/4.0.0rc4/schema.mysql
+share/rt4/etc/upgrade/4.0.0rc7/content
+share/rt4/etc/upgrade/4.0.1/acl.Pg
+share/rt4/etc/upgrade/4.0.1/content
+share/rt4/etc/upgrade/4.0.12/schema.Oracle
+share/rt4/etc/upgrade/4.0.12/schema.Pg
+share/rt4/etc/upgrade/4.0.12/schema.mysql
+share/rt4/etc/upgrade/4.0.13/schema.Oracle
+share/rt4/etc/upgrade/4.0.13/schema.Pg
+share/rt4/etc/upgrade/4.0.13/schema.mysql
+share/rt4/etc/upgrade/4.0.18/content
+share/rt4/etc/upgrade/4.0.3/content
+share/rt4/etc/upgrade/4.0.4/content
+share/rt4/etc/upgrade/4.0.6/content
+share/rt4/etc/upgrade/4.0.6/schema.mysql
+share/rt4/etc/upgrade/4.0.9/content
+share/rt4/etc/upgrade/4.1.0/content
+share/rt4/etc/upgrade/4.1.1/acl.Pg
+share/rt4/etc/upgrade/4.1.1/content
+share/rt4/etc/upgrade/4.1.1/schema.Oracle
+share/rt4/etc/upgrade/4.1.1/schema.Pg
+share/rt4/etc/upgrade/4.1.1/schema.SQLite
+share/rt4/etc/upgrade/4.1.1/schema.mysql
+share/rt4/etc/upgrade/4.1.10/schema.Oracle
+share/rt4/etc/upgrade/4.1.10/schema.Pg
+share/rt4/etc/upgrade/4.1.10/schema.mysql
+share/rt4/etc/upgrade/4.1.11/schema.Oracle
+share/rt4/etc/upgrade/4.1.11/schema.Pg
+share/rt4/etc/upgrade/4.1.11/schema.mysql
+share/rt4/etc/upgrade/4.1.12/content
+share/rt4/etc/upgrade/4.1.13/backcompat
+share/rt4/etc/upgrade/4.1.13/schema.Oracle
+share/rt4/etc/upgrade/4.1.13/schema.Pg
+share/rt4/etc/upgrade/4.1.13/schema.SQLite
+share/rt4/etc/upgrade/4.1.13/schema.mysql
+share/rt4/etc/upgrade/4.1.14/schema.Oracle
+share/rt4/etc/upgrade/4.1.14/schema.Pg
+share/rt4/etc/upgrade/4.1.14/schema.mysql
+share/rt4/etc/upgrade/4.1.15/content
+share/rt4/etc/upgrade/4.1.16/content
+share/rt4/etc/upgrade/4.1.17/content
+share/rt4/etc/upgrade/4.1.18/content
+share/rt4/etc/upgrade/4.1.19/schema.Oracle
+share/rt4/etc/upgrade/4.1.19/schema.Pg
+share/rt4/etc/upgrade/4.1.19/schema.mysql
+share/rt4/etc/upgrade/4.1.20/content
+share/rt4/etc/upgrade/4.1.21/content
+share/rt4/etc/upgrade/4.1.22/content
+share/rt4/etc/upgrade/4.1.22/schema.Oracle
+share/rt4/etc/upgrade/4.1.22/schema.Pg
+share/rt4/etc/upgrade/4.1.22/schema.SQLite
+share/rt4/etc/upgrade/4.1.22/schema.mysql
+share/rt4/etc/upgrade/4.1.23/indexes
+share/rt4/etc/upgrade/4.1.4/content
+share/rt4/etc/upgrade/4.1.4/schema.Oracle
+share/rt4/etc/upgrade/4.1.4/schema.Pg
+share/rt4/etc/upgrade/4.1.4/schema.SQLite
+share/rt4/etc/upgrade/4.1.4/schema.mysql
+share/rt4/etc/upgrade/4.1.5/content
+share/rt4/etc/upgrade/4.1.5/schema.Oracle
+share/rt4/etc/upgrade/4.1.5/schema.Pg
+share/rt4/etc/upgrade/4.1.5/schema.mysql
+share/rt4/etc/upgrade/4.1.6/content
+share/rt4/etc/upgrade/4.1.7/schema.Oracle
+share/rt4/etc/upgrade/4.1.7/schema.Pg
+share/rt4/etc/upgrade/4.1.7/schema.SQLite
+share/rt4/etc/upgrade/4.1.7/schema.mysql
+share/rt4/etc/upgrade/4.1.8/schema.Oracle
+share/rt4/etc/upgrade/4.1.8/schema.Pg
+share/rt4/etc/upgrade/4.1.8/schema.SQLite
+share/rt4/etc/upgrade/4.1.8/schema.mysql
+share/rt4/etc/upgrade/4.1.9/content
+share/rt4/etc/upgrade/${PKGVERSION}/content
+share/rt4/etc/upgrade/generate-rtaddressregexp
+share/rt4/etc/upgrade/sanity-check-stylesheets.pl
+share/rt4/etc/upgrade/shrink_cgm_table.pl
+share/rt4/etc/upgrade/shrink_transactions_table.pl
+share/rt4/etc/upgrade/split-out-cf-categories
+share/rt4/etc/upgrade/switch-templates-to
+share/rt4/etc/upgrade/time-worked-history.pl
+share/rt4/etc/upgrade/upgrade-articles
+share/rt4/etc/upgrade/upgrade-mysql-schema.pl
+share/rt4/etc/upgrade/vulnerable-passwords
 share/rt4/lib/RT.pm
 share/rt4/lib/RT/ACE.pm
 share/rt4/lib/RT/ACL.pm
@@ -1315,79 +1475,3 @@ share/rt4/sbin/rt-test-dependencies
 share/rt4/sbin/rt-validate-aliases
 share/rt4/sbin/rt-validator
 share/rt4/sbin/standalone_httpd
-@pkgdir share/rt4/var/session_data
-@pkgdir share/rt4/var/mason_data/obj
-@pkgdir share/rt4/var/mason_data/etc
-@pkgdir share/rt4/var/mason_data/cache
-@pkgdir share/rt4/var/log
-@pkgdir share/rt4/local/static
-@pkgdir share/rt4/local/po
-@pkgdir share/rt4/local/plugins
-@pkgdir share/rt4/local/lib
-@pkgdir share/rt4/local/html
-@pkgdir share/rt4/local/etc
-@pkgdir share/rt4/etc/upgrade/${PKGVERSION}
-@pkgdir share/rt4/etc/upgrade/4.1.9
-@pkgdir share/rt4/etc/upgrade/4.1.8
-@pkgdir share/rt4/etc/upgrade/4.1.7
-@pkgdir share/rt4/etc/upgrade/4.1.6
-@pkgdir share/rt4/etc/upgrade/4.1.5
-@pkgdir share/rt4/etc/upgrade/4.1.4
-@pkgdir share/rt4/etc/upgrade/4.1.23
-@pkgdir share/rt4/etc/upgrade/4.1.22
-@pkgdir share/rt4/etc/upgrade/4.1.21
-@pkgdir share/rt4/etc/upgrade/4.1.20
-@pkgdir share/rt4/etc/upgrade/4.1.19
-@pkgdir share/rt4/etc/upgrade/4.1.18
-@pkgdir share/rt4/etc/upgrade/4.1.17
-@pkgdir share/rt4/etc/upgrade/4.1.16
-@pkgdir share/rt4/etc/upgrade/4.1.15
-@pkgdir share/rt4/etc/upgrade/4.1.14
-@pkgdir share/rt4/etc/upgrade/4.1.13
-@pkgdir share/rt4/etc/upgrade/4.1.12
-@pkgdir share/rt4/etc/upgrade/4.1.11
-@pkgdir share/rt4/etc/upgrade/4.1.10
-@pkgdir share/rt4/etc/upgrade/4.1.1
-@pkgdir share/rt4/etc/upgrade/4.1.0
-@pkgdir share/rt4/etc/upgrade/4.0.9
-@pkgdir share/rt4/etc/upgrade/4.0.6
-@pkgdir share/rt4/etc/upgrade/4.0.4
-@pkgdir share/rt4/etc/upgrade/4.0.3
-@pkgdir share/rt4/etc/upgrade/4.0.18
-@pkgdir share/rt4/etc/upgrade/4.0.13
-@pkgdir share/rt4/etc/upgrade/4.0.12
-@pkgdir share/rt4/etc/upgrade/4.0.1
-@pkgdir share/rt4/etc/upgrade/4.0.0rc7
-@pkgdir share/rt4/etc/upgrade/4.0.0rc4
-@pkgdir share/rt4/etc/upgrade/4.0.0rc2
-@pkgdir share/rt4/etc/upgrade/3.9.8
-@pkgdir share/rt4/etc/upgrade/3.9.7
-@pkgdir share/rt4/etc/upgrade/3.9.6
-@pkgdir share/rt4/etc/upgrade/3.9.5
-@pkgdir share/rt4/etc/upgrade/3.9.3
-@pkgdir share/rt4/etc/upgrade/3.9.2
-@pkgdir share/rt4/etc/upgrade/3.9.1
-@pkgdir share/rt4/etc/upgrade/3.8.9
-@pkgdir share/rt4/etc/upgrade/3.8.8
-@pkgdir share/rt4/etc/upgrade/3.8.6
-@pkgdir share/rt4/etc/upgrade/3.8.4
-@pkgdir share/rt4/etc/upgrade/3.8.3
-@pkgdir share/rt4/etc/upgrade/3.8.2
-@pkgdir share/rt4/etc/upgrade/3.8.1
-@pkgdir share/rt4/etc/upgrade/3.8.0
-@pkgdir share/rt4/etc/upgrade/3.7.87
-@pkgdir share/rt4/etc/upgrade/3.7.86
-@pkgdir share/rt4/etc/upgrade/3.7.85
-@pkgdir share/rt4/etc/upgrade/3.7.82
-@pkgdir share/rt4/etc/upgrade/3.7.81
-@pkgdir share/rt4/etc/upgrade/3.7.3
-@pkgdir share/rt4/etc/upgrade/3.7.19
-@pkgdir share/rt4/etc/upgrade/3.7.15
-@pkgdir share/rt4/etc/upgrade/3.7.10
-@pkgdir share/rt4/etc/upgrade/3.7.1
-@pkgdir share/rt4/etc/upgrade/3.5.1
-@pkgdir share/rt4/etc/upgrade/3.3.11
-@pkgdir share/rt4/etc/upgrade/3.3.0
-@pkgdir share/rt4/etc/upgrade/3.1.17
-@pkgdir share/rt4/etc/upgrade/3.1.15
-@pkgdir share/rt4/etc/upgrade/3.1.0
diff --git a/devel/rt4/dirs.mk b/devel/rt4/dirs.mk
new file mode 100644
index 00000000000..2279cb629c8
--- /dev/null
+++ b/devel/rt4/dirs.mk
@@ -0,0 +1,10 @@
+# $NetBSD: dirs.mk,v 1.1 2014/06/17 11:10:40 markd Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+RT_LOCAL_DIR?=		${VARBASE}/rt4
+BUILD_DEFS+=		RT_LOCAL_DIR
+
+RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt4
+RT_SHARE_DIR=	${PREFIX}/share/rt4
+RT_VAR_DIR=	${VARBASE}/spool/rt4
diff --git a/devel/rt4/distinfo b/devel/rt4/distinfo
index 08336b0029f..e69de29bb2d 100644
--- a/devel/rt4/distinfo
+++ b/devel/rt4/distinfo
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2014/01/01 03:31:50 ryoon Exp $
-
-SHA1 (rt-4.2.1.tar.gz) = 08bd8e4d28c065030aac7b33c0a15a789a6e11f9
-RMD160 (rt-4.2.1.tar.gz) = 0a6bd58d228914de518d1707b62a34be50d2c6ab
-Size (rt-4.2.1.tar.gz) = 7630594 bytes
-SHA1 (patch-config.layout) = d5f4a93d06c80a8dc7bb55db7054bf4be53a3998
-SHA1 (patch-share_html_Install_Initialize.html) = 44b2ae9727ca3de7f0fafa226ec9e83c424e6ade
diff --git a/devel/rt4/patches/patch-Makefile.in b/devel/rt4/patches/patch-Makefile.in
new file mode 100644
index 00000000000..039ba07028d
--- /dev/null
+++ b/devel/rt4/patches/patch-Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/06/17 11:10:40 markd Exp $
+
+NetBSD find doesn't know about "-not" so use "!"
+
+--- Makefile.in.orig	2014-06-13 03:14:21.000000000 +0000
++++ Makefile.in
+@@ -302,7 +302,7 @@ fixperms:
+ 	#
+ 	# Note that we use the deprecated (by GNU/POSIX find) -perm +0NNN syntax
+ 	# instead of -perm /0NNN since BSD find doesn't support the latter.
+-	( cd etc/upgrade && find . -type f -not -name '*.in' -perm +0111 -print ) | while read file ; do \
++	( cd etc/upgrade && find . -type f '!' -name '*.in' -perm +0111 -print ) | while read file ; do \
+ 		chmod a+x "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+ 	done
+ 
+@@ -453,7 +453,7 @@ etc-install:
+ @COMMENT_INPLACE_LAYOUT@	-( cd etc/upgrade && find . -type d -print ) | while read dir ; do \
+ @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$dir" ; \
+ @COMMENT_INPLACE_LAYOUT@	done
+-@COMMENT_INPLACE_LAYOUT@	-( cd etc/upgrade && find . -type f -not -name '*.in' -print ) | while read file ; do \
++@COMMENT_INPLACE_LAYOUT@	-( cd etc/upgrade && find . -type f '!' -name '*.in' -print ) | while read file ; do \
+ @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/upgrade/$$file" "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+ @COMMENT_INPLACE_LAYOUT@	done
+ 
diff --git a/devel/rt4/patches/patch-config.layout b/devel/rt4/patches/patch-config.layout
index 3d0ea4c8657..4de352b9327 100644
--- a/devel/rt4/patches/patch-config.layout
+++ b/devel/rt4/patches/patch-config.layout
@@ -1,4 +1,4 @@
-$NetBSD: patch-config.layout,v 1.2 2014/01/01 03:31:50 ryoon Exp $
+$NetBSD: patch-config.layout,v 1.3 2014/06/17 11:10:40 markd Exp $
 
 * Add layout for pkgsrc.
 
@@ -13,7 +13,7 @@ $NetBSD: patch-config.layout,v 1.2 2014/01/01 03:31:50 ryoon Exp $
 +  exec_prefix:		${prefix}
 +  bindir:		@RT4DIR@/bin
 +  sbindir:		@RT4DIR@/sbin
-+  sysconfdir:		@RT4DIR@/etc
++  sysconfdir:		@PKG_SYSCONFDIR@
 +  mandir:		@PREFIX@/@PKGMANDIR@
 +  plugindir:		@RT4DIR@/plugins
 +  libdir:		@RT4DIR@/lib
@@ -22,12 +22,12 @@ $NetBSD: patch-config.layout,v 1.2 2014/01/01 03:31:50 ryoon Exp $
 +  fontdir:		${datadir}/fonts
 +  lexdir:		${datadir}/po
 +  manualdir:		${datadir}/docs
-+  localstatedir:	@RT4DIR@/var
++  localstatedir:	@RT_VAR_DIR@
 +  logfiledir:		${localstatedir}/log
 +  masonstatedir:	${localstatedir}/mason_data
 +  sessionstatedir:	${localstatedir}/session_data
 +  staticdir:	${datadir}/static
-+  customdir:		@RT4DIR@/local
++  customdir:		@RT_LOCAL_DIR@
 +  custometcdir:		${customdir}/etc
 +  customhtmldir:	${customdir}/html
 +  customlexdir:		${customdir}/po