From nemysis@gmx.ch  Fri Mar 22 04:24:00 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 140F7F8C
	for <freebsd-gnats-submit@freebsd.org>; Fri, 22 Mar 2013 04:24:00 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
	by mx1.freebsd.org (Postfix) with ESMTP id B8685EE6
	for <freebsd-gnats-submit@freebsd.org>; Fri, 22 Mar 2013 04:23:59 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.27]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0MRhn5-1U7ZuC2JPV-00Sv7B for
 <FreeBSD-gnats-submit@freebsd.org>; Fri, 22 Mar 2013 05:23:53 +0100
Received: (qmail invoked by alias); 22 Mar 2013 04:23:52 -0000
Received: from 38-21.104-92.cust.bluewin.ch (EHLO something.email.com) [92.104.21.38]
  by mail.gmx.net (mp027) with SMTP; 22 Mar 2013 05:23:52 +0100
Received: by something.email.com (sSMTP sendmail emulation); Fri, 22 Mar 2013 05:23:51 +0100
Message-Id: <20130322042400.140F7F8C@hub.freebsd.org>
Date: Fri, 22 Mar 2013 05:23:51 +0100
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] cad/impact: Makefile tweaks, change Homepage
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         177221
>Category:       ports
>Synopsis:       [PATCH] cad/impact: Makefile tweaks, change Homepage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 22 04:30:00 UTC 2013
>Closed-Date:    Mon Mar 25 02:51:54 UTC 2013
>Last-Modified:  Mon Mar 25 03:00:00 UTC 2013
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 22 04:30:14 UTC 2013 
Responsible-Changed-Why:  
beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177221 
State-Changed-From-To: open->patched 
State-Changed-By: beech 
State-Changed-When: Sun Mar 24 18:54:45 UTC 2013 
State-Changed-Why:  
In progress 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177221 
State-Changed-From-To: patched->closed 
State-Changed-By: beech 
State-Changed-When: Mon Mar 25 02:51:40 UTC 2013 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177221 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177221: commit references a PR
Date: Mon, 25 Mar 2013 02:51:29 +0000 (UTC)

 Author: beech
 Date: Mon Mar 25 02:51:20 2013
 New Revision: 315190
 URL: http://svnweb.freebsd.org/changeset/ports/315190
 
 Log:
   - Makefile tweaks
   - Add Icons
   - Change Homepage
   - Bump portrevision
   
   PR:		ports/177221
   Submitted by:	nemysis <nemysis@gmx.ch>
 
 Modified:
   head/cad/impact/Makefile
   head/cad/impact/distinfo
   head/cad/impact/pkg-descr   (contents, props changed)
 
 Modified: head/cad/impact/Makefile
 ==============================================================================
 --- head/cad/impact/Makefile	Mon Mar 25 01:52:06 2013	(r315189)
 +++ head/cad/impact/Makefile	Mon Mar 25 02:51:20 2013	(r315190)
 @@ -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@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>
 
 Modified: head/cad/impact/distinfo
 ==============================================================================
 --- head/cad/impact/distinfo	Mon Mar 25 01:52:06 2013	(r315189)
 +++ head/cad/impact/distinfo	Mon Mar 25 02:51:20 2013	(r315190)
 @@ -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
 
 Modified: head/cad/impact/pkg-descr
 ==============================================================================
 --- head/cad/impact/pkg-descr	Mon Mar 25 01:52:06 2013	(r315189)
 +++ head/cad/impact/pkg-descr	Mon Mar 25 02:51:20 2013	(r315190)
 @@ -3,4 +3,4 @@ events. It has a range of elements, cont
  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/
 _______________________________________________
 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"
 
>Unformatted:
