Index: branches/2018Q2/cad/feappv/files/patch-makefile.in
===================================================================
--- branches/2018Q2/cad/feappv/files/patch-makefile.in	(revision 473403)
+++ branches/2018Q2/cad/feappv/files/patch-makefile.in	(nonexistent)
@@ -1,13 +0,0 @@
---- makefile.in.orig	2013-07-15 19:15:37.000000000 +0000
-+++ makefile.in
-@@ -31,8 +31,8 @@ FF = gfortran
- CC = gcc
- 
- # What optimization level to use
--  FFOPTFLAG = -O3 -ftree-vectorize -Wall
--  CCOPTFLAG = -O3 -ftree-vectorize -Wall
-+FFOPTFLAG = -O3 -ftree-vectorize -Wall
-+CCOPTFLAG = -O3 -ftree-vectorize -Wall
- 
- # FFOPTFLAG = -g -O3 -ftree-vectorize -Wall
- # CCOPTFLAG = -g -O3 -ftree-vectorize -Wall

Property changes on: branches/2018Q2/cad/feappv/files/patch-makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q2/cad/feappv/Makefile
===================================================================
--- branches/2018Q2/cad/feappv/Makefile	(revision 473403)
+++ branches/2018Q2/cad/feappv/Makefile	(revision 473404)
@@ -1,51 +1,49 @@
 # Created by: Pedro F. Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	feappv
-PORTVERSION=	3.1
-PORTREVISION=	9
+PORTVERSION=	4.1i
+DISTVERSIONPREFIX=v
 CATEGORIES=	cad science
-MASTER_SITES=	http://www.ce.berkeley.edu/projects/feap/feappv/
-DISTFILES=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX} ${PORTDOCS}
-DIST_SUBDIR=	${PORTNAME}${PORTVERSION:S/.//}
-EXTRACT_ONLY=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
+MASTER_SITES=	http://projects.ce.berkeley.edu/feap/${PORTNAME}/:1
+DISTFILES=	${PORTDOCS}:1
+EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}_GH0${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite element analysis program (personal version)
 
-BROKEN=		No public distfiles
-USES=		fortran gmake localbase:ldflags zip
+USES=		fortran gmake localbase:ldflags
+USE_GITHUB=	yes
+GH_ACCOUNT=	sanjayg0
 USE_XORG=	x11
 MAKEFILE=	makefile
-MAKE_ENV=	FEAPPVHOME3_1="${WRKSRC}"
+MAKE_ENV=	FEAPPVHOME4_1="${WRKSRC}"
 ALL_TARGET=	install
 
-WRKSRC=		${WRKDIR}/ver${PORTVERSION:S/.//}
-
 LDFLAGS+=	-lX11 -lm
 
 PLIST_FILES=	bin/feappv lib/libfeappv.a
-PORTDOCS=	manual.pdf
+PORTDOCS=	manual41.pdf
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's| make | $$(MAKE) |' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e \
-		'/^FF /s|=.*|= ${FC}| ; \
-		 /^CC /s|=.*|= ${CC}| ; \
-		 /^FFOPTFLAG /s|=.*|= ${FFLAGS}| ; \
-		 /^CCOPTFLAG /s|=.*|= ${CFLAGS}| ; \
-		 /^LDOPTIONS /s|=.*|= ${LDFLAGS}| ; \
+		'/^  FF /s|=.*|= ${FC}| ; \
+		 /^  CC /s|=.*|= ${CC}| ; \
+		 /^  FFOPTFLAG /s|=.*|= ${FFLAGS}| ; \
+		 /^  CCOPTFLAG /s|=.*|= ${CFLAGS}| ; \
+		 /^  LDOPTIONS /s|=.*|= ${LDFLAGS}| ; \
 		 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q2/cad/feappv/distinfo
===================================================================
--- branches/2018Q2/cad/feappv/distinfo	(revision 473403)
+++ branches/2018Q2/cad/feappv/distinfo	(revision 473404)
@@ -1,4 +1,5 @@
-SHA256 (feappv31/feappv31.zip) = e1edbced934474b0839857ce799a6cc6b31961b7c0acae8ee70ce2f1efa26791
-SIZE (feappv31/feappv31.zip) = 615732
-SHA256 (feappv31/manual.pdf) = f3c6d5ac9c310852dfcde0c74c22df7388fcc6230e30630f70d591c50fd93832
-SIZE (feappv31/manual.pdf) = 649124
+TIMESTAMP = 1529955297
+SHA256 (manual41.pdf) = 09bb4b6f0622a1384ad7c52bcd7db0a1b7d190f9849012bf05622b5e7fa3463e
+SIZE (manual41.pdf) = 649177
+SHA256 (sanjayg0-feappv-v4.1i_GH0.tar.gz) = 49917388a390b5d35e4ac938db8bc67cfe144a4c7127ad7016fcc741e6256f28
+SIZE (sanjayg0-feappv-v4.1i_GH0.tar.gz) = 1043692
Index: branches/2018Q2/cad/feappv/pkg-descr
===================================================================
--- branches/2018Q2/cad/feappv/pkg-descr	(revision 473403)
+++ branches/2018Q2/cad/feappv/pkg-descr	(revision 473404)
@@ -1,13 +1,13 @@
 FEAPpv is a general purpose finite element analysis program which is
 designed for research and educational use. The program is described in the
 references:
 
 The Finite Element Method, 6th ed., Vols. 1 and 2, by O.C. Zienkiewicz and
 R.L. Taylor, Elsevier, Oxford, 2005.
 
 FEAPpv is designed to be compatible for compilation in Unix/Linux and
 Windows PC environments.
 
 No support on use of the program will be provided.
 
-WWW: http://www.ce.berkeley.edu/projects/feap/feappv/
+WWW: http://projects.ce.berkeley.edu/feap/feappv/
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 473403)
+++ branches/2018Q2	(revision 473404)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r473335