diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/ibus-kmfl/Makefile | 8 | ||||
| -rw-r--r-- | textproc/ibus-kmfl/distinfo | 6 | ||||
| -rw-r--r-- | textproc/kmflcomp/Makefile | 9 | ||||
| -rw-r--r-- | textproc/kmflcomp/distinfo | 6 | ||||
| -rw-r--r-- | textproc/kmflcomp/files/patch-include-kmfl.h | 39 | ||||
| -rw-r--r-- | textproc/kmflcomp/files/patch-include-kmflutfconv.h | 24 |
6 files changed, 12 insertions, 80 deletions
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile index e2566a036b98..b941c8f3273c 100644 --- a/textproc/ibus-kmfl/Makefile +++ b/textproc/ibus-kmfl/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ibus-kmfl -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= textproc MASTER_SITES= SF/kmfl/${PORTNAME}/${PORTVERSION} \ - http://anthesphoria.net/FreeBSD/ports/distfiles/ + http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ DIST_SUBDIR= kmfl MAINTAINER= nikola.lecic@anthesphoria.net @@ -22,10 +22,8 @@ RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp USE_GNOME= glib20 pkgconfig -USE_AUTOTOOLS= aclocal:110 automake:110 -ACLOCAL_ARGS= -I m4 -AUTOMAKE_ARGS= --add-missing --copy USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/ibus-kmfl/distinfo b/textproc/ibus-kmfl/distinfo index ea30fde19186..6d5e807d43db 100644 --- a/textproc/ibus-kmfl/distinfo +++ b/textproc/ibus-kmfl/distinfo @@ -1,3 +1,3 @@ -MD5 (kmfl/ibus-kmfl-1.0.2.tar.gz) = c1b369bcc5713f1e921dfd2c0f1285d8 -SHA256 (kmfl/ibus-kmfl-1.0.2.tar.gz) = e6b1af7e1f3dd4768489ee83f4842f7c47a64f707e4edeaf503ab2ec4e97751c -SIZE (kmfl/ibus-kmfl-1.0.2.tar.gz) = 385440 +MD5 (kmfl/ibus-kmfl-1.0.3.tar.gz) = d98ed94d49ed2019008f7b4dc4a20e6c +SHA256 (kmfl/ibus-kmfl-1.0.3.tar.gz) = 0befc497090f5d1f379aec333e2363c0c54192203b81fdfd8d102ce229f0af7f +SIZE (kmfl/ibus-kmfl-1.0.3.tar.gz) = 526025 diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile index 742545a81945..880d151beb38 100644 --- a/textproc/kmflcomp/Makefile +++ b/textproc/kmflcomp/Makefile @@ -6,11 +6,10 @@ # PORTNAME= kmflcomp -PORTVERSION= 0.9.8 -PORTREVISION= 2 +PORTVERSION= 0.9.9 CATEGORIES= textproc MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \ - http://anthesphoria.net/FreeBSD/ports/distfiles/ + http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ KMFL-Compiler.sxw DIST_SUBDIR= kmfl @@ -41,9 +40,7 @@ post-patch: ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib|-L${X11BASE}/lib|' \ ${WRKSRC}/kmfl_compiler/Makefile.in - @${REINPLACE_CMD} -E 's,"UTF(8|16LE|32LE)","UTF-\1",g' \ - ${WRKSRC}/src/utfconv.c - @${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.8",' \ + @${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.9",' \ ${WRKSRC}/kmfl_compiler/kmfl_compiler.c post-install: diff --git a/textproc/kmflcomp/distinfo b/textproc/kmflcomp/distinfo index 7112a2de9ef0..b5ff512f6409 100644 --- a/textproc/kmflcomp/distinfo +++ b/textproc/kmflcomp/distinfo @@ -1,6 +1,6 @@ -MD5 (kmfl/kmflcomp-0.9.8.tar.gz) = d8d6a3163dae204079ccbb7c490d8ee7 -SHA256 (kmfl/kmflcomp-0.9.8.tar.gz) = 0e385c3c35389e2bca84a28fa7c2587dc348dbf3fcc1bd83cdf309d5606d605f -SIZE (kmfl/kmflcomp-0.9.8.tar.gz) = 396597 +MD5 (kmfl/kmflcomp-0.9.9.tar.gz) = ece7fab3fd378ae93445912b6c90c29d +SHA256 (kmfl/kmflcomp-0.9.9.tar.gz) = d07fe491ab4bfd6ad1d60a092c382c6e567f44729d406f066d804057ca9f716a +SIZE (kmfl/kmflcomp-0.9.9.tar.gz) = 365124 MD5 (kmfl/KMFL-Compiler.sxw) = d9bf9f5a45824354205ce8a4721b807d SHA256 (kmfl/KMFL-Compiler.sxw) = dedb0aee0b7d931dff48d0bcd3f9fa5c2c71d4684f9aa53e064df5bfb8b04841 SIZE (kmfl/KMFL-Compiler.sxw) = 56675 diff --git a/textproc/kmflcomp/files/patch-include-kmfl.h b/textproc/kmflcomp/files/patch-include-kmfl.h deleted file mode 100644 index 8c9d30bdf9c2..000000000000 --- a/textproc/kmflcomp/files/patch-include-kmfl.h +++ /dev/null @@ -1,39 +0,0 @@ ---- include/kmfl.h 2006-11-03 10:32:24.000000000 -0800 -+++ include/kmfl.h 2009-11-18 16:57:02.000000000 -0800 -@@ -31,6 +31,7 @@ - #endif - - -+#include <sys/types.h> - #define FILE_VERSION "1" - #define BASE_VERSION "320" - #define LAST_VERSION "600" -@@ -79,25 +80,12 @@ - #ifdef _WIN32 - typedef unsigned int UINT; // 32-bit unsigned integer (general purpose) - #else --#include <stdint.h> --#ifdef __uint32_t_defined -- typedef uint32_t UINT; --#else -- typedef unsigned long UINT; // 32-bit unsigned integer (general purpose) --#endif -+ typedef u_int32_t UINT; - #endif - --#ifdef __int32_t_defined -- typedef int32_t INT; --#else -- typedef long INT; // 32-bit unsigned integer (general purpose) --#endif -+typedef int32_t INT; - --#ifdef __uint8_t_defined --typedef uint8_t BYTE; --#else --typedef unsigned char BYTE; // 8-bit unsigned integer --#endif -+typedef u_int8_t BYTE; - typedef UINT ITEM; // 32-bit unsigned integer for UTF-32 or control values - typedef UINT OFFSET; // 32-bit unsigned integer used as table offsets - diff --git a/textproc/kmflcomp/files/patch-include-kmflutfconv.h b/textproc/kmflcomp/files/patch-include-kmflutfconv.h deleted file mode 100644 index f4138dcddde1..000000000000 --- a/textproc/kmflcomp/files/patch-include-kmflutfconv.h +++ /dev/null @@ -1,24 +0,0 @@ ---- include/kmflutfconv.h 2006-03-10 15:34:49.000000000 -0800 -+++ include/kmflutfconv.h 2009-11-18 16:56:36.000000000 -0800 -@@ -26,16 +26,10 @@ - extern "C" { - #endif - -- --#ifdef __uint32_t_defined --typedef uint32_t UTF32; --typedef uint16_t UTF16; --typedef uint8_t UTF8; --#else --typedef unsigned long UTF32; --typedef unsigned short UTF16; --typedef unsigned char UTF8; --#endif -+#include <sys/types.h> -+typedef u_int32_t UTF32; -+typedef u_int16_t UTF16; -+typedef u_int8_t UTF8; - - size_t IConvertUTF8toUTF16 ( - const UTF8** sourceStart, const UTF8* sourceEnd, - |