freebsd-ports/x11-toolkits/qt145/files/patch-aa

--- configs/freebsd-g++-shared	Fri Feb 26 12:01:59 1999
+++ configs/freebsd-g++-shared.new	Sun Jan  2 17:11:37 2000
@@ -25,7 +25,7 @@
 
 # Linking applications
 SYSCONF_LINK		= g++
-SYSCONF_LFLAGS		= 
+SYSCONF_LFLAGS		= %%CXXFLAGS%%
 SYSCONF_LIBS		= 
 
 # Link flags shared objects
@@ -40,15 +40,13 @@
 #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
 #
 SYSCONF_LINK_SHLIB	= g++
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.3
+SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared %%CXXFLAGS%% \
 				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
 				     $(OBJECTS) $(OBJMOC) $(LIBS); \
 				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
 				 cd $(DESTDIR); \
-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
@@ -59,11 +57,11 @@
 SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -pipe -O2 -fno-strength-reduce
+SYSCONF_CXXFLAGS	= %%CXXFLAGS%% -fno-strength-reduce
 # Compiling library source
-SYSCONF_CXXFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_LIB	= %%CXXFLAGS%% -fno-strength-reduce -fPIC
 # Compiling shared-object source
-SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_SHOBJ	= %%CXXFLAGS%% -fno-strength-reduce -fPIC
 # Default link type (stati linking is still be used where required)
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
 SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`--- configs/freebsd-g++-shared Fri Feb 26 12:01:59 1999`
			`+++ configs/freebsd-g++-shared.new Sun Jan 2 17:11:37 2000`
			`@@ -25,7 +25,7 @@`
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net> 1999-02-25 08:25:17 +00:00
			`# Linking applications`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`SYSCONF_LINK = g++`
			`-SYSCONF_LFLAGS =`
			`+SYSCONF_LFLAGS = %%CXXFLAGS%%`
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net> 1999-02-25 08:25:17 +00:00			`SYSCONF_LIBS =`

Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`# Link flags shared objects`
			`@@ -40,15 +40,13 @@`
Convert to ELF and pickup a bunch of missing header files in pkg/PLIST. 1998-09-27 17:46:51 +00:00			`# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00			`#`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`SYSCONF_LINK_SHLIB = g++`
			`-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)`
			`-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \`
			`+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.3`
			`+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared %%CXXFLAGS%% \`
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after a short test period to make sure qt142 is an adequate replacement. Note #1: I changed it to install libqt.so.2.0. qt141 or newer are required for some software (most notably kde). We missed the chance to change the shlib number in qt141 so I'm doing it now. Note #2: After talking with Peter Wemm, I decided not to add extra -rpath directives. The fix for kdesupport and other build problems are forthcoming in ld. 1999-01-07 10:58:33 +00:00			`$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \`
			`$(OBJECTS) $(OBJMOC) $(LIBS); \`
			`mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \`
			`cd $(DESTDIR); \`
			`- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \`
			`- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \`
			`- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)`
			`+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00
			`# Linking static libraries`
			`# - Build the $(TARGET) library, eg. lib$(TARGET).a`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`@@ -59,11 +57,11 @@`
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net> 1999-02-25 08:25:17 +00:00			`SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00			`# Compiling application source`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`-SYSCONF_CXXFLAGS = -pipe -O2 -fno-strength-reduce`
			`+SYSCONF_CXXFLAGS = %%CXXFLAGS%% -fno-strength-reduce`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00			`# Compiling library source`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC`
			`+SYSCONF_CXXFLAGS_LIB = %%CXXFLAGS%% -fno-strength-reduce -fPIC`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00			`# Compiling shared-object source`
Upgrade qt142 to qt145 after repository copy. PR: 16844 Submitted by: andrews@technologist.com (new maintainer) 2000-02-21 06:45:29 +00:00			`-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC`
			`+SYSCONF_CXXFLAGS_SHOBJ = %%CXXFLAGS%% -fno-strength-reduce -fPIC`
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks. 1998-07-20 16:51:18 +00:00			`# Default link type (stati linking is still be used where required)`
			`SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)`
			`SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)`