netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Convert all USE_FORTRAN=yes to "USES=fortran, USE_GCC=yes". In most cases

Browse Source 
USE_GCC=yes has been omitted though.

Remove USE_FORTRAN handling from bsd.port.mk and bsd.gcc.mk.

Minor cleanups in some ports like USE_GMAKE, NOPORTDOCS,...

Exp-run:	bdrewery
Approved by:	portmgr (bdrewery)
This commit is contained in:
tijl
2014-02-16 17:15:31 +00:00
parent e04e533cf1
commit f86cbfadd2
209 changed files with 457 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mk/Uses/cran.mk
+1 -1
View File
@@ -30,7 +30,7 @@ MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
USE_FORTRAN= yes
USES+= fortran
BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
Mk/Uses/fortran.mk
+3 -2
View File
@@ -23,6 +23,7 @@ USE_BINUTILS= yes
F77= gfortran${_GCC_VER}
FC= gfortran${_GCC_VER}
FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-L${LOCALBASE}/lib/gcc${_GCC_VER}
.elif ${fortran_ARGS} == ifort
@@ -34,7 +35,7 @@ FC= ${LOCALBASE}/intel_fc_80/bin/ifort
IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS}
.endif
CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
.endif
Mk/bsd.gcc.mk
+1 -49
View File
@@ -7,8 +7,7 @@
#
# To request the use of a current version of GCC, specify USE_GCC=yes in
# your port/system configuration. This is the preferred use of USE_GCC.
# It defines a canonical, default version of GCC. The same version of
# GCC is also implied by USE_FORTRAN=yes.
# It defines a canonical, default version of GCC.
#
# USE_GCC=any is similar, except that it also accepts the old GCC 4.2-
# based system compiler in older versions of FreeBSD.
@@ -18,9 +17,6 @@
# do so by specifying USE_GCC=X.Y+ which requests at least GCC version
# X.Y. To request a specific version omit the trailing + sign.
#
# Use of a Fortran compiler is declared by the USE_FORTRAN knob, not
# USE_GCC.
#
# Examples:
# USE_GCC= yes # port requires a current version of GCC
# # (4.6 as of today, subject to change).
@@ -28,15 +24,6 @@
# USE_GCC= 4.8+ # port requires GCC 4.8 or later.
# USE_GCC= 4.8 # port requires GCC 4.8.
#
# If your port needs a Fortran compiler, please specify that with the
# USE_FORTRAN= knob. Here is the list of options for that knob:
#
# USE_FORTRAN= yes # use gfortran46 (lang/gcc46)
# USE_FORTRAN= ifort # use the Intel compiler (lang/ifc)
#
# Due to object file incompatiblity between Fortran compilers, we strongly
# recommend to use only one of them on any system.
#
# If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging.
#
@@ -81,34 +68,6 @@ _GCCVERSION_${v}_V= ${j}
. endfor
.endfor
# bsd.gcc.mk can also be used for primarily requesting a Fortran compiler.
# If we are using GCC we still define whatever we'd usually do for C and
# C++ as well.
.if defined (USE_FORTRAN)
# The default case, with a current lang/gcc port.
. if ${USE_FORTRAN} == yes
_USE_GCC:= ${GCC_DEFAULT_VERSION}
FC:= gfortran${GCC_DEFAULT_V}
F77:= gfortran${GCC_DEFAULT_V}
# Intel Fortran compiler from lang/ifc.
. elif ${USE_FORTRAN} == ifort
BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
FC:= ${LOCALBASE}/intel_fc_80/bin/ifort
F77:= ${LOCALBASE}/intel_fc_80/bin/ifort
. else
IGNORE= specifies unknown value "${USE_FORTRAN}" for USE_FORTRAN
. endif
CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
.endif
.if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
. if ${USE_GCC} == any
@@ -201,11 +160,6 @@ _GCC_RUNTIME:= ${LOCALBASE}/lib/gcc${V}
CFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
CXXFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}
. if defined (USE_FORTRAN)
. if ${USE_FORTRAN} == yes
FFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
. endif
. endif
# The following is for the sakes of some ports which use this without
# ever telling us; to be fixed.
_GCC_BUILD_DEPENDS:= ${_GCC_PORT_DEPENDS}
@@ -234,7 +188,6 @@ USE_BINUTILS= yes
test-gcc:
@echo USE_GCC=${USE_GCC}
@echo USE_FORTRAN=${USE_FORTRAN}
.if defined(IGNORE)
@echo "IGNORE: ${IGNORE}"
.else
@@ -255,7 +208,6 @@ test-gcc:
@echo Using GCC version ${_USE_GCC}
.endif
@echo CC=${CC} - CXX=${CXX} - CPP=${CPP} - CFLAGS=\"${CFLAGS}\"
@echo F77=${F77} - FC=${FC} - FFLAGS=\"${FFLAGS}\"
@echo LDFLAGS=\"${LDFLAGS}\"
@echo "BUILD_DEPENDS=${BUILD_DEPENDS}"
@echo "RUN_DEPENDS=${RUN_DEPENDS}"
Mk/bsd.octave.mk
+1 -2
View File
@@ -21,8 +21,7 @@ RUN_DEPENDS+= octave:${PORTSDIR}/math/octave \
${LOCALBASE}/libexec/octave/load-octave-pkg:${PORTSDIR}/math/octave-forge-base
LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
USE_FORTRAN= yes
USES+= gmake
USES+= fortran gmake
DIST_SUBDIR= octave-forge
OCTAVE_PKGNAME= ${PORTNAME:S/octave-forge-//}
Mk/bsd.port.mk
+1 -1
View File
@@ -1712,7 +1712,7 @@ EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself
.endif
.if defined(USE_GCC) || defined(USE_FORTRAN)
.if defined(USE_GCC)
.include "${PORTSDIR}/Mk/bsd.gcc.mk"
.endif
benchmarks/himenobench/Makefile
+7 -6
View File
@@ -22,9 +22,10 @@ USE_LHA= yes
BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
.endif
USE_FORTRAN= yes
.if defined(WITH_IFC)
USE_FORTRAN= ifort
USES+= fortran:ifort
.else
USES+= fortran
.endif
NO_STAGE= yes
@@ -42,7 +43,7 @@ PLIST_SUB+= WITH_ICC=""
.else
PLIST_SUB+= WITH_ICC="@comment "
.endif
.if ${USE_FORTRAN} == ifort
.if defined(WITH_IFC)
FFLAGS_IFC+= -O3 -tpp7 -axN -Vaxlib -ipo
IFC= ${LOCALBASE}/intel_fc_80/bin/ifort
PLIST_SUB+= WITH_IFC=""
@@ -50,14 +51,14 @@ PLIST_SUB+= WITH_IFC=""
PLIST_SUB+= WITH_IFC="@comment "
.endif
.if ${USE_FORTRAN} != yes
.if defined(WITH_IFC)
PLIST_SUB+= WITH_GFORTRAN="@comment "
.else
PLIST_SUB+= WITH_GFORTRAN=""
.endif
do-build:
.if ${USE_FORTRAN} == yes
.if ! defined(WITH_IFC)
cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp himenobmtxp.f90
.endif
# cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_xl himenobmtxp_xl.f #Too large
@@ -87,7 +88,7 @@ do-build:
.endif
do-install:
# ${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl ${PREFIX}/bin #Too large
.if ${USE_FORTRAN} == yes
.if ! defined(WITH_IFC)
@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp ${PREFIX}/bin
.endif
@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l ${PREFIX}/bin
benchmarks/hpl/Makefile
+1 -1
View File
@@ -14,7 +14,7 @@ COMMENT= High Performance Computing Linpack Benchmark
LIB_DEPENDS= libblas.so:${PORTSDIR}/math/blas \
libmpich.so:${PORTSDIR}/net/mpich2
USE_FORTRAN= yes
USES= fortran
USE_LDCONFIG= yes
HPL_ARCH?= FreeBSD_PIV_CBLAS
MAKE_ARGS= arch=${HPL_ARCH}
benchmarks/octave-forge-benchmark/Makefile
+1 -1
View File
@@ -3,7 +3,7 @@
PORTNAME= octave-forge-benchmark
PORTVERSION= 1.1.1
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= benchmarks math
MAINTAINER= stephen@FreeBSD.org
biology/crux/Makefile
+2 -4
View File
@@ -10,22 +10,20 @@ MASTER_SITES= http://www.canonware.com/download/Crux/
MAINTAINER= jasone@FreeBSD.org
COMMENT= Software toolkit for phylogenetic inference
USES= fortran gmake
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} --disable-mpi
USE_CSTD= gnu99
USE_GMAKE= yes
USE_PYTHON= yes
OPTIONS_DEFINE= SYS_LINALG
SYS_LINALG_DESC= Enable system ATLAS/LAPACK
NO_STAGE= yes
.include <bsd.port.pre.mk>
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_FORTRAN= yes
.include <bsd.port.options.mk>
@@ -43,4 +41,4 @@ BROKEN= Does not build on powerpc-9: error in pthreads
post-install:
@${PREFIX}/bin/crux -b -q /dev/null
.include <bsd.port.post.mk>
.include <bsd.port.mk>
biology/plink/Makefile
+6 -7
View File
@@ -3,10 +3,11 @@
PORTNAME= plink
PORTVERSION= 1.07
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= biology science
MASTER_SITES= http://pngu.mgh.harvard.edu/~purcell/plink/dist/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .zip
MAINTAINER= jwbacon@tds.net
COMMENT= Whole genome association analysis toolset
@@ -15,15 +16,13 @@ LICENSE= GPLv2
LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack
USES= gmake
USE_ZIP= yes
USE_FORTRAN= yes # Make it use the same compiler as lapack
# We need Fortran LDFLAGS to link with Lapack.
USES= fortran gmake
PLIST_FILES= bin/plink
NO_STAGE= yes
do-install:
${MKDIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/plink ${PREFIX}/bin
${MKDIR} ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/plink ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
biology/plink/files/patch-Makefile
+5 -4
View File
@@ -1,15 +1,16 @@
--- Makefile.orig 2009-10-10 11:00:20.000000000 -0500
+++ Makefile 2012-09-07 08:24:26.000000000 -0500
@@ -26,7 +26,7 @@
@@ -26,25 +26,25 @@
WITH_WEBCHECK = 1
FORCE_32BIT =
WITH_ZLIB = 1
-WITH_LAPACK =
-FORCE_DYNAMIC =
+WITH_LAPACK = 1
FORCE_DYNAMIC =
+FORCE_DYNAMIC = 1
# Put C++ compiler here; Windows has it's own specific version
@@ -34,17 +34,17 @@
CXX_UNIX = g++
CXX_WIN = c:\bin\mingw\bin\mingw32-g++.exe
# Any other compiler flags here ( -Wall, -g, etc)
@@ -18,7 +19,7 @@
# Misc
-LIB_LAPACK = /usr/lib/liblapack.so.3
+LIB_LAPACK = -L${LOCALBASE}/lib -llapack -lblas -lgfortran
+LIB_LAPACK = ${LDFLAGS} -L${LOCALBASE}/lib -llapack -lblas
# --------------------------------------------------------------------
cad/calculix/Makefile
+3 -6
View File
@@ -43,7 +43,8 @@ DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX} \
cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
USES= fortran gmake
USE_GCC= yes
USE_XORG= xmu
USE_GL= glut
@@ -54,7 +55,6 @@ CCX_VER= ccx_${PORTVERSION}
CGX_VER= cgx_2.6
NO_STAGE= yes
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
OPTIONS_DEFINE= METIS METIS_EDF
@@ -81,9 +81,6 @@ BLAS_LIBS= -lblas
LAPACK_LIBS= -llapack
.endif
USE_FORTRAN= yes
USE_GCC= yes
.if ${ARCH} == "sparc64"
CFLAGS+= -fPIC
FFLAGS+= -fPIC
@@ -148,4 +145,4 @@ do-install:
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>
cad/feappv/Makefile
+1 -2
View File
@@ -13,10 +13,9 @@ EXTRACT_ONLY= ${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
MAINTAINER= mexas@bris.ac.uk
COMMENT= Finite element analysis program (personal version)
USES= gmake
USES= fortran gmake
USE_ZIP= yes
USE_XORG= x11
USE_FORTRAN= yes
MAKEFILE= makefile
MAKE_ENV= FEAPPVHOME3_1="${WRKSRC}"
ALL_TARGET= install
cad/gmsh/Makefile
+2 -3
View File
@@ -3,6 +3,7 @@
PORTNAME= gmsh
PORTVERSION= 2.8.4
PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www.geuz.org/gmsh/src/ \
http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -26,9 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
SLAVEDIRS= cad/gmsh-occ
USE_FORTRAN= yes
USES= cmake
USE_GMAKE= yes
USES= cmake fortran gmake
USE_GL= yes
ALL_TARGET= all
cad/gmsh/files/patch-Fltk-Main.cpp
+11
View File
@@ -0,0 +1,11 @@
--- Fltk/Main.cpp.orig
+++ Fltk/Main.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@geuz.org>.
-#include <stdlib.h>
+#include <cstdlib>
#include <string>
#include "Gmsh.h"
#include "GmshMessage.h"
cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp
+13
View File
@@ -0,0 +1,13 @@
--- Mesh/meshGFaceBDS.cpp.orig
+++ Mesh/meshGFaceBDS.cpp
@@ -771,8 +771,8 @@
while (it != m.edges.end()){
BDS_Edge *e = *it;
if (!e->deleted && e->numfaces() == 2){
- std::map<BDS_Point*, MVertex*>::iterator itp1 = recoverMap->find(e->p1);
- std::map<BDS_Point*, MVertex*>::iterator itp2 = recoverMap->find(e->p2);
+ std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp1 = recoverMap->find(e->p1);
+ std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp2 = recoverMap->find(e->p2);
if (itp1 != recoverMap->end() &&
itp2 != recoverMap->end() &&
itp1->second == itp2->second) toSplit.insert(e);
cad/gmsh/pkg-plist
+2
View File
@@ -63,6 +63,7 @@ include/gmsh/OptHomRun.h
include/gmsh/PView.h
include/gmsh/PViewData.h
include/gmsh/PViewDataGModel.h
include/gmsh/PViewDataList.h
include/gmsh/PViewOptions.h
include/gmsh/Pair.h
include/gmsh/ParamCoord.h
@@ -103,6 +104,7 @@ include/gmsh/linearSystem.h
include/gmsh/linearSystemCSR.h
include/gmsh/linearSystemFull.h
include/gmsh/linearSystemGMM.h
include/gmsh/linearSystemMUMPS.h
include/gmsh/linearSystemPETSc.h
include/gmsh/mathEvaluator.h
include/gmsh/mathex.h
cad/sceptre/Makefile
+1 -1
View File
@@ -12,7 +12,7 @@ COMMENT= General-purpose circuit analysis program
LICENSE= GPLv2
USE_FORTRAN= yes
USES= fortran
MAKE_JOBS_UNSAFE= yes
NO_WRKSUBDIR= yes
cad/scotch/Makefile
+1 -1
View File
@@ -22,7 +22,7 @@ USES= gmake
MAKE_JOBS_UNSAFE= yes
.if defined(MAINTAINER_MODE)
USE_FORTRAN= yes
USES+= fortran
.endif
WRKSRC= ${WRKDIR}/${DISTNAME:C/b_/_/}
comms/wsjt/Makefile
+1 -2
View File
@@ -22,9 +22,8 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
${PYNUMPY}
ALL_TARGET= build
USES= fortran gmake
USE_BZIP2= yes
USE_GMAKE= yes
USE_FORTRAN= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gfortran --prefix=${LOCALBASE} \
--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \

Some files were not shown because too many files have changed in this diff Show More