Bug 170137 - cad/feappv: Update to version 3.1
Summary: cad/feappv: Update to version 3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-25 19:10 UTC by tkato432
Modified: 2012-08-05 06:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.83 KB, patch)
2012-07-25 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2012-07-25 19:10:08 UTC
- Update to version 3.1
Comment 1 Edwin Groothuis freebsd_committer 2012-07-25 19:10:37 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2012-08-05 06:07:12 UTC
Author: miwi
Date: Sun Aug  5 05:07:01 2012
New Revision: 302060
URL: http://svn.freebsd.org/changeset/ports/302060

Log:
  - Update to 3.1
  
  PR:		170137
  Submitted by:	Ports Fury

Modified:
  head/cad/feappv/Makefile   (contents, props changed)
  head/cad/feappv/distinfo   (contents, props changed)

Modified: head/cad/feappv/Makefile
==============================================================================
--- head/cad/feappv/Makefile	Sun Aug  5 05:06:20 2012	(r302059)
+++ head/cad/feappv/Makefile	Sun Aug  5 05:07:01 2012	(r302060)
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	feappv
-PORTVERSION=	2.2
+PORTVERSION=	3.1
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.ce.berkeley.edu/projects/feap/feappv/
-MASTER_SITE_SUBDIR=	feap
-DISTFILES=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	manual.pdf
-.endif
-DIST_SUBDIR=	feap
+DISTFILES=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX} ${PDF_MANUAL}
+DIST_SUBDIR=	${PORTNAME}${PORTVERSION:S/.//}
 EXTRACT_ONLY=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finite Element Analysis Program "personal version"
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/ver${PORTVERSION:S/.//}
 
 USE_ZIP=	yes
@@ -27,23 +25,37 @@ USE_XORG=	x11
 USE_FORTRAN=	yes
 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"
+MAKE_ENV=	FEAPPVHOME3_1="${WRKSRC}"
 ALL_TARGET=	install
 MAKE_JOBS_SAFE=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lm
+
 PORTDOCS=	*
 PLIST_FILES=	bin/feappv lib/libfeappv.a
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PDF_MANUAL=	manual.pdf
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's| make | $$(MAKE) |g' ${WRKSRC}/makefile
+	@${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}| ; \
+		 s|Feappv.a|libfeappv.a|' ${WRKSRC}/makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/feappv ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libfeappv.a ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf ${DOCSDIR}
 .endif

Modified: head/cad/feappv/distinfo
==============================================================================
--- head/cad/feappv/distinfo	Sun Aug  5 05:06:20 2012	(r302059)
+++ head/cad/feappv/distinfo	Sun Aug  5 05:07:01 2012	(r302060)
@@ -1,4 +1,4 @@
-SHA256 (feap/feappv22.zip) = 77533818d2ebd0dc226c5b3b95cb230cf9951cf0b0f3f6ec2c6a194efc9ef391
-SIZE (feap/feappv22.zip) = 587829
-SHA256 (feap/manual.pdf) = bfd89050c0bf35140afe00c3c31cfe9f1dfd75386d9cb4407ca331fc52bbc2dc
-SIZE (feap/manual.pdf) = 647945
+SHA256 (feappv31/feappv31.zip) = 906b340cb8d9abf53785e4c282ed4b4440d89ed913d36b51dec84ed74f7a7262
+SIZE (feappv31/feappv31.zip) = 611951
+SHA256 (feappv31/manual.pdf) = f3c6d5ac9c310852dfcde0c74c22df7388fcc6230e30630f70d591c50fd93832
+SIZE (feappv31/manual.pdf) = 649124
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Martin Wilke freebsd_committer 2012-08-05 06:08:04 UTC
State Changed
From-To: open->closed

Committed. Thanks!