diff options
15 files changed, 133 insertions, 52 deletions
diff --git a/textproc/openvanilla-framework/Makefile b/textproc/openvanilla-framework/Makefile index cb1f0000f160..88d436cc06e5 100644 --- a/textproc/openvanilla-framework/Makefile +++ b/textproc/openvanilla-framework/Makefile @@ -6,17 +6,15 @@ # PORTNAME= openvanilla-framework -PORTVERSION= 0.7.2.b20060214 -PORTREVISION= 1 +PORTVERSION= 0.7.2.20070514 CATEGORIES= textproc -MASTER_SITES= http://www.csie.org/~llwang/ \ - http://www.infor.org/~llwang/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= rafan DISTNAME= openvanilla-${PORTVERSION} MAINTAINER= llwang@infor.org COMMENT= Development header files for OpenVanilla -USE_X_PREFIX= yes NO_BUILD= yes do-install: diff --git a/textproc/openvanilla-framework/distinfo b/textproc/openvanilla-framework/distinfo index 95c6b291033b..6db7d7486b5e 100644 --- a/textproc/openvanilla-framework/distinfo +++ b/textproc/openvanilla-framework/distinfo @@ -1,3 +1,3 @@ -MD5 (openvanilla-0.7.2.b20060214.tar.gz) = d15b76fd77022cc78b660b9a719d17e7 -SHA256 (openvanilla-0.7.2.b20060214.tar.gz) = 9761b42666676ecb5e590b242d09c4e6f538a23608c0262fc02d38821b1d128d -SIZE (openvanilla-0.7.2.b20060214.tar.gz) = 16777986 +MD5 (openvanilla-0.7.2.20070514.tar.gz) = 1be55a6394a36c1a99158a147c7a2fda +SHA256 (openvanilla-0.7.2.20070514.tar.gz) = 6dcbb824293c3220a3cf8df4565c371a310f9042f01e63e5c1bfc20ee3e4a4c7 +SIZE (openvanilla-0.7.2.20070514.tar.gz) = 21002095 diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile index 88df8076a20d..2c1340ce97f3 100644 --- a/textproc/openvanilla-modules/Makefile +++ b/textproc/openvanilla-modules/Makefile @@ -6,18 +6,17 @@ # PORTNAME= openvanilla-modules -PORTVERSION= 0.7.2.b20060214 -PORTREVISION= 2 +PORTVERSION= 0.7.2.20070514 CATEGORIES= textproc -MASTER_SITES= http://www.csie.org/~llwang/ \ - http://www.infor.org/~llwang/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= rafan DISTNAME= openvanilla-${PORTVERSION} MAINTAINER= llwang@infor.org COMMENT= Input method modules for OpenVanilla -BUILD_DEPENDS= ${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework -RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla +BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework +RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla USE_AUTOTOOLS= libtool:15:env USE_GMAKE= yes @@ -29,10 +28,11 @@ OPTIONS= OVIMArray "Array Input Module" on \ OVIMPOJ_Holo "POJ-Holo Input Module" on \ OVIMPhonetic "Phonetic Input Module" on \ OVIMRoman "Roman Input Module" off \ + OVIMSpaceChewing "Chewing Input Module" on \ OVIMTibetan "Tibetan Input Module" off \ OVIMUnicode "Unicode Input Module" off -MAKE_ARGS+= INSTALL_PREFIX=${PREFIX} OV_INCLUDE=${X11BASE}/include +MAKE_ARGS+= INSTALL_PREFIX=${PREFIX} OV_INCLUDE=${LOCALBASE}/include .include <bsd.port.pre.mk> @@ -46,6 +46,11 @@ PLIST_SUB+= OVIMBig5="" .else PLIST_SUB+= OVIMBig5="@comment " .endif +#.if defined(WITH_OVIMBoshiamy) +#PLIST_SUB+= OVIMBoshiamy="" +#.else +#PLIST_SUB+= OVIMBoshiamy="@comment " +#.endif .if !defined(WITHOUT_OVIMGeneric) PLIST_SUB+= OVIMGeneric="" .else @@ -66,6 +71,11 @@ PLIST_SUB+= OVIMRoman="" .else PLIST_SUB+= OVIMRoman="@comment " .endif +.if !defined(WITHOUT_OVIMSpaceChewing) +PLIST_SUB+= OVIMSpaceChewing="" +.else +PLIST_SUB+= OVIMSpaceChewing="@comment " +.endif .if defined(WITH_OVIMTibetan) PLIST_SUB+= OVIMTibetan="" .else @@ -77,6 +87,23 @@ PLIST_SUB+= OVIMUnicode="" PLIST_SUB+= OVIMUnicode="@comment " .endif +#.if defined(WITH_OVIMBoshiamy) +#DISTFILES+= liu5.cin +#NOFETCHFILES= liu5.cin +#EXTRACT_ONLY+= openvanilla-${PORTVERSION}${EXTRACT_SUFX} +#LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 +#LDFLAGS+= ${LOCALBASE}/lib +#.if !exists(${DISTDIR}/liu5.cin) +#IGNORE= need liu5.cin from a legal copy of LIU57 standard version CDROM to use Boshiamy input module. Please copy /UNIX/xcin2.5/liu5.cin from the CDROM to ${DISTDIR} and run make again +#.endif +#post-extract: +# @${CP} ${DISTDIR}/liu5.cin ${WRKSRC}/Modules/OVIMBoshiamy +#.endif + +#.if !defined(WITHOUT_OVIMSpaceChewing) +#LIB_DEPENDS+= chewing.3:${PORTSDIR}/chinese/libchewing +#.endif + do-build: .if !defined(WITHOUT_OVIMArray) @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) @@ -84,6 +111,9 @@ do-build: .if defined(WITH_OVIMBig5) @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif +#.if defined(WITH_OVIMBoshiamy) +# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) +#.endif .if !defined(WITHOUT_OVIMGeneric) @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif @@ -93,10 +123,13 @@ do-build: .if !defined(WITHOUT_OVIMPhonetic) @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif +.if !defined(WITHOUT_OVIMSpaceChewing) + @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} data all) +.endif .if defined(WITH_OVIMRoman) @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif -.if !defined(WITHOUT_OVIMTibetan) +.if defined(WITH_OVIMTibetan) @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) .endif .if defined(WITH_OVIMUnicode) @@ -110,6 +143,9 @@ do-install: .if defined(WITH_OVIMBig5) @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif +#.if defined(WITH_OVIMBoshiamy) +# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) +#.endif .if !defined(WITHOUT_OVIMGeneric) @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif @@ -122,7 +158,10 @@ do-install: .if defined(WITH_OVIMRoman) @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif -.if !defined(WITHOUT_OVIMTibetan) +.if !defined(WITHOUT_OVIMSpaceChewing) + @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) +.endif +.if defined(WITH_OVIMTibetan) @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) .endif .if defined(WITH_OVIMUnicode) diff --git a/textproc/openvanilla-modules/distinfo b/textproc/openvanilla-modules/distinfo index 95c6b291033b..6db7d7486b5e 100644 --- a/textproc/openvanilla-modules/distinfo +++ b/textproc/openvanilla-modules/distinfo @@ -1,3 +1,3 @@ -MD5 (openvanilla-0.7.2.b20060214.tar.gz) = d15b76fd77022cc78b660b9a719d17e7 -SHA256 (openvanilla-0.7.2.b20060214.tar.gz) = 9761b42666676ecb5e590b242d09c4e6f538a23608c0262fc02d38821b1d128d -SIZE (openvanilla-0.7.2.b20060214.tar.gz) = 16777986 +MD5 (openvanilla-0.7.2.20070514.tar.gz) = 1be55a6394a36c1a99158a147c7a2fda +SHA256 (openvanilla-0.7.2.20070514.tar.gz) = 6dcbb824293c3220a3cf8df4565c371a310f9042f01e63e5c1bfc20ee3e4a4c7 +SIZE (openvanilla-0.7.2.20070514.tar.gz) = 21002095 diff --git a/textproc/openvanilla-modules/files/patch-Modules::Mk::ov.module.mk b/textproc/openvanilla-modules/files/patch-Modules-Mk-ov.module.mk index aa430813df8c..aa430813df8c 100644 --- a/textproc/openvanilla-modules/files/patch-Modules::Mk::ov.module.mk +++ b/textproc/openvanilla-modules/files/patch-Modules-Mk-ov.module.mk diff --git a/textproc/openvanilla-modules/files/patch-Modules-OVIMBoshiamy-Makefile b/textproc/openvanilla-modules/files/patch-Modules-OVIMBoshiamy-Makefile new file mode 100644 index 000000000000..41eff6367753 --- /dev/null +++ b/textproc/openvanilla-modules/files/patch-Modules-OVIMBoshiamy-Makefile @@ -0,0 +1,11 @@ +--- Modules/OVIMBoshiamy/Makefile.orig Mon May 14 14:23:33 2007 ++++ Modules/OVIMBoshiamy/Makefile Tue May 15 22:09:09 2007 +@@ -4,7 +4,7 @@ + SOURCES=OVIMBoshiamy + DATA=imtables.db + CINS=liu5.cin +-LDFLAGS+=-lsqlite3 ++LDFLAGS+=-lsqlite3 -L${LOCALBASE}/lib + EXTRA_GOALS=imtables.db + + include ../Mk/ov.module.mk diff --git a/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing-Makefile b/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing-Makefile new file mode 100644 index 000000000000..a79f69ad84ab --- /dev/null +++ b/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing-Makefile @@ -0,0 +1,13 @@ +--- Modules/OVIMSpaceChewing/Makefile.orig Mon May 14 14:23:34 2007 ++++ Modules/OVIMSpaceChewing/Makefile Tue May 15 22:20:23 2007 +@@ -31,8 +31,8 @@ + MODULEID=OVIMSpaceChewing + SOURCES=OVIMSpaceChewing + +-LIBCHEWING_PREFIX?=/usr/local +-LIBCHEWING_VERSION?=$(shell perl -n -e 'print "$$1\n" if /Version: (.+)/' < $(LIBCHEWING_PREFIX)/lib/pkgconfig/chewing.pc) ++LIBCHEWING_PREFIX?=${LOCALBASE} ++LIBCHEWING_VERSION?=$(shell perl -n -e 'print "$$1\n" if /Version: (.+)/' < $(LIBCHEWING_PREFIX)/libdata/pkgconfig/chewing.pc) + + DATA=$(LIBCHEWING_PREFIX)/share/chewing/ch_index.dat \ + $(LIBCHEWING_PREFIX)/share/chewing/dict.dat \ diff --git a/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing0.3-Makefile b/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing0.3-Makefile new file mode 100644 index 000000000000..007cdeff917b --- /dev/null +++ b/textproc/openvanilla-modules/files/patch-Modules-OVIMSpaceChewing0.3-Makefile @@ -0,0 +1,11 @@ +--- Modules/OVIMSpaceChewing0.3/Makefile.orig Tue May 15 22:36:11 2007 ++++ Modules/OVIMSpaceChewing0.3/Makefile Tue May 15 22:36:11 2007 +@@ -17,7 +17,7 @@ + + data: + cd libchewing/tool/; make; +- svn cat http://svn.openfoundry.org/libchewingdata/utf-8/tsi.src > chewingdata/tsi.src ++ #svn cat http://svn.openfoundry.org/libchewingdata/utf-8/tsi.src > chewingdata/tsi.src + cd chewingdata/; ../libchewing/tool/sort_word; + cd chewingdata/; ../libchewing/tool/sort_dic tsi.src; + cd chewingdata/; ../libchewing/tool/maketree; diff --git a/textproc/openvanilla-modules/files/patch-Modules-SharedHeaders-OVFileHandler.h b/textproc/openvanilla-modules/files/patch-Modules-SharedHeaders-OVFileHandler.h new file mode 100644 index 000000000000..178ac1900dbb --- /dev/null +++ b/textproc/openvanilla-modules/files/patch-Modules-SharedHeaders-OVFileHandler.h @@ -0,0 +1,13 @@ +--- Modules/SharedHeaders/OVFileHandler.h.orig Mon May 14 14:23:35 2007 ++++ Modules/SharedHeaders/OVFileHandler.h Tue May 15 21:07:16 2007 +@@ -43,9 +43,9 @@ + HANDLE hMap; + } MmapHandles; + #else ++ #include <sys/types.h> + #include <sys/mman.h> + #include <sys/stat.h> +- #include <sys/types.h> + #include <stdio.h> + #include <fcntl.h> + #include <unistd.h> diff --git a/textproc/openvanilla-modules/files/patch-Modules::SharedHeaders::OVFileHandler.h b/textproc/openvanilla-modules/files/patch-Modules::SharedHeaders::OVFileHandler.h deleted file mode 100644 index 0c05b9e380f5..000000000000 --- a/textproc/openvanilla-modules/files/patch-Modules::SharedHeaders::OVFileHandler.h +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/SharedHeaders/OVFileHandler.h.orig Tue Feb 14 00:18:36 2006 -+++ Modules/SharedHeaders/OVFileHandler.h Mon Mar 20 16:19:33 2006 -@@ -36,9 +36,9 @@ - #include <fstream> - - #ifndef WIN32 -+ #include <sys/types.h> - #include <sys/mman.h> - #include <sys/stat.h> -- #include <sys/types.h> - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> diff --git a/textproc/openvanilla-modules/pkg-plist b/textproc/openvanilla-modules/pkg-plist index afcc94e7b0ba..c595951e77b6 100644 --- a/textproc/openvanilla-modules/pkg-plist +++ b/textproc/openvanilla-modules/pkg-plist @@ -26,6 +26,15 @@ %%OVIMRoman%%lib/openvanilla/OVIMRoman.a %%OVIMRoman%%lib/openvanilla/OVIMRoman.la %%OVIMRoman%%lib/openvanilla/OVIMRoman.so +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03.a +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03.la +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03.so +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/ch_index.dat +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/dict.dat +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/fonetree.dat +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/ph_index.dat +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/pinyin.tab +%%OVIMSpaceChewing%%lib/openvanilla/OVIMSpaceChewing03/us_freq.dat %%OVIMTibetan%%lib/openvanilla/OVIMTibetan.a %%OVIMTibetan%%lib/openvanilla/OVIMTibetan.la %%OVIMTibetan%%lib/openvanilla/OVIMTibetan.so @@ -34,6 +43,7 @@ %%OVIMUnicode%%lib/openvanilla/OVIMUnicode.so %%OVIMUnicode%%@dirrmtry lib/openvanilla/OVIMUnicode %%OVIMTibetan%%@dirrmtry lib/openvanilla/OVIMTibetan +%%OVIMSpaceChewing%%@dirrmtry lib/openvanilla/OVIMSpaceChewing03 %%OVIMRoman%%@dirrmtry lib/openvanilla/OVIMRoman %%OVIMPhonetic%%@dirrmtry lib/openvanilla/OVIMPhonetic %%OVIMPOJ_Holo%%@dirrmtry lib/openvanilla/OVIMPOJ-Holo diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile index f028004294f5..a238b7206934 100644 --- a/textproc/scim-openvanilla/Makefile +++ b/textproc/scim-openvanilla/Makefile @@ -6,29 +6,32 @@ # PORTNAME= scim-openvanilla -PORTVERSION= 0.7.2.b20060214 -PORTREVISION= 4 +PORTVERSION= 0.7.2.20070514 CATEGORIES= textproc -MASTER_SITES= http://www.csie.org/~llwang/ \ - http://www.infor.org/~llwang/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= rafan DISTNAME= openvanilla-${PORTVERSION} MAINTAINER= llwang@infor.org COMMENT= SCIM OpenVanilla input method (IM)/output filter (OF) framework BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \ - ${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework + ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libltdl:15 WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM USE_GMAKE= yes USE_GNOME= pkgconfig +USE_GETTEXT= yes +USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include \ +CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ OV_MODULEDIR=${PREFIX}/lib/openvanilla/ -post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure +PLIST_FILES= lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.a \ + lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.la \ + lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so .include <bsd.port.mk> diff --git a/textproc/scim-openvanilla/distinfo b/textproc/scim-openvanilla/distinfo index 95c6b291033b..6db7d7486b5e 100644 --- a/textproc/scim-openvanilla/distinfo +++ b/textproc/scim-openvanilla/distinfo @@ -1,3 +1,3 @@ -MD5 (openvanilla-0.7.2.b20060214.tar.gz) = d15b76fd77022cc78b660b9a719d17e7 -SHA256 (openvanilla-0.7.2.b20060214.tar.gz) = 9761b42666676ecb5e590b242d09c4e6f538a23608c0262fc02d38821b1d128d -SIZE (openvanilla-0.7.2.b20060214.tar.gz) = 16777986 +MD5 (openvanilla-0.7.2.20070514.tar.gz) = 1be55a6394a36c1a99158a147c7a2fda +SHA256 (openvanilla-0.7.2.20070514.tar.gz) = 6dcbb824293c3220a3cf8df4565c371a310f9042f01e63e5c1bfc20ee3e4a4c7 +SIZE (openvanilla-0.7.2.20070514.tar.gz) = 21002095 diff --git a/textproc/scim-openvanilla/files/patch-src::Makefile.in b/textproc/scim-openvanilla/files/patch-src-Makefile.in index fead3be45bcc..4157e5ed6972 100644 --- a/textproc/scim-openvanilla/files/patch-src::Makefile.in +++ b/textproc/scim-openvanilla/files/patch-src-Makefile.in @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig Sat Sep 3 12:22:13 2005 -+++ src/Makefile.in Sat Sep 3 13:44:22 2005 -@@ -202,7 +202,7 @@ +--- src/Makefile.in.orig Mon May 14 14:23:30 2007 ++++ src/Makefile.in Tue May 15 20:50:22 2007 +@@ -222,7 +222,7 @@ #noinst_HEADERS = scim_chewing_imengine.h scim_chewing_config_entry.h -moduledir = @SCIM_MODULEDIR@/IMEngine -+moduledir = ${PREFIX}/lib/scim-1.0/IMEngine ++moduledir = ${PREFIX}/lib/scim-1.0/1.4.0/IMEngine module_LTLIBRARIES = OVLoader-SCIM.la OVLoader_SCIM_la_SOURCES = OVLoader-SCIM.cpp OVLoader_SCIM_la_CFLAGS = @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ diff --git a/textproc/scim-openvanilla/pkg-plist b/textproc/scim-openvanilla/pkg-plist deleted file mode 100644 index 666252e200d6..000000000000 --- a/textproc/scim-openvanilla/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/scim-1.0/IMEngine/OVLoader-SCIM.a -lib/scim-1.0/IMEngine/OVLoader-SCIM.la -lib/scim-1.0/IMEngine/OVLoader-SCIM.so -@dirrmtry lib/scim-1.0/IMEngine |