From nobody@FreeBSD.org  Sun Sep 26 14:00:54 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 BFAA1106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Sep 2010 14:00:54 +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 ADBEF8FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Sep 2010 14:00:54 +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 o8QE0rZp050920
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Sep 2010 14:00:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8QE0rot050919;
	Sun, 26 Sep 2010 14:00:53 GMT
	(envelope-from nobody)
Message-Id: <201009261400.o8QE0rot050919@www.freebsd.org>
Date: Sun, 26 Sep 2010 14:00:53 GMT
From: Han Frederic <han@math.jussieu.fr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] math/giacxcas build broken on pointyhat + run Pb  on amd64
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         150966
>Category:       ports
>Synopsis:       [PATCH] math/giacxcas build broken on pointyhat + run Pb  on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 26 14:10:07 UTC 2010
>Closed-Date:    Sat Oct 09 22:31:53 UTC 2010
>Last-Modified:  Sat Oct 09 22:31:53 UTC 2010
>Originator:     Han Frederic
>Release:        i386-8
>Organization:
Universite Paris 7
>Environment:
FreeBSD pepitoBSD 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
- bash and gettext are removed after patching in the automatic build procedure but they are needed also in build. cf all errors:
http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.8.2010092307412/giacxcas-0.9.0.log
- update flag for amd64 run problem
- add a new mastersite
- update source from author.(for diff of giac-0.9.0.tar.gz see: 
http://people.math.jussieu.fr/~han/xcas/sources/rev1/giac-0.9.0.diff-qruN
http://people.math.jussieu.fr/~han/xcas/sources/rev1/giac-0.9.0.diff-ruN.gz
NB: big diff file because of tests files outputs)

-for amd64 pr=ports/150787 is required



>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN giacxcas.bak/Makefile giacxcas/Makefile
--- giacxcas.bak/Makefile	2010-09-21 17:29:52.000000000 +0200
+++ giacxcas/Makefile	2010-09-26 09:15:32.000000000 +0200
@@ -7,9 +7,10 @@
 
 PORTNAME=	giacxcas
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	http://people.math.jussieu.fr/~han/xcas/sources/ \
-		http://www.institut.math.jussieu.fr/~han/xcas/sources/
+MASTER_SITES=	ftp://ftp-fourier.ujf-grenoble.fr/xcas/freebsd/ \
+		http://people.math.jussieu.fr/~han/xcas/sources/rev1/
 DISTFILES=	fltkdev.tgz CoCoALib.tgz giac-${PORTVERSION}.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 
@@ -18,7 +19,9 @@
 
 BUILD_DEPENDS=	hevea:${PORTSDIR}/textproc/hevea \
 		latex:${PORTSDIR}/print/teTeX-base \
-		dvips:${PORTSDIR}/print/dvipsk-tetex\
+		dvips:${PORTSDIR}/print/dvipsk-tetex \
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
+		gettext:${PORTSDIR}/devel/gettext \
 		${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 PATCH_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
@@ -37,6 +40,13 @@
 CPPFLAGS+=	-I${FLTKDEV-GIAC} -I${COCOALIB-GIAC}/include -I${LOCALBASE}/include
 LDFLAGS+=	-L${FLTKDEV-GIAC}/lib -L${COCOALIB-GIAC}/lib -L${LOCALBASE}/lib
 CXXFLAGS+=	-I${LOCALBASE}/include
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CXXFLAGS+=	-DSMARTPTR64 -D_I386_ -fPIC
+.endif
+
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 WRKSRC=		${WRKDIR}/giac-${PORTVERSION}
@@ -57,4 +67,4 @@
 	./configure --prefix=${FLTKDEV-GIAC} \
 	&& ${MAKE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN giacxcas.bak/distinfo giacxcas/distinfo
--- giacxcas.bak/distinfo	2010-09-21 17:29:52.000000000 +0200
+++ giacxcas/distinfo	2010-09-26 08:15:36.000000000 +0200
@@ -4,6 +4,6 @@
 MD5 (giacxcas/CoCoALib.tgz) = b8a7ed67355a0975321ef3cfd08c511e
 SHA256 (giacxcas/CoCoALib.tgz) = 501048b46125e730c24b9733eb180531461bd9a045a6e3a640e9aae512ce0293
 SIZE (giacxcas/CoCoALib.tgz) = 1580875
-MD5 (giacxcas/giac-0.9.0.tar.gz) = f38f028deebc6f7e652078ead0c2ebd5
-SHA256 (giacxcas/giac-0.9.0.tar.gz) = b7c31f32a8702af7ad8b91305b5f1934f9b1e328cd4bc0b861918db1f4b61241
-SIZE (giacxcas/giac-0.9.0.tar.gz) = 16260457
+MD5 (giacxcas/giac-0.9.0.tar.gz) = 736b8a37ac027bb6203d59f3d8432d28
+SHA256 (giacxcas/giac-0.9.0.tar.gz) = abed026e9869acb77275b3381dec53d3f242ab54c65485d32fcaeb05f7a24082
+SIZE (giacxcas/giac-0.9.0.tar.gz) = 18705169
diff -ruN giacxcas.bak/pkg-plist giacxcas/pkg-plist
--- giacxcas.bak/pkg-plist	2010-09-21 17:29:52.000000000 +0200
+++ giacxcas/pkg-plist	2010-09-26 13:35:32.000000000 +0200
@@ -2947,6 +2947,6 @@
 @dirrm share/doc/giac/Exemples/analyse
 @dirrm share/doc/giac/Exemples
 @dirrm share/doc/giac
-@dirrm share/applications
-@dirrm share/application-registry
+@dirrmtry share/applications
+@dirrmtry share/application-registry
 @dirrm include/giac


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: update->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Sun Sep 26 14:10:14 UTC 2010 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150966 
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sun Sep 26 17:34:25 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150966 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sat Oct 9 22:31:51 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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