Update to kde3. Bump portrev. Patch by Dave Johnson. Patch mangling

by me.

10 files changed, 203 insertions, 4 deletions

diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index f67bea935a0a..990cfc3904b9 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -8,22 +8,35 @@
 
 PORTNAME=	krss
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kde@freebsd.org
 
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14
+
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png
 
-USE_REINPLACE=	yes
-USE_KDEBASE_VER=	2
+USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
+QTCFGLIBS+=	-pthread
+CONFIGURE_ENV+=	LIBQT="-lqt-mt"
 USE_GMAKE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure
+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/deskutils/krss/files/patch-krss-Makefile.am b/deskutils/krss/files/patch-krss-Makefile.am
new file mode 100644
index 000000000000..9b1cc5c70c6a
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-Makefile.am
@@ -0,0 +1,10 @@
+
+
+Sep 10 23:17 2002 diff -ruN -l0 krss/Makefile.am~ krss/Makefile.am Page 1
+
+
+--- krss/Makefile.am~	Tue Sep 10 23:15:10 2002
++++ krss/Makefile.am	Tue Sep 10 23:15:19 2002
+@@ -4 +4 @@
+-krss_LDADD   =  $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
++krss_LDADD   =  -lkio $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
diff --git a/deskutils/krss/files/patch-krss-configuredialog.cpp b/deskutils/krss/files/patch-krss-configuredialog.cpp
new file mode 100644
index 000000000000..deffc5391671
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-configuredialog.cpp
@@ -0,0 +1,46 @@
+--- krss/configuredialog.cpp~	Thu Dec 13 16:28:44 2001
++++ krss/configuredialog.cpp	Tue Sep 10 23:06:11 2002
+@@ -29,6 +29,7 @@
+ #include <qlabel.h>
+ #include <qtoolbutton.h>
+ #include <qradiobutton.h>
++#include <qpushbutton.h>
+ 
+ #include <ktip.h>
+ #include <klineeditdlg.h>
+@@ -102,9 +103,9 @@
+ 	/** Calculate the size of the caches **/
+ 	KURL url;
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
+-	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
++	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
+-	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
++	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
+ 	
+ 	QFrame *page5 = addPage(i18n("MyChannelBar"), i18n("MyChannelBar"), QPixmap(KGlobal::iconLoader()->iconPath("view_icon", KIcon::Desktop)));
+ 	QHBoxLayout *lay5 = new QHBoxLayout(page5);
+@@ -254,9 +255,9 @@
+ 	
+ 	KURL url;
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
+-	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
++	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
+-	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
++	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
+ }
+ 
+ void ConfigureDialog::clearFeedCache(void)
+@@ -283,9 +284,9 @@
+ 	
+ 	KURL url;
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
+-	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
++	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
+ 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
+-	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
++	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
+ }
+ 
+ void ConfigureDialog::clearImageCache(void)
diff --git a/deskutils/krss/files/patch-krss-editfeeddialog.cpp b/deskutils/krss/files/patch-krss-editfeeddialog.cpp
new file mode 100644
index 000000000000..040b314ed5e3
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-editfeeddialog.cpp
@@ -0,0 +1,10 @@
+--- krss/editfeeddialog.cpp~	Tue Feb 19 21:17:22 2002
++++ krss/editfeeddialog.cpp	Tue Sep 10 23:08:15 2002
+@@ -22,6 +22,7 @@
+ #include <qcheckbox.h>
+ #include <qspinbox.h>
+ #include <qgroupbox.h>
++#include <qpushbutton.h>
+ 
+ #include <kglobal.h>
+ #include <kiconloader.h>
diff --git a/deskutils/krss/files/patch-krss-filterdialog.cpp b/deskutils/krss/files/patch-krss-filterdialog.cpp
new file mode 100644
index 000000000000..76c41ea5d1d6
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-filterdialog.cpp
@@ -0,0 +1,10 @@
+--- krss/filterdialog.cpp~	Tue Oct 16 12:05:58 2001
++++ krss/filterdialog.cpp	Tue Sep 10 22:56:44 2002
+@@ -18,6 +18,7 @@
+ #include "filterdialog.h"
+ 
+ #include <qradiobutton.h>
++#include <qpushbutton.h>
+ 
+ #include <klocale.h>
+ #include <klistview.h>
diff --git a/deskutils/krss/files/patch-krss-krss.cpp b/deskutils/krss/files/patch-krss-krss.cpp
new file mode 100644
index 000000000000..082e7fd8f540
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-krss.cpp
@@ -0,0 +1,43 @@
+--- krss/krss.cpp~	Wed Feb 20 09:00:22 2002
++++ krss/krss.cpp	Tue Sep 10 23:11:14 2002
+@@ -24,6 +24,7 @@
+ #include <qscrollbar.h>
+ #include <qsplitter.h>
+ #include <qlayout.h>
++#include <qregexp.h>
+ 
+ // include files for KDE
+ #include <kiconloader.h>
+@@ -46,7 +47,7 @@
+ #include <kwinmodule.h>
+ #include <khtml_part.h>
+ #include <khtmlview.h>
+-
++#include <kstatusbar.h>
+ 
+ // application specific includes
+ #include "krss.h"
+@@ -518,7 +519,7 @@
+ {
+ 	config->setGroup(QString("General"));
+ 	QString mExec = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
+-	mExec.replace(QString("%url"), url.url());
++	mExec.replace(QRegExp("%url"), url.url());
+ 		
+ 	slotStatusMsg(i18n("Starting ") + mExec + QString("..."));
+ 	
+@@ -967,12 +968,12 @@
+ 		config->setGroup(QString("General"));
+ 		QStringList uh_list = config->readListEntry(QString("URL Handlers"));
+ 		QString default_handler = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
+-		default_handler.replace(QString("%url"), url);
++		default_handler.replace(QRegExp("%url"), url);
+ 		menu.insertItem(default_handler);
+ 		menu.insertSeparator();
+ 		for(QStringList::Iterator i = uh_list.begin(); i != uh_list.end(); i++) {
+ 			QString handler((*i).latin1());
+-			handler.replace(QString("%url"), url);
++			handler.replace(QRegExp("%url"), url);
+ 			menu.insertItem(handler);
+ 		}
+ 		int ret = menu.exec(p);
diff --git a/deskutils/krss/files/patch-krss-mychannelbar.cpp b/deskutils/krss/files/patch-krss-mychannelbar.cpp
new file mode 100644
index 000000000000..2690880ab8e7
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-mychannelbar.cpp
@@ -0,0 +1,10 @@
+--- krss/mychannelbar.cpp~	Wed Feb 20 08:36:15 2002
++++ krss/mychannelbar.cpp	Tue Sep 10 22:56:56 2002
+@@ -23,6 +23,7 @@
+ #include <qxml.h>
+ #include <qtooltip.h>
+ #include <qfileinfo.h>
++#include <qpainter.h>
+ 
+ #include <kurldrag.h>
+ #include <kurl.h>
diff --git a/deskutils/krss/files/patch-krss-rdftree.cpp b/deskutils/krss/files/patch-krss-rdftree.cpp
new file mode 100644
index 000000000000..6823f6900fb8
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-rdftree.cpp
@@ -0,0 +1,11 @@
+--- krss/rdftree.cpp~	Mon Dec 17 11:42:06 2001
++++ krss/rdftree.cpp	Tue Sep 10 23:07:34 2002
+@@ -20,6 +20,8 @@
+ #include <qfile.h>
+ #include <qtextstream.h>
+ #include <qimage.h>
++#include <qwmatrix.h>
++
+ #include <kiconloader.h>
+ 
+ #include "colourconverter.h"
diff --git a/deskutils/krss/files/patch-krss-schemeparser.cpp b/deskutils/krss/files/patch-krss-schemeparser.cpp
new file mode 100644
index 000000000000..217141dce40f
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-schemeparser.cpp
@@ -0,0 +1,12 @@
+--- krss/schemeparser.cpp~	Sun Nov 25 17:12:50 2001
++++ krss/schemeparser.cpp	Tue Sep 10 22:58:36 2002
+@@ -342,9 +342,6 @@
+ 				else
+ 					font.setUnderline(false);
+ 			}
+-			else if(atts.qName(i).compare("charset") == 0) {
+-				font.setCharSet((QFont::CharSet) atts.value(i).toInt());
+-			}
+ 		}
+ 		if(mReadingChannel) {
+ 			if(mReadingTitle) {
diff --git a/deskutils/krss/files/patch-krss-schemetree.cpp b/deskutils/krss/files/patch-krss-schemetree.cpp
new file mode 100644
index 000000000000..00a15957253e
--- /dev/null
+++ b/deskutils/krss/files/patch-krss-schemetree.cpp
@@ -0,0 +1,34 @@
+--- krss/schemetree.cpp~	Sun Nov 25 17:16:21 2001
++++ krss/schemetree.cpp	Tue Sep 10 23:01:49 2002
+@@ -178,7 +178,6 @@
+ 				ctfelm.setAttribute("underline", "true");
+ 			else
+ 				ctfelm.setAttribute("underline", "false");
+-			ctfelm.setAttribute("charset", QString::number(channelTitleFont().charSet()));
+ 		ctelm.appendChild(ctfelm);
+ 		QDomElement ctaelm = doc.createElement("align");
+ 			QDomText ctatxt = doc.createTextNode(QString::number(channelTitleAlign()));
+@@ -220,7 +219,6 @@
+ 				cdfelm.setAttribute("underline", "true");
+ 			else
+ 				cdfelm.setAttribute("underline", "false");
+-			cdfelm.setAttribute("charset", QString::number(channelDescriptionFont().charSet()));
+ 		cdelm.appendChild(cdfelm);
+ 			QDomElement cdaelm = doc.createElement("align");
+ 				QDomText cdatxt = doc.createTextNode(QString::number(channelDescriptionAlign()));
+@@ -251,7 +249,6 @@
+ 				ntfelm.setAttribute("underline", "true");
+ 			else
+ 				ntfelm.setAttribute("underline", "false");
+-			ntfelm.setAttribute("charset", QString::number(newsTitleFont().charSet()));
+ 		ntelm.appendChild(ntfelm);
+ 		QDomElement ntaelm = doc.createElement("align");
+ 			QDomText ntatxt = doc.createTextNode(QString::number(newsTitleAlign()));
+@@ -283,7 +280,6 @@
+ 				ndfelm.setAttribute("underline", "true");
+ 			else
+ 				ndfelm.setAttribute("underline", "false");
+-			ndfelm.setAttribute("charset", QString::number(newsDescriptionFont().charSet()));
+ 		ndelm.appendChild(ndfelm);
+ 			QDomElement ndaelm = doc.createElement("align");
+ 				QDomText ndatxt = doc.createTextNode(QString::number(newsDescriptionAlign()));