- update to 2.0.1

- bump PORTEPOCH (the last version should have been 2.0.p1, not 2.0p1)
- sort pkg-plist, don't try to @dirrm directories that aren't totally ours

PR:		34231
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>
Approved by:	maintainer timeout

11 files changed, 175 insertions, 23 deletions

diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 9e0285ce9aa8..f4a34e860837 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	quanta
-PORTVERSION= 	2.0p1
-PORTREVISION=	1
+PORTVERSION= 	2.0.1
+PORTEPOCH=	1
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-2.0-pr1
+
 .if !defined(NOPORTDOCS)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		css.tar.bz2 \
@@ -24,8 +24,6 @@ MAINTAINER=	jeremy@external.org
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-WRKSRC=         ${WRKDIR}/${PORTNAME}
-
 USE_KDELIBS_VER=2
 USE_XPM=	yes
 USE_BZIP2=	yes
@@ -41,7 +39,13 @@ DOCS=		css html javascript php
 
 pre-configure:
 	@${PERL} -pi -e "s#lqt #lqt2 #g" ${WRKSRC}/quanta/Makefile.in
+	@${PERL} -pi -e "s@automake@automake14@g" ${WRKSRC}/configure
 
+	
+post-configure:
+	@${PERL} -pi -e "s@autoconf@autoconf213@g" ${WRKSRC}/Makefile
+	@${PERL} -pi -e "s@moc@moc2@g" ${WRKSRC}/configure
+	
 post-install:
 .if !defined(NOPORTDOCS)
 .for doc in ${DOCS}
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index fa635b2c8b47..e70bdbd2f677 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1,4 +1,4 @@
-MD5 (quanta-2.0-pr1.tar.bz2) = dec00150b247d40162fa3941b56c3b93
+MD5 (quanta-2.0.1.tar.bz2) = c2ea4c4a01fdc751375d033ada59a1dd
 MD5 (css.tar.bz2) = 9134a94af4c783c740cc0ad5806e4b51
 MD5 (html.tar.bz2) = 0cc3234c4b3df88d4115340ce05e0053
 MD5 (javascript.tar.bz2) = eea6e25a1c25af1f5a0c33e32e52c136
diff --git a/www/kdewebdev4/files/patch-Makefile.in b/www/kdewebdev4/files/patch-Makefile.in
new file mode 100644
index 000000000000..9b25189c91c4
--- /dev/null
+++ b/www/kdewebdev4/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	Wed Dec  5 11:04:46 2001
++++ Makefile.in	Thu Jan 24 16:34:24 2002
+@@ -251,17 +251,14 @@
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu ./Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
++Makefile: 
++	${ECHO} ""
+ 
+ $(ACLOCAL_M4):  configure.in  acinclude.m4
+ 	cd $(srcdir) && $(ACLOCAL)
+ 
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+-	cd $(srcdir) && $(AUTOCONF)
++config.status:
++	@{ECHO} config.status patched
+ 
+ config.h: stamp-h
+ 	@if test ! -f $@; then \
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h
new file mode 100644
index 000000000000..521a0cb8d7c3
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/dbgbase/DbgSite.h.orig	Thu Jan 24 17:01:33 2002
++++ quanta/plugins/php4dbg/dbgbase/DbgSite.h	Thu Jan 24 17:01:48 2002
+@@ -14,6 +14,7 @@
+ #ifndef _DBGSITE_H_
+ #define _DBGSITE_H_
+ 
++#include <sys/types.h>
+ #include <qobject.h>
+ #include "ListenerGlobals.h"
+ #include "RequestorBase.h"
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp
new file mode 100644
index 000000000000..7a69baa79f2c
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp
@@ -0,0 +1,18 @@
+--- quanta/plugins/php4dbg/dbgbase/ListenerBase.cpp.orig	Thu Jan 24 17:09:23 2002
++++ quanta/plugins/php4dbg/dbgbase/ListenerBase.cpp	Thu Jan 24 17:09:52 2002
+@@ -11,11 +11,13 @@
+                            the world-wide-web at http://dd.cron.ru/license
+  ***************************************************************************/
+ 
++#include <sys/types.h>
++#include <stdio.h>
++#include <assert.h>
+ #include "dbg_core.h"
+ #include "ListenerBase.h"
+ #include "ThreadBase.h"
+-#include <stdio.h>
+-#include <assert.h>
++
+ 
+ ListenerBase::~ListenerBase() {
+ 	DBGTRACE("ListenerBase::~ListenerBase\n");
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp
new file mode 100644
index 000000000000..efa09025f5c1
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp
@@ -0,0 +1,19 @@
+--- quanta/plugins/php4dbg/dbgbase/ListenerGlobals.cpp.orig	Thu Jan 24 16:50:10 2002
++++ quanta/plugins/php4dbg/dbgbase/ListenerGlobals.cpp	Thu Jan 24 16:51:58 2002
+@@ -11,6 +11,7 @@
+                            the world-wide-web at http://dd.cron.ru/license
+  ***************************************************************************/
+ 
++#include <sys/types.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include "ListenerGlobals.h"
+@@ -344,7 +345,7 @@
+ 	ret_val = select(listen_socket + 1, &rset, NULL, NULL, &timeout);
+ 	if (ret_val>0) {
+ 		siz = sizeof(laddr);
+-		ret_val = accept(listen_socket, &laddr, &siz);
++	       ret_val = accept(listen_socket, &laddr,(socklen_t *) &siz);
+ 	}
+ 	if (ret_val <= 0) {
+ 		return (ret_val) ? (-1) : (0);
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp
new file mode 100644
index 000000000000..3f2e2818e985
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/dbgbase/ThreadBase.cpp.orig	Thu Jan 24 16:52:35 2002
++++ quanta/plugins/php4dbg/dbgbase/ThreadBase.cpp	Thu Jan 24 16:52:44 2002
+@@ -11,6 +11,7 @@
+                            the world-wide-web at http://dd.cron.ru/license
+  ***************************************************************************/
+ 
++#include <sys/types.h>
+ #include "ThreadBase.h"
+ #include "ListenerGlobals.h"
+ #include "dbg_core.h"
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c
new file mode 100644
index 000000000000..669c0a7caaf3
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c
@@ -0,0 +1,13 @@
+--- quanta/plugins/php4dbg/dbgbase/dbg_core.c.orig	Thu Jan 24 16:53:35 2002
++++ quanta/plugins/php4dbg/dbgbase/dbg_core.c	Thu Jan 24 16:53:42 2002
+@@ -11,9 +11,9 @@
+                            the world-wide-web at http://dd.cron.ru/license
+  ***************************************************************************/
+ 
++#include <sys/types.h>
+ #include "dbg_core.h"
+ #include <string.h>
+-#include <malloc.h>
+ #include <stdlib.h>
+ 
+ #ifdef DBG_USE_STDALLOCA
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::debugger.h b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::debugger.h
new file mode 100644
index 000000000000..8f4c3c346202
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::debugger.h
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/debugger.h.orig	Thu Jan 24 17:22:31 2002
++++ quanta/plugins/php4dbg/debugger.h	Thu Jan 24 17:22:47 2002
+@@ -6,6 +6,7 @@
+ #endif
+ 
+ #include <qobject.h>
++#include <sys/types.h>
+ 
+ class Listener;
+ class QSocketNotifier;
diff --git a/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::listener.cpp b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::listener.cpp
new file mode 100644
index 000000000000..4b16cefbb9d1
--- /dev/null
+++ b/www/kdewebdev4/files/patch-quanta::plugins::php4dgb::listener.cpp
@@ -0,0 +1,8 @@
+--- quanta/plugins/php4dbg/listener.cpp.orig	Thu Jan 24 17:27:25 2002
++++ quanta/plugins/php4dbg/listener.cpp	Thu Jan 24 17:27:41 2002
+@@ -1,4 +1,4 @@
+-
++#include <sys/types.h>
+ #include "listener.h"
+ 
+ #include <stdarg.h>
diff --git a/www/kdewebdev4/pkg-plist b/www/kdewebdev4/pkg-plist
index 4faff97b344e..a4db64f27276 100644
--- a/www/kdewebdev4/pkg-plist
+++ b/www/kdewebdev4/pkg-plist
@@ -1,11 +1,3 @@
-share/locale/fr/LC_MESSAGES/quanta.mo
-share/locale/de/LC_MESSAGES/quanta.mo
-share/locale/da/LC_MESSAGES/quanta.mo
-share/icons/hicolor/48x48/apps/quanta.png
-share/icons/hicolor/32x32/apps/quanta.png
-share/icons/hicolor/22x22/apps/quanta.png
-share/icons/hicolor/16x16/apps/quanta.png
-share/apps/quanta/toolbars.rc
 share/apps/quanta/toolbar/wiznewprjweb.png
 share/apps/quanta/toolbar/wiznewprjloc.png
 share/apps/quanta/toolbar/wiznewprjglb.png
@@ -112,6 +104,8 @@ share/apps/quanta/toolbar/check.png
 share/apps/quanta/toolbar/bookmark.png
 share/apps/quanta/toolbar/ball.png
 share/apps/quanta/toolbar/back.png
+share/apps/quanta/toolbar/ftab.png
+share/apps/quanta/toolbar/ptab.png
 share/apps/quanta/tags/ul.tag
 share/apps/quanta/tags/tr.tag
 share/apps/quanta/tags/thead.tag
@@ -164,7 +158,7 @@ share/apps/quanta/doc/head_bg.gif
 share/apps/quanta/doc/documentation.html
 share/applnk/Development/quanta.desktop
 lib/quanta/plugins/weblint
-lib/quanta/plugins/libftpclient.so.0
+lib/quanta/plugins/libftpclient.so.1
 lib/quanta/plugins/libftpclient.so
 lib/quanta/plugins/libftpclient.la
 bin/quanta
@@ -1765,6 +1759,53 @@ bin/quanta
 %%PORTDOCS%%share/apps/quanta/doc/css/all-properties.html
 %%PORTDOCS%%share/apps/quanta/doc/css/LICENSE
 %%PORTDOCS%%share/apps/quanta/doc/css.docrc
+%%PORTDOCS%%share/apps/quanta/doc/aniquanta.gif
+%%PORTDOCS%%share/apps/quanta/doc/background.png
+%%PORTDOCS%%share/apps/quanta/doc/bgtable.png
+%%PORTDOCS%%share/apps/quanta/doc/developer.html
+%%PORTDOCS%%share/apps/quanta/doc/focus.html
+%%PORTDOCS%%share/apps/quanta/doc/intro.html
+%%PORTDOCS%%share/apps/quanta/doc/kdelogo2.png
+%%PORTDOCS%%share/apps/quanta/doc/konq.css
+%%PORTDOCS%%share/apps/quanta/doc/lines.png
+%%PORTDOCS%%share/apps/quanta/doc/lines2.png
+%%PORTDOCS%%share/apps/quanta/doc/maindoc.html
+%%PORTDOCS%%share/apps/quanta/doc/minilogo.png
+%%PORTDOCS%%share/apps/quanta/doc/more.png
+%%PORTDOCS%%share/apps/quanta/doc/qcenter2.png
+%%PORTDOCS%%share/apps/quanta/doc/quanta.css
+%%PORTDOCS%%share/apps/quanta/doc/quantahdr.png
+%%PORTDOCS%%share/apps/quanta/doc/shadow1.png
+%%PORTDOCS%%share/apps/quanta/doc/template.html
+%%PORTDOCS%%share/apps/quanta/doc/tips.html
+%%PORTDOCS%%share/apps/quanta/doc/webdev.png
+share/doc/HTML/en/quanta/developer.docbook
+share/doc/HTML/en/quanta/quantahdr.png
+share/doc/HTML/en/quanta/documentation.docbook
+share/doc/HTML/en/quanta/tips.docbook
+share/doc/HTML/en/quanta/introduction.docbook
+share/doc/HTML/en/quanta/webdev.png
+share/doc/HTML/en/quanta/minilogo.png
+share/doc/HTML/en/quanta/focus.docbook
+share/doc/HTML/en/quanta/index.docbook
+share/doc/HTML/en/quanta/index.cache.bz2
+share/doc/HTML/en/quanta/common
+share/locale/af/LC_MESSAGES/quanta.mo
+share/locale/az/LC_MESSAGES/quanta.mo
+share/locale/de/LC_MESSAGES/quanta.mo
+share/locale/da/LC_MESSAGES/quanta.mo
+share/locale/es/LC_MESSAGES/quanta.mo
+share/locale/eu/LC_MESSAGES/quanta.mo
+share/locale/fr/LC_MESSAGES/quanta.mo
+share/locale/hu/LC_MESSAGES/quanta.mo
+share/locale/nl/LC_MESSAGES/quanta.mo
+share/locale/ru/LC_MESSAGES/quanta.mo
+share/locale/sk/LC_MESSAGES/quanta.mo
+share/icons/hicolor/16x16/apps/quanta.png
+share/icons/hicolor/22x22/apps/quanta.png
+share/icons/hicolor/32x32/apps/quanta.png
+share/icons/hicolor/48x48/apps/quanta.png
+@dirrm share/doc/HTML/en/quanta
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/php
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/javascript/.pics/med
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/javascript/.pics
@@ -1787,17 +1828,12 @@ bin/quanta
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/css/classification
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/css/box
 %%PORTDOCS%%@dirrm share/apps/quanta/doc/css
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/16x16/apps
+%%PORTDOCS%%share/apps/quanta/actions.rc
+%%PORTDOCS%%share/apps/quanta/quantaui.rc
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
 @dirrm share/apps/quanta/toolbar
 @dirrm share/apps/quanta/tags
 @dirrm share/apps/quanta/doc
 @dirrm share/apps/quanta
-@dirrm share/applnk/Development
 @dirrm lib/quanta/plugins
 @dirrm lib/quanta