Attachment #181764 for bug #218639

View | Details | Raw Unified | Return to bug 218639
Collapse All | Expand All

Lines 17-23 Link Here

(-)astro/geographiclib/Makefile (-1 / +3 lines)
17	LICENSE= MIT	17	LICENSE= MIT
18	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	18	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
19		19
20	BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive	20	BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive \
		21	${LOCALBASE}/bin/egrep:textproc/gnugrep
21		22
22	USES= autoreconf compiler:c++11-lang gmake libtool python	23	USES= autoreconf compiler:c++11-lang gmake libtool python
23	PORTDOCS= *	24	PORTDOCS= *
Lines 27-32 Link Here
27	MAKE_ARGS+= pythondir=${PYTHON_SITELIBDIR}/geographiclib	28	MAKE_ARGS+= pythondir=${PYTHON_SITELIBDIR}/geographiclib
28	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
29	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
		31	CONFIGURE_ENV+= ac_cv_path_EGREP=${LOCALBASE}/bin/egrep
30		32
31	OPTIONS_DEFINE= DOXYGEN PERL	33	OPTIONS_DEFINE= DOXYGEN PERL
32	OPTIONS_DEFAULT= DOXYGEN PERL\	34	OPTIONS_DEFAULT= DOXYGEN PERL\




--- src/Makefile.am.orig	2016-02-15 00:29:47 UTC
+++ src/Makefile.am
@@ -5,6 +5,10 @@
 
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -Wall -Wextra
 
+GREP = @GREP@
+EGREP = @EGREP@
+SED = @SED@
+
 lib_LTLIBRARIES = libGeographic.la
 
 libGeographic_la_LDFLAGS = \
@@ -91,11 +95,11 @@ libGeographic_la_SOURCES = Accumulator.c
 		../include/GeographicLib/Config.h
 
 ../include/GeographicLib/Config.h: ../include/GeographicLib/Config-ac.h
-	( egrep '\bVERSION\b|\bGEOGRAPHICLIB_|\bHAVE_LONG_DOUBLE\b' $< | \
-	  sed -e 's/ VERSION / GEOGRAPHICLIB_VERSION_STRING /' \
+	( ${EGREP} '\bVERSION\b|\bGEOGRAPHICLIB_|\bHAVE_LONG_DOUBLE\b' $< | \
+	  ${SED} -e 's/ VERSION / GEOGRAPHICLIB_VERSION_STRING /' \
 	      -e 's/ HAVE_LONG_DOUBLE / GEOGRAPHICLIB_HAVE_LONG_DOUBLE /'; \
-	  grep WORDS_BIGENDIAN $< | tail -1 | \
-	  sed -e 's/ WORDS_BIGENDIAN / GEOGRAPHICLIB_WORDS_BIGENDIAN /' ) > $@
+	  ${GREP} WORDS_BIGENDIAN $< | tail -1 | \
+	  ${SED} -e 's/ WORDS_BIGENDIAN / GEOGRAPHICLIB_WORDS_BIGENDIAN /' ) > $@
 
 $(libGeographic_la_OBJECTS): ../include/GeographicLib/Config.h
 

Return to bug 218639

Line 0 Link Here

(-)astro/geographiclib/files/patch-src_Makefile.am (+29 lines)
	1	--- src/Makefile.am.orig 2016-02-15 00:29:47 UTC
	2	+++ src/Makefile.am
	3	@@ -5,6 +5,10 @@
	4
	5	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -Wall -Wextra
	6
	7	+GREP = @GREP@
	8	+EGREP = @EGREP@
	9	+SED = @SED@
	10	+
	11	lib_LTLIBRARIES = libGeographic.la
	12
	13	libGeographic_la_LDFLAGS = \
	14	@@ -91,11 +95,11 @@ libGeographic_la_SOURCES = Accumulator.c
	15	../include/GeographicLib/Config.h
	16
	17	../include/GeographicLib/Config.h: ../include/GeographicLib/Config-ac.h
	18	- ( egrep '\bVERSION\b\|\bGEOGRAPHICLIB_\|\bHAVE_LONG_DOUBLE\b' $< \| \
	19	- sed -e 's/ VERSION / GEOGRAPHICLIB_VERSION_STRING /' \
	20	+ ( ${EGREP} '\bVERSION\b\|\bGEOGRAPHICLIB_\|\bHAVE_LONG_DOUBLE\b' $< \| \
	21	+ ${SED} -e 's/ VERSION / GEOGRAPHICLIB_VERSION_STRING /' \
	22	-e 's/ HAVE_LONG_DOUBLE / GEOGRAPHICLIB_HAVE_LONG_DOUBLE /'; \
	23	- grep WORDS_BIGENDIAN $< \| tail -1 \| \
	24	- sed -e 's/ WORDS_BIGENDIAN / GEOGRAPHICLIB_WORDS_BIGENDIAN /' ) > $@
	25	+ ${GREP} WORDS_BIGENDIAN $< \| tail -1 \| \
	26	+ ${SED} -e 's/ WORDS_BIGENDIAN / GEOGRAPHICLIB_WORDS_BIGENDIAN /' ) > $@
	27
	28	$(libGeographic_la_OBJECTS): ../include/GeographicLib/Config.h
	29