Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Apr 2008 01:00:40 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/122503: Update port: science/xloops-ginac
Message-ID:  <20080407010040.3540ed8f.tkato432@yahoo.com>
Resent-Message-ID: <200804061610.m36GA8fi035554@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         122503
>Category:       ports
>Synopsis:       Update port: science/xloops-ginac
>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:   Sun Apr 06 16:10:08 UTC 2008
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080407010040.3540ed8f.tkato432>