Changed the mozc-el port to use the master mozc-server port

for its easy maintenance
  - changed as mozc-server slave ports for easy maintenance
  - updated to 1.3.931.102

Approved by:	maho

18 files changed, 6 insertions, 98 deletions

diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile
index ecdbd75e8d0d..d99257c4b0f9 100644
--- a/japanese/mozc-el/Makefile
+++ b/japanese/mozc-el/Makefile
@@ -5,96 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mozc-el
-PORTVERSION=	1.3.911.102
-CATEGORIES=	japanese textproc
-MASTER_SITES=	http://mozc.googlecode.com/files/
-DISTNAME=	mozc-${PORTVERSION}
-
-MAINTAINER=	maho@FreeBSD.org
+PKGNAMESUFFIX=	-el-${EMACS_PORT_NAME}
 COMMENT=	Mozc for GNU Emacs
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep \
-		gyp:${PORTSDIR}/devel/py-gyp-devel
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		gtest.0:${PORTSDIR}/devel/googletest \
-		protobuf.7:${PORTSDIR}/devel/protobuf
-RUN_DEPENDS=	mozc_server:${PORTSDIR}/japanese/mozc-server \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
-
-BROKEN=		does not build
-
-USE_BZIP2=	yes
-USE_EMACS=	yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_PYTHON=	yes
-
-PATCHDIR=	../mozc-server/files
-
-PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/mozc.el \
-		${EMACS_VERSION_SITE_LISPDIR}/mozc.elc \
-		bin/mozc_emacs_helper
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800107
-BROKEN=		Does not compile on FreeBSD 7.X
-.endif
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile: segfault
-.endif
-
-.if defined(WITH_DEBUG_CODE)
-BUILD_MODE=Debug
-.else
-BUILD_MODE=Release
-.endif
-
-.if !defined(NOPORTDOCS)
-SUB_FILES=	pkg-message
-.endif
-
-REPLACE_FILES=	${WRKSRC}/build_mozc.py \
-		${WRKSRC}/gyp/common.gypi \
-		${WRKSRC}/base/util.cc \
-		${WRKSRC}/base/process.cc \
-		${WRKSRC}/handwriting/zinnia_handwriting.cc
-
-post-patch:
-	@for FILE in ${REPLACE_FILES}; \
-	do \
-	    ${SED} -i .bak -e "s/@@LOCALBASE@@/${LOCALBASE:S/\//\\\//g}/g" \
-	    $${FILE}; \
-	done;
-
-do-build:
-	@cd ${WRKSRC}/; \
-		export BUILD_COMMAND=${GMAKE}; \
-		${PYTHON_CMD} build_mozc.py gyp --gypdir=${LOCALBASE}/bin; \
-		${PYTHON_CMD} build_mozc.py build_tools \
-			-c ${BUILD_MODE}; \
-		${PYTHON_CMD} build_mozc.py build \
-			-c ${BUILD_MODE} \
-			unix/emacs/emacs.gyp:mozc_emacs_helper
-	@cd ${WRKSRC}/unix/emacs; \
-		${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-		-f batch-byte-compile mozc.el
+MASTERDIR=	${.CURDIR}/../../japanese/mozc-server
+PKGMESSAGE=	${.CURDIR}/pkg-message
 
-do-install:
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
-		${LOCALBASE}/bin/mozc_emacs_helper
-	@${INSTALL_DATA} \
-		${WRKSRC}/unix/emacs/mozc.el \
-		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc.el
-	@${INSTALL_DATA} \
-		${WRKSRC}/unix/emacs/mozc.elc \
-		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc.elc
+BUILD_MOZC_LIST=	mozc-el
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mozc-el/distinfo b/japanese/mozc-el/distinfo
deleted file mode 100644
index 3c6903f8ca22..000000000000
--- a/japanese/mozc-el/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mozc-1.3.911.102.tar.bz2) = da27945d6732e4fc70c08534cc8d10cd23d6fba5ebc52e6b31cac5d04ba1588a
-SIZE (mozc-1.3.911.102.tar.bz2) = 39180652
diff --git a/japanese/mozc-el/files/patch-base_iconv.cc b/japanese/mozc-el/files/patch-base_iconv.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-base_iconv.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-base_mutex.h b/japanese/mozc-el/files/patch-base_mutex.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-base_mutex.h
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-base_process.cc b/japanese/mozc-el/files/patch-base_process.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-base_process.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-base_util.cc b/japanese/mozc-el/files/patch-base_util.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-base_util.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-build_mozc.py b/japanese/mozc-el/files/patch-build_mozc.py
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-build_mozc.py
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-build_tools_mozc_version.py b/japanese/mozc-el/files/patch-build_tools_mozc_version.py
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-build_tools_mozc_version.py
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-el/files/patch-gui_about_dialog_about_dialog.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-gui_about_dialog_about_dialog.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-gyp_common.gypi b/japanese/mozc-el/files/patch-gyp_common.gypi
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-gyp_common.gypi
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-el/files/patch-ipc_ipc_path_manager.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-ipc_ipc_path_manager.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-ipc_unix_ipc.cc b/japanese/mozc-el/files/patch-ipc_unix_ipc.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-ipc_unix_ipc.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-server_mozc_server.cc b/japanese/mozc-el/files/patch-server_mozc_server.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-server_mozc_server.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-el/files/patch-unix_ibus_gen_mozc_xml.py
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-unix_ibus_gen_mozc_xml.py
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-unix_ibus_mozc.xml b/japanese/mozc-el/files/patch-unix_ibus_mozc.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-unix_ibus_mozc.xml
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-unix_ibus_path_util.cc b/japanese/mozc-el/files/patch-unix_ibus_path_util.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-unix_ibus_path_util.cc
+++ /dev/null
diff --git a/japanese/mozc-el/files/patch-unix_scim_scim.gyp b/japanese/mozc-el/files/patch-unix_scim_scim.gyp
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/mozc-el/files/patch-unix_scim_scim.gyp
+++ /dev/null
diff --git a/japanese/mozc-el/files/pkg-message.in b/japanese/mozc-el/files/pkg-message.in
deleted file mode 100644
index 478791d44948..000000000000
--- a/japanese/mozc-el/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Now, mozc.el has been succesfully installed.
-You need to add following lines to ~/.emacs to use mozc in
-your emacs.
-
-(require 'mozc)
-(set-language-environment "Japanese")
-(setq default-input-method "japanese-mozc")
-(global-set-key (kbd "C-o") 'toggle-input-method)
-
-Thanks!