From 355d4ab26e58d76590cf8a09cdbff2db72ba06f9 Mon Sep 17 00:00:00 2001 From: roam Date: Tue, 15 Feb 2005 23:17:45 +0000 Subject: Snatch kbedic from the jaws of Death in the nick of time... Okay, okay - the truth is, this is a *long* overdue update to kbedic to use the QT 3 libraries instead of the dead-and-gone QT 2 ones. This does indeed result in some duplication of installed dictionaries, since kbedic no longer uses textproc/bedic-data, but I'll take care of this later. Break cbedic out into a full-blown port - it's a different version from kbedic now. While I'm here, take maintainership of both ports. Submitted by: arved (a long, long time ago) --- textproc/kbedic/Makefile | 52 ++++--------------------- textproc/kbedic/distinfo | 3 +- textproc/kbedic/files/patch-src::database.cpp | 11 ------ textproc/kbedic/files/patch-src::registry.cpp | 29 -------------- textproc/kbedic/files/patch-src::translator.cpp | 38 ------------------ textproc/kbedic/files/src::cbedic.cpp.patch | 16 -------- textproc/kbedic/files/src::win.cpp.patch | 11 ------ textproc/kbedic/pkg-descr | 2 +- textproc/kbedic/pkg-plist | 6 +++ textproc/kbedic/pkg-plist.console | 1 - 10 files changed, 16 insertions(+), 153 deletions(-) delete mode 100644 textproc/kbedic/files/patch-src::database.cpp delete mode 100644 textproc/kbedic/files/patch-src::registry.cpp delete mode 100644 textproc/kbedic/files/patch-src::translator.cpp delete mode 100644 textproc/kbedic/files/src::cbedic.cpp.patch delete mode 100644 textproc/kbedic/files/src::win.cpp.patch delete mode 100644 textproc/kbedic/pkg-plist.console (limited to 'textproc/kbedic') diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile index 566db4f..6c5af50 100644 --- a/textproc/kbedic/Makefile +++ b/textproc/kbedic/Makefile @@ -5,56 +5,20 @@ # $FreeBSD$ # -PORTNAME?= kbedic -PORTVERSION?= 2.1 -PORTREVISION= 1 -CATEGORIES= textproc +PORTNAME= kbedic +PORTVERSION= 4.0 +CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://kbedic.search.bg/download/ MASTER_SITE_SUBDIR=kbedic -DISTNAME= ${PORTNAME}-src-${PORTVERSION} -MAINTAINER= todorov@freebsd-bg.org +MAINTAINER= roam@FreeBSD.org COMMENT= An English-to-Bulgarian and Bulgarian-to-English dictionary -.if ${PORTNAME} == "kbedic" -BROKEN= "fails to patch" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2005-02-17 -.endif - -RUN_DEPENDS= ${DICT_DIR}/${DICT_CHECK}:${PORTSDIR}/textproc/bedic-data - -DICT_CHECK?= buleng.dat -DICT_DIR?= ${LOCALBASE}/share - USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${DICT_DIR} - -.if !defined(CONSOLE_VER) -USE_QT_VER= 2 -USE_X_PREFIX= yes -CONFIGURE_ARGS+= --with-x -EXTRA_PATCHES+= ${FILESDIR}/src::win.cpp.patch -.else -PLIST= ${PKGDIR}/pkg-plist.console -EXTRA_PATCHES+= ${FILESDIR}/src::cbedic.cpp.patch -.endif - -.include - -pre-fetch: - @${ECHO_MSG} " --- Dictionaries setup information ---" - @${ECHO_MSG} "This port uses dictionaries provided by the textproc/bedic-data port." - @${ECHO_MSG} "You may set the following variables to help the system locate" - @${ECHO_MSG} "the dictionaries that you have installed:" - @${ECHO_MSG} " DICT_DIR the directory where the dictionaries" - @${ECHO_MSG} " are located; currently ${DICT_DIR}" - @${ECHO_MSG} " DICT_CHECK a filename of an installed dictionary" - @${ECHO_MSG} " to check for; currently ${DICT_CHECK}" - @${ECHO_MSG} "If no dictionaries are installed yet, you may set the DICTIONARIES variable" - @${ECHO_MSG} "to the names of the dictionaries that the textproc/bedic-data port" - @${ECHO_MSG} "will install; refer to that port for more information." +CONFIGURE_ARGS+= --with-kde +CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +USE_KDELIBS_VER= 3 -.include +.include diff --git a/textproc/kbedic/distinfo b/textproc/kbedic/distinfo index 9508746..798db0b 100644 --- a/textproc/kbedic/distinfo +++ b/textproc/kbedic/distinfo @@ -1,2 +1 @@ -MD5 (kbedic-src-2.1.tar.gz) = eba8547ca714ecbe0441b569ec2f7e9b -MD5 (cbedic-src-1.2.tar.gz) = 88c36588114c614fac79c55f437d625c +MD5 (kbedic-4.0.tar.gz) = d129a31ebb3912ad09413480d421c7d4 diff --git a/textproc/kbedic/files/patch-src::database.cpp b/textproc/kbedic/files/patch-src::database.cpp deleted file mode 100644 index 1d6d37a..0000000 --- a/textproc/kbedic/files/patch-src::database.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/database.cpp.old Fri Dec 12 03:18:26 2003 -+++ src/database.cpp Fri Dec 12 03:18:39 2003 -@@ -106,7 +106,7 @@ - // Open data file and set some variables - // Return true if success, false if failed - //======================================================================== --bool Database::createDictionary(const char *fileName, const long fixedLastWordPointer = 0) { -+bool Database::createDictionary(const char *fileName, const long fixedLastWordPointer) { - // Ensure against invoking twice - if (dataFile != NULL) { - return false; diff --git a/textproc/kbedic/files/patch-src::registry.cpp b/textproc/kbedic/files/patch-src::registry.cpp deleted file mode 100644 index 90bf035..0000000 --- a/textproc/kbedic/files/patch-src::registry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- src/registry.cpp.old Fri Dec 12 03:16:27 2003 -+++ src/registry.cpp Fri Dec 12 03:16:48 2003 -@@ -79,7 +79,7 @@ - //=== Get String ========================================================= - // Return the value of key, if missed return default value - //======================================================================== --char *Registry::getString(const char *property, const char *defaultValue = "") { -+char *Registry::getString(const char *property, const char *defaultValue) { - bool found = false; - char *ret = NULL; - FILE *f; -@@ -113,7 +113,7 @@ - //=== Get Int ============================================================ - // Return the value of key, if missed return default value - //======================================================================== --int Registry::getInt(const char *property, const int defaultValue = 0) { -+int Registry::getInt(const char *property, const int defaultValue) { - int ret = defaultValue; - char *p; - p = getString(property); -@@ -141,7 +141,7 @@ - //=== Get Bool =========================================================== - // Return the value of key, if missed return default value - //======================================================================== --bool Registry::getBool(const char *property, const bool defaultValue = false) { -+bool Registry::getBool(const char *property, const bool defaultValue) { - bool ret = defaultValue; - char *p; - p = getString(property); diff --git a/textproc/kbedic/files/patch-src::translator.cpp b/textproc/kbedic/files/patch-src::translator.cpp deleted file mode 100644 index 5ed989d..0000000 --- a/textproc/kbedic/files/patch-src::translator.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/translator.cpp.old Fri Dec 12 03:19:37 2003 -+++ src/translator.cpp Fri Dec 12 03:20:30 2003 -@@ -119,7 +119,7 @@ - // Real construcor - // Call the same method of Database, and return same result - //======================================================================== --bool Translator::createDictionary(const char *fileName, const int dictionary, const long fixedLastWordPointer = 0) { -+bool Translator::createDictionary(const char *fileName, const int dictionary, const long fixedLastWordPointer) { - bool ret = false; - switch (dictionary) { - case ENG_BUL: -@@ -275,7 +275,7 @@ - // Return true if passed word is legal bulgarian word as LATIN_INPUT - // Return pointer to new word that is legal dictionary word - //======================================================================== --bool Translator::isLatinInput(const char *word, char *buf, const bool ignoreSpace = false) { -+bool Translator::isLatinInput(const char *word, char *buf, const bool ignoreSpace) { - int i = 0; - char *p; - while (word[i] != '\0') { -@@ -304,7 +304,7 @@ - // to a normal latin output - // Change buffer and return pointer to new word - //======================================================================== --char *Translator::toLatin(const char *word, char *buf, const bool legalLatinInput = true) { -+char *Translator::toLatin(const char *word, char *buf, const bool legalLatinInput) { - int i = 0; - int j = 0; - char *p; -@@ -348,7 +348,7 @@ - // Call the same method of Database, and return same result - // But perform some operations - //======================================================================== --char *Translator::getWord(const bool lowerCase = true, const bool legalLatinInput = true) { -+char *Translator::getWord(const bool lowerCase, const bool legalLatinInput) { - char *ret = NULL; - switch (currentDictionary) { - case ENG_BUL: diff --git a/textproc/kbedic/files/src::cbedic.cpp.patch b/textproc/kbedic/files/src::cbedic.cpp.patch deleted file mode 100644 index 1d7fcab..0000000 --- a/textproc/kbedic/files/src::cbedic.cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/cbedic.cpp.old Fri Dec 12 04:51:13 2003 -+++ src/cbedic.cpp Fri Dec 12 04:51:35 2003 -@@ -24,10 +24,12 @@ - **********************************************************************/ - - --#include -+#include - #include - #include - #include -+ -+using namespace std; - - #include "defaults.h" - #include "translator.h" diff --git a/textproc/kbedic/files/src::win.cpp.patch b/textproc/kbedic/files/src::win.cpp.patch deleted file mode 100644 index 805a8c5..0000000 --- a/textproc/kbedic/files/src::win.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/win.cpp.old Fri Dec 12 04:29:29 2003 -+++ src/win.cpp Fri Dec 12 04:29:38 2003 -@@ -218,7 +218,7 @@ - // Create GUI - // Init objects and set default variables - //======================================================================== --Win::Win(QWidget *parent = 0, const char *name = 0):QMainWindow(parent, name) { -+Win::Win(QWidget *parent, const char *name):QMainWindow(parent, name) { - - // Init some variables - fromSystemHighlighted = false; diff --git a/textproc/kbedic/pkg-descr b/textproc/kbedic/pkg-descr index 371d89f..8be30601 100644 --- a/textproc/kbedic/pkg-descr +++ b/textproc/kbedic/pkg-descr @@ -9,7 +9,7 @@ the largest Bulgarian-to-English and English-to-Bulgarian database. English. When we add dictionary, the name becomes kbedic. To use that program it is not necessary to have KDE installed, only the Qt libraries are required. - KBE dictionary 2.1 has been written in C/C++ and has many + KBE dictionary has been written in C/C++ and has many advantages and enhancements in comparison with the older versions - it works faster, the database contains more words and the bugs are less. There is also a console version of the diff --git a/textproc/kbedic/pkg-plist b/textproc/kbedic/pkg-plist index 9ec9a21..74c8851 100644 --- a/textproc/kbedic/pkg-plist +++ b/textproc/kbedic/pkg-plist @@ -1 +1,7 @@ bin/kbedic +%%DATADIR%%/kbedic_bg.qm +%%DATADIR%%/kbedic_icon_mini.xpm +%%DATADIR%%/kbedic_icon.xpm +%%DATADIR%%/en_bg.dat +%%DATADIR%%/bg_en.dat +@dirrm %%DATADIR%% diff --git a/textproc/kbedic/pkg-plist.console b/textproc/kbedic/pkg-plist.console deleted file mode 100644 index c6a02ca..0000000 --- a/textproc/kbedic/pkg-plist.console +++ /dev/null @@ -1 +0,0 @@ -bin/cbedic -- cgit v1.1