- Update ports textproc/openvanilla-framework, textproc/scim-openvanilla, and

  textproc/openvanilla-modules to 0.7.2.b20060214.

PR:		93364
Submitted by:	maintainer

5 files changed, 31 insertions, 61 deletions

diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index c54543a887fa..f4f4ad4f6cff 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openvanilla-modules
-PORTVERSION=	0.7.1.20050902
-PORTREVISION=	1
+PORTVERSION=	0.7.2.b20060214
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.csie.org/~llwang/	\
 		http://www.infor.org/~llwang/
@@ -30,15 +29,12 @@ OPTIONS=	OVIMArray		"Array Input Module"		on \
 		OVIMPOJ_Holo		"POJ-Holo Input Module"		on \
 		OVIMPhonetic		"Phonetic Input Module"		on \
 		OVIMRoman		"Roman Input Module"		off \
-		OVIMTibetan		"Tibetan Input Module"		on \
+		OVIMTibetan		"Tibetan Input Module"		off \
 		OVIMUnicode		"Unicode Input Module"		off
 
-.include <bsd.port.pre.mk>
+MAKE_ARGS+=	INSTALL_PREFIX=${PREFIX} OV_INCLUDE=${X11BASE}/include
 
-post-patch:
-	@${REINPLACE_CMD} -e  \
-		's|LIBTOOL=.*|LIBTOOL=${LIBTOOL}|;' \
-		${WRKSRC}/Mk/ov.vars.mk
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_OVIMArray)
 PLIST_SUB+=	OVIMArray=""
@@ -70,7 +66,7 @@ PLIST_SUB+=	OVIMRoman=""
 .else
 PLIST_SUB+=	OVIMRoman="@comment "
 .endif
-.if !defined(WITHOUT_OVIMTibetan)
+.if defined(WITH_OVIMTibetan)
 PLIST_SUB+=	OVIMTibetan=""
 .else
 PLIST_SUB+=	OVIMTibetan="@comment "
@@ -83,54 +79,54 @@ PLIST_SUB+=	OVIMUnicode="@comment "
 
 do-build:
 .if !defined(WITHOUT_OVIMArray)
-	@(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if defined(WITH_OVIMBig5)
-	@(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if !defined(WITHOUT_OVIMGeneric)
-	@(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if !defined(WITHOUT_OVIMPOJ_Holo)
-	@(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if !defined(WITHOUT_OVIMPhonetic)
-	@(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if defined(WITH_OVIMRoman)
-	@(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if !defined(WITHOUT_OVIMTibetan)
-	@(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 .if defined(WITH_OVIMUnicode)
-	@(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} all)
+	@(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all)
 .endif
 
 do-install:
 .if !defined(WITHOUT_OVIMArray)
-	@(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if defined(WITH_OVIMBig5)
-	@(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if !defined(WITHOUT_OVIMGeneric)
-	@(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if !defined(WITHOUT_OVIMPOJ_Holo)
-	@(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if !defined(WITHOUT_OVIMPhonetic)
-	@(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if defined(WITH_OVIMRoman)
-	@(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if !defined(WITHOUT_OVIMTibetan)
-	@(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 .if defined(WITH_OVIMUnicode)
-	@(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+	@(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/openvanilla-modules/distinfo b/textproc/openvanilla-modules/distinfo
index d480b9558592..95c6b291033b 100644
--- a/textproc/openvanilla-modules/distinfo
+++ b/textproc/openvanilla-modules/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvanilla-0.7.1.20050902.tar.gz) = 65ab030558a8f5a399ef497b8b99d668
-SHA256 (openvanilla-0.7.1.20050902.tar.gz) = babc0c7b8e098a27e6ab6bf9738ba4f7aa50cdeaef1959b99ed7004ab967d617
-SIZE (openvanilla-0.7.1.20050902.tar.gz) = 11321598
+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
diff --git a/textproc/openvanilla-modules/files/patch-Mk::ov.os.mk b/textproc/openvanilla-modules/files/patch-Mk::ov.os.mk
deleted file mode 100644
index 56b37d9de041..000000000000
--- a/textproc/openvanilla-modules/files/patch-Mk::ov.os.mk
+++ /dev/null
@@ -1,15 +0,0 @@
---- Mk/ov.os.mk.orig	Sat Sep  3 12:22:17 2005
-+++ Mk/ov.os.mk	Sun Sep  4 01:51:57 2005
-@@ -16,10 +16,11 @@
- else
- 
- 
--	INST_PATH=/usr/local/lib/openvanilla/
-+	INST_PATH=${PREFIX}/lib/openvanilla/
- 	OBJS=$(patsubst %, %.lo, $(SOURCES))
- 	GOALS=$(IMID).la
- 	#CFLAGS=-I/usr/local/include/ -I../../Headers/
-+	LIBS=-L/usr/local/lib
- 
- $(GOALS): $(OBJS)
- 	$(LIBTOOL) --tag=CXX --mode=link $(CPP) $(LDFLAGS) $(LIBS) -module -rpath $(INST_PATH) -avoid-version -o $(GOALS)  $(OBJS)
diff --git a/textproc/openvanilla-modules/files/patch-Mk::ov.vars.mk b/textproc/openvanilla-modules/files/patch-Mk::ov.vars.mk
deleted file mode 100644
index 0b0fe1c7b4fb..000000000000
--- a/textproc/openvanilla-modules/files/patch-Mk::ov.vars.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- Mk/ov.vars.mk.orig	Sat Sep  3 12:22:17 2005
-+++ Mk/ov.vars.mk	Sun Sep  4 00:49:19 2005
-@@ -8,9 +8,9 @@
- 
- DATA_INST_PATH?=$(INST_PATH)/$(IMID)
- 
--INC=-I../../Headers -I/usr/local/include
-+INC=-I/usr/X11R6/include -I/usr/X11R6/include/OpenVanilla -I/usr/local/include
- 
--CFLAGS=-O2 -Wall $(INC)
-+CFLAGS+=-O2 -Wall $(INC)
- 
- GCC=/usr/bin/gcc
- GPP=/usr/bin/g++
diff --git a/textproc/openvanilla-modules/pkg-plist b/textproc/openvanilla-modules/pkg-plist
index 8d59bf4e57a0..afcc94e7b0ba 100644
--- a/textproc/openvanilla-modules/pkg-plist
+++ b/textproc/openvanilla-modules/pkg-plist
@@ -1,8 +1,8 @@
 %%OVIMArray%%lib/openvanilla/OVIMArray.a
 %%OVIMArray%%lib/openvanilla/OVIMArray.la
 %%OVIMArray%%lib/openvanilla/OVIMArray.so
-%%OVIMArray%%lib/openvanilla/OVIMArray/ArrayShortCode.cin
-%%OVIMArray%%lib/openvanilla/OVIMArray/ArraySpecial.cin
+%%OVIMArray%%lib/openvanilla/OVIMArray/array-shortcode.cin
+%%OVIMArray%%lib/openvanilla/OVIMArray/array-special.cin
 %%OVIMArray%%lib/openvanilla/OVIMArray/array30.cin
 %%OVIMBig5%%lib/openvanilla/OVIMBig5.a
 %%OVIMBig5%%lib/openvanilla/OVIMBig5.la
@@ -11,8 +11,11 @@
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric.la
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric.so
 %%OVIMGeneric%%lib/openvanilla/OVIMGeneric/cj.cin
-%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/ehq.cin
-%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/iroha.cin
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/dayi3.cin
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/ehq-symbols.cin
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/pinyin.cin
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/simplex.cin
+%%OVIMGeneric%%lib/openvanilla/OVIMGeneric/wubizixing.cin
 %%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.a
 %%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.la
 %%OVIMPOJ_Holo%%lib/openvanilla/OVIMPOJ-Holo.so