From aehlig@linta.de  Fri Mar 11 14:46:14 2011
Return-Path: <aehlig@linta.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28D69106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Mar 2011 14:46:14 +0000 (UTC)
	(envelope-from aehlig@linta.de)
Received: from linta.de (isilmar-3.linta.de [188.40.101.200])
	by mx1.freebsd.org (Postfix) with ESMTP id 73C1E8FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 11 Mar 2011 14:46:12 +0000 (UTC)
Received: (qmail 4721 invoked by uid 10); 11 Mar 2011 14:46:11 -0000
Received: from kta1c10 by isilmar.linta.de with BSMTP; 11 Mar 2011 14:46:11 -0000
Received: by kta1c10.sesnet.soton.ac.uk (Postfix, from userid 1001)
	id 62A8739835; Fri, 11 Mar 2011 14:46:03 +0000 (GMT)
Message-Id: <20110311144603.62A8739835@kta1c10.sesnet.soton.ac.uk>
Date: Fri, 11 Mar 2011 14:46:03 +0000 (GMT)
From: Klaus Aehlig <aehlig@linta.de>
Reply-To: Klaus Aehlig <aehlig@linta.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: miwi@freebsd.org, devel@stasyan.com
Subject: [patch] science/meep missing build dependency gsed
X-Send-Pr-Version: 3.113
X-GNATS-Notify: devel@stasyan.com

>Number:         155469
>Category:       ports
>Synopsis:       [patch] science/meep missing build dependency gsed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    stephen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 11 14:50:10 UTC 2011
>Closed-Date:    Mon Jun 20 04:56:20 UTC 2011
>Last-Modified:  Mon Jun 20 04:56:20 UTC 2011
>Originator:     Klaus Aehlig
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kta1c10.sesnet.soton.ac.uk 8.2-STABLE FreeBSD 8.2-STABLE #0: Tue Mar 8 20:30:12 GMT 2011 root@kta1c10.kk.soton.ac.uk:/usr/obj/usr/src/sys/KTA1C10 amd64

>Description:
	If built without gsed being installed on the system, science/meep builds and install
	cleanly, HOWEVER, the binary behaves wrongly. Starting meep will result in the
	error message

	ERROR: Unbound variable: Dielectric

	This PR is related to the closed PR ports/146745; note that the patch patch-libctl_Makefile.in
	introduced there contains calls to gsed, but the build dependency on gsed was not registered.
	
>How-To-Repeat:
	On a system *without* gsed installed

	# cd /usr/ports/science/meep && make install clean

	$ /usr/local/bin/meep
>Fix:

	Apply the following patch.

--- meep.diff begins here ---
diff -ruN meep.orig/Makefile meep/Makefile
--- meep.orig/Makefile	2011-03-11 14:36:19.000000000 +0000
+++ meep/Makefile	2011-03-11 14:36:45.000000000 +0000
@@ -27,7 +27,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 \
+		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
 		blas.2:${PORTSDIR}/math/blas \
 		ctl.4:${PORTSDIR}/science/libctl \
--- meep.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Mar 11 14:50:21 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: devel@stasyan.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/155469: [patch] science/meep missing build dependency gsed
Date: Fri, 11 Mar 2011 14:50:19 UT

 Maintainer of science/meep,
 
 Please note that PR ports/155469 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/155469
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Stas Timokhin <devel@stasyan.com>
To: bug-followup@freebsd.org,
 aehlig@linta.de
Cc: edwin@freebsd.org
Subject: Re: ports/155469: [patch] science/meep missing build dependency gsed
Date: Tue, 22 Mar 2011 15:57:07 +0600

 --Boundary-00=_zJHiN/AbHT6KiHC
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
       Hello !
 
   Thanks for PRs.
 Both ports/155655 and ports/155469 are good additions to science/meep port. 
 MPI knob should be turned on by deafult, because SMP hosts are cheap enough at 
 2011 ;-)
 
 Here is cumulative patch for them (meep_stast.txt) and patch for 
 science/libctl 
 (workaround for building libctl with libtool via copy-pasting from 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=155105&cat=ports).
 
 --Boundary-00=_zJHiN/AbHT6KiHC
 Content-Type: text/plain;
   charset="KOI8-R";
   name="meep_stast.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="meep_stast.txt"
 
 --- Makefile.orig	2011-03-22 12:45:44.000000000 +0600
 +++ Makefile	2011-03-22 13:10:54.000000000 +0600
 @@ -7,7 +7,7 @@
  
  PORTNAME=	meep
  PORTVERSION=	1.1.1
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	science
  MASTER_SITES=	http://ab-initio.mit.edu/meep/
  
 @@ -17,7 +17,7 @@
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_FORTRAN=	yes
 -USE_GCC=	4.4+
 +USE_GCC=	4.5
  USE_ICONV=	yes
  USE_GETTEXT=	yes
  USE_AUTOTOOLS+=	libltdl
 @@ -27,11 +27,27 @@
  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 \
 +		gsed:${PORTSDIR}/textproc/gsed
  LIB_DEPENDS+=	guile.20:${PORTSDIR}/lang/guile \
  		blas.2:${PORTSDIR}/math/blas \
  		ctl.4:${PORTSDIR}/science/libctl \
  		hdf5.0:${PORTSDIR}/science/hdf5
  RUN_DEPENDS+=	harminv:${PORTSDIR}/science/harminv
  
 -.include <bsd.port.mk>
 +OPTIONS=	OPENMPI "Enable MPI support using openmpi" On
 +
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WITH_OPENMPI)
 +BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
 +RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 +CONFIGURE_ARGS+=--with-mpi
 +CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
 +PLIST_SUB+=	MPI="" NOMPI="@comment "
 +.else
 +CONFIGURE_ARGS+=--without-mpi
 +PLIST_SUB+=	MPI="@comment " NOMPI=""
 +.endif
 +
 +.include <bsd.port.post.mk>
 --- distinfo.orig	2009-12-21 10:58:03.000000000 +0600
 +++ distinfo	2011-03-22 12:47:02.000000000 +0600
 @@ -1,3 +1,2 @@
 -MD5 (meep-1.1.1.tar.gz) = 415e0cd312b6caa22b5dd612490e1ccf
  SHA256 (meep-1.1.1.tar.gz) = 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2
  SIZE (meep-1.1.1.tar.gz) = 751244
 --- pkg-plist.orig	2011-03-22 12:54:12.000000000 +0600
 +++ pkg-plist	2011-03-22 12:55:29.000000000 +0600
 @@ -1,10 +1,14 @@
 -bin/meep
 +%%NOMPI%%bin/meep
 +%%MPI%%bin/meep-mpi
  include/meep.hpp
  include/meep/mympi.hpp
  include/meep/vec.hpp
 -lib/libmeep.a
 -lib/libmeep.la
 -lib/pkgconfig/meep.pc
 +%%NOMPI%%lib/libmeep.a
 +%%MPI%%lib/libmeep_mpi.a
 +%%NOMPI%%lib/libmeep.la
 +%%MPI%%lib/libmeep_mpi.la
 +%%NOMPI%%lib/pkgconfig/meep.pc
 +%%MPI%%lib/pkgconfig/meep_mpi.pc
  share/meep/casimir.scm
  share/meep/meep-enums.scm
  share/meep/meep.scm
 
 --Boundary-00=_zJHiN/AbHT6KiHC
 Content-Type: text/plain;
   charset="KOI8-R";
   name="libctl.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="libctl.txt"
 
 --- Makefile.orig	2011-03-12 03:27:31.000000000 +0600
 +++ Makefile	2011-03-22 12:40:22.000000000 +0600
 @@ -11,7 +11,7 @@
  CATEGORIES=	science math
  MASTER_SITES=	http://ab-initio.mit.edu/libctl/
  
 -MAINTAINER=	ports@FreeBSD.org
 +MAINTAINER=	devel@stasyan.com
  COMMENT=	Control Language Library
  
  LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
 @@ -19,19 +19,22 @@
  USE_AUTOTOOLS=	libtool
  USE_FORTRAN=	yes
  USE_LDCONFIG=	yes
 +MAKE_ENV+=	PATH=${WRKDIR}:$$PATH
 +
  
  MAN1=		gen-ctl-io.1
  
  .include <bsd.port.pre.mk>
  
 -.if ${ARCH} == "i386" || ${ARCH} == "sparc64"
 -BROKEN=		Does not compile on i386 or sparc64
 -.endif
 -
  .if ${OSVERSION} < 700000
  USE_FORTRAN=	g77
  .endif
  
 +post-patch:
 +	${LN} -s ${LOCALBASE}/bin/${CC} ${WRKDIR}/cc
 +	${LN} -s ${LOCALBASE}/bin/${CXX} ${WRKDIR}/c++
 +
 +
  post-install:
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
 
 --Boundary-00=_zJHiN/AbHT6KiHC--
Responsible-Changed-From-To: freebsd-ports-bugs->stephen 
Responsible-Changed-By: stephen 
Responsible-Changed-When: Fri Jun 17 21:41:07 UTC 2011 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155469 
State-Changed-From-To: feedback->closed 
State-Changed-By: stephen 
State-Changed-When: Mon Jun 20 04:52:42 UTC 2011 
State-Changed-Why:  
Duplicate of ports/155655 (but not obviously so). 
Approved by: maho (mentor) 

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