diff options
-rw-r--r-- | textproc/cbedic/Makefile | 19 | ||||
-rw-r--r-- | textproc/cbedic/distinfo | 2 | ||||
-rw-r--r-- | textproc/cbedic/files/patch-database.cpp (renamed from textproc/kbedic/files/patch-src::database.cpp) | 4 | ||||
-rw-r--r-- | textproc/cbedic/files/patch-registry.cpp (renamed from textproc/kbedic/files/patch-src::registry.cpp) | 6 | ||||
-rw-r--r-- | textproc/cbedic/files/patch-src::cbedic.cpp (renamed from textproc/kbedic/files/src::cbedic.cpp.patch) | 0 | ||||
-rw-r--r-- | textproc/cbedic/files/patch-translator.cpp (renamed from textproc/kbedic/files/patch-src::translator.cpp) | 10 | ||||
-rw-r--r-- | textproc/cbedic/pkg-descr | 6 | ||||
-rw-r--r-- | textproc/cbedic/pkg-plist (renamed from textproc/kbedic/pkg-plist.console) | 0 | ||||
-rw-r--r-- | textproc/kbedic/Makefile | 52 | ||||
-rw-r--r-- | textproc/kbedic/distinfo | 3 | ||||
-rw-r--r-- | textproc/kbedic/files/src::win.cpp.patch | 11 | ||||
-rw-r--r-- | textproc/kbedic/pkg-descr | 2 | ||||
-rw-r--r-- | textproc/kbedic/pkg-plist | 6 |
13 files changed, 48 insertions, 73 deletions
diff --git a/textproc/cbedic/Makefile b/textproc/cbedic/Makefile index e764c57..a3363df 100644 --- a/textproc/cbedic/Makefile +++ b/textproc/cbedic/Makefile @@ -7,13 +7,22 @@ PORTNAME= cbedic PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR=kbedic -MAINTAINER= todorov@freebsd-bg.org +MAINTAINER= roam@FreeBSD.org +COMMENT= An English-to-Bulgarian and Bulgarian-to-English dictionary -MASTERDIR= ${.CURDIR}/../kbedic +RUN_DEPENDS= ${DICT_DIR}/${DICT_CHECK}:${PORTSDIR}/textproc/bedic-data -CONSOLE_VER= yes +DICT_CHECK?= buleng.dat +DICT_DIR?= ${LOCALBASE}/share -.include "${MASTERDIR}/Makefile" +GNU_CONFIGURE= yes +USE_GMAKE= yes + +CONFIGURE_ARGS= --datadir=${DICT_DIR} + +.include <bsd.port.mk> diff --git a/textproc/cbedic/distinfo b/textproc/cbedic/distinfo new file mode 100644 index 0000000..315c400 --- /dev/null +++ b/textproc/cbedic/distinfo @@ -0,0 +1,2 @@ +MD5 (cbedic-1.2.tar.gz) = a84055cfa6a1a99831eb2190e6df28d0 +SIZE (cbedic-1.2.tar.gz) = 3006925 diff --git a/textproc/kbedic/files/patch-src::database.cpp b/textproc/cbedic/files/patch-database.cpp index 1d6d37a..a42f3b9 100644 --- a/textproc/kbedic/files/patch-src::database.cpp +++ b/textproc/cbedic/files/patch-database.cpp @@ -1,5 +1,5 @@ ---- src/database.cpp.old Fri Dec 12 03:18:26 2003 -+++ src/database.cpp Fri Dec 12 03:18:39 2003 +--- src/database.cpp.orig Sat Aug 9 19:23:43 2003 ++++ src/database.cpp Sat Aug 9 19:24:03 2003 @@ -106,7 +106,7 @@ // Open data file and set some variables // Return true if success, false if failed diff --git a/textproc/kbedic/files/patch-src::registry.cpp b/textproc/cbedic/files/patch-registry.cpp index 90bf035..ea643cc 100644 --- a/textproc/kbedic/files/patch-src::registry.cpp +++ b/textproc/cbedic/files/patch-registry.cpp @@ -1,11 +1,11 @@ ---- src/registry.cpp.old Fri Dec 12 03:16:27 2003 -+++ src/registry.cpp Fri Dec 12 03:16:48 2003 +--- src/registry.cpp.orig Sat Aug 9 19:21:50 2003 ++++ src/registry.cpp Sat Aug 9 19:22:52 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) { ++char *Registry::getString(const char *property, const char *defaultValue ) { bool found = false; char *ret = NULL; FILE *f; diff --git a/textproc/kbedic/files/src::cbedic.cpp.patch b/textproc/cbedic/files/patch-src::cbedic.cpp index 1d7fcab..1d7fcab 100644 --- a/textproc/kbedic/files/src::cbedic.cpp.patch +++ b/textproc/cbedic/files/patch-src::cbedic.cpp diff --git a/textproc/kbedic/files/patch-src::translator.cpp b/textproc/cbedic/files/patch-translator.cpp index 5ed989d..4333f98 100644 --- a/textproc/kbedic/files/patch-src::translator.cpp +++ b/textproc/cbedic/files/patch-translator.cpp @@ -1,5 +1,5 @@ ---- src/translator.cpp.old Fri Dec 12 03:19:37 2003 -+++ src/translator.cpp Fri Dec 12 03:20:30 2003 +--- src/translator.cpp.orig Sat Aug 9 19:24:42 2003 ++++ src/translator.cpp Sat Aug 9 19:26:11 2003 @@ -119,7 +119,7 @@ // Real construcor // Call the same method of Database, and return same result @@ -14,7 +14,7 @@ // 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) { ++bool Translator::isLatinInput(const char *word, char *buf, const bool ignoreSpace ) { int i = 0; char *p; while (word[i] != '\0') { @@ -23,7 +23,7 @@ // 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) { ++char *Translator::toLatin(const char *word, char *buf, const bool legalLatinInput ) { int i = 0; int j = 0; char *p; @@ -32,7 +32,7 @@ // 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 *Translator::getWord(const bool lowerCase, const bool legalLatinInput ) { char *ret = NULL; switch (currentDictionary) { case ENG_BUL: diff --git a/textproc/cbedic/pkg-descr b/textproc/cbedic/pkg-descr new file mode 100644 index 0000000..fd4dd4e --- /dev/null +++ b/textproc/cbedic/pkg-descr @@ -0,0 +1,6 @@ +cbedic is the console version of KBE dictionary, the KDE Bulgarian-English +Dictionary. +WWW: http://kbedic.sourceforge.net + +-Angel +todorov_bg@gmx.net diff --git a/textproc/kbedic/pkg-plist.console b/textproc/cbedic/pkg-plist index c6a02ca..c6a02ca 100644 --- a/textproc/kbedic/pkg-plist.console +++ b/textproc/cbedic/pkg-plist 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 <bsd.port.pre.mk> - -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 <bsd.port.post.mk> +.include <bsd.port.mk> 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/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%% |