4 files changed, 24 insertions, 63 deletions

diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile
index f5c02c344f9d..2d47af5918eb 100644
--- a/cad/feappv/Makefile
+++ b/cad/feappv/Makefile
@@ -6,43 +6,46 @@
 #
 
 PORTNAME=	feappv
-PORTVERSION=	2.0
-PORTREVISION=	5
+PORTVERSION=	2.2
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.ce.berkeley.edu/projects/feap/feappv/
 MASTER_SITE_SUBDIR=	feap
-DISTFILES=	${PORTNAME}20${EXTRACT_SUFX}
-.ifndef NOPORTDOCS
+DISTFILES=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
+.if !defined(NOPORTDOCS)
 DISTFILES+=	manual.pdf
 .endif
 DIST_SUBDIR=	feap
-EXTRACT_ONLY=	${PORTNAME}20${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite Element Analysis Program "personal version"
 
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-L
+WRKSRC=		${WRKDIR}/ver${PORTVERSION:S/.//}
 
-WRKSRC=		${WRKDIR}/ver20
+USE_ZIP=	yes
 USE_XORG=	x11
 USE_FORTRAN=	yes
-FFLAGS+=	-O2
+USE_GMAKE=	yes
 MAKEFILE=	makefile
+MAKE_ARGS=	FF="${FC}" CC="${CC}" FFOPTFLAG="${FFLAGS}" \
+		CCOPTFLAG="${CFLAGS} -I{LOCALBASE}/include" \
+		LDOPTIONS="-L${LOCALBASE}/lib -lX11 -lm" \
+		FINCLUDE="${WRKSRC}/include" ARFEAP="${WRKSRC}/libfeappv.a"
 ALL_TARGET=	install
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	*
+PLIST_FILES=	bin/feappv lib/libfeappv.a
 
 post-patch:
-	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g; s+%%CC%%+${CC}+g;	\
-	s+%%FFLAGS%%+${FFLAGS}+g; s+%%CFLAGS%%+${CFLAGS}+g;	\
-	s+/usr/X11R6+${LOCALBASE}+g; s+%%WRKSRC%%+${WRKSRC}+;' 	\
-	${WRKSRC}/makefile.in
+	@${REINPLACE_CMD} -e 's| make | $$(MAKE) |g' ${WRKSRC}/makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${PREFIX}/bin/feappv
-	@${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${PREFIX}/lib/
-.ifndef NOPORTDOCS
+	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${PREFIX}/lib
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/feappv/distinfo b/cad/feappv/distinfo
index b890c2147dcd..51b98137c788 100644
--- a/cad/feappv/distinfo
+++ b/cad/feappv/distinfo
@@ -1,4 +1,4 @@
-SHA256 (feap/feappv20.zip) = aefc7aef83f76341ac1454ead24a38c19018a48603e056dd746c386632670435
-SIZE (feap/feappv20.zip) = 603366
-SHA256 (feap/manual.pdf) = 09c8ea7bd9e14081806c32a6d2462a78208cb649273924f1c5cb747e3c8da53f
-SIZE (feap/manual.pdf) = 686661
+SHA256 (feap/feappv22.zip) = 77533818d2ebd0dc226c5b3b95cb230cf9951cf0b0f3f6ec2c6a194efc9ef391
+SIZE (feap/feappv22.zip) = 587829
+SHA256 (feap/manual.pdf) = bfd89050c0bf35140afe00c3c31cfe9f1dfd75386d9cb4407ca331fc52bbc2dc
+SIZE (feap/manual.pdf) = 647945
diff --git a/cad/feappv/files/patch-makefile.in b/cad/feappv/files/patch-makefile.in
deleted file mode 100644
index f148c609347e..000000000000
--- a/cad/feappv/files/patch-makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- makefile.in.orig	Thu Apr  7 10:34:22 2005
-+++ makefile.in	Sat Apr  1 16:26:47 2006
-@@ -1,11 +1,11 @@
- 
- # Which compilers to use
--FF = g77
--CC = gcc
-+FF ?= %%FC%%
-+CC ?= %%CC%%
- 
- # What optimization level to use
--FFOPTFLAG = -O2
--CCOPTFLAG = -O2
-+FFOPTFLAG += %%FFLAGS%%
-+CCOPTFLAG += %%CFLAGS%% -I/usr/X11R6/include
- 
- # Source Types
- FSOURCE = 
-@@ -17,16 +17,15 @@
- 
- # What options to be used by the compiler
- FOPTIONS =
--COPTIONS =
--
-+COPTIONS = 
- # What options to be used by the loader
- LDOPTIONS = -L/usr/X11R6/lib -lX11 -lm
- 
- # Location of feap include files
--FINCLUDE = /home/rlt/Feappv/ver20/include
-+FINCLUDE = %%WRKSRC%%/include
- 
- # What archiving to use
- AR = ar rv
- 
- # Archive name
--ARFEAP = /home/rlt/Feappv/ver20/Feappv.a
-+ARFEAP = %%WRKSRC%%/libfeappv.a
diff --git a/cad/feappv/pkg-plist b/cad/feappv/pkg-plist
deleted file mode 100644
index 3d1e79bb33cb..000000000000
--- a/cad/feappv/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/feappv
-lib/libfeappv.a
-%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%