From kiri@pis.toba-cmt.ac.jp  Thu Jan  6 08:07:28 2000
Return-Path: <kiri@pis.toba-cmt.ac.jp>
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
	by hub.freebsd.org (Postfix) with ESMTP id 9953F1560D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  6 Jan 2000 08:07:26 -0800 (PST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
Received: (from kiri@localhost)
	by pis.toba-cmt.ac.jp (8.9.3/8.9.3) id BAA01459;
	Fri, 7 Jan 2000 01:02:19 +0900 (JST)
	(envelope-from kiri)
Message-Id: <200001061602.BAA01459@pis.toba-cmt.ac.jp>
Date: Fri, 7 Jan 2000 01:02:19 +0900 (JST)
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
Reply-To: kiri@pis.toba-cmt.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update ports: XEmacs21-21.1.8
X-Send-Pr-Version: 3.2

>Number:         15949
>Category:       ports
>Synopsis:       Update ports: XEmacs21-21.1.8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    shige
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan  6 08:10:01 PST 2000
>Closed-Date:    Tue Jan 11 07:25:14 PST 2000
>Last-Modified:  Tue Jan 11 07:25:43 PST 2000
>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 XEmacs21-21.1.8. 

Current modifications are :

(1) XEMACS_MAJOR_VER changed correctly.
(2) Delete misc files(delete whole directory:editors/xemacs21-mule/patches)

Update files are respecively :

[Delete] :
editors/xemacs21-mule/files/xemacs-mule.sh
editors/xemacs21-mule/pkg/PLIST-ja
editors/xemacs21-mule/files/md5
editors/xemacs21-mule/patches/patch-ai
editors/xemacs21-mule/patches/patch-aa
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/xemacs21-mule/Makefile editors/xemacs21-mule/Makefile
--- /usr/ports/current/editors/xemacs21-mule/Makefile	Thu Jan  6 20:31:38 2000
+++ editors/xemacs21-mule/Makefile	Fri Jan  7 00:45:35 2000
@@ -70,9 +70,7 @@
 FILESDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
 PLIST?=		${PKGLDIR}/PLIST
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER?=	${.CURDIR:S!^${PORTSDIR}/editors/xemacs!!:S!-mule$!!}
+XEMACS_MAJOR_VER?=	21
 MULE_PORT=		yes
 PKGNAMEEXT?=		-mule
 DESCR_TMPL?=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21-mule/files/md5 editors/xemacs21-mule/files/md5
--- /usr/ports/current/editors/xemacs21-mule/files/md5	Tue Dec  7 21:21:07 1999
+++ editors/xemacs21-mule/files/md5	Thu Jan  1 09:00:00 1970
@@ -1,3 +0,0 @@
-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/current/editors/xemacs21-mule/files/xemacs-mule.sh editors/xemacs21-mule/files/xemacs-mule.sh
--- /usr/ports/current/editors/xemacs21-mule/files/xemacs-mule.sh	Tue Dec  7 21:21:07 1999
+++ editors/xemacs21-mule/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/current/editors/xemacs21-mule/patches/patch-aa editors/xemacs21-mule/patches/patch-aa
--- /usr/ports/current/editors/xemacs21-mule/patches/patch-aa	Mon Nov 29 10:02:21 1999
+++ editors/xemacs21-mule/patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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/current/editors/xemacs21-mule/patches/patch-ai editors/xemacs21-mule/patches/patch-ai
--- /usr/ports/current/editors/xemacs21-mule/patches/patch-ai	Mon Nov 29 10:02:21 1999
+++ editors/xemacs21-mule/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/current/editors/xemacs21-mule/pkg/PLIST-ja editors/xemacs21-mule/pkg/PLIST-ja
--- /usr/ports/current/editors/xemacs21-mule/pkg/PLIST-ja	Sat Nov 27 12:14:26 1999
+++ editors/xemacs21-mule/pkg/PLIST-ja	Thu Jan  1 09:00:00 1970
@@ -1,17 +0,0 @@
-bin/b2m
-bin/ctags
-bin/etags
-bin/gnuattach
-bin/gnuclient
-bin/gnudoit
-bin/ootags
-bin/pstogif
-bin/rcs-checkin
-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%%/config.values
-@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_DIR%%/%%ARCH_SUBDIR%%
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21-mule-common/Makefile editors/xemacs21-mule-common/Makefile
--- /usr/ports/current/editors/xemacs21-mule-common/Makefile	Thu Jan  6 20:31:38 2000
+++ editors/xemacs21-mule-common/Makefile	Fri Jan  7 00:45:35 2000
@@ -22,9 +22,7 @@
 #	LIB_INPUT_METHOD  : LIB_DEPENDS list of Input Methods
 #	BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
 
-.include <bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER=	${.CURDIR:S!^${PORTSDIR}/editors/xemacs!!:S!-mule-common$!!}
+XEMACS_MAJOR_VER=	21
 
 .for dir in \
 	editors/xemacs${XEMACS_MAJOR_VER}-mule \
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-canna/Makefile japanese/xemacs21-canna/Makefile
--- /usr/ports/current/japanese/xemacs21-canna/Makefile	Thu Jan  6 20:33:02 2000
+++ japanese/xemacs21-canna/Makefile	Fri Jan  7 00:45:35 2000
@@ -28,9 +28,7 @@
 MAN1=		xemacs-ja.1
 DESCR=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER?=	${.CURDIR:S!^${PORTSDIR}/japanese/xemacs!!:S!-canna$!!}
+XEMACS_MAJOR_VER?=	21
 LANGPREFIX=		ja-
 DESCR_TMPL=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl
 .if defined(CANNA) && defined(WNN4)
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-canna+wnn4/Makefile japanese/xemacs21-canna+wnn4/Makefile
--- /usr/ports/current/japanese/xemacs21-canna+wnn4/Makefile	Thu Jan  6 20:33:02 2000
+++ japanese/xemacs21-canna+wnn4/Makefile	Fri Jan  7 00:45:35 2000
@@ -6,9 +6,7 @@
 # $FreeBSD: ports/japanese/xemacs21-canna+wnn4/Makefile,v 1.6 2000/01/06 01:46:31 shige Exp $
 #
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER=	${.CURDIR:S!^${PORTSDIR}/japanese/xemacs!!:S!-canna+wnn4$!!}
+XEMACS_MAJOR_VER=	21
 CANNA=			yes
 WNN4=			yes
 
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-canna+wnn6/Makefile japanese/xemacs21-canna+wnn6/Makefile
--- /usr/ports/current/japanese/xemacs21-canna+wnn6/Makefile	Thu Jan  6 20:33:02 2000
+++ japanese/xemacs21-canna+wnn6/Makefile	Fri Jan  7 00:45:35 2000
@@ -6,9 +6,7 @@
 # $FreeBSD: ports/japanese/xemacs21-canna+wnn6/Makefile,v 1.9 2000/01/06 01:46:34 shige Exp $
 #
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER=	${.CURDIR:S!^${PORTSDIR}/japanese/xemacs!!:S!-canna+wnn6$!!}
+XEMACS_MAJOR_VER=	21
 CANNA=			yes
 WNN6=			yes
 
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-wnn4/Makefile japanese/xemacs21-wnn4/Makefile
--- /usr/ports/current/japanese/xemacs21-wnn4/Makefile	Thu Jan  6 20:33:03 2000
+++ japanese/xemacs21-wnn4/Makefile	Fri Jan  7 00:45:35 2000
@@ -6,9 +6,7 @@
 # $FreeBSD: ports/japanese/xemacs21-wnn4/Makefile,v 1.7 2000/01/06 01:46:35 shige Exp $
 #
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER=	${.CURDIR:S!^${PORTSDIR}/japanese/xemacs!!:S!-wnn4$!!}
+XEMACS_MAJOR_VER=	21
 WNN4=			yes
 
 .include	"${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/Makefile"
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-wnn6/Makefile japanese/xemacs21-wnn6/Makefile
--- /usr/ports/current/japanese/xemacs21-wnn6/Makefile	Thu Jan  6 20:33:03 2000
+++ japanese/xemacs21-wnn6/Makefile	Fri Jan  7 00:45:35 2000
@@ -6,9 +6,7 @@
 # $FreeBSD: ports/japanese/xemacs21-wnn6/Makefile,v 1.9 2000/01/06 01:46:38 shige Exp $
 #
 
-.include	<bsd.port.pre.mk>
-
-XEMACS_MAJOR_VER=	${.CURDIR:S!^${PORTSDIR}/japanese/xemacs!!:S!-wnn6$!!}
+XEMACS_MAJOR_VER=	21
 WNN6=			yes
 
 .include	"${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/Makefile"

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->shige 
Responsible-Changed-By: shige 
Responsible-Changed-When: Thu Jan 6 09:57:23 PST 2000 
Responsible-Changed-Why:  
I'll handle this. 
State-Changed-From-To: open->closed 
State-Changed-By: shige 
State-Changed-When: Tue Jan 11 07:25:14 PST 2000 
State-Changed-Why:  
Committed. Thanks! 
>Unformatted:
