cad/NASTRAN-95: update 20151227 -> 20160908 and set MAINTAINER

- Set MAINTAINER to pfg@FreeBSD.org
- Minor source code cleanup
- Split large doc file and add OCR information

PR:		219108
Submitted by:	pfg

6 files changed, 21 insertions, 21 deletions

diff --git a/cad/NASTRAN-95/Makefile b/cad/NASTRAN-95/Makefile
index b82dc0bed9b0..0b74a3fe3941 100644
--- a/cad/NASTRAN-95/Makefile
+++ b/cad/NASTRAN-95/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	NASTRAN-95
-PORTVERSION=	20151227
-PORTREVISION=	3
+PORTVERSION=	20160908
 CATEGORIES=	cad science
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	NASA Structural Analysis System
 
 LICENSE=	NOSA
@@ -16,29 +15,28 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	twuerfl
-GH_TAGNAME=	0e77a84
+GH_TAGNAME=	a73c57a
 
 USES=		fortran gmake
 
 ALL_TARGET=	# empty
 INSTALL_TARGET=	install-strip
 
-NASTHOME= 	${PREFIX}/libexec/${PORTNAME}
+NASTHOME=	${PREFIX}/libexec/${PORTNAME}
 PLIST_SUB=	NASTHOME=${NASTHOME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%FFLAGS%%+${FFLAGS}+g;' \
-		${WRKSRC}/sb/Makefile \
+		${WRKSRC}/src/Makefile \
 		${WRKSRC}/um/Makefile
-# Version string limited to 7 characters so ${OPSYS:tu} would result in
-# "DRAGONF VERSON" for DF.  It's best to leave it hardcoded to FreeBSD
+# Version string limited to 7 characters
 	@${REINPLACE_CMD} -e 's+LINUX  +FREEBSD+g;' \
-		${WRKSRC}/sb/btstrp.f
+		${WRKSRC}/src/btstrp.f
 
 do-build:
-	@(cd ${WRKSRC}/sb; ${MAKE_CMD} ${ALL_TARGET})
+	@(cd ${WRKSRC}/src; ${MAKE_CMD} ${ALL_TARGET})
 	@(cd ${WRKSRC}/um; ${MAKE_CMD} ${ALL_TARGET})
 	@(cd ${WRKSRC}/utility; ${FC} -o chkfil.exe ${FFLAGS} chkfil.f ${LDFLAGS})
 
@@ -47,7 +45,7 @@ do-install:
 		${WRKSRC}/bin/nastran
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/nastran ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${NASTHOME}/bin
-	${INSTALL} ${WRKSRC}/sb/nastran.exe ${STAGEDIR}${NASTHOME}/bin/nastrn.exe
+	${INSTALL} ${WRKSRC}/src/nastran.exe ${STAGEDIR}${NASTHOME}/bin/nastrn.exe
 	${INSTALL} ${WRKSRC}/utility/chkfil.exe ${STAGEDIR}${NASTHOME}/bin/
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "rf" ${STAGEDIR}${NASTHOME})
 	@${MKDIR} ${STAGEDIR}${NASTHOME}/um/
@@ -57,7 +55,7 @@ do-install:
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pdf	${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf	${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "demoout inp test" ${STAGEDIR}${EXAMPLESDIR})
diff --git a/cad/NASTRAN-95/distinfo b/cad/NASTRAN-95/distinfo
index 7eaf0cd3face..0a1038f5ddd1 100644
--- a/cad/NASTRAN-95/distinfo
+++ b/cad/NASTRAN-95/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470760555
-SHA256 (twuerfl-NASTRAN-95-20151227-0e77a84_GH0.tar.gz) = f54b3316db8b5788dfbd70c7edec9ea588088fa1ac155e3c1bd1bf7ab17ce7f4
-SIZE (twuerfl-NASTRAN-95-20151227-0e77a84_GH0.tar.gz) = 84075299
+TIMESTAMP = 1502791592
+SHA256 (twuerfl-NASTRAN-95-20160908-a73c57a_GH0.tar.gz) = 2a05a340c1a043b6a88859da3db7d89d0d8328ce0ca7236b4a0b7206a003c75e
+SIZE (twuerfl-NASTRAN-95-20160908-a73c57a_GH0.tar.gz) = 137502681
diff --git a/cad/NASTRAN-95/files/patch-bin_nastran b/cad/NASTRAN-95/files/patch-bin_nastran
index e491bf895024..524da6013565 100644
--- a/cad/NASTRAN-95/files/patch-bin_nastran
+++ b/cad/NASTRAN-95/files/patch-bin_nastran
@@ -1,4 +1,4 @@
---- bin/nastran.orig	2015-12-27 21:50:03 UTC
+--- bin/nastran.orig	2016-09-08 21:25:12 UTC
 +++ bin/nastran
 @@ -1,6 +1,7 @@
  #!/bin/csh
diff --git a/cad/NASTRAN-95/files/patch-sb_Makefile b/cad/NASTRAN-95/files/patch-src_Makefile
index a6aa9bde17a2..618ac3a434f2 100644
--- a/cad/NASTRAN-95/files/patch-sb_Makefile
+++ b/cad/NASTRAN-95/files/patch-src_Makefile
@@ -1,5 +1,5 @@
---- sb/Makefile.orig	2015-12-27 21:50:03 UTC
-+++ sb/Makefile
+--- src/Makefile.orig	2016-09-08 21:25:12 UTC
++++ src/Makefile
 @@ -1,6 +1,6 @@
  # Declaration of variables
 -FC = gfortran
diff --git a/cad/NASTRAN-95/files/patch-um_Makefile b/cad/NASTRAN-95/files/patch-um_Makefile
index 0f900d1ebddd..c5ebcc3fadb8 100644
--- a/cad/NASTRAN-95/files/patch-um_Makefile
+++ b/cad/NASTRAN-95/files/patch-um_Makefile
@@ -1,4 +1,4 @@
---- um/Makefile.orig	2016-08-10 15:22:55 UTC
+--- um/Makefile.orig	2016-09-08 21:25:12 UTC
 +++ um/Makefile
 @@ -1,6 +1,6 @@
  # Declaration of variables
diff --git a/cad/NASTRAN-95/pkg-plist b/cad/NASTRAN-95/pkg-plist
index 36541d4389f1..94a3b8383387 100644
--- a/cad/NASTRAN-95/pkg-plist
+++ b/cad/NASTRAN-95/pkg-plist
@@ -40,8 +40,10 @@ bin/nastran
 %%NASTHOME%%/um/SUBS.TXT
 %%NASTHOME%%/um/UMFL.TXT
 %%NASTHOME%%/um/nasthelp.exe
-%%PORTDOCS%%%%DOCSDIR%%/NASTRAN Programmers Manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/NASTRAN Users Manual 2.pdf
+%%PORTDOCS%%%%DOCSDIR%%/NASA-SP-221(06) The NASTRAN Theoretical Manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/NASA-SP-222(08) NASTRAN Users Manual Vol I.pdf
+%%PORTDOCS%%%%DOCSDIR%%/NASA-SP-222(08) NASTRAN Users Manual Vol II.pdf
+%%PORTDOCS%%%%DOCSDIR%%/NASA-SP-223(05) NASTRAN Programmers Manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demoout/d01000a.out
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demoout/d01001a.out