ports/177221: [PATCH] cad/impact: Makefile tweaks, change Homepage

nemysis nemysis at gmx.ch
Fri Mar 22 04:30:01 UTC 2013


>Number:         177221
>Category:       ports
>Synopsis:       [PATCH] cad/impact: Makefile tweaks, change Homepage
>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:   Fri Mar 22 04:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

- Makefile tweaks
- Add Icons
- Change Homepage
- Bump portrevision

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- impact-0.7.06.038_1,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/impact/Makefile ./Makefile
--- /usr/ports/cad/impact/Makefile	2013-02-08 13:13:13.000000000 +0100
+++ ./Makefile	2013-03-22 05:11:00.000000000 +0100
@@ -3,52 +3,65 @@
 
 PORTNAME=	impact
 PORTVERSION=	0.7.06.038
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	cad java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-DISTNAME=	Impact-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	Impact-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	Impact-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Dynamic Finite Element Program Suite
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	java3d>0:${PORTSDIR}/java/java3d
 
 WRKSRC=		${WRKDIR}/Impact
-NO_BUILD=	yes
 
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
+NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/Impact
 
 SUB_FILES=	impact impactgui
 
-PLIST=		${WRKDIR}/PLIST
+PLIST_FILES=	bin/impact \
+		bin/impactgui \
+		share/pixmaps/impact.png
+
+OPTIONS_DEFINE=	GMSH
+
+GMSH_DESC=	Enable automatic 3D finite element mesh generator
 
-pre-install:
-	@${ECHO_CMD} -n > ${PLIST}
-	@${ECHO_CMD} "bin/impact" >> ${PLIST}
-	@${ECHO_CMD} "bin/impactgui" >> ${PLIST}
-	@(cd ${WRKDIR} && ${FIND} Impact ! -type d | ${GREP} -v \
-		-e "CVS" -e "lib_j3d" -e "\.bat" -e "\.dll" -e "\.ico" \
-		-e "\.jnilib" -e "\.sh" -e "\.so" | ${SORT} | \
-		${SED} "s|^Impact|%%DATADIR%%|" >> ${PLIST})
-	@(cd ${WRKDIR} && ${FIND} Impact -type d | ${GREP} -v \
-		-e "CVS" -e "lib_j3d" -e "\.bat" -e "\.dll" -e "\.ico" \
-		-e "\.jnilib" -e "\.sh" -e "\.so" | ${SORT} -r | \
-		${SED} "s|^Impact|@dirrm %%DATADIR%%|" >> ${PLIST})
+DESKTOP_ENTRIES="Impact" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}gui" "Graphics;3DGraphics;Education;" false
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGMSH}
+RUN_DEPENDS+=	gmsh:${PORTSDIR}/cad/gmsh
+.endif
+
+post-extract:
+	@${FIND} ${WRKSRC} -name CVS -type d -print0 -or -name .cvsignore -type f -print0 | \
+		${XARGS} -0 ${RM} -rf
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/impact ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/impactgui ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	@(${TAR} -C ${WRKSRC} --exclude "CVS" --exclude "lib_j3d" \
-		--exclude "*.bat" --exclude "*.dll" --exclude "*.ico" \
-		--exclude "*.jnilib" --exclude "*.sh" --exclude "*.so" \
-		-cf - . | ${TAR} -C ${DATADIR} --unlink -xf -)
-	@${FIND} ${DATADIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGPR}
-	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${INSTALL_SCRIPT} ${WRKDIR}/impact ${WRKDIR}/impactgui ${PREFIX}/bin
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR})
+
+post-install:
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+	@${FIND} ${DATADIR} ! -type d | \
+		${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
+	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
+		${SED} 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/cad/impact/distinfo ./distinfo
--- /usr/ports/cad/impact/distinfo	2013-02-08 13:13:13.000000000 +0100
+++ ./distinfo	2012-12-31 14:29:56.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (Impact-0.7.06.038.zip) = 85ad4a1506a5dd22adc020b44cb9adf27d77253fcf84b4d1b8a339e2e3922ed6
-SIZE (Impact-0.7.06.038.zip) = 13757964
+SHA256 (impact/Impact-0.7.06.038.zip) = 85ad4a1506a5dd22adc020b44cb9adf27d77253fcf84b4d1b8a339e2e3922ed6
+SIZE (impact/Impact-0.7.06.038.zip) = 13757964
+SHA256 (impact/impact.png) = a59d37cb161cfdf3961d90522c7f4a02644c4698a0cf17722949914f7399c4d5
+SIZE (impact/impact.png) = 2908
diff -ruN --exclude=CVS /usr/ports/cad/impact/pkg-descr ./pkg-descr
--- /usr/ports/cad/impact/pkg-descr	2013-01-14 17:53:34.000000000 +0100
+++ ./pkg-descr	2013-03-22 04:44:42.000000000 +0100
@@ -3,4 +3,4 @@
 laws. Models can be created and viewed with external programs or the
 included postprocessor.
 
-WWW: http://impact.sourceforge.net/
+WWW: http://www.impact-fem.org/
--- impact-0.7.06.038_1,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list