diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2004-05-28 08:23:11 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2004-05-28 08:23:11 +0000 |
| commit | 67fa6d9f6b7f02697a35b7944df693d86fc81f48 (patch) | |
| tree | 1f45fb37eafd6f434623c995cc9e8cb85dee5d25 /comms/aldo | |
| parent | 9392bfb311155176a17b1fa276b4d14d5b4494d4 (diff) | |
| download | ports-67fa6d9f6b7f02697a35b7944df693d86fc81f48.tar.gz ports-67fa6d9f6b7f02697a35b7944df693d86fc81f48.zip | |
Cleanup CC/CFLAGS handling & patch.
PR: ports/65839
Submitted by: Michael Johnson
Approved by: maintainer timeoute (busy)
Notes
Notes:
svn path=/head/; revision=110171
Diffstat (limited to 'comms/aldo')
| -rw-r--r-- | comms/aldo/Makefile | 4 | ||||
| -rw-r--r-- | comms/aldo/files/patch-Makefile | 24 |
2 files changed, 10 insertions, 18 deletions
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 7563b5544f2f..c24eb85e6a5e 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -16,6 +16,7 @@ COMMENT= Morse code training program USE_BZIP2= yes USE_GMAKE= yes +MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" PLIST_FILES= bin/aldo @@ -26,4 +27,7 @@ USE_GCC= 3.3 MAKE_ENV+= CXX="${CXX}" .endif +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/aldo ${PREFIX}/bin + .include <bsd.port.post.mk> diff --git a/comms/aldo/files/patch-Makefile b/comms/aldo/files/patch-Makefile index 06ec482e7138..afda28787a82 100644 --- a/comms/aldo/files/patch-Makefile +++ b/comms/aldo/files/patch-Makefile @@ -1,21 +1,9 @@ ---- Makefile.old Tue Mar 16 21:13:21 2004 -+++ Makefile Tue Mar 16 21:14:20 2004 -@@ -3,6 +3,8 @@ +--- Makefile.orig Sun May 9 22:32:36 2004 ++++ Makefile Sun May 9 22:32:49 2004 +@@ -1,5 +1,5 @@ + #MARCH=-march=athlon-tbird +-CXXFLAGS=-ansi -pedantic -Wall -O3 ++CXXFLAGS?=-ansi -pedantic -Wall -O3 includedir = $(CURDIR)/include CXXFLAGS+= -I$(includedir) -+PREFIX ?= /usr -+ - export MARCH CXXFLAGS - - VPATH = src $(SUBDIRS) -@@ -65,7 +67,7 @@ - - install: libs aldo uninstall - @strip aldo -- @install -m555 -oroot aldo /usr/bin/ -+ @install -m555 -oroot aldo $(PREFIX)/bin/ - - uninstall: -- @$(RM) /usr/bin/aldo -+ @$(RM) $(PREFIX)/bin/aldo |