Date: Wed, 24 Nov 1999 05:10:02 -0800 (PST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/14591: Update port: xemacs-mule(body) Message-ID: <199911241310.FAA26602@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/14591; it has been noted by GNATS.
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
To: freebsd-gnats-submit@freebsd.org, kiri@pis.toba-cmt.ac.jp
Cc:
Subject: Re: ports/14591: Update port: xemacs-mule(body)
Date: Wed, 24 Nov 1999 22:01:39 +0900 (JST)
Updated the port XEmacs-21.1.8. I've drastic changed XEmacs-Mule ports
because of future merging to original ediotrs/xemacs21.
Current modifications are :
(1) version up from 21.1.7 to 21.1.8
(2) merge all ports to editors/xemacs-mule
Update files are respecively :
[Add] :
editors/xemacs-mule/files/DESCR.tmpl
editors/xemacs-mule/files/md5
editors/xemacs-mule/files/xemacs-mule.sh
editors/xemacs-mule/patches/patch-aa
editors/xemacs-mule/patches/patch-ai
editors/xemacs-mule-common/files/DESCR.tmpl
editors/xemacs-mule-common/files/INSTALL.tmpl
japanese/xemacs-canna/files/DESCR.tmpl
[Delete] :
editors/xemacs-mule/pkg/DESCR
editors/xemacs-mule-common/files/md5
editors/xemacs-mule-common/files/xemacs-mule.sh
editors/xemacs-mule-common/patches/patch-ai
editors/xemacs-mule-common/patches/patch-aj
editors/xemacs-mule-common/pkg/DESCR
japanese/xemacs-canna/pkg/COMMENT
japanese/xemacs-canna/pkg/DESCR
I put the diff from above below:
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/Makefile editors/xemacs-mule/Makefile
--- /usr/ports/tmp.cur/editors/xemacs-mule/Makefile Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule/Makefile Wed Nov 24 21:30:57 1999
@@ -1,53 +1,57 @@
# New ports collection makefile for: XEmacs
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 5 Dec 1997
# Whom: Kazuyuki IENAGA <ienaga@jsys.co.jp>
#
# $FreeBSD: ports/editors/xemacs-mule/Makefile,v 1.20 1999/10/26 01:03:45 taoka Exp $
#
-DISTNAME= xemacs-${VERSION}
-PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-${VERSION}
+# This is the MASTER port of XEmacs Mule slave ports(japanese/xemacs-*)
+# and provides `Architecture Dependent' parts of xemacs binary.
+#
+# Caracteristic variables of XEmacs Mule ports family:
+# MULE_COMMON : COMMON port if defined
+# PKGLDIR : Local PKGDIR of MASTER port(editors/xemacs-mule/pkg)
+# SITE_INCLUDES : site include path(configure arguments)
+# SITE_LIBRARIES : site libraries path(configure arguments)
+# WITH_INPUT_METHOD : input methods(configure arguments)
+# LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods
+# BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
+
+DISTNAME= xemacs-${XEMACS_VER}
+PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-${XEMACS_VER}
CATEGORIES?= editors
MASTER_SITES= ftp://ftp.lab.kdd.co.jp/xemacs/${FTP_DIR}/ \
ftp://ftp.xemacs.org/pub/xemacs/${FTP_DIR}/ \
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${FTP_DIR}/ \
- ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${FTP_DIR}/ \
- ftp://ftp.jpl.org/pub/elisp/
-DISTFILES= xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
- xemacs-${VERSION}-info.tar.gz \
- ps-print-jp.el.gz
+ ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${FTP_DIR}/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} \
+ ${DISTNAME}-info${EXTRACT_SUFX}
DIST_SUBDIR= xemacs
-MAINTAINER?= kiri@kiri.toba-cmt.ac.jp
+MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+.if !defined(MULE_COMMON)
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}
-
+ ${BUILD_INPUT_METHOD}
+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
+.endif
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= ${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
-INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME}
-PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
-GNU_CONFIGURE= yes
+WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER}
USE_AUTOCONF= yes
-MAKE_ENV= LANG=C
-MAKE_ARGS= prefix=${PREFIX}
+USE_XLIB= yes
+GNU_CONFIGURE= yes
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS= --with-x11 \
+CONFIGURE_ARGS?=--with-x11 \
--with-xim=no \
--with-mule \
--x-includes=${X11BASE}/include \
@@ -70,23 +74,37 @@
--with-clash-detection \
--lockdir=/var/run/emacs/lock \
${WITH_INPUT_METHOD}
+MAKE_ENV= LANG=C
+MAKE_ARGS= prefix=${PREFIX}
+PATCHDIR= ${.CURDIR}/../../editors/xemacs-mule/patches
+FILESDIR= ${.CURDIR}/../../editors/xemacs-mule/files
+INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
STRIP=
-INSTALL_TARGET= install-arch-dep
+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}
-
+PLIST_SUB?= XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR} EMACS_CMD=${EMACS_CMD}
-MAJOR_VERSION= 21.1
-VERSION= 21.1.7
-EMACS_CMD= xemacs-${VERSION}
-XEMACS_DIR= xemacs-${VERSION}
-FTP_DIR= xemacs-${MAJOR_VERSION}
+XEMACS_MAJVER= 21.1
+XEMACS_VER= 21.1.8
+EMACS_CMD= xemacs-${XEMACS_VER}
+XEMACS_DIR= xemacs-${XEMACS_VER}
+FTP_DIR= xemacs-${XEMACS_MAJVER}
ARCH_SUBDIR= ${MACHINE_ARCH}--freebsd
PKGNAMEEXT?= -mule
+DESCR_TMPL?= ${.CURDIR}/../xemacs-mule/files/DESCR.tmpl
+.if !defined(MULE_COMMON)
PKGLDIR= ${.CURDIR}/../../editors/xemacs-mule/pkg
SITE_INCLUDES+= ${PREFIX}/include
SITE_LIBRARIES+= ${PREFIX}/lib
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 \{} \;
@@ -99,14 +117,11 @@
.endif
post-install::
-.for file in b2m ctags etags gnuclient xemacs-${VERSION}
+.for file in b2m ctags etags gnuclient xemacs-${XEMACS_VER}
@strip ${PREFIX}/bin/${file}
.endfor
- @if [ -f ${PKGDIR}/INSTALL ]; then \
- ${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
- fi
@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+.endif
post-package:
@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/files/DESCR.tmpl editors/xemacs-mule/files/DESCR.tmpl
--- /usr/ports/tmp.cur/editors/xemacs-mule/files/DESCR.tmpl Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/files/DESCR.tmpl Wed Nov 17 17:14:32 1999
@@ -0,0 +1,17 @@
+This is a package containing only the executables for XEmacs with
+Mule(version %%XEMACS_VER%%), the next generation of Emacs.
+
+You need to install a package, xemacs-common-%%XEMACS_VER%%, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version %%XEMACS_VER%%).
+
+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-%%XEMACS_VER%% 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/tmp.cur/editors/xemacs-mule/files/md5 editors/xemacs-mule/files/md5
--- /usr/ports/tmp.cur/editors/xemacs-mule/files/md5 Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/files/md5 Wed Nov 17 14:09:33 1999
@@ -0,0 +1,3 @@
+MD5 (xemacs/xemacs-21.1.8.tar.gz) = d6b55722307fd2f09c916439354f4282
+MD5 (xemacs/xemacs-21.1.8-elc.tar.gz) = 6102d59e743f6517e2a867c3abf6c715
+MD5 (xemacs/xemacs-21.1.8-info.tar.gz) = 0fb0b3ceb1d552f9faf11f2a3f2d39bb
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/files/xemacs-mule.sh editors/xemacs-mule/files/xemacs-mule.sh
--- /usr/ports/tmp.cur/editors/xemacs-mule/files/xemacs-mule.sh Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/files/xemacs-mule.sh Thu Oct 14 12:29:43 1999
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -d /var/run/emacs/lock ]
+then
+ rm -f /var/run/emacs/lock/*
+else
+ mkdir -p /var/run/emacs/lock
+fi
+chmod 1777 /var/run/emacs/lock
+exit 0
+
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/patches/patch-aa editors/xemacs-mule/patches/patch-aa
--- /usr/ports/tmp.cur/editors/xemacs-mule/patches/patch-aa Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/patches/patch-aa Sat Nov 13 01:00:00 1999
@@ -0,0 +1,11 @@
+--- lisp/package-info.el~ Sun Jan 25 18:54:45 1998
++++ lisp/package-info.el Sat Nov 13 00:58:33 1999
+@@ -50,7 +50,7 @@
+
+ (defun pi-md5sum (file)
+ (with-temp-buffer
+- (call-process "md5sum" file t)
++ (call-process "md5" file t)
+ (goto-char (point-min))
+ (looking-at "[a-z0-9]+")
+ (buffer-substring (match-beginning 0) (match-end 0))))
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/patches/patch-ai editors/xemacs-mule/patches/patch-ai
--- /usr/ports/tmp.cur/editors/xemacs-mule/patches/patch-ai Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule/patches/patch-ai Thu Oct 14 12:29:43 1999
@@ -0,0 +1,10 @@
+--- lib-src/fakemail.c.orig Thu Feb 4 23:50:08 1999
++++ lib-src/fakemail.c Thu Feb 4 23:50:18 1999
+@@ -21,6 +21,7 @@
+ /* Synched up with: FSF 19.28. */
+
+ #define NO_SHORTNAMES
++#define cuserid(s) ((char *)0)
+ #include <../src/config.h>
+
+ #if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/pkg/DESCR editors/xemacs-mule/pkg/DESCR
--- /usr/ports/tmp.cur/editors/xemacs-mule/pkg/DESCR Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule/pkg/DESCR Thu Jan 1 09:00:00 1970
@@ -1,17 +0,0 @@
-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.*, containing emacs
-lisp files, info pages, and so on (except executables) for
-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.* 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/tmp.cur/editors/xemacs-mule/pkg/PLIST editors/xemacs-mule/pkg/PLIST
--- /usr/ports/tmp.cur/editors/xemacs-mule/pkg/PLIST Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule/pkg/PLIST Wed Nov 17 22:26:37 1999
@@ -7,26 +7,9 @@
bin/ootags
bin/pstogif
bin/rcs-checkin
-bin/%%EMACS_CMD%%
+bin/%%XEMACS_DIR%%
@exec ln -sf %D/%F %B/xemacs
@unexec rm %B/xemacs
lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/DOC
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/add-big-package.sh
lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/config.values
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/cvtmail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/digest-doc
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/fakemail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gnuserv
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gzip-el.sh
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/hexl
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-docfile
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-path
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/mmencode
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/movemail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/profile
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/rcs2log
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/sorted-doc
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/vcdiff
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/wakeup
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/yow
@dirrm lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule/pkg/PLIST-ja editors/xemacs-mule/pkg/PLIST-ja
--- /usr/ports/tmp.cur/editors/xemacs-mule/pkg/PLIST-ja Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule/pkg/PLIST-ja Wed Nov 17 15:52:57 1999
@@ -7,31 +7,11 @@
bin/ootags
bin/pstogif
bin/rcs-checkin
-bin/%%EMACS_CMD%%
+bin/%%XEMACS_DIR%%
@exec ln -sf %D/%F %B/xemacs
@unexec rm %B/xemacs
lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/DOC
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/add-big-package.sh
lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/config.values
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/cvtmail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/digest-doc
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/fakemail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gnuserv
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gzip-el.sh
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/hexl
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-docfile
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-path
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/mmencode
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/movemail
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/profile
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/rcs2log
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/sorted-doc
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/vcdiff
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/wakeup
-lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/yow
-lib/xemacs/mule-packages/lisp/ps-print/ps-print.el
-@comment lib/xemacs/mule-packages/lisp/ps-print/ps-print.elc
@exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
@unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
-@dirrm lib/xemacs/mule-packages/lisp/ps-print
@dirrm lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule-common/Makefile editors/xemacs-mule-common/Makefile
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/Makefile Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule-common/Makefile Wed Nov 24 21:30:57 1999
@@ -1,119 +1,96 @@
# New ports collection makefile for: files except executables for xemacs with mule
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 5 Dec 1997
# Whom: Kazuyuki IENAGA <ienaga@jsys.co.jp>
#
# $FreeBSD: ports/editors/xemacs-mule-common/Makefile,v 1.10 1999/09/10 23:38:56 asami Exp $
#
-DISTNAME= xemacs-${VERSION}
-PKGNAME= xemacs-mule-common-${VERSION}
-CATEGORIES= editors japanese
-MASTER_SITES= ftp://ftp.lab.kdd.co.jp/xemacs/${FTP_DIR}/ \
- ftp://ftp.xemacs.org/pub/xemacs/${FTP_DIR}/ \
- ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${FTP_DIR}/ \
- ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${FTP_DIR}/ \
- ftp://ftp.jpl.org/pub/elisp/
-DISTFILES= xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
- xemacs-${VERSION}-info.tar.gz \
- ps-print-jp.el.gz
-DIST_SUBDIR= xemacs
-
-MAINTAINER= kiri@kiri.toba-cmt.ac.jp
-
-# from xemacs-mule
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- compface.1:${PORTSDIR}/mail/faces
-USE_AUTOCONF= yes
-
-EXTRACT_ONLY= xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
- xemacs-${VERSION}-info.tar.gz
+# This is the COMMON port of XEmacs Mule slave ports(editors/xemacs-mule,
+# japanese/xemacs-*) and provides `Architecture Independent' parts of xemacs binary.
+#
+# Caracteristic variables of XEmacs Mule ports family:
+# MULE_COMMON : COMMON port if defined
+# PKGLDIR : Local PKGDIR of MASTER port(editors/xemacs-mule/pkg)
+# SITE_INCLUDES : site include path(configure arguments)
+# SITE_LIBRARIES : site libraries path(configure arguments)
+# WITH_INPUT_METHOD : input methods(configure arguments)
+# LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods
+# BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
.include <bsd.port.pre.mk>
.for dir in \
editors/xemacs-mule \
- japanese/xemacs \
japanese/xemacs-canna \
japanese/xemacs-canna+wnn4 \
japanese/xemacs-canna+wnn6 \
japanese/xemacs-wnn4 \
japanese/xemacs-wnn6
.if exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.install_done)
-WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
+WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
.elif exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.build_done)
-WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
+WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work
.endif
.endfor
-WRKSRC= ${WRKDIR}/xemacs-${VERSION}
-
.if !defined(WRKDIR)
.if defined(PACKAGE_BUILDING)
-# XXX
pre-build:
- @cd ${.CURDIR}/../xemacs-mule; make
+ @cd ${.CURDIR}/../xemacs-mule; ${MAKE}
.else
BROKEN= You should build install one of the other xemacs ports first
.endif
.endif
-INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME}
-PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
-TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-
-USE_XLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= i386-unknown-freebsd \
- --with-x11 \
+CONFIGURE_ARGS= --with-x11 \
--with-mule \
--x-includes=${X11BASE}/include \
--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
+PKGINSTALL= ${WRKDIR}/INSTALL.${PKGNAME}
+PLIST= ${PKGDIR}/PLIST
+DESCR= ${WRKDIR}/DESCR.${PKGNAME}
PLIST_SUB= XEMACS_DIR=${XEMACS_DIR}
PKGINSTALL= ${WRKDIR}/INSTALL
+TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-MAJOR_VERSION= 21.1
-VERSION= 21.1.7
-XEMACS_DIR= xemacs-${VERSION}
-FTP_DIR= xemacs-${MAJOR_VERSION}
+MULE_COMMON= yes
+PKGNAMEEXT= -mule-common
+DESCR_TMPL= ${.CURDIR}/../xemacs-mule-common/files/DESCR.tmpl
+INSTALL_TMPL= ${.CURDIR}/../xemacs-mule-common/files/INSTALL.tmpl
pre-build:
- ${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
+ @${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
pre-install:
- @${MKDIR} ${PREFIX}/lib/xemacs
+.for dirp in site mule xemacs
+.for dir in etc info man pkginfo
+ @${MKDIR} ${PREFIX}/lib/xemacs/${dirp}-packages/${dir}
+.endfor
+.endfor
@(cd ${PREFIX}/lib/xemacs; ${MKDIR} info etc site-lisp)
@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
+ @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+ ${DESCR_TMPL} > ${DESCR}
+ @${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+ ${INSTALL_TMPL} > ${PKGINSTALL}
-post-install:
+post-install::
# install xemacs-mule.sh into ${PREFIX}/etc/rc.d
- @${MKDIR} /var/run/emacs/lock
- ${CHMOD} 1777 /var/run/emacs/lock
+ @if [ ! -d /var/run/emacs/lock ]; then \
+ ${MKDIR} /var/run/emacs/lock; \
+ ${CHMOD} 1777 /var/run/emacs/lock; \
+ fi
@${MKDIR} ${PREFIX}/etc/rc.d
@${INSTALL_SCRIPT} ${FILESDIR}/xemacs-mule.sh ${PREFIX}/etc/rc.d
+ @if [ -f ${PKGDIR}/INSTALL ]; then \
+ ${SETENV} PKG_PREFIX=${PREFIX} \
+ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
+ fi
@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
-post-package:
- @${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../xemacs-mule/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule-common/files/DESCR.tmpl editors/xemacs-mule-common/files/DESCR.tmpl
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/files/DESCR.tmpl Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule-common/files/DESCR.tmpl Wed Nov 17 20:40:17 1999
@@ -0,0 +1,18 @@
+This is XEmacs lisp files, info pages, and so on (except executables)
+for XEmacs with Mule(version %%XEMACS_VER%%), the next generation of Emacs.
+
+You must install one of packages, xemacs-mule-%%XEMACS_VER%%,
+ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+wnn4-%%XEMACS_VER%%, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion %%XEMACS_VER%%).
+
+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/tmp.cur/editors/xemacs-mule-common/files/INSTALL.tmpl editors/xemacs-mule-common/files/INSTALL.tmpl
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/files/INSTALL.tmpl Thu Jan 1 09:00:00 1970
+++ editors/xemacs-mule-common/files/INSTALL.tmpl Wed Nov 17 20:43:15 1999
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "################################################################"
+echo "You must install one of packages, xemacs-mule and "
+echo " ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-%%XEMACS_VER%%, ja-xemacs-canna-%%XEMACS_VER%%, etc.)"
+echo ", each of which contains only the executables for xemacs-%%XEMACS_VER%%"
+echo "################################################################"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule-common/files/md5 editors/xemacs-mule-common/files/md5
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/files/md5 Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule-common/files/md5 Thu Jan 1 09:00:00 1970
@@ -1,4 +0,0 @@
-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/tmp.cur/editors/xemacs-mule-common/files/xemacs-mule.sh editors/xemacs-mule-common/files/xemacs-mule.sh
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/files/xemacs-mule.sh Wed Nov 24 11:21:29 1999
+++ editors/xemacs-mule-common/files/xemacs-mule.sh Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ -d /var/run/emacs/lock ]
-then
- rm -f /var/run/emacs/lock/*
-else
- mkdir -p /var/run/emacs/lock
-fi
-chmod 1777 /var/run/emacs/lock
-exit 0
-
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule-common/patches/patch-ai editors/xemacs-mule-common/patches/patch-ai
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/patches/patch-ai Wed Nov 24 11:21:29 1999
+++ editors/xemacs-mule-common/patches/patch-ai Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- lib-src/fakemail.c.orig Thu Feb 4 23:50:08 1999
-+++ lib-src/fakemail.c Thu Feb 4 23:50:18 1999
-@@ -21,6 +21,7 @@
- /* Synched up with: FSF 19.28. */
-
- #define NO_SHORTNAMES
-+#define cuserid(s) ((char *)0)
- #include <../src/config.h>
-
- #if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/editors/xemacs-mule-common/patches/patch-aj editors/xemacs-mule-common/patches/patch-aj
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/patches/patch-aj Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule-common/patches/patch-aj Thu Jan 1 09:00:00 1970
@@ -1,35 +0,0 @@
-===================================================================
-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/tmp.cur/editors/xemacs-mule-common/pkg/DESCR editors/xemacs-mule-common/pkg/DESCR
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/pkg/DESCR Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule-common/pkg/DESCR Thu Jan 1 09:00:00 1970
@@ -1,18 +0,0 @@
-This is XEmacs lisp files, info pages, and so on (except executables)
-for XEmacs 21.*, the next generation of Emacs.
-
-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
-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/tmp.cur/editors/xemacs-mule-common/pkg/PLIST editors/xemacs-mule-common/pkg/PLIST
--- /usr/ports/tmp.cur/editors/xemacs-mule-common/pkg/PLIST Wed Nov 24 11:23:20 1999
+++ editors/xemacs-mule-common/pkg/PLIST Wed Nov 17 21:25:31 1999
@@ -1,11 +1,20 @@
+@exec mkdir -p %D/lib/xemacs/site-packages/etc
@exec mkdir -p %D/lib/xemacs/site-packages/info
+@exec mkdir -p %D/lib/xemacs/site-packages/lisp
+@exec mkdir -p %D/lib/xemacs/site-packages/man
+@exec mkdir -p %D/lib/xemacs/site-packages/pkginfo
+@exec mkdir -p %D/lib/xemacs/mule-packages/etc
@exec mkdir -p %D/lib/xemacs/mule-packages/info
+@exec mkdir -p %D/lib/xemacs/mule-packages/lisp
+@exec mkdir -p %D/lib/xemacs/mule-packages/man
+@exec mkdir -p %D/lib/xemacs/mule-packages/pkginfo
+@exec mkdir -p %D/lib/xemacs/xemacs-packages/etc
@exec mkdir -p %D/lib/xemacs/xemacs-packages/info
+@exec mkdir -p %D/lib/xemacs/xemacs-packages/lisp
+@exec mkdir -p %D/lib/xemacs/xemacs-packages/man
+@exec mkdir -p %D/lib/xemacs/xemacs-packages/pkginfo
@exec mkdir -p %D/lib/xemacs/site-lisp
@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
-@comment
-@comment XEmacs etc
-@comment
etc/rc.d/xemacs-mule.sh
lib/%%XEMACS_DIR%%/etc/BETA
lib/%%XEMACS_DIR%%/etc/CHARSETS
@@ -367,9 +376,6 @@
lib/%%XEMACS_DIR%%/etc/xemacs.1
lib/%%XEMACS_DIR%%/etc/xemacs.xbm
lib/%%XEMACS_DIR%%/etc/xemacs.xpm
-@comment
-@comment XEmacs infos
-@comment
lib/%%XEMACS_DIR%%/info/cl.info
lib/%%XEMACS_DIR%%/info/cl.info-1
lib/%%XEMACS_DIR%%/info/cl.info-2
@@ -490,9 +496,6 @@
lib/%%XEMACS_DIR%%/info/xemacs.info-7
lib/%%XEMACS_DIR%%/info/xemacs.info-8
lib/%%XEMACS_DIR%%/info/xemacs.info-9
-@comment
-@comment XEmacs lisp
-@comment
lib/%%XEMACS_DIR%%/lisp/.cvsignore
lib/%%XEMACS_DIR%%/lisp/ChangeLog
lib/%%XEMACS_DIR%%/lisp/ChangeLog.1
@@ -923,20 +926,16 @@
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
-@dirrm lib/%%XEMACS_DIR%%/etc/custom
-@dirrm lib/%%XEMACS_DIR%%/etc/eos
-@dirrm lib/%%XEMACS_DIR%%/etc/idd
-@dirrm lib/%%XEMACS_DIR%%/etc/photos
-@dirrm lib/%%XEMACS_DIR%%/etc/sparcworks
+@dirrm lib/%%XEMACS_DIR%%/lisp/term
+@dirrm lib/%%XEMACS_DIR%%/lisp/mule
+@dirrm lib/%%XEMACS_DIR%%/lisp
+@dirrm lib/%%XEMACS_DIR%%/info
+@dirrm lib/%%XEMACS_DIR%%/etc/toolbar
@dirrm lib/%%XEMACS_DIR%%/etc/tests/external-widget
@dirrm lib/%%XEMACS_DIR%%/etc/tests
-@dirrm lib/%%XEMACS_DIR%%/etc/toolbar
+@dirrm lib/%%XEMACS_DIR%%/etc/sparcworks
+@dirrm lib/%%XEMACS_DIR%%/etc/photos
+@dirrm lib/%%XEMACS_DIR%%/etc/idd
+@dirrm lib/%%XEMACS_DIR%%/etc/eos
+@dirrm lib/%%XEMACS_DIR%%/etc/custom
@dirrm lib/%%XEMACS_DIR%%/etc
-@dirrm lib/%%XEMACS_DIR%%/info
-@dirrm lib/%%XEMACS_DIR%%/lisp/mule
-@dirrm lib/%%XEMACS_DIR%%/lisp/term
-@dirrm lib/%%XEMACS_DIR%%/lisp
-@dirrm lib/%%XEMACS_DIR%%
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/japanese/xemacs-canna/Makefile japanese/xemacs-canna/Makefile
--- /usr/ports/tmp.cur/japanese/xemacs-canna/Makefile Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-canna/Makefile Wed Nov 24 21:30:57 1999
@@ -1,57 +1,73 @@
# New ports collection makefile for: XEmacs for Japanese
-# Version required: 21.1.7
+# Version required: 21.1.8
# 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 $
#
+# This is the MASTER port of Japanese XEmacs slave ports(japanese/xemacs-*)
+# and provides `Architecture Dependent' parts of xemacs binary.
+#
+# Caracteristic variables of XEmacs Mule ports family:
+# MULE_COMMON : COMMON port if defined
+# PKGLDIR : Local PKGDIR of MASTER port(editors/xemacs-mule/pkg)
+# SITE_INCLUDES : site include path(configure arguments)
+# SITE_LIBRARIES : site libraries path(configure arguments)
+# WITH_INPUT_METHOD : input methods(configure arguments)
+# LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods
+# BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
+
CATEGORIES= japanese editors
+JAPANESE= yes
MANLANG= ja
MAN1= xemacs-ja.1
+DESCR_TMPL= ${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
PLIST= ${PKGLDIR}/PLIST-ja
LANGPREFIX= ja-
-MULEPKGDIR= ${PREFIX}/lib/xemacs/mule-packages
-DESCR= ${.CURDIR}/../../japanese/xemacs-canna/pkg/DESCR
+COMMENT= ${WRKDIR}/COMMENT
+DESCR= ${WRKDIR}/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
+BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn4 support.
.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
+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.
.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
+BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+COMMENT_TEXT= XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn4 support.
.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
+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.
.else
PKGNAMEEXT= -canna
WITH_INPUT_METHOD= --with-canna --with-wnn=no --with-wnn6=no
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 ${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
+ @${MKDIR} ${PREFIX}/man/ja/man1
@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1
- @${LN} -sf ja ${MULEPKGDIR}/etc/app-defaults/ja_JP.EUC
+ @${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/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/tmp.cur/japanese/xemacs-canna/files/DESCR.tmpl japanese/xemacs-canna/files/DESCR.tmpl
--- /usr/ports/tmp.cur/japanese/xemacs-canna/files/DESCR.tmpl Thu Jan 1 09:00:00 1970
+++ japanese/xemacs-canna/files/DESCR.tmpl Sat Nov 13 00:10:31 1999
@@ -0,0 +1,31 @@
+This is a package containing only the executables for XEmacs with
+Mule(version %%XEMACS_VER%%), the next generation of Emacs.
+
+You need to install a package, xemacs-common-%%XEMACS_VER%%, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version %%XEMACS_VER%%).
+
+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-%%XEMACS_VER%%, 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/tmp.cur/japanese/xemacs-canna/pkg/COMMENT japanese/xemacs-canna/pkg/COMMENT
--- /usr/ports/tmp.cur/japanese/xemacs-canna/pkg/COMMENT Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-canna/pkg/COMMENT Thu Jan 1 09:00:00 1970
@@ -1 +0,0 @@
-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/tmp.cur/japanese/xemacs-canna/pkg/DESCR japanese/xemacs-canna/pkg/DESCR
--- /usr/ports/tmp.cur/japanese/xemacs-canna/pkg/DESCR Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-canna/pkg/DESCR Thu Jan 1 09:00:00 1970
@@ -1,32 +0,0 @@
-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.*, containing emacs
-lisp files, info pages, and so on (except executables) for
-xemacs-21.*.
-
-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.*, 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/tmp.cur/japanese/xemacs-canna+wnn4/Makefile japanese/xemacs-canna+wnn4/Makefile
--- /usr/ports/tmp.cur/japanese/xemacs-canna+wnn4/Makefile Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-canna+wnn4/Makefile Wed Nov 24 21:30:57 1999
@@ -1,5 +1,5 @@
# New ports collection makefile for: XEmacs with Canna and Wnn4
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 5 Dec 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
@@ -9,6 +9,4 @@
CANNA= yes
WNN4= yes
-MASTERDIR= ${.CURDIR}/../../japanese/xemacs-canna
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xemacs-canna/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/japanese/xemacs-canna+wnn6/Makefile japanese/xemacs-canna+wnn6/Makefile
--- /usr/ports/tmp.cur/japanese/xemacs-canna+wnn6/Makefile Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-canna+wnn6/Makefile Wed Nov 24 21:30:57 1999
@@ -1,5 +1,5 @@
# New ports collection makefile for: XEmacs with Canna and Wnn6
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 5 Dec 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
@@ -9,6 +9,4 @@
CANNA= yes
WNN6= yes
-MASTERDIR= ${.CURDIR}/../../japanese/xemacs-canna
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xemacs-canna/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/japanese/xemacs-wnn4/Makefile japanese/xemacs-wnn4/Makefile
--- /usr/ports/tmp.cur/japanese/xemacs-wnn4/Makefile Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-wnn4/Makefile Wed Nov 24 21:30:57 1999
@@ -1,5 +1,5 @@
# New ports collection makefile for: XEmacs with Wnn4
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 25 January 1998
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
@@ -8,6 +8,4 @@
WNN4= yes
-MASTERDIR= ${.CURDIR}/../../japanese/xemacs-canna
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xemacs-canna/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/tmp.cur/japanese/xemacs-wnn6/Makefile japanese/xemacs-wnn6/Makefile
--- /usr/ports/tmp.cur/japanese/xemacs-wnn6/Makefile Wed Nov 24 11:23:20 1999
+++ japanese/xemacs-wnn6/Makefile Wed Nov 24 21:30:57 1999
@@ -1,5 +1,5 @@
# New ports collection makefile for: XEmacs with Wnn6
-# Version required: 21.1.7
+# Version required: 21.1.8
# Date created: 25 January 1998
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
@@ -8,6 +8,4 @@
WNN6= yes
-MASTERDIR= ${.CURDIR}/../../japanese/xemacs-canna
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xemacs-canna/Makefile"
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?199911241310.FAA26602>