diff options
| -rw-r--r-- | misc/dvorakng/Makefile | 3 | ||||
| -rw-r--r-- | misc/dvorakng/files/patch-Makefile | 28 |
2 files changed, 2 insertions, 29 deletions
diff --git a/misc/dvorakng/Makefile b/misc/dvorakng/Makefile index 31692d0..059a67a 100644 --- a/misc/dvorakng/Makefile +++ b/misc/dvorakng/Makefile @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_GETOPT_LONG= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCS= README TODO diff --git a/misc/dvorakng/files/patch-Makefile b/misc/dvorakng/files/patch-Makefile deleted file mode 100644 index 5401fd3..0000000 --- a/misc/dvorakng/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig Mon Mar 17 15:14:42 2003 -+++ Makefile Tue Apr 29 03:00:34 2003 -@@ -8,12 +8,10 @@ - - ### That's all ### - --CC = gcc --CXX = g++ - PROF = #-g0 -O2 --CFLAGS = $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH) --CXXFLAGS = $(CFLAGS) --LDFLAGS = $(PROF) -+CFLAGS += $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH) -+CXXFLAGS?= $(CFLAGS) -+LDFLAGS += $(PROF) - LIBS = -lncurses - - OBJECTS = dvorakng.o lessons.o -@@ -30,6 +28,9 @@ - - dvorakng: $(OBJECTS) - $(CXX) -s $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) -+ -+.cpp.o: -+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $> - - clean: - rm -f $(OBJECTS) $(TARGET) |
