old

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 0 insertions, 330 deletions

diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
index 5826500c1756..6ca83fd9d2b4 100644
--- a/games-action/atanks/Manifest
+++ b/games-action/atanks/Manifest
@@ -1,13 +1,7 @@
-AUX atanks-3.7-build.patch 4498 RMD160 eeccd72cc6efc5d7cec9b0b0e49dfe07b8fc849c SHA1 8d05663b5afa6618b6b038e688d765b40a117763 SHA256 3b87472e4b13d367f47faf3e45fda8f44bb2b1d6f2349de74546ee10edc13575
-AUX atanks-4.3-build.patch 5361 RMD160 a38d9840f197278f3adf57772410f27e3c26587d SHA1 4dc83166f7087f0f452a56558f5b0a7e5b360ea4 SHA256 b2cf4e15ae389ead074cce9d9d1979acee0665c5c0f89bc679b87dbd3e7eb146
 AUX atanks-4.5-build.patch 5361 RMD160 a38d9840f197278f3adf57772410f27e3c26587d SHA1 4dc83166f7087f0f452a56558f5b0a7e5b360ea4 SHA256 b2cf4e15ae389ead074cce9d9d1979acee0665c5c0f89bc679b87dbd3e7eb146
 AUX atanks-4.6-build.patch 5477 RMD160 2ccb1e58976e3c3d67ee2f37d8886596f51bd581 SHA1 90df1333e39bb6ac913faf02906273817ed0f0a2 SHA256 7f2962bd876c3b12578bab416e1c204fc10e2948a1b762758ee59badee121ca2
-DIST atanks-3.7-stable.tar.gz 1458056 RMD160 a0b776add1b7d2da337e5b7c1b6db04f37abff06 SHA1 2bf79c6ffd38fc35c6bbbf2ad487268c697a66cf SHA256 961450479d87482653acbcd733984d329bb8b260f2bf70a3c648d1297e02045a
-DIST atanks-4.3.tar.gz 3364593 RMD160 408e81b8fd5cbd387703db5d9dcddc9d55f2d845 SHA1 daa210489168ba62336319e664d9a395723d61c7 SHA256 043abb872dc784a3e3a2fe36b7a5049fa98f4ef03ee49b8db13688d9b9123399
 DIST atanks-4.5.tar.gz 3099988 RMD160 fcd4d4831e2b98c740338792a6bfd367d935f764 SHA1 fb79d8392a8fa7f4a04074519e4ecbef35a1e6dd SHA256 29fcf9d8c2493dd94d9bc0776e75b54e18a7cb3dd1fd40a07954112f8ebe6bdc
 DIST atanks-4.6.tar.gz 3118071 RMD160 8e7b48d6e27f060d22a3a980ca633c810b1d9501 SHA1 3c02683fd9aef76c5976f7c8f919a59ff7604aae SHA256 230fd102ffca083e30187c9fc86c098446f532a8cca5c035f852f7da5eb81a77
-EBUILD atanks-3.7.ebuild 895 RMD160 a1c311962a89805a184fce5829b6245a4c633751 SHA1 64a690096236bc5348f043a28e33b8187f1d933f SHA256 3f4c65e68380fa6b34e7f5f325ed58ea470b69d35ac7b6fbb480db2adc9c0981
-EBUILD atanks-4.3.ebuild 1035 RMD160 96de219ea7280b975e32ae52e888f4fd28836d06 SHA1 66cf98c301a454fb7425b191432d403437ab0cb2 SHA256 7b8f1762fa615136db7f7da3eafb78e40298c6e0b317aefb324154f9a785d2d9
 EBUILD atanks-4.5.ebuild 1033 RMD160 1db6eb410005a6511fd7eab873ea07ce88d8c4d4 SHA1 8fc726f5bef903fa5bf9ffbe965f9f97394d64ff SHA256 9f1c68e5b6944e9e1afdd0aa08131178bb4ef07e5432d7ddfc9c8470baffe9d3
 EBUILD atanks-4.6.ebuild 1035 RMD160 52b78630ffd4d5cdb1286531b9a5863050f74e7a SHA1 2f14f08e168e6fe28ba01fd096228dc781fdde0f SHA256 068ebe030e08967cd03761576050aef6ab97ab184b86735e49744437c26c0ee9
 MISC ChangeLog 7380 RMD160 478e861bf3e8694681abdd9e75c4ab6036f21ca4 SHA1 5cdca7c613438da1776dfeaf1766f85514f5f525 SHA256 d4da90dc2362a10814bd0c4e5edc322f9f1c31db384fe6d366228724ea97c1fa
diff --git a/games-action/atanks/atanks-3.7.ebuild b/games-action/atanks/atanks-3.7.ebuild
deleted file mode 100644
index 99be077364f3..000000000000
--- a/games-action/atanks/atanks-3.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-3.7.ebuild,v 1.3 2009/11/09 09:21:59 volkmar Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Worms and Scorched Earth-like game"
-HOMEPAGE="http://atanks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanks/${P}-stable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/allegro[X]"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_compile() {
-	emake \
-		BINDIR="${GAMES_BINDIR}"
-		INSTALLDIR="${GAMES_DATADIR}/${PN}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins *.dat *.txt || die "doins failed"
-	doicon ${PN}.png
-	make_desktop_entry atanks "Atomic Tanks"
-	dodoc Changelog README TODO
-	prepgamesdirs
-}
diff --git a/games-action/atanks/atanks-4.3.ebuild b/games-action/atanks/atanks-4.3.ebuild
deleted file mode 100644
index af4a2fdea920..000000000000
--- a/games-action/atanks/atanks-4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-4.3.ebuild,v 1.3 2010/03/24 14:11:22 ranger Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Worms and Scorched Earth-like game"
-HOMEPAGE="http://atanks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanks/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/allegro[X]"
-
-src_prepare() {
-	find . -type f -name ".directory" -exec rm -vf '{}' +
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake \
-		BINDIR="${GAMES_BINDIR}"
-		INSTALLDIR="${GAMES_DATADIR}/${PN}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r button misc missile sound stock tank tankgun text title \
-		unicode.dat *.txt \
-		|| die "doins failed"
-	doicon ${PN}.png
-	make_desktop_entry atanks "Atomic Tanks"
-	dodoc Changelog README TODO
-	prepgamesdirs
-}
diff --git a/games-action/atanks/files/atanks-3.7-build.patch b/games-action/atanks/files/atanks-3.7-build.patch
deleted file mode 100644
index 60819abfa801..000000000000
--- a/games-action/atanks/files/atanks-3.7-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ru atanks-3.7.orig/src/Makefile atanks-3.7/src/Makefile
---- atanks-3.7.orig/src/Makefile	2009-06-23 19:33:53.000000000 -0400
-+++ atanks-3.7/src/Makefile	2009-06-28 21:30:13.000000000 -0400
-@@ -3,9 +3,6 @@
- MODULES = atanks.o beam.o button.o environment.o explosion.o fade.o files.o globaldata.o \
-           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o update.o
- 
--CPP=g++
--CC=gcc
--LD=g++
- LIB=ar
- WINDRES=
- #FLAGS += -DDATA_DIR=\".\"
-@@ -14,10 +11,10 @@
- WFLAGS = 
- OFLAGS = 
- LFLAGS +=
--LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs`
- 
--CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
--# CFLAGS += -g	# debug vs optimize flags
-+CXXFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
-+# CXXFLAGS += -g	# debug vs optimize flags
- # No, let the user decide!
- 
- SRCS  = $(MODULES:.o=.cpp)
-@@ -34,67 +31,67 @@
- $(MODULES): Makefile
- 
- atanks.o: atanks.cpp
--	$(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- button.o: button.cpp
--	$(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- environment.o: environment.cpp
--	$(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- explosion.o: explosion.cpp
--	$(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- files.o: files.cpp
--	$(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- # No longer needed, as floattext is fully inline now!
- # floattext.o:
--# 	$(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+# 	$(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- globaldata.o: globaldata.cpp
--	$(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- missile.o: missile.cpp
--	$(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- teleport.o: teleport.cpp
--	$(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- physobj.o: physobj.cpp
--	$(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- player.o: player.cpp
--	$(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- tank.o: tank.cpp
--	$(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- team.o: team.cpp
--	$(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- virtobj.o: virtobj.cpp
--	$(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- fade.o: fade.cpp
--	$(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- perlin.o: perlin.cpp
--	$(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- sky.o: sky.cpp
--	$(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- satellite.o: satellite.cpp
--	$(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- update.o: update.cpp update.h
--	$(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- %.o: %.cpp %.h
--	$(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- $(OUTPUT): $(OBJECTS) $(MODULES)
--	$(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
-+	$(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
- 	# strip $(OUTPUT)
- 
- # dependencies:
diff --git a/games-action/atanks/files/atanks-4.3-build.patch b/games-action/atanks/files/atanks-4.3-build.patch
deleted file mode 100644
index a8a1443fc33e..000000000000
--- a/games-action/atanks/files/atanks-4.3-build.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -ru atanks-4.3.orig/src/Makefile atanks-4.3/src/Makefile
---- atanks-4.3.orig/src/Makefile	2010-01-14 20:24:24.000000000 -0500
-+++ atanks-4.3/src/Makefile	2010-01-15 14:49:28.167487376 -0500
-@@ -4,20 +4,16 @@
-           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
-           update.o network.o floattext.o land.o text.o client.o
- 
--CPP=g++
--CC=gcc
--LD=g++
- LIB=ar
- WINDRES=
--# FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
- FLAGS += -DDATA_DIR=\"${INSTALLDIR}\"  -Wno-write-strings -DNETWORK -DTHREADS
- OUTPUT = ../atanks
- WFLAGS = 
- OFLAGS = 
- LFLAGS +=
--LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs`
- 
--CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
-+CXXFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
- 
- SRCS  = $(MODULES:.o=.cpp)
- GLOBALS	= main.h imagedefs.h externs.h
-@@ -33,79 +29,79 @@
- $(MODULES): Makefile
- 
- atanks.o: atanks.cpp globals.h main.h menucontent.h
--	$(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- button.o: button.cpp button.h
--	$(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- client.o: client.h client.cpp
--	$(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
-+	$(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CXXFLAGS)
- 
- environment.o: environment.cpp environment.h
--	$(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- explosion.o: explosion.cpp explosion.h
--	$(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- files.o: files.cpp files.h text.h text.cpp
--	$(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- floattext.o: floattext.cpp floattext.h
--	$(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- globaldata.o: globaldata.cpp globaldata.h
--	$(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- land.o: land.cpp land.h globaldata.h environment.h
--	$(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- missile.o: missile.cpp missile.h
--	$(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- teleport.o: teleport.cpp teleport.h
--	$(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- physobj.o: physobj.cpp physobj.h
--	$(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- player.o: player.cpp player.h
--	$(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- tank.o: tank.cpp tank.h
--	$(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- team.o: team.cpp team.h
--	$(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- virtobj.o: virtobj.cpp virtobj.h
--	$(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- fade.o: fade.cpp
--	$(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- perlin.o: perlin.cpp
--	$(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- sky.o: sky.cpp sky.h
--	$(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- satellite.o: satellite.cpp satellite.h
--	$(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- text.o: text.cpp text.h
--	$(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- update.o: update.cpp update.h
--	$(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- network.o: network.cpp network.h
--	$(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- %.o: %.cpp %.h
--	$(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- $(OUTPUT): $(OBJECTS) $(MODULES)
--	$(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
-+	$(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
- 	# strip $(OUTPUT)
- 
- # dependencies: