4 files changed, 17 insertions, 11 deletions

diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index 1cebe5ab838c..f2e30b3ef9c9 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -42,15 +42,12 @@ AUTH_PGSQL_DOCS=	apache/manual/mod/mod_auth_pgsql
 
 PLIST_SUB+=	AUTH_PGSQL_DOCS="${AUTH_PGSQL_DOCS}"
 
-PKGMESSAGE=	${WRKSRC}/.install_notes
-
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pgsql=${PREFIX} \
 		--with-apxs=${APXS}
 
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	DOC=''
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/
@@ -61,8 +58,7 @@ post-install:
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} \
 		${PREFIX}/share/doc/${AUTH_PGSQL_DOCS}/index.html
 	${LN} -sf ${AUTH_PGSQL_DOCS} ${PREFIX}/share/doc/
-.else
-PLIST_SUB+=	DOC='@comment '
 .endif
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_auth_pgsql/pkg-descr b/www/mod_auth_pgsql/pkg-descr
index 50f3b87a96f1..3cbd7cc4140c 100644
--- a/www/mod_auth_pgsql/pkg-descr
+++ b/www/mod_auth_pgsql/pkg-descr
@@ -2,3 +2,5 @@ This add-on  module allows  the apache  web server  to use  a PostgreSQL
 database for user and/or group authentication. For large user lists this
 can  offer a  significate  speed  up over  apache's  standard flat  file
 format.
+
+WWW: http://www.giuseppetanzilli.it/mod_auth_pgsql/
diff --git a/www/mod_auth_pgsql/pkg-message b/www/mod_auth_pgsql/pkg-message
new file mode 100644
index 000000000000..34ff46f75898
--- /dev/null
+++ b/www/mod_auth_pgsql/pkg-message
@@ -0,0 +1,8 @@
+
+	================= Upgrading ===================
+
+Note on upgrading from earlier versions. All of the module's commands
+are now consistently named Auth_PG_*. Make sure to review your Apache
+config file(s) and, well, ``s/Auth_PG([^_])/Auth_PG_\1/g''.
+
+	===============================================
diff --git a/www/mod_auth_pgsql/pkg-plist b/www/mod_auth_pgsql/pkg-plist
index d970ccc7a942..cebde9580495 100644
--- a/www/mod_auth_pgsql/pkg-plist
+++ b/www/mod_auth_pgsql/pkg-plist
@@ -1,8 +1,8 @@
 libexec/apache/mod_auth_pgsql.so
 @exec %D/sbin/apxs -e -a -n auth_pgsql %f
 @unexec %D/sbin/apxs -e -A -n auth_pgsql %f
-%%DOC%%share/doc/%%AUTH_PGSQL_DOCS%%/README
-%%DOC%%share/doc/%%AUTH_PGSQL_DOCS%%/index.html
-%%DOC%%@exec (cd %D/share/doc && ln -sf %%AUTH_PGSQL_DOCS%% mod_auth_pgsql)
-%%DOC%%@unexec rm -f %D/share/doc/mod_auth_pgsql
-%%DOC%%@dirrm share/doc/%%AUTH_PGSQL_DOCS%%
+%%PORTDOCS%%share/doc/%%AUTH_PGSQL_DOCS%%/README
+%%PORTDOCS%%share/doc/%%AUTH_PGSQL_DOCS%%/index.html
+%%PORTDOCS%%@exec (cd %D/share/doc && ln -sf %%AUTH_PGSQL_DOCS%% mod_auth_pgsql)
+%%PORTDOCS%%@unexec rm -f %D/share/doc/mod_auth_pgsql
+%%PORTDOCS%%@dirrm share/doc/%%AUTH_PGSQL_DOCS%%