diff options
-rw-r--r-- | editors/xemacs21-mule-common/Makefile | 4 | ||||
-rw-r--r-- | editors/xemacs21-mule-common/pkg-descr | 18 | ||||
-rw-r--r-- | editors/xemacs21-mule/Makefile | 11 | ||||
-rw-r--r-- | editors/xemacs21-mule/pkg-descr | 34 | ||||
-rw-r--r-- | japanese/xemacs21-canna+freewnn/pkg-comment | 2 | ||||
-rw-r--r-- | japanese/xemacs21-canna+wnn6/pkg-comment | 2 | ||||
-rw-r--r-- | japanese/xemacs21-canna/Makefile | 16 | ||||
-rw-r--r-- | japanese/xemacs21-canna/pkg-comment | 1 | ||||
-rw-r--r-- | japanese/xemacs21-canna/pkg-descr | 31 | ||||
-rw-r--r-- | japanese/xemacs21-freewnn/pkg-comment | 2 | ||||
-rw-r--r-- | japanese/xemacs21-wnn6/pkg-comment | 2 |
11 files changed, 103 insertions, 20 deletions
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile index b87a2dc9ad01..4bdd30669033 100644 --- a/editors/xemacs21-mule-common/Makefile +++ b/editors/xemacs21-mule-common/Makefile @@ -51,7 +51,7 @@ MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ 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} @@ -75,8 +75,6 @@ pre-install: ${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} post-install:: diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr new file mode 100644 index 000000000000..b30a9e36a7f4 --- /dev/null +++ b/editors/xemacs21-mule-common/pkg-descr @@ -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 --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index b226981feebd..d094aef89b11 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -82,7 +82,6 @@ INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME} 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 @@ WITH_INPUT_METHOD?= --with-canna=no --with-wnn=no --with-wnn6=no .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 @@ -126,4 +121,10 @@ post-install:: 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 --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr new file mode 100644 index 000000000000..91afef983fcf --- /dev/null +++ b/editors/xemacs21-mule/pkg-descr @@ -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 --git a/japanese/xemacs21-canna+freewnn/pkg-comment b/japanese/xemacs21-canna+freewnn/pkg-comment index b3cba2f0d39e..a6caec3c136d 100644 --- a/japanese/xemacs21-canna+freewnn/pkg-comment +++ b/japanese/xemacs21-canna+freewnn/pkg-comment @@ -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 --git a/japanese/xemacs21-canna+wnn6/pkg-comment b/japanese/xemacs21-canna+wnn6/pkg-comment index c4c2a3a6c9ab..eca2557a760c 100644 --- a/japanese/xemacs21-canna+wnn6/pkg-comment +++ b/japanese/xemacs21-canna+wnn6/pkg-comment @@ -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 --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile index d74fcfd20995..61de09456b98 100644 --- a/japanese/xemacs21-canna/Makefile +++ b/japanese/xemacs21-canna/Makefile @@ -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 @@ COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn4 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 @@ LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna 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 --git a/japanese/xemacs21-canna/pkg-comment b/japanese/xemacs21-canna/pkg-comment new file mode 100644 index 000000000000..ada90301ac39 --- /dev/null +++ b/japanese/xemacs21-canna/pkg-comment @@ -0,0 +1 @@ +XEmacs(version 21.1.8) text editor, with SJ3, SKK and Canna support. diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr new file mode 100644 index 000000000000..503bbd8aeee3 --- /dev/null +++ b/japanese/xemacs21-canna/pkg-descr @@ -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 --git a/japanese/xemacs21-freewnn/pkg-comment b/japanese/xemacs21-freewnn/pkg-comment index 3a8ebf39bc10..e28656c4f538 100644 --- a/japanese/xemacs21-freewnn/pkg-comment +++ b/japanese/xemacs21-freewnn/pkg-comment @@ -1 +1 @@ -XEmacs text editor, with Wnn4, SJ3 and SKK +XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn4 support. diff --git a/japanese/xemacs21-wnn6/pkg-comment b/japanese/xemacs21-wnn6/pkg-comment index f6571d5432cb..219b478b7868 100644 --- a/japanese/xemacs21-wnn6/pkg-comment +++ b/japanese/xemacs21-wnn6/pkg-comment @@ -1 +1 @@ -XEmacs text editor, with Wnn6, SJ3 and SKK +XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn6 support. |