Update to kde3.

Submitted by:	Dave Johnson.

12 files changed, 106 insertions, 90 deletions

diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 4be875a56544..0ecf2205299a 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -6,15 +6,33 @@
 #
 
 PORTNAME=	uml
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
+DISTNAME=	uml-1.0.3-1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_KDELIBS_VER=2
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14
+
+USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
+QTCFGLIBS+=	-pthread
+CONFIGURE_ENV+=	LIBQT="-lqt-mt"
 USE_GMAKE=	yes
 
+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=${WRKSRC}/auto-bin:$$PATH \
+		${GMAKE} -f Makefile.dist
+
 .include <bsd.port.mk>
diff --git a/devel/umbrello/distinfo b/devel/umbrello/distinfo
index 14c7990db49c..09bfbdbaee34 100644
--- a/devel/umbrello/distinfo
+++ b/devel/umbrello/distinfo
@@ -1 +1 @@
-MD5 (uml-1.0.2.tar.gz) = 48b510c837bd4714d833aa6545180084
+MD5 (uml-1.0.3-1.tar.gz) = e8090aa59585611aba9af2fdda3eeb22
diff --git a/devel/umbrello/files/patch-Makefile.in b/devel/umbrello/files/patch-Makefile.in
index cdf541c0fed2..e69de29bb2d1 100644
--- a/devel/umbrello/files/patch-Makefile.in
+++ b/devel/umbrello/files/patch-Makefile.in
@@ -1,42 +0,0 @@
---- Makefile.in.orig	Wed Sep 19 20:59:58 2001
-+++ Makefile.in	Wed Sep 19 21:01:26 2001
-@@ -245,22 +245,15 @@
- all: docs-am  all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--#>- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--#>+ 2
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(ACLOCAL_M4):  configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
- 
- config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
- 
- config.h: stamp-h
- 	@if test ! -f $@; then \
-@@ -278,7 +271,6 @@
- 		$(MAKE) $(srcdir)/stamp-h.in; \
- 	else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
-@@ -542,8 +534,6 @@
- 
- #>+ 5
- force-reedit:
--		cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
- 
- 
- #>+ 2
diff --git a/devel/umbrello/files/patch-uml-Makefile.am b/devel/umbrello/files/patch-uml-Makefile.am
new file mode 100644
index 000000000000..b6eb5d776770
--- /dev/null
+++ b/devel/umbrello/files/patch-uml-Makefile.am
@@ -0,0 +1,11 @@
+--- uml/Makefile.am.org	Thu Sep 20 10:09:54 2001
++++ uml/Makefile.am	Tue Sep 10 21:14:56 2002
+@@ -1,7 +1,7 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ bin_PROGRAMS = uml
+ uml_SOURCES = messagecopy.cpp widgetassoccontainer.cpp assoccopy.cpp cutcopypaste.cpp diagramprintpage.cpp classoptionspage.cpp worktoolbar.cpp usecasewidget.cpp usecase.cpp umlwidget.cpp umlview.cpp umlobject.cpp umldoc.cpp uml_meta_unload.cpp uml.cpp selectopdlg.cpp parmpropdlg.cpp operation.cpp objectwidget.cpp notewidget.cpp notemultilineedit.cpp mylistviewitem.cpp mylistview.cpp messagewidget.cpp main.cpp listpopupmenu.cpp infowidget.cpp floatingtext.cpp conceptwidget.cpp concept.cpp classpropdlg.cpp classopspage.cpp classgenpage.cpp classattpage.cpp attribute.cpp assocpropdlg.cpp assocpage.cpp association.cpp actorwidget.cpp actor.cpp 
+-uml_LDADD   =  $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
++uml_LDADD   =  -lkio $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+ 
+ SUBDIRS = pics pixmaps 
+ 
diff --git a/devel/umbrello/files/patch-uml-uml.cpp b/devel/umbrello/files/patch-uml-uml.cpp
new file mode 100644
index 000000000000..490c22b40f96
--- /dev/null
+++ b/devel/umbrello/files/patch-uml-uml.cpp
@@ -0,0 +1,11 @@
+--- uml/uml.cpp.org	Sat Sep 15 10:10:46 2001
++++ uml/uml.cpp	Tue Sep 10 21:14:56 2002
+@@ -12,6 +12,8 @@
+ #include <kconfig.h>
+ #include <kstdaction.h>
+ #include <kprinter.h>
++#include <kstatusbar.h>
++
+ // application specific includes
+ #include "uml.h"
+ #include "umlview.h"
diff --git a/devel/umbrello/files/patch-uml-umldoc.cpp b/devel/umbrello/files/patch-uml-umldoc.cpp
new file mode 100644
index 000000000000..0447a96ff8c3
--- /dev/null
+++ b/devel/umbrello/files/patch-uml-umldoc.cpp
@@ -0,0 +1,10 @@
+--- uml/umldoc.cpp.org	Thu Sep 20 08:13:37 2001
++++ uml/umldoc.cpp	Tue Sep 10 21:14:56 2002
+@@ -1,6 +1,7 @@
+ // include files for Qt
+ #include <qdir.h>
+ #include <qwidget.h>
++#include <qpainter.h>
+ 
+ // include files for KDE
+ #include <klocale.h>
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index 4be875a56544..0ecf2205299a 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -6,15 +6,33 @@
 #
 
 PORTNAME=	uml
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
+DISTNAME=	uml-1.0.3-1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_KDELIBS_VER=2
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14
+
+USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
+QTCFGLIBS+=	-pthread
+CONFIGURE_ENV+=	LIBQT="-lqt-mt"
 USE_GMAKE=	yes
 
+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=${WRKSRC}/auto-bin:$$PATH \
+		${GMAKE} -f Makefile.dist
+
 .include <bsd.port.mk>
diff --git a/devel/uml/distinfo b/devel/uml/distinfo
index 14c7990db49c..09bfbdbaee34 100644
--- a/devel/uml/distinfo
+++ b/devel/uml/distinfo
@@ -1 +1 @@
-MD5 (uml-1.0.2.tar.gz) = 48b510c837bd4714d833aa6545180084
+MD5 (uml-1.0.3-1.tar.gz) = e8090aa59585611aba9af2fdda3eeb22
diff --git a/devel/uml/files/patch-Makefile.in b/devel/uml/files/patch-Makefile.in
index cdf541c0fed2..e69de29bb2d1 100644
--- a/devel/uml/files/patch-Makefile.in
+++ b/devel/uml/files/patch-Makefile.in
@@ -1,42 +0,0 @@
---- Makefile.in.orig	Wed Sep 19 20:59:58 2001
-+++ Makefile.in	Wed Sep 19 21:01:26 2001
-@@ -245,22 +245,15 @@
- all: docs-am  all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--#>- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--#>+ 2
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(ACLOCAL_M4):  configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
- 
- config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
- 
- config.h: stamp-h
- 	@if test ! -f $@; then \
-@@ -278,7 +271,6 @@
- 		$(MAKE) $(srcdir)/stamp-h.in; \
- 	else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
-@@ -542,8 +534,6 @@
- 
- #>+ 5
- force-reedit:
--		cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ./Makefile
--	cd $(top_srcdir) && perl admin/am_edit Makefile.in
- 
- 
- #>+ 2
diff --git a/devel/uml/files/patch-uml-Makefile.am b/devel/uml/files/patch-uml-Makefile.am
new file mode 100644
index 000000000000..b6eb5d776770
--- /dev/null
+++ b/devel/uml/files/patch-uml-Makefile.am
@@ -0,0 +1,11 @@
+--- uml/Makefile.am.org	Thu Sep 20 10:09:54 2001
++++ uml/Makefile.am	Tue Sep 10 21:14:56 2002
+@@ -1,7 +1,7 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+ bin_PROGRAMS = uml
+ uml_SOURCES = messagecopy.cpp widgetassoccontainer.cpp assoccopy.cpp cutcopypaste.cpp diagramprintpage.cpp classoptionspage.cpp worktoolbar.cpp usecasewidget.cpp usecase.cpp umlwidget.cpp umlview.cpp umlobject.cpp umldoc.cpp uml_meta_unload.cpp uml.cpp selectopdlg.cpp parmpropdlg.cpp operation.cpp objectwidget.cpp notewidget.cpp notemultilineedit.cpp mylistviewitem.cpp mylistview.cpp messagewidget.cpp main.cpp listpopupmenu.cpp infowidget.cpp floatingtext.cpp conceptwidget.cpp concept.cpp classpropdlg.cpp classopspage.cpp classgenpage.cpp classattpage.cpp attribute.cpp assocpropdlg.cpp assocpage.cpp association.cpp actorwidget.cpp actor.cpp 
+-uml_LDADD   =  $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
++uml_LDADD   =  -lkio $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+ 
+ SUBDIRS = pics pixmaps 
+ 
diff --git a/devel/uml/files/patch-uml-uml.cpp b/devel/uml/files/patch-uml-uml.cpp
new file mode 100644
index 000000000000..490c22b40f96
--- /dev/null
+++ b/devel/uml/files/patch-uml-uml.cpp
@@ -0,0 +1,11 @@
+--- uml/uml.cpp.org	Sat Sep 15 10:10:46 2001
++++ uml/uml.cpp	Tue Sep 10 21:14:56 2002
+@@ -12,6 +12,8 @@
+ #include <kconfig.h>
+ #include <kstdaction.h>
+ #include <kprinter.h>
++#include <kstatusbar.h>
++
+ // application specific includes
+ #include "uml.h"
+ #include "umlview.h"
diff --git a/devel/uml/files/patch-uml-umldoc.cpp b/devel/uml/files/patch-uml-umldoc.cpp
new file mode 100644
index 000000000000..0447a96ff8c3
--- /dev/null
+++ b/devel/uml/files/patch-uml-umldoc.cpp
@@ -0,0 +1,10 @@
+--- uml/umldoc.cpp.org	Thu Sep 20 08:13:37 2001
++++ uml/umldoc.cpp	Tue Sep 10 21:14:56 2002
+@@ -1,6 +1,7 @@
+ // include files for Qt
+ #include <qdir.h>
+ #include <qwidget.h>
++#include <qpainter.h>
+ 
+ // include files for KDE
+ #include <klocale.h>