From tkato432@yahoo.com  Sun Apr  6 16:02:04 2008
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A7AA1065676
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  6 Apr 2008 16:02:00 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 171B98FC19
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  6 Apr 2008 16:02:00 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost.localdomain (U053031.ppp.dion.ne.jp [218.222.53.31])
	by msa101lp.auone-net.jp (au one net msa) with ESMTP id C0E6334034
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  7 Apr 2008 01:01:57 +0900 (JST)
Message-Id: <20080407010040.3540ed8f.tkato432@yahoo.com>
Date: Mon, 7 Apr 2008 01:00:40 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: science/xloops-ginac

>Number:         122503
>Category:       ports
>Synopsis:       Update port: science/xloops-ginac
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 06 16:10:08 UTC 2008
>Closed-Date:    Mon Apr 28 07:53:54 UTC 2008
>Last-Modified:  Mon Apr 28 08:00:15 UTC 2008
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Fix build

New file:
files/patch-configure.ac

Remove file:
files/patch-Makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/science/xloops-ginac/Makefile science/xloops-ginac/Makefile
--- /usr/ports/science/xloops-ginac/Makefile	2007-12-17 13:39:02.000000000 +0900
+++ science/xloops-ginac/Makefile	2008-04-06 21:23:58.000000000 +0900
@@ -15,22 +15,21 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program calculating Feynman diagrams
 
-LIB_DEPENDS=	ginac-1.3.8:${PORTSDIR}/math/GiNaC
+LIB_DEPENDS=	ginac-1.4.0:${PORTSDIR}/math/GiNaC
 
-BROKEN=		Does not configure (cannot find GiNaC)
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2008-03-17
-
-USE_GCC=	3.4
-USE_GMAKE=	yes
 USE_GNOME=	gnometarget
-GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	aclocal:110 autoheader:261 autoconf:261 automake:110 \
+		libtool:15
+ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
 
 CFLAGS+=	-fpermissive
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.am
+
 .include <bsd.port.mk>
diff -urN /usr/ports/science/xloops-ginac/files/patch-Makefile.in science/xloops-ginac/files/patch-Makefile.in
--- /usr/ports/science/xloops-ginac/files/patch-Makefile.in	2003-10-11 03:01:51.000000000 +0900
+++ science/xloops-ginac/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Nov  8 23:19:05 2001
-+++ Makefile.in	Fri Oct 10 11:10:31 2003
-@@ -91,7 +91,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
--SUBDIRS = lib check xloops ginsh doc
-+SUBDIRS = lib check xloops ginsh
- 
- # Requires automake 1.4
- AUTOMAKE_OPTIONS = 1.4
diff -urN /usr/ports/science/xloops-ginac/files/patch-configure.ac science/xloops-ginac/files/patch-configure.ac
--- /usr/ports/science/xloops-ginac/files/patch-configure.ac	1970-01-01 09:00:00.000000000 +0900
+++ science/xloops-ginac/files/patch-configure.ac	2008-04-06 20:58:36.000000000 +0900
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2001-11-08 23:18:49.000000000 +0900
++++ configure.ac	2008-04-06 20:58:27.000000000 +0900
+@@ -72,8 +72,8 @@
+     ln -fs ${with_ginac}/ginsh/ginsh_parser.yy . \
+   )
+ else
+-  AM_PATH_GINAC([0.9.4], , AC_MSG_ERROR([need to have GiNaC installed]))
+-  CPPFLAGS="$CPPFLAGS $GINACLIB_CPPFLAGS"
++  PKG_CHECK_MODULES(GINACLIB, ginac >= 0.9.4, , AC_MSG_ERROR([need to have GiNaC installed]))
++  CPPFLAGS="$CPPFLAGS $GINACLIB_CFLAGS"
+   LIBS="$LIBS $GINACLIB_LIBS"
+ fi
+ 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Apr 6 17:11:06 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122503 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Mon Apr 7 07:56:27 UTC 2008 
State-Changed-Why:  
Hi Kato, 

Build failed: 

http://head.miwibox.org/tb/index.php?action=describe_port&id=3238 
http://amd64.miwibox.org/tb/index.php?action=describe_port&id=3264 


Martin 


http://www.freebsd.org/cgi/query-pr.cgi?pr=122503 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Apr 28 07:53:53 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122503: commit references a PR
Date: Mon, 28 Apr 2008 07:53:51 +0000 (UTC)

 miwi        2008-04-28 07:53:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     science/xloops-ginac Makefile 
     science/xloops-ginac/files patch-ginsh_parser.yy 
   Added files:
     science/xloops-ginac/files patch-configure.ac 
   Removed files:
     science/xloops-ginac/files patch-Makefile.in 
   Log:
   - Fix build after math/GiNaC update
   
   PR:             122503
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.23      +9 -10     ports/science/xloops-ginac/Makefile
   1.2       +0 -11     ports/science/xloops-ginac/files/patch-Makefile.in (dead)
   1.1       +13 -0     ports/science/xloops-ginac/files/patch-configure.ac (new)
   1.2       +54 -5     ports/science/xloops-ginac/files/patch-ginsh_parser.yy
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
