3 files changed, 6 insertions, 8 deletions

diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 6c8807ec3da0..55ab828cea1f 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rt
-PORTVERSION=	4.0.17
+PORTVERSION=	4.0.18
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		SF/requesttracker/
@@ -10,7 +10,7 @@ MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	RT is an industrial-grade ticketing system written in Perl
 
 CONFLICTS=	rt-3.8* brlcad-[0-9]*
-LATEST_LINK=	rt40
+PKGNAMESUFFIX=	40
 NEED_ROOT=	yes
 
 # See doc/web_deployment.pod for info on the choices of webserver /
diff --git a/www/rt40/distinfo b/www/rt40/distinfo
index b68387107988..0e540ae9709b 100644
--- a/www/rt40/distinfo
+++ b/www/rt40/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rt-4.0.17.tar.gz) = dd5cd3104a5c88ce072dbeea1c21ace26acd4e47974006adf0d1a3f9d8abbec4
-SIZE (rt-4.0.17.tar.gz) = 6925490
+SHA256 (rt-4.0.18.tar.gz) = f5e7aec617aced244d2117e8d089d3f16d00a3c733dfc8e82a22b34bdb253b85
+SIZE (rt-4.0.18.tar.gz) = 6928488
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index 282801c8e71a..9a13dee1882d 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -296,7 +296,6 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.7.85/content
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.7.86/content
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.7.87/content
-%%PORTDOCS%%%%DOCSDIR%%/upgrade/3.8-branded-queues-extension
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.8-ical-extension
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.8.0/content
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.8.1/content
@@ -350,6 +349,7 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.13/schema.Pg
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.13/schema.mysql
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.13/schema.Oracle
+%%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.18/content
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/generate-rtaddressregexp
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/sanity-check-stylesheets.pl
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/shrink_cgm_table.pl
@@ -1521,10 +1521,8 @@ share/rt40/po/zh_TW.po
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor/lang
-@dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor/lang
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor/dialogs
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor
-@dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/uicolor
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/templates/templates
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/templates/dialogs
@@ -1540,7 +1538,6 @@ share/rt40/po/zh_TW.po
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/specialchar/lang
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/specialchar/dialogs
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/specialchar
-@dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/specialchar
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/smiley/images
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/smiley/dialogs
 @dirrm share/rt40/html/NoAuth/RichText/ckeditor/plugins/smiley
@@ -1657,6 +1654,7 @@ share/rt40/po/zh_TW.po
 @dirrm share/rt40/fonts
 @dirrmtry share/rt40/etc
 @dirrm share/rt40
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.18
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.13
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.12
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.9