Attachment #37387 for bug #59540

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




#

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

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

EXTRACT_AFTER_ARGS=	> yc.el
NO_WRKSUBDIR=	yes

EMACS_PORT_NAME?=	emacs21
YC_LISPDIR=		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc

MAKE_ARGS+=	LISPDIR=${YC_LISPDIR}
MAKE_ARGS+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
do-install:
	${MKDIR} ${YC_LISPDIR}
	${INSTALL_DATA} ${WRKSRC}/yc.el ${YC_LISPDIR}
	${INSTALL_DATA} ${WRKSRC}/yc.elc ${YC_LISPDIR}

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

Line 1 Link Here

(-)yc.el/distinfo (-1 / +1 lines)
1	MD5 (yc.el-3.5.8.gz) = 94c4484b2a1e13d3e3a2d57dbdc7c19f	1	MD5 (yc-4.0.1.tar.gz) = e63c37a2692d77d132f9f8765f9a53a2




--- Makefile.orig	Sun Nov  9 16:18:10 2003
+++ Makefile	Fri Nov 21 12:59:50 2003
@@ -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,10 @@
 elc = yc.elc
 PROGRAM = icanna$(exesuffix)
 OBJS = icanna.o
-CC = gcc
-INSTALL = install
+#CC = gcc
+#INSTALL = install
+
+.SUFFIXES: .el .elc
 
 all: $(PROGRAM) $(elc)
 
@@ -29,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
 

Lines 1-3 Link Here

(-)yc.el/pkg-plist (+1 lines)
1	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el	1	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el
2	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc	2	%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
		3	bin/icanna
3	@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/yc	4	@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/yc

Return to bug 59540

Lines 6-33 Link Here

(-)yc.el/Makefile (-12 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= yc.el	8	PORTNAME= yc.el
9	PORTVERSION= 3.5.8	9	PORTVERSION= 4.0.1
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= japanese elisp	11	CATEGORIES= japanese elisp
12	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/	12	MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/
13	EXTRACT_SUFX= .gz	13	DISTNAME= yc-${PORTVERSION}
14		14
15	MAINTAINER= t@nakao.org	15	MAINTAINER= t@nakao.org
16	COMMENT= Yet another Canna client for Emacs/XEmacs	16	COMMENT= Yet another Canna client for Emacs/XEmacs
17		17
18	EXTRACT_AFTER_ARGS= > yc.el
19	NO_WRKSUBDIR= yes
20
21	EMACS_PORT_NAME?= emacs21	18	EMACS_PORT_NAME?= emacs21
22	YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc	19	YC_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
23		20
24	do-build:	21	MAKE_ARGS+= LISPDIR=${YC_LISPDIR}
25	${EMACS_CMD} -batch -f batch-byte-compile ${WRKSRC}/yc.el	22	MAKE_ARGS+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
26		23	MAKE_ARGS+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
27	do-install:
28	${MKDIR} ${YC_LISPDIR}
29	${INSTALL_DATA} ${WRKSRC}/yc.el ${YC_LISPDIR}
30	${INSTALL_DATA} ${WRKSRC}/yc.elc ${YC_LISPDIR}
31		24
32	post-install:	25	post-install:
33	@${CAT} ${MASTERDIR}/pkg-message	26	@${CAT} ${MASTERDIR}/pkg-message

Line 0 Link Here

(-)yc.el/files/patch-aa (+46 lines)
	1	--- Makefile.orig Sun Nov 9 16:18:10 2003
	2	+++ Makefile Fri Nov 21 12:59:50 2003
	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,10 @@
	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	all: $(PROGRAM) $(elc)
	29
	30	@@ -29,11 +31,13 @@
	31	install: install-bin install-el
	32
	33	install-bin: $(PROGRAM)
	34	- $(INSTALL) -m 755 -s $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
	35	+ test -f $(INSTALL_PATH) \|\| mkdir -p $(INSTALL_PATH)
	36	+ $(INSTALL_PROGRAM) $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
	37
	38	install-el: $(ELCS) $(SRCS)
	39	- $(INSTALL) -m 755 $(elc) $(elispdir)/$(elc)
	40	- $(INSTALL) -m 755 $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
	41	+ test -f $(elispdir) \|\| mkdir -p $(elispdir)
	42	+ $(INSTALL_SCRIPT) $(elc) $(elispdir)/$(elc)
	43	+ $(INSTALL_SCRIPT) $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
	44
	45	uninstall: uninstall-bin uninstall-el
	46