diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-09 00:58:58 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-09 00:58:58 +0000 |
| commit | ae3accaccc074bec054513db9aca6171102a1198 (patch) | |
| tree | 4a21bd1311d28c72092b57db341368603bc45508 /russian/wmcyrx | |
| parent | Fix package build and package deinstall when not using GNOME. (diff) | |
Fix build on -current (build/link C++ code with ${CXX})
Notes
Notes:
svn path=/head/; revision=65869
Diffstat (limited to 'russian/wmcyrx')
| -rw-r--r-- | russian/wmcyrx/Makefile | 2 | ||||
| -rw-r--r-- | russian/wmcyrx/files/patch-aa | 41 |
2 files changed, 37 insertions, 6 deletions
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile index b2c870c354eb..6046b153771b 100644 --- a/russian/wmcyrx/Makefile +++ b/russian/wmcyrx/Makefile @@ -21,7 +21,7 @@ NO_INSTALL_MANPAGES= yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 400012 -MAKE_ENV= COPT="-fpermissive" +MAKE_ENV+= COPT="${CXXFLAGS} -fpermissive" .endif post-extract: diff --git a/russian/wmcyrx/files/patch-aa b/russian/wmcyrx/files/patch-aa index 19706df458a4..524d58fac839 100644 --- a/russian/wmcyrx/files/patch-aa +++ b/russian/wmcyrx/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Apr 28 18:17:54 1999 -+++ Makefile Thu May 25 18:58:23 2000 -@@ -1,11 +1,11 @@ +--- Makefile.orig Wed Apr 28 08:17:54 1999 ++++ Makefile Sun Sep 8 17:58:29 2002 +@@ -1,31 +1,34 @@ -I = -I/usr/openwin/include -I/usr/local/include +I = -I${X11BASE}/include -I${LOCALBASE}/include @@ -9,10 +9,41 @@ +L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext #CC = gcc -O $I -DXLIB_ILLEGAL_ACCESS -CC=CC -O $I -DXLIB_ILLEGAL_ACCESS -+CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS ++CXX ?= c++ ++CXXFLAGS= ${COPT} $I -DXLIB_ILLEGAL_ACCESS ++CC ?= cc ++CFLAGS+= $I -DXLIB_ILLEGAL_ACCESS -cyrx2: cyrx2.o cyrmapper.o +- $(CC) cyrx2.o cyrmapper.o -o cyrx2 $L +all: cyrx2.o cyrmapper.o - $(CC) cyrx2.o cyrmapper.o -o cyrx2 $L ++ $(CXX) $(CXXFLAGS) cyrx2.o cyrmapper.o -o cyrx2 $L cyrx: cyrx.o cyrmapper.o +- $(CC) -xildoff cyrx.o cyrmapper.o -o cyrx $L ++ $(CXX) $(CXXFLAGS) -xildoff cyrx.o cyrmapper.o -o cyrx $L + + cyrx2.o: cyrx2.cc +- $(CC) cyrx2.cc -c -o cyrx2.o ++ $(CXX) $(CXXFLAGS) cyrx2.cc -c -o cyrx2.o + + cyrx.o: cyrx.cc cyrmapper.h cyrl.h cyrx.icon cright.icon +- $(CC) cyrx.cc -c -o cyrx.o ++ $(CXX) $(CXXFLAGS) cyrx.cc -c -o cyrx.o + + + cyrmapper.o: cyrmapper.cc cyrmapper.h +- $(CC) cyrmapper.cc -c -o cyrmapper.o ++ $(CXX) $(CXXFLAGS) cyrmapper.cc -c -o cyrmapper.o + + test: test.cc +- $(CC) test.cc -o test -lg++ ++ $(CXX) $(CXXFLAGS) test.cc -o test -lg++ + +-test: gen.c +- $(CC) gen.c -o gen ++gen: gen.c ++ $(CC) $(CFLAGS) gen.c -o gen + + + tabs: |