diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/R/Makefile | 5 | ||||
| -rw-r--r-- | math/coinmp/Makefile | 5 | ||||
| -rw-r--r-- | math/cvc3/Makefile | 4 | ||||
| -rw-r--r-- | math/cvc3/files/patch-src-Makefile | 8 | ||||
| -rw-r--r-- | math/fann/Makefile | 5 | ||||
| -rw-r--r-- | math/hfst/Makefile | 2 | ||||
| -rw-r--r-- | math/hfst/files/patch-libhfst-Makefile.in | 11 | ||||
| -rw-r--r-- | math/igraph/Makefile | 6 | ||||
| -rw-r--r-- | math/ipopt/Makefile | 9 | ||||
| -rw-r--r-- | math/jags/Makefile | 4 | ||||
| -rw-r--r-- | math/nlopt/Makefile | 2 | ||||
| -rw-r--r-- | math/ufc/Makefile | 2 |
12 files changed, 15 insertions, 48 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index 3624ef7..0de59e0 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -35,7 +35,7 @@ CONFIGURE_ARGS= --disable-java \ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip ONLY_FOR_ARCHS= i386 amd64 -USES= fortran iconv libtool localbase objc:compiler perl5 \ +USES= fortran iconv libtool localbase objc:compiler pathfix perl5 \ readline USE_PERL5= build @@ -147,9 +147,6 @@ USE_LDCONFIG= ${PREFIX}/lib/R/lib .endif post-patch: - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\ - ${WRKSRC}/src/nmath/standalone/Makefile.in \ - ${WRKSRC}/src/unix/Makefile.in @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \ ${WRKSRC}/configure diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile index 5b1cae6..fb64d26 100644 --- a/math/coinmp/Makefile +++ b/math/coinmp/Makefile @@ -18,7 +18,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS= clp-[0-9]* ogdf-[0-9]* GNU_CONFIGURE= yes -USES= libtool pkgconfig tar:tgz +USES= libtool pathfix pkgconfig tar:tgz USE_LDCONFIG= yes CONFIGURE_ARGS+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig CXXFLAGS+= -ffast-math @@ -40,8 +40,7 @@ STRIP_FILES= libCoinUtils libOsi libOsiClp libOsiCommonTests libClp libClpSolver libCgl libCbc libCbcSolver libOsiCbc libCoinMP post-patch:: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \ -e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \ -e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \ diff --git a/math/cvc3/Makefile b/math/cvc3/Makefile index 4c880d8..712c33b 100644 --- a/math/cvc3/Makefile +++ b/math/cvc3/Makefile @@ -18,14 +18,14 @@ CONFIGURE_ARGS= --enable-dynamic \ --with-extra-libs=${LOCALBASE}/lib CXXFLAGS+= -fPIC GNU_CONFIGURE= yes -USES= bison gmake perl5 +USES= bison gmake pathfix perl5 +PATHFIX_MAKEFILEIN= Makefile USE_GCC= any USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/Makefile.std ${REINPLACE_CMD} -e 's,.*$$(LDCONFIG).*,,' ${WRKSRC}/src/Makefile - ${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' ${WRKSRC}/src/Makefile post-install: ${INSTALL_PROGRAM} `readlink ${WRKSRC}/bin/cvc3` ${STAGEDIR}${PREFIX}/bin diff --git a/math/cvc3/files/patch-src-Makefile b/math/cvc3/files/patch-src-Makefile index 14e0cd1..2543b3b 100644 --- a/math/cvc3/files/patch-src-Makefile +++ b/math/cvc3/files/patch-src-Makefile @@ -32,12 +32,12 @@ endif - mkdir -p $(bindir) - $(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(bindir) -- mkdir -p $(libdir)/pkgconfig -- $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(libdir)/pkgconfig +- mkdir -p $(prefix)/libdata/pkgconfig +- $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(prefix)/libdata/pkgconfig + mkdir -p $(DESTDIR)$(bindir) + $(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(DESTDIR)$(bindir) -+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig -+ $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(libdir)/pkgconfig ++ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig ++ $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(prefix)/libdata/pkgconfig ifndef FILELIST FILELIST = /dev/null diff --git a/math/fann/Makefile b/math/fann/Makefile index 383bedb..eae3be7 100644 --- a/math/fann/Makefile +++ b/math/fann/Makefile @@ -12,10 +12,7 @@ COMMENT= Free open source neural network library WRKSRC= ${WRKDIR}/FANN-2.2.0-Source -USES= cmake zip +USES= cmake pathfix zip USE_LDCONFIG= yes -post-patch: - ${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/CMakeLists.txt - .include <bsd.port.mk> diff --git a/math/hfst/Makefile b/math/hfst/Makefile index 8437499..7c2f14b 100644 --- a/math/hfst/Makefile +++ b/math/hfst/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/source MAINTAINER= demon@FreeBSD.org COMMENT= A toolkit for for processing natural language morphologies -USES= libtool pkgconfig python:2 readline shebangfix +USES= libtool pathfix pkgconfig python:2 readline shebangfix USE_GNOME= glib20 libxml2 USE_GCC= yes GNU_CONFIGURE= yes diff --git a/math/hfst/files/patch-libhfst-Makefile.in b/math/hfst/files/patch-libhfst-Makefile.in deleted file mode 100644 index 19bc380..0000000 --- a/math/hfst/files/patch-libhfst-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libhfst/Makefile.in.orig 2014-07-05 18:38:21.000000000 +0400 -+++ libhfst/Makefile.in 2014-07-05 18:39:40.000000000 +0400 -@@ -287,7 +287,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = src --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = hfst.pc - all: all-recursive - diff --git a/math/igraph/Makefile b/math/igraph/Makefile index 2c4fb1b..22afb82 100644 --- a/math/igraph/Makefile +++ b/math/igraph/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libgmp.so:math/gmp GNU_CONFIGURE= yes -USES= gmake libtool +USES= gmake libtool pathfix USE_GNOME= libxml2 CONFIGURE_ARGS+= --enable-gmp CFLAGS+= -I${LOCALBASE}/include @@ -22,10 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes -post-patch: - @${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in - .include <bsd.port.pre.mk> .if ${ARCH} == "sparc64" diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile index 5b3af3b..aedcc5d 100644 --- a/math/ipopt/Makefile +++ b/math/ipopt/Makefile @@ -16,13 +16,13 @@ COMMENT= Software package for large-scale nonlinear optimization LICENSE= EPL -USES= blaslapack fortran libtool pkgconfig tar:tgz +USES= blaslapack fortran libtool pathfix pkgconfig tar:tgz GNU_CONFIGURE= yes USE_LDCONFIG= yes TEST_TARGET= test INSTALL_TARGET= install-strip -CONFIGURE_ENV+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig \ +CONFIGURE_ENV+= PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \ CXX="${CXX} -B${LOCALBASE}/bin" CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \ --with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" @@ -34,11 +34,6 @@ PORTDOCS= * DEBUG_CXXFLAGS= -fomit-frame-pointer -pre-build: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' - post-extract: @(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." ) @(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS}); diff --git a/math/jags/Makefile b/math/jags/Makefile index 1e04492..5b6f6e4 100644 --- a/math/jags/Makefile +++ b/math/jags/Makefile @@ -19,7 +19,7 @@ COMMENT= Just Another Gibbs Sampler LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= bison compiler:features fortran gmake libtool localbase +USES= bison compiler:features fortran gmake libtool localbase pathfix USE_GCC= yes USE_LDCONFIG= yes @@ -58,8 +58,6 @@ PORTEXAMPLES= * .endif post-patch: - @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/etc/Makefile.in @${REINPLACE_CMD} \ -e '/@WINDOWS_FALSE@bin_SCRIPTS =/s/jags/mcmc-&/' \ -e '/CLEANFILES =/s/jags/mcmc-&/' \ diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index dd5afb8..c1d09e1 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -28,8 +28,6 @@ USES= autoreconf compiler:features libtool pathfix \ pkgconfig python:2 USE_LDCONFIG= yes -PATHFIX_MAKEFILEIN= Makefile.am - INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/math/ufc/Makefile b/math/ufc/Makefile index e19453f..96a611e 100644 --- a/math/ufc/Makefile +++ b/math/ufc/Makefile @@ -22,8 +22,6 @@ CMAKE_ARGS+= -DUFC_PKGCONFIG_DIR=${PREFIX}/libdata/pkgconfig MMVERSION= 2.2 post-patch: - ${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \ - ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -i '' -e 's|os.path.join(os.path.sep, "usr")|os.path.normpath("${PREFIX}")|' ${WRKSRC}/src/utils/python/ufc_utils/build.py .include <bsd.port.mk> |
