7 files changed, 37 insertions, 13 deletions

diff --git a/lang/gnat-doc-html/Makefile b/lang/gnat-doc-html/Makefile
index 707549787b9d..f50715aaa43a 100644
--- a/lang/gnat-doc-html/Makefile
+++ b/lang/gnat-doc-html/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnat-doc
-PORTVERSION=	3.14p
+PORTVERSION=	3.15p
 CATEGORIES=	lang
 MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/%SUBDIR%/ \
 		ftp://ftp.cdrom.com/pub/languages/ada/compiler/gnat/%SUBDIR%/ \
@@ -19,12 +19,12 @@ MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/%SUBDIR%/ \
 		ftp://ftp.fss.bme.hu/pub/ada/gnat/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMESUFFIX=	-${DOCFORMAT}
-DISTNAME=	gnat-${PORTVERSION}-docs
+DISTNAME=	gnat-${PORTVERSION}-unx-docs
 
 MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	Documentation for the GNAT compiler
 
-WRKSRC=		${WRKDIR}/gnat-${PORTVERSION}-docs
+WRKSRC=		${WRKDIR}/gnat-${PORTVERSION}-unx-docs
 NO_BUILD=	yes
 PLIST=		${MASTERDIR}/pkg-plist_${DOCFORMAT}
 PKGMESSAGE=	${MASTERDIR}/pkg-message_${DOCFORMAT}
@@ -61,9 +61,6 @@ do-install:
 .if ${DOCFORMAT} == "info"
 	@${MKDIR} ${PREFIX}/info
 	@${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${PREFIX}/info
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	fi
 	@${INSTALL_INFO} --item=${ARM_LABEL} ${PREFIX}/info/arm95.info ${PREFIX}/info/dir
 	@${INSTALL_INFO} --item=${GCC_LABEL} ${PREFIX}/info/gcc.info ${PREFIX}/info/dir
 	@${INSTALL_INFO} --item=${RM_LABEL} ${PREFIX}/info/gnat_rm.info ${PREFIX}/info/dir
diff --git a/lang/gnat-doc-html/distinfo b/lang/gnat-doc-html/distinfo
index 984ffbc58897..1ece28fb1a73 100644
--- a/lang/gnat-doc-html/distinfo
+++ b/lang/gnat-doc-html/distinfo
@@ -1 +1 @@
-MD5 (gnat-3.14p-docs.tar.gz) = b5ed0bdfa4a5d6f88b0f64c444e60761
+MD5 (gnat-3.15p-unx-docs.tar.gz) = 3bcbedfaccf343a8515efc0f74b8a027
diff --git a/lang/gnat-doc-html/pkg-plist_html b/lang/gnat-doc-html/pkg-plist_html
index 931d7deb4d62..b5c5077de6d6 100644
--- a/lang/gnat-doc-html/pkg-plist_html
+++ b/lang/gnat-doc-html/pkg-plist_html
@@ -15,4 +15,4 @@ share/doc/gnat/html/process.gif
 share/doc/gnat/html/tasks.gif
 share/doc/gnat/html/tooltips.gif
 @dirrm share/doc/gnat/html
-@unexec rmdir %D/share/doc/gnat 2>/dev/null || true
+@dirrm share/doc/gnat
diff --git a/lang/gnat-doc-html/pkg-plist_info b/lang/gnat-doc-html/pkg-plist_info
index f962eb00015c..39430fb8919d 100644
--- a/lang/gnat-doc-html/pkg-plist_info
+++ b/lang/gnat-doc-html/pkg-plist_info
@@ -49,7 +49,21 @@ info/gcc.info-11
 info/gcc.info-12
 info/gcc.info-13
 info/gcc.info-14
+info/gcc.info-15
+info/gcc.info-16
+info/gcc.info-17
+info/gcc.info-18
+info/gcc.info-19
 info/gcc.info-2
+info/gcc.info-20
+info/gcc.info-21
+info/gcc.info-22
+info/gcc.info-23
+info/gcc.info-24
+info/gcc.info-25
+info/gcc.info-26
+info/gcc.info-27
+info/gcc.info-28
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -59,6 +73,11 @@ info/gcc.info-8
 info/gcc.info-9
 info/gdb.info
 info/gdb.info-1
+info/gdb.info-10
+info/gdb.info-11
+info/gdb.info-12
+info/gdb.info-13
+info/gdb.info-14
 info/gdb.info-2
 info/gdb.info-3
 info/gdb.info-4
@@ -69,6 +88,8 @@ info/gdb.info-8
 info/gdb.info-9
 info/gnat_rm.info
 info/gnat_rm.info-1
+info/gnat_rm.info-10
+info/gnat_rm.info-11
 info/gnat_rm.info-2
 info/gnat_rm.info-3
 info/gnat_rm.info-4
@@ -79,6 +100,13 @@ info/gnat_rm.info-8
 info/gnat_rm.info-9
 info/gnat_ug.info
 info/gnat_ug.info-1
+info/gnat_ug.info-10
+info/gnat_ug.info-11
+info/gnat_ug.info-12
+info/gnat_ug.info-13
+info/gnat_ug.info-14
+info/gnat_ug.info-15
+info/gnat_ug.info-16
 info/gnat_ug.info-2
 info/gnat_ug.info-3
 info/gnat_ug.info-4
diff --git a/lang/gnat-doc-html/pkg-plist_ps b/lang/gnat-doc-html/pkg-plist_ps
index 22a5f0f0d0ec..514ebb36bb62 100644
--- a/lang/gnat-doc-html/pkg-plist_ps
+++ b/lang/gnat-doc-html/pkg-plist_ps
@@ -4,6 +4,5 @@ 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
-share/doc/gnat/ps/refcard.ps
 @dirrm share/doc/gnat/ps
-@unexec rmdir %D/share/doc/gnat 2>/dev/null || true
+@dirrm share/doc/gnat
diff --git a/lang/gnat-doc-html/pkg-plist_texi b/lang/gnat-doc-html/pkg-plist_texi
index 485f65d13f89..82ac6109dd26 100644
--- a/lang/gnat-doc-html/pkg-plist_texi
+++ b/lang/gnat-doc-html/pkg-plist_texi
@@ -3,7 +3,7 @@ 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/gdb.texinfo
+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
@@ -15,4 +15,4 @@ share/doc/gnat/texi/texinfo.tex
 share/doc/gnat/texi/texiplus.tex
 share/doc/gnat/texi/tm.texi
 @dirrm share/doc/gnat/texi
-@unexec rmdir %D/share/doc/gnat 2>/dev/null || true
+@dirrm share/doc/gnat
diff --git a/lang/gnat-doc-html/pkg-plist_txt b/lang/gnat-doc-html/pkg-plist_txt
index b800550c1567..9d30aeb9dc64 100644
--- a/lang/gnat-doc-html/pkg-plist_txt
+++ b/lang/gnat-doc-html/pkg-plist_txt
@@ -5,4 +5,4 @@ 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
-@unexec rmdir %D/share/doc/gnat 2>/dev/null || true
+@dirrm share/doc/gnat