Attachment 6417 Details for Bug 14591 – file.diff

[patch] file.diff

file.diff (text/plain), 27.68 KB, created by KIRIYAMA Kazuhiko on 1999-10-29 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: KIRIYAMA Kazuhiko

Created: 1999-10-29 16:40:01 UTC

Size: 27.68 KB

patch

obsolete

>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	Wed Oct 27 04:31:28 1999
>+++ editors/xemacs-mule/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	XEmacs
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		5 Dec 1997
> # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
> #
>@@ -21,25 +21,31 @@
> 
> MAINTAINER?=	kiri@kiri.toba-cmt.ac.jp
> 
>-BUILD_DEPENDS=	${BUILD_DEP_LIST}
>+BUILD_DEPENDS=	${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
>+		${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages \
>+		${BUILD_DEP_LIST}
>+
> LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		png.3:${PORTSDIR}/graphics/png \
> 		compface.1:${PORTSDIR}/mail/faces \
> 		tiff.4:${PORTSDIR}/graphics/tiff \
> 		${LIB_INPUT_METHOD}
>-RUN_DEPENDS=	${RUN_DEP_LIST}
>+RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common \
>+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
>+		${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
> 
> EXTRACT_ONLY=	xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
> 		xemacs-${VERSION}-info.tar.gz
> WRKSRC=		${WRKDIR}/xemacs-${VERSION}
> PATCHDIR=	${.CURDIR}/../../editors/xemacs-mule-common/patches
> FILESDIR=	${.CURDIR}/../../editors/xemacs-mule-common/files
>-SCRIPTDIR=	${.CURDIR}/../../editors/xemacs-mule-common/scripts
> INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
> PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
> GNU_CONFIGURE=	yes
> USE_AUTOCONF=	yes
>+MAKE_ENV=	LANG=C
>+MAKE_ARGS=	prefix=${PREFIX}
> CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
> CONFIGURE_ARGS=	--with-x11 \
> 		--with-xim=no \
>@@ -67,10 +73,11 @@
> STRIP=
> INSTALL_TARGET=	install-arch-dep
> PLIST?=		${PKGLDIR}/PLIST
>-PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR}
>+PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR} EMACS_CMD=${EMACS_CMD}
>+
> 
> MAJOR_VERSION=		21.1
>-VERSION=		21.1.6
>+VERSION=		21.1.7
> EMACS_CMD=		xemacs-${VERSION}
> XEMACS_DIR=		xemacs-${VERSION}
> FTP_DIR=		xemacs-${MAJOR_VERSION}
>@@ -80,7 +87,6 @@
> SITE_INCLUDES+=		${PREFIX}/include
> SITE_LIBRARIES+=	${PREFIX}/lib
> WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
>-RUN_DEP_LIST+=		${PREFIX}/lib/${XEMACS_DIR}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common
> 
> pre-build:
> 	@find ${WRKSRC} $ -name \*.orig -o -name \*~ $ -exec ${RM} -f \{} \;
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule/pkg/COMMENT editors/xemacs-mule/pkg/COMMENT
>--- /usr/ports/current/editors/xemacs-mule/pkg/COMMENT	Fri May 29 20:58:46 1998
>+++ editors/xemacs-mule/pkg/COMMENT	Wed Oct 27 20:39:42 1999
>@@ -1 +1 @@
>-XEmacs text editor (Only the executables)
>+XEmacs text editor with mule(Only the executables)
>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	Fri Sep 10 04:32:49 1999
>+++ editors/xemacs-mule/pkg/DESCR	Wed Oct 27 20:38:54 1999
>@@ -1,16 +1,16 @@
>-This is a package containing only the executables for xemacs-21.1.6, the
>+This is a package containing only the executables for xemacs-21.*, the
> next generation of Emacs.
> 
>-You need to install a package, xemacs-common-21.1.6, containing emacs
>+You need to install a package, xemacs-common-21.*, containing emacs
> lisp files, info pages, and so on (except executables) for
>-xemacs-21.1.6.
>+xemacs-21.*.
> 
> This package is not built with any particular language support.  If
> you want a built-in input method, look into the xemacs ports in
> language- specific directories.  Currently only Japanese (SKK,Canna, SJ3,
> Wnn4 and Wnn6) is available.
> 
>-This package and the package, xemacs-common-21.1.6 are designed *not* to 
>+This package and the package, xemacs-common-21.* 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.
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule/pkg/PLIST editors/xemacs-mule/pkg/PLIST
>--- /usr/ports/current/editors/xemacs-mule/pkg/PLIST	Fri Sep 10 04:32:50 1999
>+++ editors/xemacs-mule/pkg/PLIST	Wed Oct 27 19:03:11 1999
>@@ -7,7 +7,7 @@
> bin/ootags
> bin/pstogif
> bin/rcs-checkin
>-bin/xemacs-21.1.6
>+bin/%%EMACS_CMD%%
> @exec ln -sf %D/%F %B/xemacs
> @unexec rm %B/xemacs
> lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/DOC
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule/pkg/PLIST-ja editors/xemacs-mule/pkg/PLIST-ja
>--- /usr/ports/current/editors/xemacs-mule/pkg/PLIST-ja	Fri Sep 10 04:32:50 1999
>+++ editors/xemacs-mule/pkg/PLIST-ja	Tue Oct 26 20:03:25 1999
>@@ -7,7 +7,7 @@
> bin/ootags
> bin/pstogif
> bin/rcs-checkin
>-bin/xemacs-21.1.6
>+bin/%%EMACS_CMD%%
> @exec ln -sf %D/%F %B/xemacs
> @unexec rm %B/xemacs
> lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/DOC
>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 Sep 11 12:31:33 1999
>+++ editors/xemacs-mule-common/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	files except executables for xemacs with mule
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		5 Dec 1997
> # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
> #
>@@ -73,13 +73,15 @@
> 		--x-libraries=${X11BASE}/lib
> MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
> 		gnuserv.1 xemacs.1
>+MAKE_ARGS=	prefix=${PREFIX}
> 
> STRIP=
> INSTALL_TARGET=	install-arch-indep
> PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR}
>+PKGINSTALL=	${WRKDIR}/INSTALL
> 
> MAJOR_VERSION=	21.1
>-VERSION=	21.1.6
>+VERSION=	21.1.7
> XEMACS_DIR=	xemacs-${VERSION}
> FTP_DIR=	xemacs-${MAJOR_VERSION}
> 
>@@ -92,6 +94,16 @@
> 	@if [ ! -f ${PREFIX}/lib/xemacs/info/dir ]; then \
> 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/lib/xemacs/info/dir; \
> 	fi
>+	${ECHO} '#!/bin/sh'	>  ${WRKDIR}/INSTALL
>+	${ECHO} 'if [ "$$2" != "POST-INSTALL" ]; then exit 0; fi'  >> ${WRKDIR}/INSTALL
>+	${ECHO} 'echo "############################################################"' \
>+				 >> ${WRKDIR}/INSTALL
>+	${ECHO} 'echo "You must install one of packages, xemacs-mule and "' \
>+				 >> ${WRKDIR}/INSTALL
>+	${ECHO} "echo \" ja-xemacs-*-${VERSION} (ja-xemacs-${VERSION}, ja-xemacs-canna-${VERSION}, etc.)\""  >> ${WRKDIR}/INSTALL
>+	${ECHO} "echo \", each of which contains only the executables for xemacs-${VERSION}\""  >> ${WRKDIR}/INSTALL
>+	${ECHO} 'echo "############################################################"' \
>+				 >> ${WRKDIR}/INSTALL
> 
> post-install:
> # install xemacs-mule.sh into ${PREFIX}/etc/rc.d
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/files/md5 editors/xemacs-mule-common/files/md5
>--- /usr/ports/current/editors/xemacs-mule-common/files/md5	Fri Sep 10 04:32:50 1999
>+++ editors/xemacs-mule-common/files/md5	Thu Oct 14 14:30:20 1999
>@@ -1,4 +1,4 @@
>-MD5 (xemacs/xemacs-21.1.6.tar.gz) = f216ccf246d10771b65436fd45b50810
>-MD5 (xemacs/xemacs-21.1.6-elc.tar.gz) = 5047ea121e8b972725bbeb2a197e4461
>-MD5 (xemacs/xemacs-21.1.6-info.tar.gz) = 6d9bf4b1f51b278439fd3fbb7033c9b5
>+MD5 (xemacs/xemacs-21.1.7.tar.gz) = c251da17e7aadaabaa3ffdfff56ac4a9
>+MD5 (xemacs/xemacs-21.1.7-elc.tar.gz) = 13efe35dcf9d40f7b43f6783a32af88d
>+MD5 (xemacs/xemacs-21.1.7-info.tar.gz) = 736e211486583994fdb2bda584bf5f9c
> MD5 (xemacs/ps-print-jp.el.gz) = 40ed0019ccf64a917a90cf16959eee81
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/patches/patch-aj editors/xemacs-mule-common/patches/patch-aj
>--- /usr/ports/current/editors/xemacs-mule-common/patches/patch-aj	Thu Jan  1 09:00:00 1970
>+++ editors/xemacs-mule-common/patches/patch-aj	Wed Oct 27 12:45:03 1999
>@@ -0,0 +1,35 @@
>+===================================================================
>+RCS file: lisp/mule/RCS/japanese.el,v
>+retrieving revision 1.1
>+diff -u -r1.1 lisp/mule/japanese.el
>+--- lisp/mule/japanese.el	1999/10/18 09:41:37	1.1
>++++ lisp/mule/japanese.el	1999/10/26 02:42:06
>+@@ -218,8 +218,27 @@
>+ (copy-coding-system 'euc-jp 'euc-japan) ; only for w3
>+ (copy-coding-system 'euc-jp 'japanese-euc)
>+ 
>++(defun setup-japanese-environment ()
>++  "Setup multilingual environment (MULE) for Japanese."
>++  (interactive)
>++  (setup-english-environment)
>++  (set-coding-category-system 'shift-jis 'shift_jis)
>++  (set-coding-category-system 'iso-8-2 'euc-jp)
>++  (set-coding-category-system 'iso-7 'iso-2022-jp)
>++  (set-coding-category-system 'iso-8-designate 'iso-2022-8bit-ss2)
>++
>++  (set-coding-priority-list
>++   '(iso-7
>++     iso-8-2
>++     shift-jis
>++     iso-8-1
>++     iso-lock-shift
>++     iso-8-designate
>++     no-conversion
>++     big5)))
>++
>+ (set-language-info-alist
>+- "Japanese" '((setup-function . setup-japanese-environment-internal)
>++ "Japanese" '((setup-function . setup-japanese-environment)
>+ 	      (tutorial . "TUTORIAL.ja")
>+ 	      (charset . (japanese-jisx0208 japanese-jisx0208-1978
>+ 			  japanese-jisx0212 latin-jisx0201
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/patches/patch-ak editors/xemacs-mule-common/patches/patch-ak
>--- /usr/ports/current/editors/xemacs-mule-common/patches/patch-ak	Sat Oct 16 17:51:37 1999
>+++ editors/xemacs-mule-common/patches/patch-ak	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- lisp/mule/japanese.el~	Wed Feb 17 22:59:32 1999
>-+++ lisp/mule/japanese.el	Thu Oct  7 16:23:57 1999
>-@@ -219,7 +219,7 @@
>- (copy-coding-system 'euc-jp 'japanese-euc)
>- 
>- (set-language-info-alist
>-- "Japanese" '((setup-function . setup-japanese-environment)
>-+ "Japanese" '((setup-function . setup-japanese-environment-internal)
>- 	      (tutorial . "TUTORIAL.ja")
>- 	      (charset . (japanese-jisx0208 japanese-jisx0208-1978
>- 			  japanese-jisx0212 latin-jisx0201
>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	Fri Sep 10 04:32:51 1999
>+++ editors/xemacs-mule-common/pkg/DESCR	Wed Oct 27 20:31:34 1999
>@@ -1,9 +1,9 @@
> This is XEmacs lisp files, info pages, and so on (except executables)
>-for XEmacs 21.1.6, the next generation of Emacs.
>+for XEmacs 21.*, the next generation of Emacs.
> 
>-You must install one of packages, xemacs, jp-xemacs-*-21.1.6 (
>-jp-xemacs-canna-21.1.6, jp-xemacs-canna+sj3-21.1.6, etc.), each of which
>-contains only the executables for xemacs-21.1.6.
>+You must install one of packages, xemacs, jp-xemacs-*-21.* (
>+ja-xemacs-canna-21.*, jp-xemacs-canna+wnn4-21.*, etc.), each of which
>+contains only the executables for xemacs-21.*.
> 
> This package and the above package of the executables *will* clobber any
> existing XEmacs installation.  In particular, the executables and man
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/pkg/INSTALL editors/xemacs-mule-common/pkg/INSTALL
>--- /usr/ports/current/editors/xemacs-mule-common/pkg/INSTALL	Fri Sep 10 04:32:51 1999
>+++ editors/xemacs-mule-common/pkg/INSTALL	Thu Jan  1 09:00:00 1970
>@@ -1,8 +0,0 @@
>-#!/bin/sh
>-
>-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
>-echo "############################################################"
>-echo "You must install one of packages, xemacs-mule and "
>-echo " ja-xemacs-*-21.1.6 (ja-xemacs-21.1.6, ja-xemacs-canna-21.1.6, etc.)"
>-echo ", each of which contains only the executables for xemacs-21.1.6"
>-echo "############################################################"
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/pkg/PLIST editors/xemacs-mule-common/pkg/PLIST
>--- /usr/ports/current/editors/xemacs-mule-common/pkg/PLIST	Fri Sep 10 04:32:59 1999
>+++ editors/xemacs-mule-common/pkg/PLIST	Wed Oct 27 19:38:42 1999
>@@ -1,9 +1,6 @@
> @exec mkdir -p %D/lib/xemacs/site-packages/info
> @exec mkdir -p %D/lib/xemacs/mule-packages/info
> @exec mkdir -p %D/lib/xemacs/xemacs-packages/info
>-@exec [ -f %D/lib/xemacs/site-packages/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir-tmpl > %D/lib/xemacs/site-packages/info/dir
>-@exec [ -f %D/lib/xemacs/mule-packages/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir-tmpl > %D/lib/xemacs/mule-packages/info/dir
>-@exec [ -f %D/lib/xemacs/xemacs-packages/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir-tmpl > %D/lib/xemacs/xemacs-packages/info/dir
> @exec mkdir -p %D/lib/xemacs/site-lisp
> @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
> @comment
>@@ -392,6 +389,7 @@
> lib/%%XEMACS_DIR%%/info/internals.info-5
> lib/%%XEMACS_DIR%%/info/internals.info-6
> lib/%%XEMACS_DIR%%/info/internals.info-7
>+lib/%%XEMACS_DIR%%/info/internals.info-8
> lib/%%XEMACS_DIR%%/info/lispref.info
> lib/%%XEMACS_DIR%%/info/lispref.info-1
> lib/%%XEMACS_DIR%%/info/lispref.info-10
>@@ -923,6 +921,8 @@
> lib/%%XEMACS_DIR%%/lisp/x-win-sun.elc
> lib/%%XEMACS_DIR%%/lisp/x-win-xfree86.el
> lib/%%XEMACS_DIR%%/lisp/x-win-xfree86.elc
>+lib/%%XEMACS_DIR%%/lisp/xpm-button.el
>+lib/%%XEMACS_DIR%%/lisp/xpm-button.elc
> @comment
> @comment dirrm
> @comment
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/editors/xemacs-mule-common/scripts/post-configure editors/xemacs-mule-common/scripts/post-configure
>--- /usr/ports/current/editors/xemacs-mule-common/scripts/post-configure	Sun Oct 11 00:28:22 1998
>+++ editors/xemacs-mule-common/scripts/post-configure	Thu Jan  1 09:00:00 1970
>@@ -1,21 +0,0 @@
>-#!/bin/sh
>-
>-chgdirs=". lib-src lwlib src"
>-
>-cd ${WRKSRC}
>-
>-for dir in ${chgdirs}; do
>-	case ${dir} in
>-	".")
>-		perl -p -i.bak -e '
>-			s@^prefix[ \t]*=.*$@prefix=\${PREFIX}@;
>-			s@^install-arch-dep:(.*)$@install-arch-dep:#$1@;
>-			' ${dir}/Makefile
>-		;;
>-	*)
>-		perl -p -i.bak -e '
>-			s@^prefix[ \t]*=.*$@prefix=\${PREFIX}@;
>-			' ${dir}/Makefile
>-		;;
>-	esac
>-done
>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 Sep 11 12:32:23 1999
>+++ japanese/xemacs-canna/Makefile	Fri Oct 29 22:51:13 1999
>@@ -1,14 +1,57 @@
>-# New ports collection makefile for:	XEmacs for Japanese with Canna
>-# Version required:	21.1.6
>+# New ports collection makefile for:	XEmacs for Japanese
>+# Version required:	21.1.7
> # Date created:		5 Dec 1997
> # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
> #
> # $FreeBSD: ports/japanese/xemacs-canna/Makefile,v 1.5 1999/09/10 21:04:23 taoka Exp $
> #
> 
>-CANNA=		yes
>+CATEGORIES=	japanese editors
> 
>-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
>-PKGDIR=		${.CURDIR}/pkg
>+MANLANG=	ja
>+MAN1=		xemacs-ja.1
>+PLIST=		${PKGLDIR}/PLIST-ja
> 
>-.include	"${MASTERDIR}/Makefile"
>+LANGPREFIX=	ja-
>+MULEPKGDIR=	${PREFIX}/lib/xemacs/mule-packages
>+DESCR=		${.CURDIR}/../../japanese/xemacs-canna/pkg/DESCR
>+.if defined(CANNA) && defined(WNN4)
>+PKGNAMEEXT=		-canna+wnn4
>+SITE_INCLUDES=		${X11BASE}/include
>+SITE_LIBRARIES=		${X11BASE}/lib
>+WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
>+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
>+BUILD_DEP_LIST=		${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
>+.elif defined(CANNA) && defined(WNN6)
>+PKGNAMEEXT=		-canna+wnn6
>+WITH_INPUT_METHOD=	--with-canna --with-wnn6
>+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
>+BUILD_DEP_LIST=		${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
>+.elif defined(WNN4)
>+PKGNAMEEXT=		-wnn4
>+SITE_INCLUDES=		${X11BASE}/include
>+SITE_LIBRARIES=		${X11BASE}/lib
>+WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
>+BUILD_DEP_LIST=		${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
>+.elif defined(WNN6)
>+PKGNAMEEXT=		-wnn6
>+WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
>+BUILD_DEP_LIST=		${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
>+.else
>+PKGNAMEEXT=		-canna
>+WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
>+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
>+.endif
>+
>+post-install::
>+	@${MKDIR} ${PREFIX}/man/ja/man1 ${MULEPKGDIR}/lisp/ps-print
>+	cd ${MULEPKGDIR}/lisp/ps-print; \
>+	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/ps-print-jp.el.gz > ps-print.el; \
>+	chmod 444 ps-print.el
>+#	${PREFIX}/bin/${EMACS_CMD} -batch -q -no-site-file -f batch-byte-compile \
>+#		ps-print.el; \
>+#	chmod 444 ps-print.el ps-print.elc
>+	@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1
>+	@${LN} -sf ja ${MULEPKGDIR}/etc/app-defaults/ja_JP.EUC
>+
>+.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	Sun Jun 27 20:33:57 1999
>+++ japanese/xemacs-canna/pkg/COMMENT	Thu Oct 14 12:42:31 1999
>@@ -1 +1 @@
>-XEmacs text editor, with Canna, SJ3 and SKK support
>+XEmacs text editor, with SJ3 and SKK 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	Fri Sep 10 04:33:43 1999
>+++ japanese/xemacs-canna/pkg/DESCR	Wed Oct 27 23:27:02 1999
>@@ -1,16 +1,25 @@
>-This is a package containing only the executables for xemacs-21.1.6, the
>+This is a package containing only the executables for xemacs-21.*, the
> next generation of Emacs.
> 
>-You need to install a package, xemacs-common-21.1.6, containing emacs
>+You need to install a package, xemacs-common-21.*, containing emacs
> lisp files, info pages, and so on (except executables) for
>-xemacs-21.1.6.
>+xemacs-21.*.
> 
>-This package is built with Japanese support by using Canna 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
>+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.6, might clobber any
>+This package and the package xemacs-common-21.*, 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.
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-canna+wnn4/Makefile japanese/xemacs-canna+wnn4/Makefile
>--- /usr/ports/current/japanese/xemacs-canna+wnn4/Makefile	Fri Sep 10 04:33:44 1999
>+++ japanese/xemacs-canna+wnn4/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	XEmacs with Canna and Wnn4
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		5 Dec 1997
> # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
> #
>@@ -9,7 +9,6 @@
> CANNA=		yes
> WNN4=		yes
> 
>-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
>-PKGDIR=		${.CURDIR}/pkg
>+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-canna
> 
> .include	"${MASTERDIR}/Makefile"
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-canna+wnn4/pkg/DESCR japanese/xemacs-canna+wnn4/pkg/DESCR
>--- /usr/ports/current/japanese/xemacs-canna+wnn4/pkg/DESCR	Fri Sep 10 04:33:44 1999
>+++ japanese/xemacs-canna+wnn4/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 Canna ,Wnn4 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.
>-
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-canna+wnn6/Makefile japanese/xemacs-canna+wnn6/Makefile
>--- /usr/ports/current/japanese/xemacs-canna+wnn6/Makefile	Sat Sep 11 12:32:23 1999
>+++ japanese/xemacs-canna+wnn6/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	XEmacs with Canna and Wnn6
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		5 Dec 1997
> # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
> #
>@@ -9,7 +9,6 @@
> CANNA=		yes
> WNN6=		yes
> 
>-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
>-PKGDIR=		${.CURDIR}/pkg
>+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-canna
> 
> .include	"${MASTERDIR}/Makefile"
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-canna+wnn6/pkg/DESCR japanese/xemacs-canna+wnn6/pkg/DESCR
>--- /usr/ports/current/japanese/xemacs-canna+wnn6/pkg/DESCR	Fri Sep 10 04:33:44 1999
>+++ japanese/xemacs-canna+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 Canna ,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.
>-
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-wnn4/Makefile japanese/xemacs-wnn4/Makefile
>--- /usr/ports/current/japanese/xemacs-wnn4/Makefile	Sat Sep 11 12:32:23 1999
>+++ japanese/xemacs-wnn4/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	XEmacs with Wnn4
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		25 January 1998
> # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
> #
>@@ -8,7 +8,6 @@
> 
> WNN4=		yes
> 
>-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
>-PKGDIR=		${.CURDIR}/pkg
>+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-canna
> 
> .include	"${MASTERDIR}/Makefile"
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-wnn4/pkg/DESCR japanese/xemacs-wnn4/pkg/DESCR
>--- /usr/ports/current/japanese/xemacs-wnn4/pkg/DESCR	Fri Sep 10 04:33:48 1999
>+++ japanese/xemacs-wnn4/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 Wnn4 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.
>-
>diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# *\$FreeBSD.*$ /usr/ports/current/japanese/xemacs-wnn6/Makefile japanese/xemacs-wnn6/Makefile
>--- /usr/ports/current/japanese/xemacs-wnn6/Makefile	Sat Sep 11 12:32:24 1999
>+++ japanese/xemacs-wnn6/Makefile	Thu Oct 28 22:32:12 1999
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	XEmacs with Wnn6
>-# Version required:	21.1.6
>+# Version required:	21.1.7
> # Date created:		25 January 1998
> # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
> #
>@@ -8,7 +8,6 @@
> 
> WNN6=		yes
> 
>-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
>-PKGDIR=		${.CURDIR}/pkg
>+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-canna
> 
> .include	"${MASTERDIR}/Makefile"
>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	Fri Sep 10 04:33:48 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.
>-

Actions: View | Diff

Attachments on bug 14591: 6417