From 8e8a05a9bf93dba48ad1eae1a897d93fca1f9303 Mon Sep 17 00:00:00 2001
From: will <will@FreeBSD.org>
Date: Mon, 6 Aug 2001 07:12:16 +0000
Subject: After making people wait 5 weeks, update this port to sync with the
 QT 2.3.1 upgrade.  Sorry!  8(

---
 devel/qt-designer/files/patch-Makefile |  8 ++++----
 devel/qt-designer/files/patch-aa       | 12 ++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/devel/qt-designer/files/patch-Makefile b/devel/qt-designer/files/patch-Makefile
index 8b18a9fc7af7..3d93c0866277 100644
--- a/devel/qt-designer/files/patch-Makefile
+++ b/devel/qt-designer/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile	Wed Jan 31 21:29:35 2001
-+++ Makefile.new	Sat Feb  3 20:21:49 2001
+--- Makefile	Mon Aug  6 01:55:43 2001
++++ Makefile.new	Mon Aug  6 01:56:45 2001
 @@ -25,11 +25,11 @@
  	-rm -f bin/moc
  	cp src/moc/moc bin/moc
@@ -9,8 +9,8 @@
  	cd tools; $(MAKE)
  
  symlinks: .buildopts
--	@cd include; rm -f q*.h; ln -s $(QTDIR)/src/*/q*.h .; ln -s $(QTDIR)/extensions/*/src/q*.h .; rm -f q*_p.h
-+	@cd include; rm -f q*.h; ln -s ../src/*/q*.h .; ln -s ../extensions/*/src/q*.h .; rm -f q*_p.h
+-	@cd include; rm -f q*.h;  for i in $(QTDIR)/src/*/q*.h $(QTDIR)/extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h
++	@cd include; rm -f q*.h;  for i in ../src/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h
  
  sub-src: src-moc src-mt .buildopts FORCE
  	cd src; $(MAKE)
diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa
index 695099386459..a58966744e42 100644
--- a/devel/qt-designer/files/patch-aa
+++ b/devel/qt-designer/files/patch-aa
@@ -27,16 +27,10 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -57,16 +57,14 @@
- #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
- #
- SYSCONF_LINK_SHLIB	= g++
+@@ -60,1 +60,1 @@
 -SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
 +SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
- SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
- 				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
- 				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
- 				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+@@ -65,6 +65,4 @@
  				 cd $(DESTDIR) && \
 -				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
 -				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
@@ -45,8 +39,6 @@
 +				 rm -f lib$(TARGET).so;\
 +				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
  
- # Linking static libraries
- #   - Build the $(TARGET) library, eg. lib$(TARGET).a
 @@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
-- 
cgit