Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Dec 2011 00:04:17 +0900
From:      Daichi GOTO <daichi@freebsd.org>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:        Daichi GOTO <daichi@FreeBSD.org>, FreeBSD-gnats-submit@FreeBSD.org
Subject:   Re: ports/163586: suggestion: change the mozc-el port to use the master mozc-server port for its easy maintenance
Message-ID:  <20111225000417.7b1bffbe.daichi@freebsd.org>
In-Reply-To: <201112241430.pBOEUGiM073636@freefall.freebsd.org>
References:  <201112241423.pBOENeDc017377@red.freebsd.org> <201112241430.pBOEUGiM073636@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.

--Multipart=_Sun__25_Dec_2011_00_04_17_+0900_WFRblgvdUthXacCw
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Included patch for mozc-el

# The Web send-pr program looks like working wrong. 
# It droped my patch :-(

--Multipart=_Sun__25_Dec_2011_00_04_17_+0900_WFRblgvdUthXacCw
Content-Type: text/x-diff;
 name="mozc-el.diff"
Content-Disposition: attachment;
 filename="mozc-el.diff"
Content-Transfer-Encoding: 7bit

diff -urN /usr/ports/japanese/mozc-el/Makefile mozc-el/Makefile
--- /usr/ports/japanese/mozc-el/Makefile	2011-12-22 09:17:27.000000000 +0900
+++ mozc-el/Makefile	2011-12-24 16:32:17.087093000 +0900
@@ -5,96 +5,16 @@
 # $FreeBSD: ports/japanese/mozc-el/Makefile,v 1.8 2011/12/22 00:17:27 pav Exp $
 #
 
-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 -urN /usr/ports/japanese/mozc-el/files/pkg-message.in mozc-el/files/pkg-message.in
--- /usr/ports/japanese/mozc-el/files/pkg-message.in	2011-06-28 13:04:52.000000000 +0900
+++ mozc-el/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
@@ -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!
diff -urN /usr/ports/japanese/mozc-el/pkg-message mozc-el/pkg-message
--- /usr/ports/japanese/mozc-el/pkg-message	1970-01-01 09:00:00.000000000 +0900
+++ mozc-el/pkg-message	2011-12-24 15:55:10.460093000 +0900
@@ -0,0 +1,7 @@
+To activate mozc, you will need to add the following lines to
+your ~/.emacs:
+
+(require 'mozc)
+(set-language-environment "Japanese")
+(setq default-input-method "japanese-mozc")
+(global-set-key (kbd "C-o") 'toggle-input-method)

--Multipart=_Sun__25_Dec_2011_00_04_17_+0900_WFRblgvdUthXacCw--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111225000417.7b1bffbe.daichi>