From 02588391df7e4f97941e9db5bc45086302f79043 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 4 Dec 2004 22:47:45 +0000 Subject: [PATCH] Remove dependancy on REINPLACE. --- math/octave-devel/Makefile | 8 +++----- math/octave/Makefile | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index a06586b39246..835beaa4d40c 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -39,7 +39,6 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -lcblas -latlas" USE_GMAKE= yes GNU_CONFIGURE= yes -USE_REINPLACE= yes CONFIGURE_ARGS= --host=${GNU_HOST} \ --with-fftw --with-blas=${BLAS_LIBS} --with-lapack=-lalapack \ @@ -63,11 +62,10 @@ post-extract: @${RM} -f ${WRKSRC}/doc/interpreter/octave.info* @${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info* post-install: + @${SED} -e 's,%%PREFIX%%,${PREFIX},g ; \ + s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ + ${FILESDIR}/octave > ${WRKDIR}/octave ${RM} ${PREFIX}/bin/octave - @${CP} ${FILESDIR}/octave ${WRKDIR} - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g ; \ - s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ - ${WRKDIR}/octave ${INSTALL_SCRIPT} ${WRKDIR}/octave ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/liboctave.info ${PREFIX}/info install-info --entry='* Octave: (octave). Interactive language for numerical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir diff --git a/math/octave/Makefile b/math/octave/Makefile index a06586b39246..835beaa4d40c 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -39,7 +39,6 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -lcblas -latlas" USE_GMAKE= yes GNU_CONFIGURE= yes -USE_REINPLACE= yes CONFIGURE_ARGS= --host=${GNU_HOST} \ --with-fftw --with-blas=${BLAS_LIBS} --with-lapack=-lalapack \ @@ -63,11 +62,10 @@ post-extract: @${RM} -f ${WRKSRC}/doc/interpreter/octave.info* @${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info* post-install: + @${SED} -e 's,%%PREFIX%%,${PREFIX},g ; \ + s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ + ${FILESDIR}/octave > ${WRKDIR}/octave ${RM} ${PREFIX}/bin/octave - @${CP} ${FILESDIR}/octave ${WRKDIR} - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g ; \ - s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ - ${WRKDIR}/octave ${INSTALL_SCRIPT} ${WRKDIR}/octave ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/liboctave.info ${PREFIX}/info install-info --entry='* Octave: (octave). Interactive language for numerical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir