- update to 0.8.3

- make the port ${PREFIX}-safe
- use ${DATADIR}
- instead of installing docs to ${DATADIR}, respect NOPORTDOCS and intall
  to ${DOCSDIR}
- take maintainership

4 files changed, 30 insertions, 30 deletions

diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index 79c759dac133..632db04271d4 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	slrnconf
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 CATEGORIES=	news
 MASTER_SITES=	http://home.arcor.de/kaffeetisch/downloads/
 
@@ -13,30 +13,29 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical configuation utility for the newsreader slrn
 
 BUILD_DEPENDS=	slrn:${PORTSDIR}/news/slrn \
-		${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
+		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
 
+WRKSRC=	${WRKDIR}/${PORTNAME}
 USE_REINPLACE=	yes
 
 post-patch:
-.for file in Makefile
-	@${REINPLACE_CMD} -e \
-	's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/${file}
-.endfor
+	@${REINPLACE_CMD} -e 's|PREFIX=|PREFIX?=|' ${WRKSRC}/Makefile
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}/help
-	@${INSTALL_DATA} ${WRKSRC}/help/* \
-		${PREFIX}/share/${PORTNAME}/help
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}/data
-	@${INSTALL_DATA} ${WRKSRC}/data/* \
-		${PREFIX}/share/${PORTNAME}/data
-	@${INSTALL_SCRIPT} ${WRKSRC}/slrnconf \
-		${PREFIX}/bin
-.for i in ABOUT COPYING README preferences.pm rc_grammar.pm ui.pm
-	@${INSTALL_DATA} ${WRKSRC}/${i} \
-		${PREFIX}/share/${PORTNAME}
+	@${MKDIR} ${DATADIR}/help
+	@${INSTALL_DATA} ${WRKSRC}/help/* ${DATADIR}/help
+	@${MKDIR} ${DATADIR}/data
+	@${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data
+	@${INSTALL_SCRIPT} ${WRKSRC}/slrnconf ${PREFIX}/bin
+.for i in preferences.pm rc_grammar.pm ui.pm
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ABOUT COPYING README
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/news/slrnconf/distinfo b/news/slrnconf/distinfo
index 714322f8846d..cdc7406ba83d 100644
--- a/news/slrnconf/distinfo
+++ b/news/slrnconf/distinfo
@@ -1 +1 @@
-MD5 (slrnconf-0.8.2.tar.gz) = 0271cab7ea8917d93aeff2e989aa7ad3
+MD5 (slrnconf-0.8.3.tar.gz) = 31a842e3aba653e1853f414a2c4e728a
diff --git a/news/slrnconf/pkg-descr b/news/slrnconf/pkg-descr
index 56f07f2de4d9..8764fa437260 100644
--- a/news/slrnconf/pkg-descr
+++ b/news/slrnconf/pkg-descr
@@ -1,7 +1,7 @@
 Slrnconf is a graphical configuation utility for the newsreader
 slrn. It is intended to make the hairy configuration of SLRN a
 bit easier. Slrnconf will try to read your ~/.slrnrc at
-startup. If you're using  a different file, just open it via 
+startup. If you're using a different file, just open it via 
 File -> Open. There are no command line switches.
 
 WWW: http://home.arcor.de/kaffeetisch/slrnconf.html
diff --git a/news/slrnconf/pkg-plist b/news/slrnconf/pkg-plist
index 3412fe23b1d3..23cfbc2e8bb0 100644
--- a/news/slrnconf/pkg-plist
+++ b/news/slrnconf/pkg-plist
@@ -1,17 +1,17 @@
 bin/slrnconf
-share/slrnconf/ABOUT
-share/slrnconf/COPYING
-share/slrnconf/README
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/slrnconf/preferences.pm
 share/slrnconf/rc_grammar.pm
 share/slrnconf/ui.pm
-share/slrnconf/data/preferences_display_elements
+share/slrnconf/data/bitmaps
+share/slrnconf/data/colors
+share/slrnconf/data/display_elements
+share/slrnconf/data/menus
+share/slrnconf/data/monos
 share/slrnconf/data/rc_grammar
-share/slrnconf/data/ui_bitmaps
-share/slrnconf/data/ui_colors
-share/slrnconf/data/ui_menus
-share/slrnconf/data/ui_monos
-share/slrnconf/data/ui_tabs
+share/slrnconf/data/tabs
 share/slrnconf/help/Xbrowser
 share/slrnconf/help/abort_unmodified_edits
 share/slrnconf/help/art_help_line
@@ -172,6 +172,7 @@ share/slrnconf/help/warn_followup_to
 share/slrnconf/help/wrap_flags
 share/slrnconf/help/wrap_method
 share/slrnconf/help/write_newsrc_flags
-@dirrm share/slrnconf/data
 @dirrm share/slrnconf/help
+@dirrm share/slrnconf/data
 @dirrm share/slrnconf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%