14 files changed, 88 insertions, 79 deletions

diff --git a/lang/gnat-doc-html/Makefile b/lang/gnat-doc-html/Makefile
index dd45ae6e7c10..bee995d667da 100644
--- a/lang/gnat-doc-html/Makefile
+++ b/lang/gnat-doc-html/Makefile
@@ -26,10 +26,9 @@ COMMENT=	Documentation for the GNAT compiler
 WRKSRC=		${WRKDIR}/gnat-${PORTVERSION}-unx-docs
 NO_BUILD=	yes
 PLIST=		${MASTERDIR}/pkg-plist_${DOCFORMAT}
-PKGMESSAGE=	${MASTERDIR}/pkg-message_${DOCFORMAT}
+SUB_FILES=	pkg-message_${DOCFORMAT}
 
 DOCFORMAT?=	html
-DOCSDIR=	${PREFIX}/share/doc/gnat/${DOCFORMAT}
 
 SEC_LABEL=	"Programming & development tools."
 INSTALL_INFO=	install-info --section=${SEC_LABEL}
@@ -50,13 +49,11 @@ PLIST_SUB=	SEC_LABEL=${SEC_LABEL} ARM_LABEL=${ARM_LABEL} \
 	@${FALSE}
 .endif
 
-pre-install:
-	@${CP} ${PKGDIR}/pkg-plist_${DOCFORMAT} ${WRKDIR}
-	@${CP} ${PKGDIR}/pkg-message_${DOCFORMAT} ${WRKDIR}
+.ifdef NOPORTDOCS
+IGNORE=		this port only contains documentation, please undefine NOPORTDOCS and try again
+.endif
 
 do-install:
-.if !defined(NOPORTDOCS)
-
 .if ${DOCFORMAT} == "info"
 	@${MKDIR} ${PREFIX}/info
 	@${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${PREFIX}/info
@@ -65,15 +62,11 @@ do-install:
 	@${INSTALL_INFO} --item=${RM_LABEL} ${PREFIX}/info/gnat_rm.info ${PREFIX}/info/dir
 	@${INSTALL_INFO} --item=${UG_LABEL} ${PREFIX}/info/gnat_ug.info ${PREFIX}/info/dir
 .else
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${DOCSDIR}
-.endif
-
+	@${MKDIR} ${DOCSDIR}/${DOCFORMAT}
+	@${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${DOCSDIR}/${DOCFORMAT}
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
-.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/gnat-doc-html/pkg-message_html b/lang/gnat-doc-html/files/pkg-message_html.in
index df7dd30f5d43..97b89bcf0280 100644
--- a/lang/gnat-doc-html/pkg-message_html
+++ b/lang/gnat-doc-html/files/pkg-message_html.in
@@ -6,16 +6,16 @@ NOTE:
 You may find it useful to add the following URL's to your browser:
 
 	Ada 95 Annotated Reference Manual
-		file:///usr/local/share/doc/gnat/html/arm95.html
+		file://%%DOCSDIR%%/html/arm95.html
 
 	GNAT gcc 2.8.1 Compiler Manual
-		file:///usr/local/share/doc/gnat/html/gcc.html
+		file://%%DOCSDIR%%/html/gcc.html
 
 	GNAT Reference Manual
-		file:///usr/local/share/doc/gnat/html/gnat_rm.html
+		file://%%DOCSDIR%%/html/gnat_rm.html
 
 	GNAT User Guide
-		file:///usr/local/share/doc/gnat/html/gnat_ug.html
+		file://%%DOCSDIR%%/html/gnat_ug.html
 
 *********************************************************************
 
diff --git a/lang/gnat-doc-html/pkg-message_info b/lang/gnat-doc-html/files/pkg-message_info.in
index 7c2284187eac..4d899c7eebfa 100644
--- a/lang/gnat-doc-html/pkg-message_info
+++ b/lang/gnat-doc-html/files/pkg-message_info.in
@@ -3,9 +3,9 @@
 
 NOTE:
 
-GNU info browser entries have been installed in /usr/local/info/dir.
+GNU info browser entries have been installed in %%PREFIX%%/info/dir
 If entries do not appear in your info browser, make sure that
-/usr/local/info is in your INFOPATH.
+%%PREFIX%%/info is in your INFOPATH.
 
 *********************************************************************
 
diff --git a/lang/gnat-doc-html/pkg-message_ps b/lang/gnat-doc-html/files/pkg-message_ps.in
index ae664f96320d..c1b211ef18c8 100644
--- a/lang/gnat-doc-html/pkg-message_ps
+++ b/lang/gnat-doc-html/files/pkg-message_ps.in
@@ -4,7 +4,7 @@
 NOTE:
 
 Postscript documentation has been installed in
-/usr/local/share/doc/gnat/ps.
+%%DOCSDIR%%/ps
 
 *********************************************************************
 
diff --git a/lang/gnat-doc-html/pkg-message_texi b/lang/gnat-doc-html/files/pkg-message_texi.in
index 7cc05e38d1da..b3dd3725967e 100644
--- a/lang/gnat-doc-html/pkg-message_texi
+++ b/lang/gnat-doc-html/files/pkg-message_texi.in
@@ -4,7 +4,7 @@
 NOTE:
 
 TeXi documentation has been installed in
-/usr/local/share/doc/gnat/texi.
+%%DOCSDIR%%/texi.
 
 *********************************************************************
 
diff --git a/lang/gnat-doc-html/pkg-message_txt b/lang/gnat-doc-html/files/pkg-message_txt.in
index 43d4049f4045..da230f2e1a2a 100644
--- a/lang/gnat-doc-html/pkg-message_txt
+++ b/lang/gnat-doc-html/files/pkg-message_txt.in
@@ -4,7 +4,7 @@
 NOTE:
 
 ASCII Text documentation has been installed in
-/usr/local/share/gnat/txt.
+%%DOCSDIR%%/txt.
 
 *********************************************************************
 
diff --git a/lang/gnat-doc-html/pkg-plist_html b/lang/gnat-doc-html/pkg-plist_html
index b5c5077de6d6..cc452c7c392e 100644
--- a/lang/gnat-doc-html/pkg-plist_html
+++ b/lang/gnat-doc-html/pkg-plist_html
@@ -1,18 +1,18 @@
-share/doc/gnat/html/arm95.html
-share/doc/gnat/html/assembly.gif
-share/doc/gnat/html/breakpoints.gif
-share/doc/gnat/html/canvas.gif
-share/doc/gnat/html/colors.gif
-share/doc/gnat/html/explorer.gif
-share/doc/gnat/html/gcc.html
-share/doc/gnat/html/gdb.html
-share/doc/gnat/html/gnat_rm.html
-share/doc/gnat/html/gnat_ug.html
-share/doc/gnat/html/gvd.html
-share/doc/gnat/html/main-window.gif
-share/doc/gnat/html/memory-view.gif
-share/doc/gnat/html/process.gif
-share/doc/gnat/html/tasks.gif
-share/doc/gnat/html/tooltips.gif
-@dirrm share/doc/gnat/html
-@dirrm share/doc/gnat
+%%DOCSDIR%%/html/arm95.html
+%%DOCSDIR%%/html/assembly.gif
+%%DOCSDIR%%/html/breakpoints.gif
+%%DOCSDIR%%/html/canvas.gif
+%%DOCSDIR%%/html/colors.gif
+%%DOCSDIR%%/html/explorer.gif
+%%DOCSDIR%%/html/gcc.html
+%%DOCSDIR%%/html/gdb.html
+%%DOCSDIR%%/html/gnat_rm.html
+%%DOCSDIR%%/html/gnat_ug.html
+%%DOCSDIR%%/html/gvd.html
+%%DOCSDIR%%/html/main-window.gif
+%%DOCSDIR%%/html/memory-view.gif
+%%DOCSDIR%%/html/process.gif
+%%DOCSDIR%%/html/tasks.gif
+%%DOCSDIR%%/html/tooltips.gif
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
diff --git a/lang/gnat-doc-html/pkg-plist_ps b/lang/gnat-doc-html/pkg-plist_ps
index 514ebb36bb62..7b9a68b616c8 100644
--- a/lang/gnat-doc-html/pkg-plist_ps
+++ b/lang/gnat-doc-html/pkg-plist_ps
@@ -1,8 +1,8 @@
-share/doc/gnat/ps/arm95.ps
-share/doc/gnat/ps/gcc.ps
-share/doc/gnat/ps/gdb.ps
-share/doc/gnat/ps/gnat_rm.ps
-share/doc/gnat/ps/gnat_ug.ps
-share/doc/gnat/ps/gvd.ps
-@dirrm share/doc/gnat/ps
-@dirrm share/doc/gnat
+%%DOCSDIR%%/ps/arm95.ps
+%%DOCSDIR%%/ps/gcc.ps
+%%DOCSDIR%%/ps/gdb.ps
+%%DOCSDIR%%/ps/gnat_rm.ps
+%%DOCSDIR%%/ps/gnat_ug.ps
+%%DOCSDIR%%/ps/gvd.ps
+@dirrm %%DOCSDIR%%/ps
+@dirrm %%DOCSDIR%%
diff --git a/lang/gnat-doc-html/pkg-plist_texi b/lang/gnat-doc-html/pkg-plist_texi
index 82ac6109dd26..25d24ae5ccb3 100644
--- a/lang/gnat-doc-html/pkg-plist_texi
+++ b/lang/gnat-doc-html/pkg-plist_texi
@@ -1,18 +1,18 @@
-share/doc/gnat/texi/arm95.texi
-share/doc/gnat/texi/cpp.texi
-share/doc/gnat/texi/extend.texi
-share/doc/gnat/texi/gcc.texi
-share/doc/gnat/texi/gcov.texi
-share/doc/gnat/texi/gfdl.texi
-share/doc/gnat/texi/gnat_rm.texi
-share/doc/gnat/texi/gnat_ug_unx.texi
-share/doc/gnat/texi/gvd.texi
-share/doc/gnat/texi/install.texi
-share/doc/gnat/texi/invoke.texi
-share/doc/gnat/texi/md.texi
-share/doc/gnat/texi/rtl.texi
-share/doc/gnat/texi/texinfo.tex
-share/doc/gnat/texi/texiplus.tex
-share/doc/gnat/texi/tm.texi
-@dirrm share/doc/gnat/texi
-@dirrm share/doc/gnat
+%%DOCSDIR%%/texi/arm95.texi
+%%DOCSDIR%%/texi/cpp.texi
+%%DOCSDIR%%/texi/extend.texi
+%%DOCSDIR%%/texi/gcc.texi
+%%DOCSDIR%%/texi/gcov.texi
+%%DOCSDIR%%/texi/gfdl.texi
+%%DOCSDIR%%/texi/gnat_rm.texi
+%%DOCSDIR%%/texi/gnat_ug_unx.texi
+%%DOCSDIR%%/texi/gvd.texi
+%%DOCSDIR%%/texi/install.texi
+%%DOCSDIR%%/texi/invoke.texi
+%%DOCSDIR%%/texi/md.texi
+%%DOCSDIR%%/texi/rtl.texi
+%%DOCSDIR%%/texi/texinfo.tex
+%%DOCSDIR%%/texi/texiplus.tex
+%%DOCSDIR%%/texi/tm.texi
+@dirrm %%DOCSDIR%%/texi
+@dirrm %%DOCSDIR%%
diff --git a/lang/gnat-doc-html/pkg-plist_txt b/lang/gnat-doc-html/pkg-plist_txt
index 9d30aeb9dc64..52f2b0240704 100644
--- a/lang/gnat-doc-html/pkg-plist_txt
+++ b/lang/gnat-doc-html/pkg-plist_txt
@@ -1,8 +1,8 @@
-share/doc/gnat/txt/arm95.txt
-share/doc/gnat/txt/gcc.txt
-share/doc/gnat/txt/gdb.txt
-share/doc/gnat/txt/gnat_rm.txt
-share/doc/gnat/txt/gnat_ug.txt
-share/doc/gnat/txt/gvd.txt
-@dirrm share/doc/gnat/txt
-@dirrm share/doc/gnat
+%%DOCSDIR%%/txt/arm95.txt
+%%DOCSDIR%%/txt/gcc.txt
+%%DOCSDIR%%/txt/gdb.txt
+%%DOCSDIR%%/txt/gnat_rm.txt
+%%DOCSDIR%%/txt/gnat_ug.txt
+%%DOCSDIR%%/txt/gvd.txt
+@dirrm %%DOCSDIR%%/txt
+@dirrm %%DOCSDIR%%
diff --git a/lang/gnat-doc-info/Makefile b/lang/gnat-doc-info/Makefile
index 403e07518d9c..59d5bba279e2 100644
--- a/lang/gnat-doc-info/Makefile
+++ b/lang/gnat-doc-info/Makefile
@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
-DOCFORMAT=	info
+PORTNAME=	gnat-doc
+
+MAINTAINER=	ports@FreeBSD.org
+
 MASTERDIR=	${.CURDIR}/../gnat-doc-html
+DOCFORMAT=	info
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/gnat-doc-ps/Makefile b/lang/gnat-doc-ps/Makefile
index 1fbc89517a68..20b10ccc1fc0 100644
--- a/lang/gnat-doc-ps/Makefile
+++ b/lang/gnat-doc-ps/Makefile
@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
-DOCFORMAT=	ps
+PORTNAME=	gnat-doc
+
+MAINTAINER=	ports@FreeBSD.org
+
 MASTERDIR=	${.CURDIR}/../gnat-doc-html
+DOCFORMAT=	ps
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/gnat-doc-texi/Makefile b/lang/gnat-doc-texi/Makefile
index c1780eb7b8ab..9f2305825e9c 100644
--- a/lang/gnat-doc-texi/Makefile
+++ b/lang/gnat-doc-texi/Makefile
@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
-DOCFORMAT=	texi
+PORTNAME=	gnat-doc
+
+MAINTAINER=	ports@FreeBSD.org
+
 MASTERDIR=	${.CURDIR}/../gnat-doc-html
+DOCFORMAT=	texi
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/gnat-doc-txt/Makefile b/lang/gnat-doc-txt/Makefile
index dfea0696a35b..928947f23395 100644
--- a/lang/gnat-doc-txt/Makefile
+++ b/lang/gnat-doc-txt/Makefile
@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
-DOCFORMAT=	txt
+PORTNAME=	gnat-doc
+
+MAINTAINER=	ports@FreeBSD.org
+
 MASTERDIR=	${.CURDIR}/../gnat-doc-html
+DOCFORMAT=	txt
 
 .include "${MASTERDIR}/Makefile"