From owner-freebsd-ports Sun Nov 10 16:30: 6 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98AE937B401 for ; Sun, 10 Nov 2002 16:30:03 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11CC143E8A for ; Sun, 10 Nov 2002 16:30:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAB0U1x3013558 for ; Sun, 10 Nov 2002 16:30:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAB0U1Ph013557; Sun, 10 Nov 2002 16:30:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C8A137B401 for ; Sun, 10 Nov 2002 16:28:23 -0800 (PST) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.208.78.105]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0F6843E42 for ; Sun, 10 Nov 2002 16:28:22 -0800 (PST) (envelope-from kargl@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.12.6/8.12.6) with ESMTP id gAB0SM8A075265 for ; Sun, 10 Nov 2002 16:28:22 -0800 (PST) (envelope-from kargl@troutmask.apl.washington.edu) Received: (from kargl@localhost) by troutmask.apl.washington.edu (8.12.6/8.12.6/Submit) id gAB0SMU6075264; Sun, 10 Nov 2002 16:28:22 -0800 (PST) Message-Id: <200211110028.gAB0SMU6075264@troutmask.apl.washington.edu> Date: Sun, 10 Nov 2002 16:28:22 -0800 (PST) From: "Steven G. Kargl" Reply-To: "Steven G. Kargl" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45201: Fix build of math/octave on -current Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45201 >Category: ports >Synopsis: Fix build of math/octave on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Nov 10 16:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Steven G. Kargl >Release: FreeBSD 5.0-CURRENT i386 >Organization: apl/uw >Environment: System: FreeBSD troutmask.apl.washington.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Nov 5 11:54:46 PST 2002 kargl@troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386 >Description: math/octave does not build on -current. >How-To-Repeat: cd math/octave ; make >Fix: This fixes the building of math/octave. The change to glob/glob.h is probably a hack, but it works. The following is noted: 1) Updated to 2.1.39 2) Add library dependence on math/fftw 3) Add hack to glob/glob.h diff -rubBN octave.orig/Makefile octave/Makefile --- octave.orig/Makefile Sun Jul 2 21:48:29 2000 +++ octave/Makefile Sun Nov 10 15:30:37 2002 @@ -6,7 +6,7 @@ # PORTNAME= octave -PORTVERSION= 2.1.30 +PORTVERSION= 2.1.39 CATEGORIES= math MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ @@ -16,6 +16,7 @@ USE_BZIP2= yes BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw .include @@ -29,7 +30,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-shared --host=${GNU_HOST} +CONFIGURE_ARGS= --disable-shared --with-fftw --host=${GNU_HOST} .if ${OSVERSION} < 400004 CONFIGURE_ARGS+= --with-f2c diff -rubBN octave.orig/distinfo octave/distinfo --- octave.orig/distinfo Thu Jun 22 19:29:31 2000 +++ octave/distinfo Sun Nov 10 15:31:02 2002 @@ -1 +1 @@ -MD5 (octave-2.1.30.tar.bz2) = a4b60bb9942947b9a22795bef61cfb2b +MD5 (octave-2.1.39.tar.bz2) = ab7f7e4d1a0d1032d260eb85ca4c571e diff -rubBN octave.orig/files/patch-ah octave/files/patch-ah --- octave.orig/files/patch-ah Wed Dec 31 16:00:00 1969 +++ octave/files/patch-ah Sun Nov 10 15:33:20 2002 @@ -0,0 +1,14 @@ +--- glob/glob.h.orig Sun Nov 10 15:32:00 2002 ++++ glob/glob.h Sun Nov 10 15:32:49 2002 +@@ -48,7 +48,11 @@ + /* We need `size_t' for the following definitions. */ + #ifndef __size_t + # if defined __GNUC__ && __GNUC__ >= 2 ++#ifndef __FreeBSD__ + typedef __SIZE_TYPE__ __size_t; ++#else ++#include ++#endif + # else + /* This is a guess. */ + /*hb >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message