From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 9 15:41:30 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CCAD37B47E for ; Sat, 9 Aug 2003 15:41:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B13C43FE1 for ; Sat, 9 Aug 2003 15:40:32 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h79MeIUp052025 for ; Sat, 9 Aug 2003 15:40:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h79MeIud052024; Sat, 9 Aug 2003 15:40:18 -0700 (PDT) Resent-Date: Sat, 9 Aug 2003 15:40:18 -0700 (PDT) Resent-Message-Id: <200308092240.h79MeIud052024@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thierry Thomas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AF0737B412 for ; Sat, 9 Aug 2003 15:36:35 -0700 (PDT) Received: from ws90bj.pompo.net (lns-th2-2f-81-56-186-139.adsl.proxad.net [81.56.186.139]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C3D243FAF for ; Sat, 9 Aug 2003 15:36:34 -0700 (PDT) (envelope-from thierry@pompo.net) Received: by ws90bj.pompo.net (Postfix, from userid 1001) id CE7EC22BABD; Sun, 10 Aug 2003 00:36:18 +0200 (CEST) Message-Id: <20030809223618.CE7EC22BABD@ws90bj.pompo.net> Date: Sun, 10 Aug 2003 00:36:18 +0200 (CEST) From: Thierry Thomas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: "Pedro F. Giffuni" Subject: ports/55431: french/aster: replace blas by atlas + misc improvements. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Thierry Thomas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2003 22:41:35 -0000 >Number: 55431 >Category: ports >Synopsis: french/aster: replace blas by atlas + misc improvements. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 09 15:40:18 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 5.1-RELEASE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD ws90bj.pompo.net 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Sat Aug 9 10:48:19 CEST 2003 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-030610 i386 >Description: - replace blas by atlas by default and add a knob to keep blas (requested by Pedro F. Giffuni); - handle FFLAGS; - fix default directories; - some cleaning. Remark: this port is still broken on 4.8; I can provide details if somebody wants to fix it. >How-To-Repeat: N/A. >Fix: Please apply the following patch: --- aster.diff begins here --- diff -urN french/aster.orig/Makefile french/aster/Makefile --- french/aster.orig/Makefile Fri Aug 8 22:19:30 2003 +++ french/aster/Makefile Sat Aug 9 13:17:20 2003 @@ -19,8 +19,11 @@ # You may define these options: # # - F77: don't use the default fortran compiler; +# - FFLAGS: fortan compiler's flags (-O2 by default); # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among # zsh (default), bash or ksh; +# - WITH_BLAS: don't link with atlas, but with blas; +# (blas is slower, but lighter) # - WITHOUT_ASTK: don't use the GUI; # - WITHOUT_ASTK_CLI: won't use the GUI from this machine; # - WITHOUT_EFICAS: don't install ASter Command FIle Editor; @@ -36,7 +39,6 @@ PATCH_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER} \ wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} -LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas BUILD_DEPENDS= ${opt_hdf}:${PORTSDIR}/graphics/hdf5 \ ${opt_med}:${PORTSDIR}/french/med \ ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} @@ -62,6 +64,11 @@ BROKEN= Does not build on systems prior 5.x - work in progress... .endif +.if defined(WITH_BLAS) +LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas +.else +LIB_DEPENDS= f77blas.1:${PORTSDIR}/math/atlas +.endif .if !defined(WITHOUT_ASTK) RUN_DEPENDS+= ${LOCALBASE}/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur .if !defined(WITHOUT_ASTK_CLI) @@ -100,6 +107,7 @@ .endif F77?= f77 +FFLAGS?= -O2 TK_VER?= 8.3 SHORT_TK_VER= ${TK_VER:S/.//} @@ -135,8 +143,6 @@ INST_DAT= astest bibpyt cata_ele.pickled catalo catapy commande \ config.txt elements etude materiau tcl python_path= ${PYTHON_LIBDIR}:${PYTHON_LIBDIR}/lib-dynload:${PYTHON_SITELIBDIR}:${PYTHON_SITELIBDIR}/Numeric -#nm!= ${WHICH} nm -#nmD= ${nm} -D inst_dir= ${PREFIX}/${PORTNAME}/${vaster} tools_dir= ${inst_dir}/outils unames!= ${UNAME} -s @@ -147,10 +153,12 @@ python_dir= ${PYTHONBASE}/bin opt_hdf= ${LOCALBASE}/lib/libhdf5.a opt_med= ${LOCALBASE}/lib/libmed.a +.if defined(WITH_BLAS) lib_blas= -lblas +.else +lib_blas= -lf77blas -latlas +.endif home_ar!= dirname `${WHICH} ${AR}` -#home_f77!= dirname `${WHICH} ${F77}` -#home_cc!= dirname `${WHICH} ${CC}` gzip!= dirname `${WHICH} ${GZIP_CMD}` LASTKDIR?= ASTK/ASTK_CLIENT ASTKDIR= ${LOCALBASE}/${LASTKDIR} @@ -188,20 +196,20 @@ ${SED} -e "s#TK_LIB_SPEC='##;s#'##" > ${WRKDIR}/tk_lib_spec @${REINPLACE_CMD} -e "s#OPT_HDF#${opt_hdf}#" \ -e "s#OPT_MED#${opt_med}#" \ - -e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#g" \ - -e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#g" \ + -e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#" \ + -e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#" \ -e "s#OPT_X11#-L${X11BASE}/lib -lX11#" \ -e "s#OPT_BLAS#${lib_blas}#" \ - -e "s#HOME_AR#${home_ar}#g" \ - -e "s#%%F77%%#${F77}#g" \ - -e "s#HOME_F90#${home_f77}#g" \ - -e "s#%%CC%%#${CC}#g" \ - -e "s#CFLAGS#${CFLAGS} ${PTHREAD_CFLAGS}#g" \ - -e "s#HOME_GZIP#${gzip}#g" \ - -e "s#HOME_PYTHON#${PYTHONBASE}#g" \ - -e "s#PYTHON_BIN#${PYTHON_VERSION}#g" \ + -e "s#HOME_AR#${home_ar}#" \ + -e "s#%%F77%%#${F77}#" \ + -e "s#%%CC%%#${CC}#" \ + -e "s#CFLAGS#${CFLAGS} ${PTHREAD_CFLAGS}#" \ + -e "s#FFLAGS#${FFLAGS}#" \ + -e "s#HOME_GZIP#${gzip}#" \ + -e "s#HOME_PYTHON#${PYTHONBASE}#" \ + -e "s#PYTHON_BIN#${PYTHON_VERSION}#" \ -e "s#PYTHON_VERSION#${_PYTHON_VERSION}#g" \ - -e "s#PTHREAD#${PTHREAD_LIBS}#g" \ + -e "s#PTHREAD#${PTHREAD_LIBS}#" \ ${WRKSRC}/tcl/conf/${v_ifdef}/config.txt @${MV} ${WRKSRC}/tcl/conf/${v_ifdef}/config.txt ${WRKSRC} @${RM} ${WRKSRC}/tcl/run_aster.orig @@ -209,6 +217,8 @@ @${RM} -rf ${WRKSRC}/bibpyt/Utilitai @${REINPLACE_CMD} -e "s#\$$(HOME)#${LOCALBASE}/apps#" \ ${WRKSRC}/bibpyt/Execution/E_SUPERV.py + @${REINPLACE_CMD} -e "s#%%inst_dir%%#${inst_dir}#" \ + ${WRKSRC}/bibc/utilitai/asterm.c do-build: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bibpyt diff -urN french/aster.orig/files/config.txt french/aster/files/config.txt --- french/aster.orig/files/config.txt Fri Aug 8 22:19:30 2003 +++ french/aster/files/config.txt Sat Aug 9 12:26:23 2003 @@ -49,7 +49,7 @@ F77 | f77 | ? | %%F77%% # OPTF_D | f90 | ? | -c -g -OPTF_O | f90 | ? | -c -O2 +OPTF_O | f90 | ? | -c FFLAGS # G77_AGLA | g77 | ? | %%F77%% # diff -urN french/aster.orig/files/patch-bibc::utilitai::asterm.c french/aster/files/patch-bibc::utilitai::asterm.c --- french/aster.orig/files/patch-bibc::utilitai::asterm.c Thu Jan 1 01:00:00 1970 +++ french/aster/files/patch-bibc::utilitai::asterm.c Sat Aug 9 12:23:28 2003 @@ -0,0 +1,26 @@ +--- bibc/utilitai/asterm.c.orig Wed Apr 23 11:41:04 2003 ++++ bibc/utilitai/asterm.c Thu Aug 7 21:14:44 2003 +@@ -271,7 +271,12 @@ + #define REP_SPY "/aster/stat/" + #define LREP 12 + #elif defined SOLARIS || HPUX || IRIX || P_LINUX || TRU64 || SOLARIS64 ++#if defined(__FreeBSD__) ++/* Note: spycod does not exist any more, but... */ ++#define REP_SPY "/var/aster/stat/" ++#else + #define REP_SPY "/export/docaster/asa/aster/stat/" ++#endif + #define LREP 32 + #elif defined PPRO_NT + #define REP_SPY " " +@@ -300,6 +305,10 @@ + #define REP_MAT "/aster/materiau/" + #define REP_OUT "/aster/outils/" + #define REP_DON "/aster/donnees/" ++#elif defined __FreeBSD__ ++#define REP_MAT "%%inst_dir%%/materiau/" ++#define REP_OUT "%%inst_dir%%/outils/" ++#define REP_DON "/var/aster/donnees/" + #elif defined SOLARIS || HPUX || P_LINUX + #define REP_MAT "/logiciels/aster/materiau/" + #define REP_OUT "/logiciels/aster/outils/" --- aster.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: