diff options
| author | Diane Bruce <db@FreeBSD.org> | 2011-07-01 12:30:51 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2011-07-01 12:30:51 +0000 |
| commit | 6e6530fb1d25f3f0414594d3dc3ad61677f022c9 (patch) | |
| tree | 1a7adf36d49763f442362917c93da6e0e515b38f /comms/locator | |
| parent | e6167f250e4aa5e6681850232669c1ceaee927b5 (diff) | |
| download | ports-6e6530fb1d25f3f0414594d3dc3ad61677f022c9.tar.gz ports-6e6530fb1d25f3f0414594d3dc3ad61677f022c9.zip | |
- Unbreak clang build
- Replace hard coded g++ with ${CXX} in Makefile
- main() was missing int declaration
Notes
Notes:
svn path=/head/; revision=276780
Diffstat (limited to 'comms/locator')
| -rw-r--r-- | comms/locator/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | comms/locator/files/patch-locator.cc | 17 |
2 files changed, 29 insertions, 5 deletions
diff --git a/comms/locator/files/patch-Makefile b/comms/locator/files/patch-Makefile new file mode 100644 index 000000000000..d253d43e0a25 --- /dev/null +++ b/comms/locator/files/patch-Makefile @@ -0,0 +1,17 @@ +--- Makefile.orig 2011-07-01 08:24:26.000000000 -0400 ++++ Makefile 2011-07-01 08:24:53.000000000 -0400 +@@ -2,11 +2,11 @@ + all: $(PROGS) + + conv_fn.o: conv_fn.cc +- g++ -c conv_fn.cc ++ ${CXX} -c conv_fn.cc + + locator: locator.cc conv_fn.o +- g++ -c locator.cc +- g++ -o locator locator.o conv_fn.o ++ ${CXX} -c locator.cc ++ ${CXX} -o locator locator.o conv_fn.o + + clean:: + rm -f *~ *.o $(PROGS) diff --git a/comms/locator/files/patch-locator.cc b/comms/locator/files/patch-locator.cc index 28ea4c749e9c..d072f0259d46 100644 --- a/comms/locator/files/patch-locator.cc +++ b/comms/locator/files/patch-locator.cc @@ -1,8 +1,8 @@ ---- locator.cc.orig Thu Jun 30 15:21:49 2005 -+++ locator.cc Thu Jun 30 17:04:24 2005 -@@ -3,9 +3,13 @@ +--- locator.cc.orig 2001-07-29 07:33:02.000000000 -0400 ++++ locator.cc 2011-07-01 08:26:29.000000000 -0400 +@@ -3,15 +3,19 @@ /* Last change 29.07.2001 */ - + /* A few includes */ -#include <iostream.h> -#include <string.h> @@ -14,6 +14,13 @@ +using std::iostream; +using std::ostream; +using std::cout; - + /* A few definitions */ #define VERSION "0.1" + + /* Main program */ +-main(int argc, char *argv[]) { ++int main(int argc, char *argv[]) { + float c_long, c_lat; + char *locator; + |