Upgrade KDE to 2.2.2:

 * General:
 	- Support for objprelink.
 	- Hack for autoconf 2.13/automake 1.4.  Note that we can't use
	  the standard USE_AUTO* because they change things in work/*;
	  KDE has its own way of doing that.
 	- Light cleanup of extra dirs in the PLISTs provided by
	   my mkplistpkg[1] script.
 	- Speedups of both compile and runtime through the usage of
	  --disable-debug and --enable-final.  The latter did not work
	  with the kdemultimedia package, unfortunately.
	- Patch updates.
 * audio/kdemultimedia2:
	- Patch to fix KSCD on FreeBSD[2].  It works very well now.
 * deskutils/kdepim:
 	- Enable kpilot[3].  Pull in the latest pilot-link stuff.
 * devel/kdesdk,
 * devel/kdevelop:
 	- No specific changes.
 * devel/qt-designer:
 	- Make this port depend almost entirely on qt23 to make it more
	  maintainable, so I don't have to keep hacking the patches to
	  get them to apply.
 * editors/koffice,
 * games/kdegames,
 * graphics/kdegraphics:
 	- No specific changes.
 * misc/kdeaddons:
	- SDL is required now.  Cull SDL PLIST_SUB and such.
	- Fix breakage from hardcoding "sdl-config".
 * misc/kdeutils2:
	- Fix problem with klaptopdaemon[4] where it didn't properly
	  display the battery time.  This patch is untested, but applied.
 * net/kdenetwork2:
	- Fix DCC for KSIRC[5].
	- Remove ktalkd from the build.  It requires some weird thing
	  in the configure script that I don't have time to look at.
 * sysutils/kdeadmin:
	- No specific changes.
 * textproc/kdoc:
	- Remove bogus requirement that kdoc requires Perl 5.6.0; it sure
	  seems to operate fine with >= 5.005.  But I'll let time tell.
 * www/quanta:
	- No specific changes (--disable-debug support only).
 * x11/kde2:
	- No specific changes.
 * x11/kdebase2:
	- Fix ksysguard compile by merging the files from the HEAD branch
	  of KDE CVS that were missing at release time for FreeBSD[6].  :\
 * x11/kdelibs2:
	- Recognize CUPS' spinoff[7].
	- Add libxslt dependency since it was removed from kdelibs.
	- Fix libxml compile problems[8] (accomplished by upgrading).
	- Remove libkformula from port Makefile; this library has been
	  spun off into koffice.
	- Fix mode problems with DCOP[9].  This allows you to save files
	  properly.  It also seems to be a FreeBSD specific problem.
	- Fix bashisms in kdeprint/imagetops script[10].
 * x11-clocks/kdetoys2:
 	- No specific changes.
 * x11-toolkits/qt23:
	- Do NOT upgrade to QT 2.3.2[11].
	- Allow devel/qt-designer to depend on this port entirely for the
	  patches by adding a perlre to accomplish this.
 * x11-wm/kdeartwork:
	- No specific changes.

Thanks to the FreeBSD/KDE[1] team[12] who helped me test these out!

[1]  http://freebsd.kde.org/;
     http://www.databits.net/cgi-bin/cvsweb.cgi/scripts/portbuild/mkplistpkg
[2]  Submitted by:	Matthew Holmes <matt@speakeasy.net>
[3]  PR:		31914
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[4]  PR:		28475
     Submitted by:	Arun Sharma <arun@sharmas.dhs.org>
[5]  Submitted by:	Luc Morin <luc_m@videotron.ca>
[6]  Found at:	http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/
[7]  PR:		32321
     Reported by:	gad
     Submitted by:	James A. Halstead <jah4007@cs.rit.edu>
[8]  PR:		32055
     Reported by:	William Richard <wrichard@trivalley.com>, others
[9]  PR:		31629
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[10] PR:		32358
     Submitted by:	Alexander N. Kabaev <ak03@gte.com>
[11] PR:		31809
     Requested by:	Nathan Ahlstrom <nrahlstr@winternet.com> (denied)
[12] http://freebsd.kde.org/contact.shtml;
     http://lists.csociety.org/pipermail/kde-freebsd;
     http://lists.csociety.org/listinfo/kde-freebsd

19 files changed, 267 insertions, 348 deletions

diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
index 520bb4d9af75..4a70fd498429 100644
--- a/devel/kdesdk/Makefile
+++ b/devel/kdesdk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,15 +14,36 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14 \
+		objprelink:${PORTSDIR}/devel/objprelink
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
 
 USE_KDEBASE_VER=2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde2
 
 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
 
+pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+		${GMAKE} -f Makefile.cvs
+
 .include <bsd.port.mk>
diff --git a/devel/kdesdk/distinfo b/devel/kdesdk/distinfo
index f0b1583dfcda..91704129044c 100644
--- a/devel/kdesdk/distinfo
+++ b/devel/kdesdk/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a
+MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 520bb4d9af75..4a70fd498429 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,15 +14,36 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14 \
+		objprelink:${PORTSDIR}/devel/objprelink
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
 
 USE_KDEBASE_VER=2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde2
 
 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
 
+pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+		${GMAKE} -f Makefile.cvs
+
 .include <bsd.port.mk>
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index f0b1583dfcda..91704129044c 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a
+MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 520bb4d9af75..4a70fd498429 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,15 +14,36 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14 \
+		objprelink:${PORTSDIR}/devel/objprelink
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
 
 USE_KDEBASE_VER=2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde2
 
 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
 
+pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+		${GMAKE} -f Makefile.cvs
+
 .include <bsd.port.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index f0b1583dfcda..91704129044c 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-2.2.1.tar.bz2) = 1744ab2c6d1708530de53547eb95f28a
+MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 76dba19e0f0e..7f59f84a6aa7 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/2.2.1/src
+MASTER_SITE_SUBDIR=	stable/2.2.2/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext \
+		autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14 \
+		objprelink:${PORTSDIR}/devel/objprelink
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 .if defined(WITH_OPTIONAL_DEPENDS)
 RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
@@ -33,9 +36,15 @@ RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html
+CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html \
+		--enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 
 pre-everything::
 .if !defined(WITH_OPTIONAL_DEPENDS)
@@ -45,6 +54,17 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
+pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+		${GMAKE} -f Makefile.cvs
+
 pre-build:
 	${PERL} -pi -e "s@libkdeui.so.3@libkdeui.so@g" ${WRKSRC}/kdevelop/main.cpp
 
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index aa02412303e4..7e3a9f5448f1 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdevelop-2.0.1.tar.bz2) = f64d135ee64715ffe75c81106a39d934
+MD5 (KDE/kdevelop-2.0.2.tar.bz2) = ba97e043cd6819c8bd77e342ee0af6fc
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 66490d8acfa6..489dd3fdd5cf 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -246,10 +246,8 @@ share/icons/hicolor/16x16/apps/kdevelop.png
 share/icons/hicolor/32x32/apps/kdevelop.png
 share/icons/hicolor/48x48/apps/kdevelop.png
 share/mimelnk/application/x-kdevelop-project.desktop
-@dirrm share/mimelnk/application
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kdevelop/tutorial
 @dirrm share/doc/HTML/en/kdevelop/reference/C
 @dirrm share/doc/HTML/en/kdevelop/reference
@@ -257,7 +255,6 @@ share/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/doc/HTML/en/kdevelop/kde_libref
 @dirrm share/doc/HTML/en/kdevelop/about
 @dirrm share/doc/HTML/en/kdevelop
-@dirrm share/doc/HTML/en
 @dirrm share/apps/kdevelop/tools
 @dirrm share/apps/kdevelop/templates
 @dirrm share/apps/kdevelop/pics
@@ -268,5 +265,5 @@ share/mimelnk/application/x-kdevelop-project.desktop
 @dirrm share/apps/kdevelop/icons/hicolor
 @dirrm share/apps/kdevelop/icons
 @dirrm share/apps/kdevelop
-@dirrm share/apps/kconf_update
 @dirrm share/applnk/Development
+@dirrm share/applnk
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile
index 0ca0b97b5d70..d862aa6c16ae 100644
--- a/devel/qt-designer/Makefile
+++ b/devel/qt-designer/Makefile
@@ -16,12 +16,22 @@ post-patch:
 do-build:
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
+qt-pre-configure:
+	${PERL} -pi -e 's@DESTDIR = \$$\(QTDIR\)/bin@DESTDIR = ../../../bin@g' \
+		${WRKSRC}/tools/designer/designer/Makefile.in
+	${PERL} -pi -e 's@sub-tools: sub-src @sub-tools: @g' ${WRKSRC}/Makefile
+	${PERL} -pi -e "s@\$$(MAKE) util@@g; s@\$$(MAKE) uic@@g; \
+			s@util \\\@designer@g; s@uic \\\@@g; \
+			s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in
+	${PERL} -pi -e "s@getenv\( \"QTDIR\" \)@QT_PREFIX@g; \
+		s@/tools/designer/templates@/share/qt2/designer/templates@g" \
+		${WRKSRC}/tools/designer/designer/newformimpl.cpp
+
 .include "${MASTERDIR}/Makefile"
 
 LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
 
 WRKSRC=		${WRKDIR}/qt-${PORTVERSION}
-PATCHDIR=	${.CURDIR}/files
 PATCH_WRKSRC=	${WRKSRC}
 PKGDIR=		${.CURDIR}
 MAKE_ENV=	QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX}
diff --git a/devel/qt-designer/files/patch-Makefile b/devel/qt-designer/files/patch-Makefile
deleted file mode 100644
index 3d93c0866277..000000000000
--- a/devel/qt-designer/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
- 
--sub-tools: sub-src FORCE
-+sub-tools: FORCE
- 	cd tools; $(MAKE)
- 
- symlinks: .buildopts
--	@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
deleted file mode 100644
index a58966744e42..000000000000
--- a/devel/qt-designer/files/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
---- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
-+++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
-@@ -6,7 +6,7 @@
- 
- # Compiling with support libraries
- SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
--SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
- SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
- 
- # Compiling YACC output
-@@ -23,7 +23,7 @@
- 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		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
- SYSCONF_LIBS_QT_OPENGL	= 
- # OpenGL
- SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -46,7 +46,7 @@
- SYSCONF_LIBS_THREAD	= 
- 
- # Meta-object compiler
--SYSCONF_MOC		= $(QTDIR)/bin/moc
-+SYSCONF_MOC		= $(QTDIR)/bin/moc2
- 
- # UI compiler
- SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -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)
-@@ -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; \
--				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
--				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+				 rm -f lib$(TARGET).so;\
-+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
- 
-@@ -77,8 +75,8 @@
- 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 -fno-exceptions -O2
--SYSCONF_CFLAGS		= -pipe -fno-exceptions -O2
-+SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
-+SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
- # Default link type (static linking is still be used where required)
- SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
- SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/devel/qt-designer/files/patch-ag b/devel/qt-designer/files/patch-ag
deleted file mode 100644
index 0347913d3a31..000000000000
--- a/devel/qt-designer/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/designer/designer/help.cpp	2000/11/18 17:43:54	1.1
-+++ tools/designer/designer/help.cpp	2000/11/18 17:46:09
-@@ -84,8 +84,8 @@
-     browser = new TextBrowser( this );
-     browser->mimeSourceFactory()->setFilePath( home );
-     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
--    browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/tools/designer/manual" );
--    browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/doc/html/designer" );
-+    browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/qt2/designer/manual" );
-+    browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/doc/qt2/html/designer" );
-     browser->mimeSourceFactory()->addFilePath( parent->documentationPath() );
-     connect( browser, SIGNAL( textChanged() ),
- 	     this, SLOT( textChanged() ) );
diff --git a/devel/qt-designer/files/patch-ah b/devel/qt-designer/files/patch-ah
deleted file mode 100644
index 1bf90ba1c6f2..000000000000
--- a/devel/qt-designer/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/designer/designer/helpdialogimpl.cpp	2000/11/18 19:37:35	1.1
-+++ tools/designer/designer/helpdialogimpl.cpp	2000/11/18 19:38:57
-@@ -569,9 +569,9 @@
-     delete lst;
- 
- 
--    QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html";
-+    QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html";
-     if ( !QFile::exists( manualdir ) )
--	manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html";
-+	manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html";
-     QFile file( manualdir );
-     if ( !file.open( IO_ReadOnly ) )
- 	return;
diff --git a/devel/qt-designer/files/patch-ai b/devel/qt-designer/files/patch-ai
deleted file mode 100644
index 8ba1cf2ee470..000000000000
--- a/devel/qt-designer/files/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/designer/designer/newformimpl.cpp	2000/11/18 17:43:54	1.1
-+++ tools/designer/designer/newformimpl.cpp	2000/11/18 17:48:49
-@@ -33,9 +33,9 @@
- {
-     if ( QFileInfo( "../templates" ).exists() )
- 	return "../templates";
--    QString qtdir = getenv( "QTDIR" );
--    if ( QFileInfo( qtdir + "/tools/designer/templates" ).exists() )
--	return qtdir + "/tools/designer/templates";
-+    QString qtdir = QT_PREFIX;
-+    if ( QFileInfo( qtdir + "/share/qt2/designer/templates" ).exists() )
-+	return qtdir + "/share/qt2/designer/templates";
-     return t;
- }
- 
diff --git a/devel/qt-designer/files/patch-aj b/devel/qt-designer/files/patch-aj
deleted file mode 100644
index eddf54f011d9..000000000000
--- a/devel/qt-designer/files/patch-aj
+++ /dev/null
@@ -1,32 +0,0 @@
---- tools/designer/designer/mainwindow.cpp	2000/11/18 17:50:58	1.1
-+++ tools/designer/designer/mainwindow.cpp	2000/11/18 17:53:21
-@@ -125,7 +125,7 @@
-     : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ),
- #endif
-       grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
--      docPath( "$QTDIR/doc/html" ), client( asClient )
-+      docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient )
- {
-     self = this;
-     setIcon( PixmapChooser::loadPixmap( "logo" ) );
-@@ -3144,7 +3144,7 @@
- 	QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) );
- 	return;
-     }
--    fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" );
-+    fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" );
-     fn.append( ".ui" );
-     QFile f( fn );
-     if ( !f.open( IO_WriteOnly ) ) {
-@@ -3236,9 +3236,9 @@
- 
- void MainWindow::openHelpForDialog( const QString &dia )
- {
--    QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html";
-+    QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html";
-     if ( !QFile::exists( manualdir ) )
--	manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html";
-+	manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html";
-     QFile file( manualdir );
-     if ( !file.open( IO_ReadOnly ) )
- 	return;
diff --git a/devel/qt-designer/files/patch-designer::Makefile.in b/devel/qt-designer/files/patch-designer::Makefile.in
deleted file mode 100644
index 52f3cca45258..000000000000
--- a/devel/qt-designer/files/patch-designer::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/designer/designer/Makefile.in	Wed Jan 31 21:29:50 2001
-+++ tools/designer/designer/Makefile.in.new	Sat Feb  3 20:41:04 2001
-@@ -14,7 +14,7 @@
- 
- ####### Target
- 
--DESTDIR = $(QTDIR)/bin/
-+DESTDIR = ../../../bin/
- VER_MAJ = 1
- VER_MIN = 0
- VER_PATCH = 0
diff --git a/devel/qt-designer/files/patch-designer:Makefile.in b/devel/qt-designer/files/patch-designer:Makefile.in
deleted file mode 100644
index 498cff3955af..000000000000
--- a/devel/qt-designer/files/patch-designer:Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- tools/designer/Makefile.in	Wed Jan 31 21:29:47 2001
-+++ tools/designer/Makefile.in.new	Sat Feb  3 20:04:32 2001
-@@ -5,13 +5,9 @@
- #    Template: subdirs
- #############################################################################
- 
--SUBDIRS =	util \
--		uic \
--		designer
-+SUBDIRS =	designer
- 
- all:
--	$(MAKE) util
--	$(MAKE) uic
- 	$(MAKE) designer
- 
- 
diff --git a/devel/qt-designer/pkg-plist b/devel/qt-designer/pkg-plist
index 2e4183356173..c4612f2176b3 100644
--- a/devel/qt-designer/pkg-plist
+++ b/devel/qt-designer/pkg-plist
@@ -1,165 +1,164 @@
-bin/designer
-share/doc/qt2/html/designer/arrows/home.png
-share/doc/qt2/html/designer/arrows/left.png
-share/doc/qt2/html/designer/arrows/right.png
-share/doc/qt2/html/designer/arrows/up.png
-share/doc/qt2/html/designer/book1.html
-share/doc/qt2/html/designer/chap10_1.html
-share/doc/qt2/html/designer/chap1_1.html
-share/doc/qt2/html/designer/chap2_1.html
-share/doc/qt2/html/designer/chap2_2.html
-share/doc/qt2/html/designer/chap2_3.html
-share/doc/qt2/html/designer/chap2_4.html
-share/doc/qt2/html/designer/chap3_1.html
-share/doc/qt2/html/designer/chap3_2.html
-share/doc/qt2/html/designer/chap3_3.html
-share/doc/qt2/html/designer/chap3_4.html
-share/doc/qt2/html/designer/chap4_1.html
-share/doc/qt2/html/designer/chap4_2.html
-share/doc/qt2/html/designer/chap5_1.html
-share/doc/qt2/html/designer/chap5_2.html
-share/doc/qt2/html/designer/chap5_3.html
-share/doc/qt2/html/designer/chap5_4.html
-share/doc/qt2/html/designer/chap5_5.html
-share/doc/qt2/html/designer/chap5_6.html
-share/doc/qt2/html/designer/chap6_1.html
-share/doc/qt2/html/designer/chap6_2.html
-share/doc/qt2/html/designer/chap6_3.html
-share/doc/qt2/html/designer/chap6_4.html
-share/doc/qt2/html/designer/chap6_5.html
-share/doc/qt2/html/designer/chap6_6.html
-share/doc/qt2/html/designer/chap6_7.html
-share/doc/qt2/html/designer/chap7_1.html
-share/doc/qt2/html/designer/chap7_10.html
-share/doc/qt2/html/designer/chap7_11.html
-share/doc/qt2/html/designer/chap7_12.html
-share/doc/qt2/html/designer/chap7_13.html
-share/doc/qt2/html/designer/chap7_14.html
-share/doc/qt2/html/designer/chap7_15.html
-share/doc/qt2/html/designer/chap7_16.html
-share/doc/qt2/html/designer/chap7_2.html
-share/doc/qt2/html/designer/chap7_3.html
-share/doc/qt2/html/designer/chap7_4.html
-share/doc/qt2/html/designer/chap7_5.html
-share/doc/qt2/html/designer/chap7_6.html
-share/doc/qt2/html/designer/chap7_7.html
-share/doc/qt2/html/designer/chap7_8.html
-share/doc/qt2/html/designer/chap7_9.html
-share/doc/qt2/html/designer/chap8_1.html
-share/doc/qt2/html/designer/chap9_1.html
-share/doc/qt2/html/designer/chap9_2.html
-share/doc/qt2/html/designer/chap9_3.html
-share/doc/qt2/html/designer/chap9_4.html
-share/doc/qt2/html/designer/chap9_5.html
-share/doc/qt2/html/designer/chap9_6.html
-share/doc/qt2/html/designer/colophon.html
-share/doc/qt2/html/designer/feedback.html
-share/doc/qt2/html/designer/figures/aboutdialog.png
-share/doc/qt2/html/designer/figures/adjustsize.png
-share/doc/qt2/html/designer/figures/breaklayout.png
-share/doc/qt2/html/designer/figures/buttongroup.png
-share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png
-share/doc/qt2/html/designer/figures/checkbox.png
-share/doc/qt2/html/designer/figures/combobox.png
-share/doc/qt2/html/designer/figures/connectionedit.png
-share/doc/qt2/html/designer/figures/connections.png
-share/doc/qt2/html/designer/figures/connectionviewer.png
-share/doc/qt2/html/designer/figures/connecttool.png
-share/doc/qt2/html/designer/figures/customwidget.png
-share/doc/qt2/html/designer/figures/customwidgets.png
-share/doc/qt2/html/designer/figures/editcopy.png
-share/doc/qt2/html/designer/figures/editcustomwidgets.png
-share/doc/qt2/html/designer/figures/editcut.png
-share/doc/qt2/html/designer/figures/editdelete.png
-share/doc/qt2/html/designer/figures/editgrid.png
-share/doc/qt2/html/designer/figures/edithlayout.png
-share/doc/qt2/html/designer/figures/editiconview.png
-share/doc/qt2/html/designer/figures/editlistbox.png
-share/doc/qt2/html/designer/figures/editlistview.png
-share/doc/qt2/html/designer/figures/editlower.png
-share/doc/qt2/html/designer/figures/editmultiline.png
-share/doc/qt2/html/designer/figures/editpaste.png
-share/doc/qt2/html/designer/figures/editraise.png
-share/doc/qt2/html/designer/figures/editslots.png
-share/doc/qt2/html/designer/figures/emptydialog.png
-share/doc/qt2/html/designer/figures/f001.png
-share/doc/qt2/html/designer/figures/filenew.png
-share/doc/qt2/html/designer/figures/filesave.png
-share/doc/qt2/html/designer/figures/firstdialog.png
-share/doc/qt2/html/designer/figures/form.png
-share/doc/qt2/html/designer/figures/formsettings.png
-share/doc/qt2/html/designer/figures/fourcheckboxes.png
-share/doc/qt2/html/designer/figures/frame.png
-share/doc/qt2/html/designer/figures/groupbox.png
-share/doc/qt2/html/designer/figures/help.png
-share/doc/qt2/html/designer/figures/helpdialog.png
-share/doc/qt2/html/designer/figures/home.png
-share/doc/qt2/html/designer/figures/iconview.png
-share/doc/qt2/html/designer/figures/image.png
-share/doc/qt2/html/designer/figures/label.png
-share/doc/qt2/html/designer/figures/layout.png
-share/doc/qt2/html/designer/figures/layouttutstep1.png
-share/doc/qt2/html/designer/figures/layouttutstep10.png
-share/doc/qt2/html/designer/figures/layouttutstep11.png
-share/doc/qt2/html/designer/figures/layouttutstep2.png
-share/doc/qt2/html/designer/figures/layouttutstep3.png
-share/doc/qt2/html/designer/figures/layouttutstep4.png
-share/doc/qt2/html/designer/figures/layouttutstep5.png
-share/doc/qt2/html/designer/figures/layouttutstep6.png
-share/doc/qt2/html/designer/figures/layouttutstep7.png
-share/doc/qt2/html/designer/figures/layouttutstep9.png
-share/doc/qt2/html/designer/figures/lcdnumber.png
-share/doc/qt2/html/designer/figures/left.png
-share/doc/qt2/html/designer/figures/line.png
-share/doc/qt2/html/designer/figures/lineedit.png
-share/doc/qt2/html/designer/figures/listbox.png
-share/doc/qt2/html/designer/figures/listview.png
-share/doc/qt2/html/designer/figures/load.png
-share/doc/qt2/html/designer/figures/multilineedit.png
-share/doc/qt2/html/designer/figures/newform.png
-share/doc/qt2/html/designer/figures/newformdialog.png
-share/doc/qt2/html/designer/figures/objecthierarchy.png
-share/doc/qt2/html/designer/figures/onecheckbox.png
-share/doc/qt2/html/designer/figures/ordertool.png
-share/doc/qt2/html/designer/figures/paletteeditor.png
-share/doc/qt2/html/designer/figures/pixlabel.png
-share/doc/qt2/html/designer/figures/pizza1screenshot.png
-share/doc/qt2/html/designer/figures/pointer.png
-share/doc/qt2/html/designer/figures/preferences.png
-share/doc/qt2/html/designer/figures/print.png
-share/doc/qt2/html/designer/figures/progress.png
-share/doc/qt2/html/designer/figures/pushbutton.png
-share/doc/qt2/html/designer/figures/qtlogo.png
-share/doc/qt2/html/designer/figures/radiobutton.png
-share/doc/qt2/html/designer/figures/redo.png
-share/doc/qt2/html/designer/figures/right.png
-share/doc/qt2/html/designer/figures/slider.png
-share/doc/qt2/html/designer/figures/slots.png
-share/doc/qt2/html/designer/figures/spacer.png
-share/doc/qt2/html/designer/figures/spinbox.png
-share/doc/qt2/html/designer/figures/startup.png
-share/doc/qt2/html/designer/figures/taborderform.png
-share/doc/qt2/html/designer/figures/tabwidget.png
-share/doc/qt2/html/designer/figures/testmode.png
-share/doc/qt2/html/designer/figures/textbrowser.png
-share/doc/qt2/html/designer/figures/textview.png
-share/doc/qt2/html/designer/figures/title.png
-share/doc/qt2/html/designer/figures/toolbutton.png
-share/doc/qt2/html/designer/figures/topicchooser.png
-share/doc/qt2/html/designer/figures/undo.png
-share/doc/qt2/html/designer/figures/vlayout.png
-share/doc/qt2/html/designer/figures/whatsthis.png
-share/doc/qt2/html/designer/part1index.html
-share/doc/qt2/html/designer/part2index.html
-share/doc/qt2/html/designer/preface.html
-share/qt2/designer/templates/Configuration_Dialog.ui
-share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
-share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
 share/qt2/designer/templates/Tab-Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/doc/qt2/html/designer/preface.html
+share/doc/qt2/html/designer/part2index.html
+share/doc/qt2/html/designer/part1index.html
+share/doc/qt2/html/designer/figures/whatsthis.png
+share/doc/qt2/html/designer/figures/vlayout.png
+share/doc/qt2/html/designer/figures/undo.png
+share/doc/qt2/html/designer/figures/topicchooser.png
+share/doc/qt2/html/designer/figures/toolbutton.png
+share/doc/qt2/html/designer/figures/title.png
+share/doc/qt2/html/designer/figures/textview.png
+share/doc/qt2/html/designer/figures/textbrowser.png
+share/doc/qt2/html/designer/figures/testmode.png
+share/doc/qt2/html/designer/figures/tabwidget.png
+share/doc/qt2/html/designer/figures/taborderform.png
+share/doc/qt2/html/designer/figures/startup.png
+share/doc/qt2/html/designer/figures/spinbox.png
+share/doc/qt2/html/designer/figures/spacer.png
+share/doc/qt2/html/designer/figures/slots.png
+share/doc/qt2/html/designer/figures/slider.png
+share/doc/qt2/html/designer/figures/right.png
+share/doc/qt2/html/designer/figures/redo.png
+share/doc/qt2/html/designer/figures/radiobutton.png
+share/doc/qt2/html/designer/figures/qtlogo.png
+share/doc/qt2/html/designer/figures/pushbutton.png
+share/doc/qt2/html/designer/figures/progress.png
+share/doc/qt2/html/designer/figures/print.png
+share/doc/qt2/html/designer/figures/preferences.png
+share/doc/qt2/html/designer/figures/pointer.png
+share/doc/qt2/html/designer/figures/pizza1screenshot.png
+share/doc/qt2/html/designer/figures/pixlabel.png
+share/doc/qt2/html/designer/figures/paletteeditor.png
+share/doc/qt2/html/designer/figures/ordertool.png
+share/doc/qt2/html/designer/figures/onecheckbox.png
+share/doc/qt2/html/designer/figures/objecthierarchy.png
+share/doc/qt2/html/designer/figures/newformdialog.png
+share/doc/qt2/html/designer/figures/newform.png
+share/doc/qt2/html/designer/figures/multilineedit.png
+share/doc/qt2/html/designer/figures/load.png
+share/doc/qt2/html/designer/figures/listview.png
+share/doc/qt2/html/designer/figures/listbox.png
+share/doc/qt2/html/designer/figures/lineedit.png
+share/doc/qt2/html/designer/figures/line.png
+share/doc/qt2/html/designer/figures/left.png
+share/doc/qt2/html/designer/figures/lcdnumber.png
+share/doc/qt2/html/designer/figures/layouttutstep9.png
+share/doc/qt2/html/designer/figures/layouttutstep7.png
+share/doc/qt2/html/designer/figures/layouttutstep6.png
+share/doc/qt2/html/designer/figures/layouttutstep5.png
+share/doc/qt2/html/designer/figures/layouttutstep4.png
+share/doc/qt2/html/designer/figures/layouttutstep3.png
+share/doc/qt2/html/designer/figures/layouttutstep2.png
+share/doc/qt2/html/designer/figures/layouttutstep11.png
+share/doc/qt2/html/designer/figures/layouttutstep10.png
+share/doc/qt2/html/designer/figures/layouttutstep1.png
+share/doc/qt2/html/designer/figures/layout.png
+share/doc/qt2/html/designer/figures/label.png
+share/doc/qt2/html/designer/figures/image.png
+share/doc/qt2/html/designer/figures/iconview.png
+share/doc/qt2/html/designer/figures/home.png
+share/doc/qt2/html/designer/figures/helpdialog.png
+share/doc/qt2/html/designer/figures/help.png
+share/doc/qt2/html/designer/figures/groupbox.png
+share/doc/qt2/html/designer/figures/frame.png
+share/doc/qt2/html/designer/figures/fourcheckboxes.png
+share/doc/qt2/html/designer/figures/formsettings.png
+share/doc/qt2/html/designer/figures/form.png
+share/doc/qt2/html/designer/figures/firstdialog.png
+share/doc/qt2/html/designer/figures/filesave.png
+share/doc/qt2/html/designer/figures/filenew.png
+share/doc/qt2/html/designer/figures/f001.png
+share/doc/qt2/html/designer/figures/emptydialog.png
+share/doc/qt2/html/designer/figures/editslots.png
+share/doc/qt2/html/designer/figures/editraise.png
+share/doc/qt2/html/designer/figures/editpaste.png
+share/doc/qt2/html/designer/figures/editmultiline.png
+share/doc/qt2/html/designer/figures/editlower.png
+share/doc/qt2/html/designer/figures/editlistview.png
+share/doc/qt2/html/designer/figures/editlistbox.png
+share/doc/qt2/html/designer/figures/editiconview.png
+share/doc/qt2/html/designer/figures/edithlayout.png
+share/doc/qt2/html/designer/figures/editgrid.png
+share/doc/qt2/html/designer/figures/editdelete.png
+share/doc/qt2/html/designer/figures/editcut.png
+share/doc/qt2/html/designer/figures/editcustomwidgets.png
+share/doc/qt2/html/designer/figures/editcopy.png
+share/doc/qt2/html/designer/figures/customwidgets.png
+share/doc/qt2/html/designer/figures/customwidget.png
+share/doc/qt2/html/designer/figures/connecttool.png
+share/doc/qt2/html/designer/figures/connectionviewer.png
+share/doc/qt2/html/designer/figures/connections.png
+share/doc/qt2/html/designer/figures/connectionedit.png
+share/doc/qt2/html/designer/figures/combobox.png
+share/doc/qt2/html/designer/figures/checkbox.png
+share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png
+share/doc/qt2/html/designer/figures/buttongroup.png
+share/doc/qt2/html/designer/figures/breaklayout.png
+share/doc/qt2/html/designer/figures/adjustsize.png
+share/doc/qt2/html/designer/figures/aboutdialog.png
+share/doc/qt2/html/designer/feedback.html
+share/doc/qt2/html/designer/colophon.html
+share/doc/qt2/html/designer/chap9_6.html
+share/doc/qt2/html/designer/chap9_5.html
+share/doc/qt2/html/designer/chap9_4.html
+share/doc/qt2/html/designer/chap9_3.html
+share/doc/qt2/html/designer/chap9_2.html
+share/doc/qt2/html/designer/chap9_1.html
+share/doc/qt2/html/designer/chap8_1.html
+share/doc/qt2/html/designer/chap7_9.html
+share/doc/qt2/html/designer/chap7_8.html
+share/doc/qt2/html/designer/chap7_7.html
+share/doc/qt2/html/designer/chap7_6.html
+share/doc/qt2/html/designer/chap7_5.html
+share/doc/qt2/html/designer/chap7_4.html
+share/doc/qt2/html/designer/chap7_3.html
+share/doc/qt2/html/designer/chap7_2.html
+share/doc/qt2/html/designer/chap7_16.html
+share/doc/qt2/html/designer/chap7_15.html
+share/doc/qt2/html/designer/chap7_14.html
+share/doc/qt2/html/designer/chap7_13.html
+share/doc/qt2/html/designer/chap7_12.html
+share/doc/qt2/html/designer/chap7_11.html
+share/doc/qt2/html/designer/chap7_10.html
+share/doc/qt2/html/designer/chap7_1.html
+share/doc/qt2/html/designer/chap6_7.html
+share/doc/qt2/html/designer/chap6_6.html
+share/doc/qt2/html/designer/chap6_5.html
+share/doc/qt2/html/designer/chap6_4.html
+share/doc/qt2/html/designer/chap6_3.html
+share/doc/qt2/html/designer/chap6_2.html
+share/doc/qt2/html/designer/chap6_1.html
+share/doc/qt2/html/designer/chap5_6.html
+share/doc/qt2/html/designer/chap5_5.html
+share/doc/qt2/html/designer/chap5_4.html
+share/doc/qt2/html/designer/chap5_3.html
+share/doc/qt2/html/designer/chap5_2.html
+share/doc/qt2/html/designer/chap5_1.html
+share/doc/qt2/html/designer/chap4_2.html
+share/doc/qt2/html/designer/chap4_1.html
+share/doc/qt2/html/designer/chap3_4.html
+share/doc/qt2/html/designer/chap3_3.html
+share/doc/qt2/html/designer/chap3_2.html
+share/doc/qt2/html/designer/chap3_1.html
+share/doc/qt2/html/designer/chap2_4.html
+share/doc/qt2/html/designer/chap2_3.html
+share/doc/qt2/html/designer/chap2_2.html
+share/doc/qt2/html/designer/chap2_1.html
+share/doc/qt2/html/designer/chap1_1.html
+share/doc/qt2/html/designer/chap10_1.html
+share/doc/qt2/html/designer/book1.html
+share/doc/qt2/html/designer/arrows/up.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/home.png
+bin/designer
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
 @dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
-@dirrm share/qt2/designer/templates
-@dirrm share/qt2/designer
-@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true
-@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true