2 files changed, 60 insertions, 55 deletions

diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 80dd54e1571d..b4a804808db8 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -8,11 +8,12 @@
 
 PORTNAME=	xdialog
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xdialog.free.fr/
 DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ports@geeksrus.org
 
 USE_BZIP2=	yes
 USE_GTK=	yes
@@ -23,11 +24,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	Xdialog.1
 
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+PLIST_DIRS=	DOCSDIR=${DOCSDIR}
+PLIST_SUB+=	${PLIST_DIRS:S,DIR=${PREFIX}/,DIR=,}
+
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DATADIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist
index 06dfad5ee48a..7d11a2590c31 100644
--- a/x11/xdialog/pkg-plist
+++ b/x11/xdialog/pkg-plist
@@ -5,54 +5,54 @@ share/locale/fr/LC_MESSAGES/Xdialog.mo
 share/locale/hu/LC_MESSAGES/Xdialog.mo
 share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
 share/locale/ru/LC_MESSAGES/Xdialog.mo
-%%PORTDOCS%%share/xdialog/2ranges.png
-%%PORTDOCS%%share/xdialog/authors.html
-%%PORTDOCS%%share/xdialog/box.html
-%%PORTDOCS%%share/xdialog/buildlist.png
-%%PORTDOCS%%share/xdialog/calendar.png
-%%PORTDOCS%%share/xdialog/center.png
-%%PORTDOCS%%share/xdialog/changelog.html
-%%PORTDOCS%%share/xdialog/check.png
-%%PORTDOCS%%share/xdialog/checklist.png
-%%PORTDOCS%%share/xdialog/combobox.png
-%%PORTDOCS%%share/xdialog/common.html
-%%PORTDOCS%%share/xdialog/compatibility.html
-%%PORTDOCS%%share/xdialog/dselect.png
-%%PORTDOCS%%share/xdialog/editbox.png
-%%PORTDOCS%%share/xdialog/faq.html
-%%PORTDOCS%%share/xdialog/fill.png
-%%PORTDOCS%%share/xdialog/fixedfont.png
-%%PORTDOCS%%share/xdialog/fselect.png
-%%PORTDOCS%%share/xdialog/gauge.png
-%%PORTDOCS%%share/xdialog/gtk.html
-%%PORTDOCS%%share/xdialog/icon.png
-%%PORTDOCS%%share/xdialog/index.html
-%%PORTDOCS%%share/xdialog/infobox.png
-%%PORTDOCS%%share/xdialog/input.png
-%%PORTDOCS%%share/xdialog/intro.html
-%%PORTDOCS%%share/xdialog/labelcenter.png
-%%PORTDOCS%%share/xdialog/labelleft.png
-%%PORTDOCS%%share/xdialog/labelright.png
-%%PORTDOCS%%share/xdialog/left.png
-%%PORTDOCS%%share/xdialog/license.html
-%%PORTDOCS%%share/xdialog/logbox.png
-%%PORTDOCS%%share/xdialog/msgbox.png
-%%PORTDOCS%%share/xdialog/nofixedfont.png
-%%PORTDOCS%%share/xdialog/notags.png
-%%PORTDOCS%%share/xdialog/password.png
-%%PORTDOCS%%share/xdialog/radiolist.png
-%%PORTDOCS%%share/xdialog/range.png
-%%PORTDOCS%%share/xdialog/rcfile.png
-%%PORTDOCS%%share/xdialog/right.png
-%%PORTDOCS%%share/xdialog/special.html
-%%PORTDOCS%%share/xdialog/spinbox.png
-%%PORTDOCS%%share/xdialog/syntax.html
-%%PORTDOCS%%share/xdialog/tailbox.png
-%%PORTDOCS%%share/xdialog/timebox.png
-%%PORTDOCS%%share/xdialog/title.png
-%%PORTDOCS%%share/xdialog/transient.html
-%%PORTDOCS%%share/xdialog/treeview.png
-%%PORTDOCS%%share/xdialog/withtags.png
-%%PORTDOCS%%share/xdialog/yesno-wizard.png
-%%PORTDOCS%%share/xdialog/yesno.png
-%%PORTDOCS%%@dirrm share/xdialog
+%%PORTDOCS%%%%DOCSDIR%%/2ranges.png
+%%PORTDOCS%%%%DOCSDIR%%/authors.html
+%%PORTDOCS%%%%DOCSDIR%%/box.html
+%%PORTDOCS%%%%DOCSDIR%%/buildlist.png
+%%PORTDOCS%%%%DOCSDIR%%/calendar.png
+%%PORTDOCS%%%%DOCSDIR%%/center.png
+%%PORTDOCS%%%%DOCSDIR%%/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/check.png
+%%PORTDOCS%%%%DOCSDIR%%/checklist.png
+%%PORTDOCS%%%%DOCSDIR%%/combobox.png
+%%PORTDOCS%%%%DOCSDIR%%/common.html
+%%PORTDOCS%%%%DOCSDIR%%/compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/dselect.png
+%%PORTDOCS%%%%DOCSDIR%%/editbox.png
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fill.png
+%%PORTDOCS%%%%DOCSDIR%%/fixedfont.png
+%%PORTDOCS%%%%DOCSDIR%%/fselect.png
+%%PORTDOCS%%%%DOCSDIR%%/gauge.png
+%%PORTDOCS%%%%DOCSDIR%%/gtk.html
+%%PORTDOCS%%%%DOCSDIR%%/icon.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/infobox.png
+%%PORTDOCS%%%%DOCSDIR%%/input.png
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/labelcenter.png
+%%PORTDOCS%%%%DOCSDIR%%/labelleft.png
+%%PORTDOCS%%%%DOCSDIR%%/labelright.png
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/logbox.png
+%%PORTDOCS%%%%DOCSDIR%%/msgbox.png
+%%PORTDOCS%%%%DOCSDIR%%/nofixedfont.png
+%%PORTDOCS%%%%DOCSDIR%%/notags.png
+%%PORTDOCS%%%%DOCSDIR%%/password.png
+%%PORTDOCS%%%%DOCSDIR%%/radiolist.png
+%%PORTDOCS%%%%DOCSDIR%%/range.png
+%%PORTDOCS%%%%DOCSDIR%%/rcfile.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/special.html
+%%PORTDOCS%%%%DOCSDIR%%/spinbox.png
+%%PORTDOCS%%%%DOCSDIR%%/syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/tailbox.png
+%%PORTDOCS%%%%DOCSDIR%%/timebox.png
+%%PORTDOCS%%%%DOCSDIR%%/title.png
+%%PORTDOCS%%%%DOCSDIR%%/transient.html
+%%PORTDOCS%%%%DOCSDIR%%/treeview.png
+%%PORTDOCS%%%%DOCSDIR%%/withtags.png
+%%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
+%%PORTDOCS%%%%DOCSDIR%%/yesno.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%