Date: Tue, 7 Dec 1999 22:32:05 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15331: Update ports: XEmacs-21.1.8 Message-ID: <199912071332.WAA26176@pis.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 15331
>Category: ports
>Synopsis: Update ports: XEmacs-21.1.8
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 7 05:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: KIRIYAMA Kazuhiko
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Toba National College of Maritime Technology.
Department of Electronic Mechanical Engineering
>Environment:
>Description:
Updated the port XEmacs-21.1.8. I'm sorry for regret handbook rules. I've
not put DESCR and COMMENT to all slave ports but made these at Makefile.
I've made xemacs-mule ports to regular form in which all ports refer
COMMENT, DESCR and PLIST.
Update files are respecively :
[Add] :
editors/xemacs-mule/pkg/DESCR
editors/xemacs-mule-common/pkg/DESCR
japanese/xemacs-canna/COMMENT
japanese/xemacs-canna/DESCR
[Delete] :
japanese/xemacs-wnn6/pkg/DESCR
I put the diff from ports-current in "Fix:".
>How-To-Repeat:
>Fix:
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs-mule/Makefile editors/xemacs-mule/Makefile
--- /usr/ports/current/editors/xemacs-mule/Makefile Sat Nov 27 20:31:21 1999
+++ editors/xemacs-mule/Makefile Tue Dec 7 22:12:55 1999
@@ -82,7 +82,6 @@
PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
STRIP=
INSTALL_TARGET?=install-arch-dep
-DESCR?= ${WRKDIR}/DESCR
PLIST?= ${PKGLDIR}/PLIST
PLIST_SUB?= XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR} EMACS_CMD=${EMACS_CMD}
@@ -102,10 +101,6 @@
.endif
.if !defined(MULE_COMMON)
-post-configure::
- @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
- ${DESCR_TMPL} > ${DESCR}
-
pre-build:
@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
@@ -125,5 +120,11 @@
post-package:
@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
+
+# for make DESCR (only maintainer use)
+arrange::
+ @${MKDIR} ${PKGDIR}
+ @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+ ${DESCR_TMPL} > ${DESCR}
.include <bsd.port.mk>
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs-mule/pkg/DESCR editors/xemacs-mule/pkg/DESCR
--- /usr/ports/current/editors/xemacs-mule/pkg/DESCR Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/pkg/DESCR Tue Dec 7 21:49:21 1999
@@ -0,0 +1,34 @@
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is not built with any particular language support except for
+already built-in Imput Method - SKK and SJ3. If you want other built-in
+input method, look into the xemacs ports in language- specific directories.
+Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+
+This package and the package, xemacs-common-21.1.8 are designed
+*not* to clobber any existing emacs installation. In particular, the
+executables and man pages of etags/ctags are not installed, and the
+info pages that come with the original emacs don't get installed too.
+The Japanese version is build to install everything, by the way.
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is not built with any particular language support except for
+already built-in Imput Method - SKK and SJ3. If you want other built-in
+input method, look into the xemacs ports in language- specific directories.
+Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+
+This package and the package, xemacs-common-21.1.8 are designed
+*not* to clobber any existing emacs installation. In particular, the
+executables and man pages of etags/ctags are not installed, and the
+info pages that come with the original emacs don't get installed too.
+The Japanese version is build to install everything, by the way.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs-mule-common/Makefile editors/xemacs-mule-common/Makefile
--- /usr/ports/current/editors/xemacs-mule-common/Makefile Sat Nov 27 20:31:21 1999
+++ editors/xemacs-mule-common/Makefile Tue Dec 7 21:33:53 1999
@@ -51,7 +51,7 @@
INSTALL_TARGET= install-arch-indep
PKGINSTALL= ${WRKDIR}/INSTALL.${PKGNAME}
PLIST= ${PKGDIR}/PLIST
-DESCR= ${WRKDIR}/DESCR.${PKGNAME}
+# DESCR= ${WRKDIR}/DESCR.${PKGNAME}
PLIST_SUB= XEMACS_DIR=${XEMACS_DIR}
PKGINSTALL= ${WRKDIR}/INSTALL
TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME}
@@ -74,8 +74,6 @@
@if [ ! -f ${PREFIX}/lib/xemacs/info/dir ]; then \
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/lib/xemacs/info/dir; \
fi
- @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
- ${DESCR_TMPL} > ${DESCR}
@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
${INSTALL_TMPL} > ${PKGINSTALL}
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs-mule-common/pkg/DESCR editors/xemacs-mule-common/pkg/DESCR
--- /usr/ports/current/editors/xemacs-mule-common/pkg/DESCR Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule-common/pkg/DESCR Tue Dec 7 21:49:08 1999
@@ -0,0 +1,18 @@
+This is XEmacs lisp files, info pages, and so on (except executables)
+for XEmacs with Mule(version 21.1.8), the next generation of Emacs.
+
+You must install one of packages, xemacs-mule-21.1.8,
+ja-xemacs-*-21.1.8 (ja-xemacs-canna-21.1.8, ja-xemacs-canna+wnn4-21.1.8, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.8).
+
+This package and the above package of the executables *will* clobber any
+existing XEmacs installation. In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs get installed too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd. If
+someone has a solution to this, please tell me.
+
+--
+Kazz
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-canna/Makefile japanese/xemacs-canna/Makefile
--- /usr/ports/current/japanese/xemacs-canna/Makefile Sat Nov 27 20:32:23 1999
+++ japanese/xemacs-canna/Makefile Tue Dec 7 22:12:49 1999
@@ -20,15 +20,13 @@
CATEGORIES= japanese editors
-JAPANESE= yes
MANLANG= ja
MAN1= xemacs-ja.1
-DESCR_TMPL= ${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
+DESCR= ${.CURDIR}/../xemacs-canna/pkg/DESCR
PLIST= ${PKGLDIR}/PLIST-ja
+DESCR_TMPL= ${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
LANGPREFIX= ja-
-COMMENT= ${WRKDIR}/COMMENT
-DESCR= ${WRKDIR}/DESCR
.if defined(CANNA) && defined(WNN4)
PKGNAMEEXT= -canna+wnn4
SITE_INCLUDES= ${X11BASE}/include
@@ -54,7 +52,7 @@
PKGNAMEEXT= -wnn6
WITH_INPUT_METHOD= --with-wnn6 --with-canna=no
BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
-COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support.
+COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn6 support.
.else
PKGNAMEEXT= -canna
WITH_INPUT_METHOD= --with-canna --with-wnn=no --with-wnn6=no
@@ -62,12 +60,14 @@
COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Canna support.
.endif
-post-configure::
- @${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
-
post-install::
@${MKDIR} ${PREFIX}/man/ja/man1
@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1
@${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
+
+# for make COMMENT (only maintainer use)
+arrange::
+ @${MKDIR} ${PKGDIR} ${.CURDIR}/../xemacs-canna/pkg
+ @${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
.include "${.CURDIR}/../../editors/xemacs-mule/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-canna/pkg/COMMENT japanese/xemacs-canna/pkg/COMMENT
--- /usr/ports/current/japanese/xemacs-canna/pkg/COMMENT Thu Jan 1 09:00:00 1970
+++ japanese/xemacs-canna/pkg/COMMENT Tue Dec 7 21:46:03 1999
@@ -0,0 +1 @@
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Canna support.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-canna/pkg/DESCR japanese/xemacs-canna/pkg/DESCR
--- /usr/ports/current/japanese/xemacs-canna/pkg/DESCR Thu Jan 1 09:00:00 1970
+++ japanese/xemacs-canna/pkg/DESCR Tue Dec 7 21:48:20 1999
@@ -0,0 +1,31 @@
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is built with Japanese support by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine. Each input method would be
+supported in following ports respectively:
+
+ japanese/xemacs-canna ........ SKK, SJ3, Canna
+ japanese/xemacs-canna+wnn4 ... SKK, SJ3, Canna, Wnn4
+ japanese/xemacs-canna+wnn6 ... SKK, SJ3, Canna, Wnn6
+ japanese/xemacs-wnn4 ......... SKK, SJ3, Wnn4
+ japanese/xemacs-wnn6 ......... SKK, SJ3, Wnn6
+
+If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
+in advance. SKK is supported as already builtin. Also it will
+support several input methods under leim.
+
+This package and the package xemacs-common-21.1.8, might clobber any
+existing emacs installation. In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs will be overwritten too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd. If
+someone has a solution to this, please tell me.
+Or to avoid this problem, you could select prefix for top install
+directory. By default it is pointed to the usual place, /usr/local.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-canna+wnn4/pkg/COMMENT japanese/xemacs-canna+wnn4/pkg/COMMENT
--- /usr/ports/current/japanese/xemacs-canna+wnn4/pkg/COMMENT Sun Jun 27 20:33:57 1999
+++ japanese/xemacs-canna+wnn4/pkg/COMMENT Tue Dec 7 21:47:33 1999
@@ -1 +1 @@
-XEmacs text editor, with Canna, Wnn4, SJ3 and SKK support
+XEmacs(version 21.1.8) text editor, with SJ3, SKK, Canna and Wnn4 support.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-canna+wnn6/pkg/COMMENT japanese/xemacs-canna+wnn6/pkg/COMMENT
--- /usr/ports/current/japanese/xemacs-canna+wnn6/pkg/COMMENT Sun Jun 27 20:33:57 1999
+++ japanese/xemacs-canna+wnn6/pkg/COMMENT Tue Dec 7 21:48:09 1999
@@ -1 +1 @@
-XEmacs text editor, with Canna, Wnn6, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK, Canna and Wnn6 support.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-wnn4/pkg/COMMENT japanese/xemacs-wnn4/pkg/COMMENT
--- /usr/ports/current/japanese/xemacs-wnn4/pkg/COMMENT Sun Jun 27 20:33:57 1999
+++ japanese/xemacs-wnn4/pkg/COMMENT Tue Dec 7 21:48:17 1999
@@ -1 +1 @@
-XEmacs text editor, with Wnn4, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn4 support.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-wnn6/pkg/COMMENT japanese/xemacs-wnn6/pkg/COMMENT
--- /usr/ports/current/japanese/xemacs-wnn6/pkg/COMMENT Sun Jun 27 20:33:57 1999
+++ japanese/xemacs-wnn6/pkg/COMMENT Tue Dec 7 21:50:57 1999
@@ -1 +1 @@
-XEmacs text editor, with Wnn6, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn6 support.
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs-wnn6/pkg/DESCR japanese/xemacs-wnn6/pkg/DESCR
--- /usr/ports/current/japanese/xemacs-wnn6/pkg/DESCR Mon Nov 29 23:40:28 1999
+++ japanese/xemacs-wnn6/pkg/DESCR Thu Jan 1 09:00:00 1970
@@ -1,23 +0,0 @@
-This is a package containing only the executables for xemacs-21.1.6, the
-next generation of Emacs.
-
-You need to install a package, xemacs-common-21.1.6, containing emacs
-lisp files, info pages, and so on (except executables) for
-xemacs-21.1.6.
-
-This package is built with Japanese support by using Wnn6 or SJ3 as
-an external input engine. If you use with SJ3, you should be installed
-sj3serv in advance. SKK is supported as already builtin. Also it will
-support several input methods under leim.
-
-This package and the package xemacs-common-21.1.6 might clobber any
-existing emacs installation. In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs will be overwritten too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd. If
-someone has a solution to this, please tell me.
-Or to avoid this problem, you could select prefix for top install
-directory. By default it is pointed to the usual place, /usr/local.
-
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912071332.WAA26176>