Date: Tue, 12 Oct 2010 23:08:11 GMT From: Han Frederic <han@math.jussieu.fr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/151418: [PATCH] math/giacxcas build broken on old FreeBSD versions due to scandir change Message-ID: <201010122308.o9CN8BIq051256@www.freebsd.org> Resent-Message-ID: <201010122310.o9CNA61d018458@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151418 >Category: ports >Synopsis: [PATCH] math/giacxcas build broken on old FreeBSD versions due to scandir change >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 12 23:10:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Han Frederic >Release: 7.3 >Organization: universite PAris 7 >Environment: FreeBSD BSDto73 7.3-RELEASE FreeBSD 7.3-RELEASE #0: Sun Mar 21 06:15:01 UTC 2010 root@walker.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: scandir prototype has changed since PR/142255 so the compilation of math/giacxcas fails for FreeBSD_version prior to this modification. (FreeBSD_version < 800501) >How-To-Repeat: FreeBSD_version<800501 900000<= FreeBSD_version < 900006 >Fix: Patch attached with submission follows: diff -ruN giacxcas.orig/Makefile giacxcas/Makefile --- giacxcas.orig/Makefile 2010-10-10 00:26:00.000000000 +0200 +++ giacxcas/Makefile 2010-10-12 17:36:42.000000000 +0200 @@ -7,7 +7,7 @@ PORTNAME= giacxcas PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ftp://ftp-fourier.ujf-grenoble.fr/xcas/freebsd/ \ http://people.math.jussieu.fr/~han/xcas/sources/rev1/ diff -ruN giacxcas.orig/files/patch-src-help.cc giacxcas/files/patch-src-help.cc --- giacxcas.orig/files/patch-src-help.cc 1970-01-01 01:00:00.000000000 +0100 +++ giacxcas/files/patch-src-help.cc 2010-10-12 00:44:19.000000000 +0200 @@ -0,0 +1,14 @@ +--- src/help.cc.orig 2010-10-11 22:21:22.000000000 +0200 ++++ src/help.cc 2010-10-11 22:35:32.000000000 +0200 +@@ -748,7 +748,10 @@ + return s=="index.htm"; + } + #else +-#if defined(__APPLE__) // || defined(__FreeBSD__) ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif ++#if defined(__APPLE__) || (defined(__FreeBSD_version) && (__FreeBSD_version < 800501)) + static int dir_select (struct dirent *d){ + #else + static int dir_select (const struct dirent *d){ diff -ruN giacxcas.orig/files/patch-src-rpn.cc giacxcas/files/patch-src-rpn.cc --- giacxcas.orig/files/patch-src-rpn.cc 1970-01-01 01:00:00.000000000 +0100 +++ giacxcas/files/patch-src-rpn.cc 2010-10-12 00:44:19.000000000 +0200 @@ -0,0 +1,14 @@ +--- src/rpn.cc.orig 2010-10-11 22:21:12.000000000 +0200 ++++ src/rpn.cc 2010-10-11 22:07:07.000000000 +0200 +@@ -530,7 +530,10 @@ + gen symb_VARS(const gen & a){ + return symbolic(at_VARS,a); + } +-#if defined(__APPLE__) // || defined(__FreeBSD__) ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif ++#if defined(__APPLE__) || (defined(__FreeBSD_version) && (__FreeBSD_version < 800501)) + static int int_one (struct dirent *unused){ + #else + static int int_one (const struct dirent *unused){ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010122308.o9CN8BIq051256>