Attachment #92611 for bug #130290

View | Details | Raw Unified | Return to bug 130290
Collapse All | Expand All




#

PORTNAME=	yc.el
PORTVERSION=	5.0.0
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	japanese elisp
MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
DISTNAME=	yc-${PORTVERSION}
DISTFILES=	${DISTNAME}.el.gz

MAINTAINER=	t@nakao.org
COMMENT=	Yet another Canna client for Emacs/XEmacs

NO_WRKSUBDIR=	yes
YC_LISPDIR=		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc

USE_EMACS=	yes
YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"

PLIST_FILES=	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
		%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
		%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
PLIST_DIRS=	%%EMACS_VERSION_SITE_LISPDIR%%/yc

OPTIONS=	ICANNA	"Enable icanna support"	off

.include <bsd.port.pre.mk>

.if defined(WITH_ICANNA)
RUN_DEPENDS+=	${LOCALBASE}/bin/icanna:${PORTSDIR}/japanese/icanna
.endif

do-extract:
	@${RM} -rf ${WRKDIR}
	@${MKDIR} ${WRKDIR}
	@cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/${DISTNAME}.el.gz >yc.el

do-build:
	@cd ${WRKDIR} && \
	${EMACS_CMD} -batch -f batch-byte-compile yc.el

do-install:
	@${TEST} -f ${YC_LISPDIR} || ${MKDIR} ${YC_LISPDIR}
	@cd ${WRKDIR} && \
	${INSTALL_SCRIPT} yc.el yc.elc ${YC_LISPDIR}

post-install:
	@${CAT} ${MASTERDIR}/pkg-message

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)yc.el/distinfo (+3 lines)
		1	MD5 (yc-5.0.0.el.gz) = 46e30679981c4daeefc8bae688728820
		2	SHA256 (yc-5.0.0.el.gz) = fc7c08b686efd420b0c674298d85158d16fda6277c0062eca778919c44d95a89
		3	SIZE (yc-5.0.0.el.gz) = 33202
1	MD5 (yc-4.0.13.tar.gz) = 5cc5f04346b806d4157b4b66d7eba69f	4	MD5 (yc-4.0.13.tar.gz) = 5cc5f04346b806d4157b4b66d7eba69f
2	SHA256 (yc-4.0.13.tar.gz) = 5afd06ea819bbf20f5cbfbcd3c60eb58a50b2ef093defc4c93bfdf8ab69444f3	5	SHA256 (yc-4.0.13.tar.gz) = 5afd06ea819bbf20f5cbfbcd3c60eb58a50b2ef093defc4c93bfdf8ab69444f3
3	SIZE (yc-4.0.13.tar.gz) = 43916	6	SIZE (yc-4.0.13.tar.gz) = 43916




--- Makefile.orig	Tue Apr 20 00:16:34 2004
+++ Makefile	Thu Apr 22 16:31:02 2004
@@ -1,10 +1,10 @@
-prefix = /usr/local
+prefix = $(PREFIX)
 #exesuffix = .exe # for Windows
 
-EMACS = emacs
+#EMACS = emacs
 #EMACS = xemacs
 
-elispdir = $(prefix)/share/emacs/site-lisp
+elispdir = $(LISPDIR)
 #elispdir = $(prefix)/lib/$(EMACS)/site-lisp
 #elispdir = $(prefix)/lib/emacs
 
@@ -12,8 +12,8 @@
 elc = yc.elc
 PROGRAM = icanna$(exesuffix)
 OBJS = icanna.o
-CC = gcc
-INSTALL = install
+#CC = gcc
+#INSTALL = install
 
 .SUFFIXES: .el .elc
 
@@ -31,11 +31,13 @@
 install: install-bin install-el
 
 install-bin: $(PROGRAM)
-	$(INSTALL) -m 755 -s $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
+	test -f $(INSTALL_PATH) || mkdir -p $(INSTALL_PATH)
+	$(INSTALL_PROGRAM) $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
 
 install-el: $(ELCS) $(SRCS)
-	$(INSTALL) -m 755 $(elc) $(elispdir)/$(elc)
-	$(INSTALL) -m 755 $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
+	test -f $(elispdir) || mkdir -p $(elispdir)
+	$(INSTALL_SCRIPT) $(elc) $(elispdir)/$(elc)
+	$(INSTALL_SCRIPT) $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
 
 uninstall: uninstall-bin uninstall-el
 




--- yc.el.orig	2008-02-17 00:37:39.000000000 +0900
+++ yc.el	2008-02-17 00:38:16.000000000 +0900
@@ -393,7 +393,7 @@
 		       (error nil)))))))
   (when (processp yc-server)
     (put 'yc-server 'init nil)
-    (process-kill-without-query yc-server)
+    (set-process-query-on-exit-flag yc-server nil)
     (when yc-debug
       (unwind-protect
 	  (progn
@@ -4046,14 +4046,15 @@
  "japanese-yc" "Japanese" 'yc-activate
  "$B$"(B" "Romaji -> Hiragana -> Kanji&Kana"
  nil)
-(set-language-info "Japanese" 'input-method "japanese-yc")
-;(setq default-input-method "japanese-yc"))
+(defun force-yc-input-mode ()
+  (set-language-info "Japanese" 'input-method "japanese-yc")
+  (setq default-input-method "japanese-yc"))
 
-;(yc-setup)
-;(when (and yc-connect-server-at-startup (yc-server-check))
-;  (yc-init)
-;  (force-yc-input-mode)
-;  )
+(yc-setup)
+(when (and yc-connect-server-at-startup (yc-server-check))
+  (yc-init)
+  (force-yc-input-mode)
+  )
 
 (defconst yc-version "5.0.0")
 (provide 'yc)

Lines 1-4 Link Here

(-)yc.el/pkg-message (-2 / +8 lines)
1	************************************************************	1	**********************************************************************
2	Quick Setup:	2	Quick Setup:
3		3
4	(1) Add the following two lines in your $HOME/.emacs file;	4	(1) Add the following two lines in your $HOME/.emacs file;
Lines 13-16 Link Here
13		13
14	These values are also configurable in .emacs by setting variables	14	These values are also configurable in .emacs by setting variables
15	'yc-server-host' and 'yc-canna-lib-path'.	15	'yc-server-host' and 'yc-canna-lib-path'.
16	************************************************************	16	**********************************************************************
		17	Note:
		18	If you want to use UNIX-domain socket for communication with cannaserver
		19	in emacs21 or former version of emacsen, define WITH_ICANNA to add
		20	dependency to ports ja-icanna.
		21	**********************************************************************
		22

Return to bug 130290

Lines 6-34 Link Here

(-)yc.el/Makefile (-10 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= yc.el	8	PORTNAME= yc.el
9	PORTVERSION= 4.0.13	9	PORTVERSION= 5.0.0
10	PORTREVISION= 2
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= japanese elisp	11	CATEGORIES= japanese elisp
13	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/	12	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/
14	DISTNAME= yc-${PORTVERSION}	13	DISTNAME= yc-${PORTVERSION}
		14	DISTFILES= ${DISTNAME}.el.gz
15		15
16	MAINTAINER= t@nakao.org	16	MAINTAINER= t@nakao.org
17	COMMENT= Yet another Canna client for Emacs/XEmacs	17	COMMENT= Yet another Canna client for Emacs/XEmacs
18		18
19	USE_EMACS= yes	19	NO_WRKSUBDIR= yes
20	YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
21		20
22	MAKE_ARGS+= LISPDIR=${YC_LISPDIR}	21	USE_EMACS= yes
23	MAKE_ARGS+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"	22	YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
24	MAKE_ARGS+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
25		23
26	PLIST_FILES= bin/icanna \	24	PLIST_FILES= %%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
27	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el \
28	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc	25	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
29	PLIST_DIRS= %%EMACS_VERSION_SITE_LISPDIR%%/yc	26	PLIST_DIRS= %%EMACS_VERSION_SITE_LISPDIR%%/yc
30		27
		28	OPTIONS= ICANNA "Enable icanna support" off
		29
		30	.include <bsd.port.pre.mk>
		31
		32	.if defined(WITH_ICANNA)
		33	RUN_DEPENDS+= ${LOCALBASE}/bin/icanna:${PORTSDIR}/japanese/icanna
		34	.endif
		35
		36	do-extract:
		37	@${RM} -rf ${WRKDIR}
		38	@${MKDIR} ${WRKDIR}
		39	@cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/${DISTNAME}.el.gz >yc.el
		40
		41	do-build:
		42	@cd ${WRKDIR} && \
		43	${EMACS_CMD} -batch -f batch-byte-compile yc.el
		44
		45	do-install:
		46	@${TEST} -f ${YC_LISPDIR} \|\| ${MKDIR} ${YC_LISPDIR}
		47	@cd ${WRKDIR} && \
		48	${INSTALL_SCRIPT} yc.el yc.elc ${YC_LISPDIR}
		49
31	post-install:	50	post-install:
32	@${CAT} ${MASTERDIR}/pkg-message	51	@${CAT} ${MASTERDIR}/pkg-message
33		52
34	.include <bsd.port.mk>	53	.include <bsd.port.post.mk>

Lines 1-44 Link Here

(-)yc.el/files/patch-aa (-44 lines)
1	--- Makefile.orig Tue Apr 20 00:16:34 2004
2	+++ Makefile Thu Apr 22 16:31:02 2004
3	@@ -1,10 +1,10 @@
4	-prefix = /usr/local
5	+prefix = $(PREFIX)
6	#exesuffix = .exe # for Windows
7
8	-EMACS = emacs
9	+#EMACS = emacs
10	#EMACS = xemacs
11
12	-elispdir = $(prefix)/share/emacs/site-lisp
13	+elispdir = $(LISPDIR)
14	#elispdir = $(prefix)/lib/$(EMACS)/site-lisp
15	#elispdir = $(prefix)/lib/emacs
16
17	@@ -12,8 +12,8 @@
18	elc = yc.elc
19	PROGRAM = icanna$(exesuffix)
20	OBJS = icanna.o
21	-CC = gcc
22	-INSTALL = install
23	+#CC = gcc
24	+#INSTALL = install
25
26	.SUFFIXES: .el .elc
27
28	@@ -31,11 +31,13 @@
29	install: install-bin install-el
30
31	install-bin: $(PROGRAM)
32	- $(INSTALL) -m 755 -s $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
33	+ test -f $(INSTALL_PATH) \|\| mkdir -p $(INSTALL_PATH)
34	+ $(INSTALL_PROGRAM) $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
35
36	install-el: $(ELCS) $(SRCS)
37	- $(INSTALL) -m 755 $(elc) $(elispdir)/$(elc)
38	- $(INSTALL) -m 755 $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
39	+ test -f $(elispdir) \|\| mkdir -p $(elispdir)
40	+ $(INSTALL_SCRIPT) $(elc) $(elispdir)/$(elc)
41	+ $(INSTALL_SCRIPT) $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
42
43	uninstall: uninstall-bin uninstall-el
44

Line 0 Link Here

(-)yc.el/files/patch-yc.el (+34 lines)
	1	--- yc.el.orig 2008-02-17 00:37:39.000000000 +0900
	2	+++ yc.el 2008-02-17 00:38:16.000000000 +0900
	3	@@ -393,7 +393,7 @@
	4	(error nil)))))))
	5	(when (processp yc-server)
	6	(put 'yc-server 'init nil)
	7	- (process-kill-without-query yc-server)
	8	+ (set-process-query-on-exit-flag yc-server nil)
	9	(when yc-debug
	10	(unwind-protect
	11	(progn
	12	@@ -4046,14 +4046,15 @@
	13	"japanese-yc" "Japanese" 'yc-activate
	14	"$B$"(B" "Romaji -> Hiragana -> Kanji&Kana"
	15	nil)
	16	-(set-language-info "Japanese" 'input-method "japanese-yc")
	17	-;(setq default-input-method "japanese-yc"))
	18	+(defun force-yc-input-mode ()
	19	+ (set-language-info "Japanese" 'input-method "japanese-yc")
	20	+ (setq default-input-method "japanese-yc"))
	21
	22	-;(yc-setup)
	23	-;(when (and yc-connect-server-at-startup (yc-server-check))
	24	-; (yc-init)
	25	-; (force-yc-input-mode)
	26	-; )
	27	+(yc-setup)
	28	+(when (and yc-connect-server-at-startup (yc-server-check))
	29	+ (yc-init)
	30	+ (force-yc-input-mode)
	31	+ )
	32
	33	(defconst yc-version "5.0.0")
	34	(provide 'yc)