Oops, commit the new patch, not the patch to the previous patch.

svn path=/head/; revision=18726

astro/xglobe/files/patch-aa

@@ -1,23 +1,42 @@
-Index: patches/patch-aa
+--- Makefile.orig	Mon Apr 19 18:51:04 1999
-===================================================================
++++ Makefile	Sun May  9 12:57:37 1999
-RCS file: /home/ncvs/ports/astro/xglobe/patches/patch-aa,v
+@@ -4,29 +4,31 @@
-retrieving revision 1.2
+ 
-diff -u -r1.2 patch-aa
+ ####### Installation directory
---- patch-aa	1999/05/01 08:09:05	1.2
+ 
-+++ patch-aa	1999/05/09 03:27:50
+-XGLOBE_DIR     = /usr/local
-@@ -1,5 +1,5 @@
++XGLOBE_DIR     = $(PREFIX)
- --- Makefile.orig	Mon Apr 19 18:51:04 1999
+ XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
--+++ Makefile	Sat May  1 17:17:30 1999
+ XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
-++++ Makefile	Sun May  9 12:57:37 1999
+ 
- @@ -4,29 +4,31 @@
+ ####### Library directories - you may need to modify these
-  
+ 
-  ####### Installation directory
+-X11_INCLUDE_DIR = /usr/X11R6/include
-@@ -14,7 +14,7 @@
+-QT_INCLUDE_DIR  = /usr/lib/qt/include
- -X11_INCLUDE_DIR = /usr/X11R6/include
++X11_INCLUDE_DIR = $(X11BASE)/include
- -QT_INCLUDE_DIR  = /usr/lib/qt/include
++QT_INCLUDE_DIR  = $(X11BASE)/include/X11/qt
- +X11_INCLUDE_DIR = $(X11BASE)/include
+ 
--+QT_INCLUDE_DIR  = $(X11BASE)/share/include/X11/qt
+-QT_LIB_DIR      = /usr/lib/qt/lib
-++QT_INCLUDE_DIR  = $(X11BASE)/include/X11/qt
+-X11_LIB_DIR     = /usr/X11R6/lib
-  
++QT_LIB_DIR      = $(X11BASE)/lib
- -QT_LIB_DIR      = /usr/lib/qt/lib
++X11_LIB_DIR     = $(X11BASE)/lib
- -X11_LIB_DIR     = /usr/X11R6/lib
+ 
+ 
+ ####### Compiler and tools
+ 
+-CPP     = g++
+-LINK    = g++
++CXX	?= g++
++CPP     = $(CXX)
++LINK    = $(CXX)
+ MOC     = moc
+ INSTALL = install
+ 
+ ####### compile and link options
+ 
+-CFLAGS       = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall
++CFLAGS       ?= -O2
++CFLAGS       += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall
+ 
+ LFLAGS       =
+