8 files changed, 8 insertions, 106 deletions

diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index e504c179ee3c..c696a30fedf3 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tellico
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
@@ -30,10 +30,6 @@ OPTIONS=	CDDB "CDDB support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
 .if defined(WITHOUT_CDDB)
 CONFIGURE_ARGS+=--disable-libkcddb
 .else
diff --git a/misc/tellico-kde4/distinfo b/misc/tellico-kde4/distinfo
index c394b779c7ba..46b9bb46131b 100644
--- a/misc/tellico-kde4/distinfo
+++ b/misc/tellico-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (tellico-1.2.7.tar.gz) = 51635d215ac43d8c90125cc24a28fe46
-SHA256 (tellico-1.2.7.tar.gz) = bc5e8d1aa90d8b6d902d0c1e01814a77dac95188f911e3788c81da6cf4197916
-SIZE (tellico-1.2.7.tar.gz) = 4684384
+MD5 (tellico-1.2.8.tar.gz) = ac9be76e26edaf9f75cddb03ee4ed73b
+SHA256 (tellico-1.2.8.tar.gz) = b6c111c713aa56844a4293a87a932888faec3cfd8c465d7fdab8686acd9f6806
+SIZE (tellico-1.2.8.tar.gz) = 4689201
diff --git a/misc/tellico-kde4/files/patch-src-fetch-z3950connection.cpp b/misc/tellico-kde4/files/patch-src-fetch-z3950connection.cpp
deleted file mode 100644
index 992ec806426f..000000000000
--- a/misc/tellico-kde4/files/patch-src-fetch-z3950connection.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/fetch/z3950connection.cpp.orig	Thu Jan 11 18:50:07 2007
-+++ src/fetch/z3950connection.cpp	Fri Jan 12 11:13:31 2007
-@@ -340,16 +340,16 @@
- 
- inline
- QCString Z3950Connection::toCString(const QString& text_) {
--  return iconv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
-+  return iConv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
- }
- 
- inline
- QString Z3950Connection::toString(const QCString& text_) {
--  return QString::fromUtf8(iconv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
-+  return QString::fromUtf8(iConv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
- }
- 
- // static
--QCString Z3950Connection::iconv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
-+QCString Z3950Connection::iConv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
- #if HAVE_YAZ
-   if(text_.isEmpty()) {
-     return text_;
-@@ -365,9 +365,9 @@
-     QString charSetLower = fromCharSet_.lower();
-     charSetLower.remove('-').remove(' ');
-     if(charSetLower == Latin1Literal("iso5426")) {
--      return iconv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-+      return iConv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-     } else if(charSetLower == Latin1Literal("iso6937")) {
--      return iconv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-+      return iConv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-     }
-     kdWarning() << "Z3950Fetcher::iconv() - conversion from " << fromCharSet_
-                 << " to " << toCharSet_ << " is unsupported" << endl;
diff --git a/misc/tellico-kde4/files/patch-src-fetch-z3950connection.h b/misc/tellico-kde4/files/patch-src-fetch-z3950connection.h
deleted file mode 100644
index 6789cb7b21ef..000000000000
--- a/misc/tellico-kde4/files/patch-src-fetch-z3950connection.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fetch/z3950connection.h.orig	Fri Jan 12 11:14:04 2007
-+++ src/fetch/z3950connection.h	Fri Jan 12 11:14:17 2007
-@@ -85,7 +85,7 @@
-   void abort() { m_aborted = true; }
- 
- private:
--  static QCString iconv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
-+  static QCString iConv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
-   static QString toXML(const QCString& marc, const QString& fromCharSet);
- 
-   bool makeConnection();
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index e504c179ee3c..c696a30fedf3 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tellico
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
@@ -30,10 +30,6 @@ OPTIONS=	CDDB "CDDB support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
-.endif
-
 .if defined(WITHOUT_CDDB)
 CONFIGURE_ARGS+=--disable-libkcddb
 .else
diff --git a/misc/tellico/distinfo b/misc/tellico/distinfo
index c394b779c7ba..46b9bb46131b 100644
--- a/misc/tellico/distinfo
+++ b/misc/tellico/distinfo
@@ -1,3 +1,3 @@
-MD5 (tellico-1.2.7.tar.gz) = 51635d215ac43d8c90125cc24a28fe46
-SHA256 (tellico-1.2.7.tar.gz) = bc5e8d1aa90d8b6d902d0c1e01814a77dac95188f911e3788c81da6cf4197916
-SIZE (tellico-1.2.7.tar.gz) = 4684384
+MD5 (tellico-1.2.8.tar.gz) = ac9be76e26edaf9f75cddb03ee4ed73b
+SHA256 (tellico-1.2.8.tar.gz) = b6c111c713aa56844a4293a87a932888faec3cfd8c465d7fdab8686acd9f6806
+SIZE (tellico-1.2.8.tar.gz) = 4689201
diff --git a/misc/tellico/files/patch-src-fetch-z3950connection.cpp b/misc/tellico/files/patch-src-fetch-z3950connection.cpp
deleted file mode 100644
index 992ec806426f..000000000000
--- a/misc/tellico/files/patch-src-fetch-z3950connection.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/fetch/z3950connection.cpp.orig	Thu Jan 11 18:50:07 2007
-+++ src/fetch/z3950connection.cpp	Fri Jan 12 11:13:31 2007
-@@ -340,16 +340,16 @@
- 
- inline
- QCString Z3950Connection::toCString(const QString& text_) {
--  return iconv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
-+  return iConv(text_.utf8(), QString::fromLatin1("utf-8"), m_sourceCharSet);
- }
- 
- inline
- QString Z3950Connection::toString(const QCString& text_) {
--  return QString::fromUtf8(iconv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
-+  return QString::fromUtf8(iConv(text_, m_sourceCharSet, QString::fromLatin1("utf-8")));
- }
- 
- // static
--QCString Z3950Connection::iconv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
-+QCString Z3950Connection::iConv(const QCString& text_, const QString& fromCharSet_, const QString& toCharSet_) {
- #if HAVE_YAZ
-   if(text_.isEmpty()) {
-     return text_;
-@@ -365,9 +365,9 @@
-     QString charSetLower = fromCharSet_.lower();
-     charSetLower.remove('-').remove(' ');
-     if(charSetLower == Latin1Literal("iso5426")) {
--      return iconv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-+      return iConv(Iso5426Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-     } else if(charSetLower == Latin1Literal("iso6937")) {
--      return iconv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-+      return iConv(Iso6937Converter::toUtf8(text_).utf8(), QString::fromLatin1("utf-8"), toCharSet_);
-     }
-     kdWarning() << "Z3950Fetcher::iconv() - conversion from " << fromCharSet_
-                 << " to " << toCharSet_ << " is unsupported" << endl;
diff --git a/misc/tellico/files/patch-src-fetch-z3950connection.h b/misc/tellico/files/patch-src-fetch-z3950connection.h
deleted file mode 100644
index 6789cb7b21ef..000000000000
--- a/misc/tellico/files/patch-src-fetch-z3950connection.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fetch/z3950connection.h.orig	Fri Jan 12 11:14:04 2007
-+++ src/fetch/z3950connection.h	Fri Jan 12 11:14:17 2007
-@@ -85,7 +85,7 @@
-   void abort() { m_aborted = true; }
- 
- private:
--  static QCString iconv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
-+  static QCString iConv(const QCString& text, const QString& fromCharSet, const QString& toCharSet);
-   static QString toXML(const QCString& marc, const QString& fromCharSet);
- 
-   bool makeConnection();