Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jul 2012 02:42:27 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/170137: cad/feappv: Update to version 3.1
Message-ID:  <20120726024227.08e82b1f24db5772d07c2d94@yahoo.com>
Resent-Message-ID: <201207251810.q6PIA8Ug060661@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         170137
>Category:       ports
>Synopsis:       cad/feappv: Update to version 3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 25 18:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
- Update to version 3.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/cad/feappv/Makefile cad/feappv/Makefile
--- /usr/ports/cad/feappv/Makefile	2011-09-01 06:43:18.000000000 +0900
+++ cad/feappv/Makefile	2012-07-06 03:49:20.000000000 +0900
@@ -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_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
diff -urN /usr/ports/cad/feappv/distinfo cad/feappv/distinfo
--- /usr/ports/cad/feappv/distinfo	2011-09-01 06:43:18.000000000 +0900
+++ cad/feappv/distinfo	2012-07-06 03:34:11.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120726024227.08e82b1f24db5772d07c2d94>