From nobody@FreeBSD.org  Thu May 20 03:52:08 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49F1D106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 May 2010 03:52:08 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E3528FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 May 2010 03:52:08 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4K3q71I073910
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 20 May 2010 03:52:07 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o4K3q7HW073909;
	Thu, 20 May 2010 03:52:07 GMT
	(envelope-from nobody)
Message-Id: <201005200352.o4K3q7HW073909@www.freebsd.org>
Date: Thu, 20 May 2010 03:52:07 GMT
From: Stas Timokhin <devel@stasyan.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix for port science/meep
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146745
>Category:       ports
>Synopsis:       Fix for port science/meep
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 20 04:00:15 UTC 2010
>Closed-Date:    Sun Jun 06 07:21:04 UTC 2010
>Last-Modified:  Sun Jun 06 07:21:04 UTC 2010
>Originator:     Stas Timokhin
>Release:        8.0-release
>Organization:
None
>Environment:
>Description:
Difference between GNU- and BSD- sed is significant for building this port, but it wasn't detected at the moment of port creation.

>How-To-Repeat:
"ERROR: Unbound variable: Dielectric" when running meep.
>Fix:


Patch attached with submission follows:

--- Makefile.orig	2010-05-12 15:49:15.000000000 +0700
+++ Makefile	2010-05-20 10:49:23.000000000 +0700
@@ -7,6 +7,7 @@
 
 PORTNAME=	meep
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
@@ -25,7 +26,8 @@
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}"
 
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
-		harminv:${PORTSDIR}/science/harminv
+		harminv:${PORTSDIR}/science/harminv \
+		gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
 		blas.2:${PORTSDIR}/math/blas \
 		ctl.4:${PORTSDIR}/science/libctl \
--- files/patch-libctl_Makefile.in.orig	1970-01-01 07:00:00.000000000 +0700
+++ files/patch-libctl_Makefile.in	2010-04-30 10:15:49.000000000 +0700
@@ -0,0 +1,15 @@
+--- libctl/Makefile.in.orig	2010-04-30 10:14:01.000000000 +0700
++++ libctl/Makefile.in	2010-04-30 10:11:18.000000000 +0700
+@@ -717,10 +717,10 @@
+ 	(echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; grep -h friend $(LIBHDRS) | sed 's/^ *friend \+[A-Za-z_0-9:<>]\+[* ]\+\([A-Za-z_0-9:]*\) *(.*$$/%ignore \1;/' | grep "%ignore" | sort -u;) > $@
+ 
+ meep_enum_renames.i: $(LIBHDRS)
+-	(echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; for f in $(LIBHDRS); do egrep "^enum" $$f | sed 's/enum \+\([A-Za-z_0-9:]\+\).*$$/\1/g' | while read enum; do cat $$f | tr -d '\n' | sed 's/.*enum \+'$${enum}' *{\([^}]*\)}.*/\1/g' | sed 's/= *[0-9]\+//g' |tr -d ' \t' | tr ',' '\n' | sed 's/^.*$$/'"%rename(meep_$${enum}_\0) meep::\0;/g"; echo; done; done;) > $@
++	(echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; for f in $(LIBHDRS); do egrep "^enum" $$f | gsed 's/enum \+\([A-Za-z_0-9:]\+\).*$$/\1/g' | while read enum; do cat $$f | tr -d '\n' | gsed 's/.*enum \+'$${enum}' *{\([^}]*\)}.*/\1/g' | gsed 's/= *[0-9]\+//g' |tr -d ' \t' | tr ',' '\n' | gsed 's/^.*$$/'"%rename(meep_$${enum}_\0) meep::\0;/g"; echo; done; done;) > $@
+ 
+ meep-enums.scm: meep_enum_renames.i
+-	(sed 's/%rename(\([A-Za-z0-9_]*\)) *\([A-Za-z0-9:_]*\);$$/(define \2 (\1))/' meep_enum_renames.i | sed 's/[A-Za-z0-9:_]*:://g' | sed 's/_/-/g' | sed 's,//,;,'; echo "(define Centered Dielectric)") > $@
++	(gsed 's/%rename(\([A-Za-z0-9_]*\)) *\([A-Za-z0-9:_]*\);$$/(define \2 (\1))/' meep_enum_renames.i | gsed 's/[A-Za-z0-9:_]*:://g' | sed 's/_/-/g' | sed 's,//,;,'; echo "(define Centered Dielectric)") > $@
+ 
+ ##############################################################################
+ 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu May 20 06:10:06 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146745 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Jun 6 07:21:03 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146745 
>Unformatted:
