openbsd-ports/x11/qt/patches/patch-configs_openbsd-g++-static

--- configs/openbsd-g++-static.orig	Sat Jun 24 14:42:12 2000
+++ configs/openbsd-g++-static	Sat Jun 24 14:49:55 2000
@@ -1,30 +1,30 @@
 # Compiling
-SYSCONF_CXX		= g++
+SYSCONF_CXX		= $(SYS_CXX)
 
 # Compiling with support libraries
-SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include -I/usr/local/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/local/include
 
 # Compiline YACC output
 SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
 
 # Linking with support libraries
 # X11
-SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib -L/usr/local/lib
 SYSCONF_LIBS_X11	= -lX11 -lXext
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 SYSCONF_LIBS_QT		= -lqt
 SYSCONF_LIBS_QT_OPENGL	= -lqgl
 # OpenGL
-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -L/usr/local/lib
 SYSCONF_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXext -lm
 # Yacc
 SYSCONF_LIBS_YACC	= 
 
 # Linking applications
-SYSCONF_LINK		= g++
+SYSCONF_LINK		= $(SYS_CXX)
 SYSCONF_LFLAGS		= 
 SYSCONF_LIBS		= 
 
@@ -53,10 +53,10 @@
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
 				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
 # Compiling application source
-SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
+SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS) -fno-strength-reduce
 # Compiling library source
-SYSCONF_CXXFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_LIB	= $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC
 # Compiling shared-object source
-SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_SHOBJ	= $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
 SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
- don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. - move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. - use better filenames for patches and include patches to setup the debug Qt config files. 2000-06-30 03:01:33 -04:00			`--- configs/openbsd-g++-static.orig Sat Jun 24 14:42:12 2000`
			`+++ configs/openbsd-g++-static Sat Jun 24 14:49:55 2000`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00			`@@ -1,30 +1,30 @@`
			`# Compiling`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`-SYSCONF_CXX = g++`
use EGCS to compile this port 1999-06-07 11:58:48 -04:00			`+SYSCONF_CXX = $(SYS_CXX)`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00
			`# Compiling with support libraries`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`-SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include`
- don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. - move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. - use better filenames for patches and include patches to setup the debug Qt config files. 2000-06-30 03:01:33 -04:00			`+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include`
			`-SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include`
- don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. - move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. - use better filenames for patches and include patches to setup the debug Qt config files. 2000-06-30 03:01:33 -04:00			`+SYSCONF_CXXFLAGS_OPENGL = -I/usr/local/include`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00
			`# Compiline YACC output`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00
			`# Linking with support libraries`
			`# X11`
			`-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib`
- don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. - move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. - use better filenames for patches and include patches to setup the debug Qt config files. 2000-06-30 03:01:33 -04:00			`+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L/usr/local/lib`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00			`SYSCONF_LIBS_X11 = -lX11 -lXext`
			`# Qt, Qt+OpenGL`
			`SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib`
			`SYSCONF_LIBS_QT = -lqt`
			`SYSCONF_LIBS_QT_OPENGL = -lqgl`
			`# OpenGL`
			`-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib`
- don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. - move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. - use better filenames for patches and include patches to setup the debug Qt config files. 2000-06-30 03:01:33 -04:00			`+SYSCONF_LFLAGS_OPENGL = -L/usr/local/lib`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00			`SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm`
			`# Yacc`
			`SYSCONF_LIBS_YACC =`

			`# Linking applications`
			`-SYSCONF_LINK = g++`
use EGCS to compile this port 1999-06-07 11:58:48 -04:00			`+SYSCONF_LINK = $(SYS_CXX)`
upgrade to Qt 1.42 1999-03-06 21:25:55 -05:00			`SYSCONF_LFLAGS =`
			`SYSCONF_LIBS =`

make Qt use the CXXFLAGS 1999-05-16 00:50:25 -04:00			`@@ -53,10 +53,10 @@`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \`
make Qt use the CXXFLAGS 1999-05-16 00:50:25 -04:00			`ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)`
			`# Compiling application source`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`-SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce`
use EGCS to compile this port 1999-06-07 11:58:48 -04:00			`+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS) -fno-strength-reduce`
make Qt use the CXXFLAGS 1999-05-16 00:50:25 -04:00			`# Compiling library source`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC`
use EGCS to compile this port 1999-06-07 11:58:48 -04:00			`+SYSCONF_CXXFLAGS_LIB = $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC`
make Qt use the CXXFLAGS 1999-05-16 00:50:25 -04:00			`# Compiling shared-object source`
- upgrade to Qt 1.44 - add patch to work around Internal Compiler errors on SPARC 1999-05-27 16:13:05 -04:00			`-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC`
use EGCS to compile this port 1999-06-07 11:58:48 -04:00			`+SYSCONF_CXXFLAGS_SHOBJ = $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC`
make Qt use the CXXFLAGS 1999-05-16 00:50:25 -04:00			`SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)`
			`SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)`