openbsd-ports/x11/qt2/patches/patch-configs_openbsd-g++-shared

--- configs/openbsd-g++-shared.orig	Fri Sep 22 03:35:36 2000
+++ configs/openbsd-g++-shared	Fri Sep 22 04:05:43 2000
@@ -1,11 +1,11 @@
 # Compiling
-SYSCONF_CXX		= g++
+SYSCONF_CXX		= $(SYS_CXX)
 SYSCONF_CC		= gcc
 
 # 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
 
 # Compiling YACC output
 SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -17,46 +17,46 @@ SYSCONF_RPATH_OPENGL	= 
 
 # 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	= -lXext -lX11 -lm
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
 SYSCONF_LIBS_QT_OPENGL	= 
 # OpenGL
-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -L/usr/local/lib
 SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
 
 # Linking applications
-SYSCONF_LINK		= g++
-SYSCONF_LFLAGS		= 
+SYSCONF_LINK		= $(SYS_CXX)
+SYSCONF_LFLAGS		= -L/usr/X11R6/lib -L/usr/local/lib
 SYSCONF_LIBS		= 
 
 # Link flags for shared objects
 SYSCONF_LFLAGS_SHOBJ	= -Bshareable
 
 # Flags for threading
-SYSCONF_CFLAGS_THREAD	= 
-SYSCONF_CXXFLAGS_THREAD	= 
-SYSCONF_LFLAGS_THREAD	= 
+SYSCONF_CFLAGS_THREAD	= -pthread
+SYSCONF_CXXFLAGS_THREAD	= -pthread
+SYSCONF_LFLAGS_THREAD	= -pthread
 # SYSCONF_LIBS_THREAD	= ???
 
 # Meta-object compiler
 SYSCONF_MOC		= $(QTDIR)/bin/moc
 
 # UI compiler
-SYSCONF_UIC		= $(QTDIR)/bin/uic
+SYSCONF_UIC		= env LD_LIBRARY_PATH="$(QTDIR)/lib" $(QTDIR)/bin/uic
 
 # Linking shared libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
-SYSCONF_LINK_SHLIB	= ld
+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared
 SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
+SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
@@ -68,7 +68,7 @@ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDI
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
 				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
 # Compiling application source
-SYSCONF_CXXFLAGS	= -O2
+SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS)
 SYSCONF_CFLAGS		= -O2
 # Default link type (static linking is still be used where required)
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`--- configs/openbsd-g++-shared.orig Fri Sep 22 03:35:36 2000`
			`+++ configs/openbsd-g++-shared Fri Sep 22 04:05:43 2000`
			`@@ -1,11 +1,11 @@`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# Compiling`
			`-SYSCONF_CXX = g++`
			`+SYSCONF_CXX = $(SYS_CXX)`
			`SYSCONF_CC = gcc`

			`# Compiling with support libraries`
			`-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. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -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. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_CXXFLAGS_OPENGL = -I/usr/local/include`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`# Compiling YACC output`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`@@ -17,46 +17,46 @@ SYSCONF_RPATH_OPENGL =`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04: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. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L/usr/local/lib`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LIBS_X11 = -lXext -lX11 -lm`
			`# Qt, Qt+OpenGL`
			`SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)`
			`SYSCONF_LIBS_QT_OPENGL =`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# 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. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_LFLAGS_OPENGL = -L/usr/local/lib`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu`
			`# Yacc`
			`SYSCONF_LIBS_YACC =`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00
			`# Linking applications`
			`-SYSCONF_LINK = g++`
			`-SYSCONF_LFLAGS =`
			`+SYSCONF_LINK = $(SYS_CXX)`
			`+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LIBS =`

Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`# Link flags for shared objects`
			`SYSCONF_LFLAGS_SHOBJ = -Bshareable`

			`# Flags for threading`
			`-SYSCONF_CFLAGS_THREAD =`
			`-SYSCONF_CXXFLAGS_THREAD =`
			`-SYSCONF_LFLAGS_THREAD =`
			`+SYSCONF_CFLAGS_THREAD = -pthread`
			`+SYSCONF_CXXFLAGS_THREAD = -pthread`
			`+SYSCONF_LFLAGS_THREAD = -pthread`
			`# SYSCONF_LIBS_THREAD = ???`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
			`# Meta-object compiler`
			`SYSCONF_MOC = $(QTDIR)/bin/moc`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00
			`# UI compiler`
			`-SYSCONF_UIC = $(QTDIR)/bin/uic`
			`+SYSCONF_UIC = env LD_LIBRARY_PATH="$(QTDIR)/lib" $(QTDIR)/bin/uic`

			`# Linking shared libraries`
			`# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# - Place target in $(DESTDIR) - which has a trailing /`
			`# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)`
			`#`
			`-SYSCONF_LINK_SHLIB = ld`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`+SYSCONF_LINK_SHLIB = $(SYS_CXX) -shared`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)`
			-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) \| tsort` $(LIBS)
			`+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)`

			`# Linking static libraries`
			`# - Build the $(TARGET) library, eg. lib$(TARGET).a`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`@@ -68,7 +68,7 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDI`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \`
			`ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)`
			`# Compiling application source`
			`-SYSCONF_CXXFLAGS = -O2`
			`+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS)`
			`SYSCONF_CFLAGS = -O2`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`# Default link type (static linking is still be used where required)`
			`SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)`