Re: mew-current again

[Noriyuki Koizumi <GBC01623@nifty.ne.jp>]

From: Shin-ichi YOSHIMOTO <yosimoto@daemon.kek.jp>
Subject: mew-current again
Date: Mon, 19 Jun 2000 06:01:03 +0900
Message-ID: <20000619060103V.yosimoto@daemon.kek.jp>

> こいずみさんからのご指摘の通り、アーカイブが壊れていたようです。どうも申
> し訳御座いません。再度添付しますので、よろしくお願いします。

展開できました。ありがとうございます。

 - * - * - * -

これを元にして、

 - /usr/pkg を ${PREFIX} に修正
 - インストール先の変更 (Emacs なら${PREFIX}/share/emacs/site-lisp/mew へ)
 - PKGNAME に処理した Emacs 名を含める (mew-${EMACS}-1.95b39 となるように)
 - make deinstall / pkg_delete したときに ${PREFIX}/info/dir から mew
   のエントリを削除するように修正

いじったものをつけます。吉本さんのアーカイブに対するパッチです。
Quick Hack なのでかなりいい加減なところがありますが ^_^;

＃人様にだす pkgsrc なのでちょっとドキドキしています

XEmacs 対応させるなら:
 - Emacs=xemacs で分岐を作り、
 - ELISPDIR を適切な場所(ってどこなんでしょう???)にして、
 - INFO を適宜処理(japanese な INFO をどう作るんだろう???)して、
 - アイコンを必要な場所にインストールして、
 - 必要なら PLIST を分ける

で対応可能かと。


diff -Nur mew-current.old/Makefile mew-current/Makefile
--- mew-current.old/Makefile	Mon Jun 19 01:18:17 2000
+++ mew-current/Makefile	Tue Jun 20 09:00:59 2000
@@ -2,17 +2,31 @@
 #
 
 DISTNAME=	mew-1.95b39
+PKGNAME=	mew-${EMACS}-1.95b39
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/beta/
 
 MAINTAINER=	<yosimoto@post.kek.jp>
 HOMEPAGE=	http://www.mew.org/
 
-BUILD_DEPENDS+= emacs-${EMACS_VER}:../../editors/emacs
 DEPENDS+=	im-141:../../mail/im-current
-DEPENDS+=	emacs-${EMACS_VER}:../../editors/emacs
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !defined(EMACS) || (${EMACS} != "xemacs" && ${EMACS} != "emacs")
+IGNORE=	"is ignored. because EMACS is NOT set \"emacs\" or \"xemacs\""
+.endif
+
+.if defined(EMACS) && ${EMACS} == "emacs"
 EMACS_VER=	20.6
-PLIST_SUBST=	EMACS_VER=${EMACS_VER}
+.endif
+#.if defined(EMACS) && ${EMACS} == "xemacs"
+#EMACS_VER=	21.1.9
+#.endif
+
+BUILD_DEPENDS+= ${EMACS}-${EMACS_VER}:../../editors/${EMACS}
+DEPENDS+=	${EMACS}-${EMACS_VER}:../../editors/${EMACS}
+
+PLIST_SUBST=	EMACS=${EMACS} EMACS_VER=${EMACS_VER}
 
 .include "../../mk/bsd.pkg.mk"
diff -Nur mew-current.old/files/patch-sum mew-current/files/patch-sum
--- mew-current.old/files/patch-sum	Tue Jun 13 01:01:41 2000
+++ mew-current/files/patch-sum	Tue Jun 20 00:01:05 2000
@@ -3,4 +3,4 @@
 MD5 (patch-aa) = d6c9fd429dea2030a18b069b654b3559
 MD5 (patch-ab) = 49a1f6986ce598d5a332b2b7d0cc12dc
 MD5 (patch-ac) = 46da6dc35f0af94b2e30667bb7a1791b
-MD5 (patch-ad) = 330429697328b7a40ab27da6c4a1868d
+MD5 (patch-ad) = 85e3ba9611c28b224ddefa9361a89d84
diff -Nur mew-current.old/patches/patch-ad mew-current/patches/patch-ad
--- mew-current.old/patches/patch-ad	Tue Jun 13 01:01:17 2000
+++ mew-current/patches/patch-ad	Tue Jun 20 00:01:00 2000
@@ -1,37 +1,36 @@
 $NetBSD$
 
---- Makefile.orig	Tue Jun 13 00:29:39 2000
-+++ Makefile	Tue Jun 13 00:37:54 2000
+--- Makefile.orig	Wed May 24 15:37:15 2000
++++ Makefile	Mon Jun 19 23:58:55 2000
 @@ -19,7 +19,7 @@
  ## EDIT THE FOLLOWINGS
  ##
  
 -PREFIX = /usr/local
-+PREFIX = /usr/pkg
++#PREFIX = /usr/local
  INFODIR = $(PREFIX)/info
  
  ##
-@@ -29,11 +29,12 @@
+@@ -29,11 +29,11 @@
  CC = gcc
  CFLAGS = -O
  
 -EMACS = emacs
-+EMACS_VER= 20.6
-+EMACS = emacs-${EMACS_VER}
++#EMACS = emacs
  #EMACS = xemacs
  #EMACS = mule
  
 -PERL=`which perl`
-+PERL=/usr/pkg/bin/perl
++PERL=$(PREFIX)/bin/perl
  #PERL=/usr/local/bin/perl
  
  ##
-@@ -46,7 +47,7 @@
+@@ -46,7 +46,7 @@
  ## A directory where mew*.el[c] will be installed.
  ##
  
 -ELISPDIR = $(PREFIX)/share/emacs/site-lisp/mew
-+ELISPDIR = $(PREFIX)/share/emacs/${EMACS_VER}/site-lisp/mew
++ELISPDIR = $(PREFIX)/share/$(EMACS)/site-lisp/mew
  #ELISPDIR  = $(PREFIX)/lib/$(EMACS)/site-lisp
  #ELISPDIR = $(PREFIX)/lib/emacs
  
diff -Nur mew-current.old/pkg/PLIST mew-current/pkg/PLIST
--- mew-current.old/pkg/PLIST	Mon Jun 19 00:44:13 2000
+++ mew-current/pkg/PLIST	Tue Jun 20 00:06:29 2000
@@ -3,94 +3,96 @@
 bin/mewcat
 bin/mewencode
 bin/uumerge
-share/emacs/20.6/site-lisp/mew/mew-addrbook.el
-share/emacs/20.6/site-lisp/mew/mew-md5.el
-share/emacs/20.6/site-lisp/mew/mew-auth.el
-share/emacs/20.6/site-lisp/mew/mew-xemacs.el
-share/emacs/20.6/site-lisp/mew/mew-win32.el
-share/emacs/20.6/site-lisp/mew/mew-virtual.el
-share/emacs/20.6/site-lisp/mew/mew-vars2.el
-share/emacs/20.6/site-lisp/mew/mew-vars.el
-share/emacs/20.6/site-lisp/mew/mew-unix.el
-share/emacs/20.6/site-lisp/mew/mew-temacs.el
-share/emacs/20.6/site-lisp/mew/mew-syntax.el
-share/emacs/20.6/site-lisp/mew/mew-summary.el
-share/emacs/20.6/site-lisp/mew/mew-ssh.el
-share/emacs/20.6/site-lisp/mew/mew-sort.el
-share/emacs/20.6/site-lisp/mew/mew-smtp.el
-share/emacs/20.6/site-lisp/mew/mew-scan.el
-share/emacs/20.6/site-lisp/mew/mew-refile.el
-share/emacs/20.6/site-lisp/mew/mew-pick.el
-share/emacs/20.6/site-lisp/mew/mew-pgp.el
-share/emacs/20.6/site-lisp/mew/mew-os2.el
-share/emacs/20.6/site-lisp/mew/mew-nntp.el
-share/emacs/20.6/site-lisp/mew/mew-mule3.el
-share/emacs/20.6/site-lisp/mew/mew-mule2.el
-share/emacs/20.6/site-lisp/mew/mew-mule0.el
-share/emacs/20.6/site-lisp/mew/mew-mule.el
-share/emacs/20.6/site-lisp/mew/mew-minibuf.el
-share/emacs/20.6/site-lisp/mew/mew-mime.el
-share/emacs/20.6/site-lisp/mew/mew-message.el
-share/emacs/20.6/site-lisp/mew/mew-mark.el
-share/emacs/20.6/site-lisp/mew/mew-lang-jp.el
-share/emacs/20.6/site-lisp/mew/mew-highlight.el
-share/emacs/20.6/site-lisp/mew/mew-header.el
-share/emacs/20.6/site-lisp/mew/mew-func.el
-share/emacs/20.6/site-lisp/mew/mew-fib.el
-share/emacs/20.6/site-lisp/mew/mew-ext.el
-share/emacs/20.6/site-lisp/mew/mew-env.el
-share/emacs/20.6/site-lisp/mew/mew-encode.el
-share/emacs/20.6/site-lisp/mew/mew-edit.el
-share/emacs/20.6/site-lisp/mew/mew-draft.el
-share/emacs/20.6/site-lisp/mew/mew-demo.el
-share/emacs/20.6/site-lisp/mew/mew-decode.el
-share/emacs/20.6/site-lisp/mew/mew-const.el
-share/emacs/20.6/site-lisp/mew/mew-config.el
-share/emacs/20.6/site-lisp/mew/mew-complete.el
-share/emacs/20.6/site-lisp/mew/mew.el
-share/emacs/20.6/site-lisp/mew/mew-cache.el
-share/emacs/20.6/site-lisp/mew/mew-bq.el
-share/emacs/20.6/site-lisp/mew/mew-blvs.el
-share/emacs/20.6/site-lisp/mew/mew-attach.el
-share/emacs/20.6/site-lisp/mew/mew-addrbook.elc
-share/emacs/20.6/site-lisp/mew/mew-md5.elc
-share/emacs/20.6/site-lisp/mew/mew-auth.elc
-share/emacs/20.6/site-lisp/mew/mew-virtual.elc
-share/emacs/20.6/site-lisp/mew/mew-vars2.elc
-share/emacs/20.6/site-lisp/mew/mew-vars.elc
-share/emacs/20.6/site-lisp/mew/mew-syntax.elc
-share/emacs/20.6/site-lisp/mew/mew-summary.elc
-share/emacs/20.6/site-lisp/mew/mew-ssh.elc
-share/emacs/20.6/site-lisp/mew/mew-sort.elc
-share/emacs/20.6/site-lisp/mew/mew-smtp.elc
-share/emacs/20.6/site-lisp/mew/mew-scan.elc
-share/emacs/20.6/site-lisp/mew/mew-refile.elc
-share/emacs/20.6/site-lisp/mew/mew-pick.elc
-share/emacs/20.6/site-lisp/mew/mew-pgp.elc
-share/emacs/20.6/site-lisp/mew/mew-nntp.elc
-share/emacs/20.6/site-lisp/mew/mew-minibuf.elc
-share/emacs/20.6/site-lisp/mew/mew-mime.elc
-share/emacs/20.6/site-lisp/mew/mew-message.elc
-share/emacs/20.6/site-lisp/mew/mew-mark.elc
-share/emacs/20.6/site-lisp/mew/mew-highlight.elc
-share/emacs/20.6/site-lisp/mew/mew-header.elc
-share/emacs/20.6/site-lisp/mew/mew-func.elc
-share/emacs/20.6/site-lisp/mew/mew-fib.elc
-share/emacs/20.6/site-lisp/mew/mew-ext.elc
-share/emacs/20.6/site-lisp/mew/mew-env.elc
-share/emacs/20.6/site-lisp/mew/mew-encode.elc
-share/emacs/20.6/site-lisp/mew/mew-edit.elc
-share/emacs/20.6/site-lisp/mew/mew-draft.elc
-share/emacs/20.6/site-lisp/mew/mew-demo.elc
-share/emacs/20.6/site-lisp/mew/mew-decode.elc
-share/emacs/20.6/site-lisp/mew/mew-const.elc
-share/emacs/20.6/site-lisp/mew/mew-config.elc
-share/emacs/20.6/site-lisp/mew/mew-complete.elc
-share/emacs/20.6/site-lisp/mew/mew-cache.elc
-share/emacs/20.6/site-lisp/mew/mew-bq.elc
-share/emacs/20.6/site-lisp/mew/mew-blvs.elc
-share/emacs/20.6/site-lisp/mew/mew-attach.elc
-share/emacs/20.6/site-lisp/mew/mew.elc
+share/emacs/site-lisp/mew/mew-addrbook.el
+share/emacs/site-lisp/mew/mew-md5.el
+share/emacs/site-lisp/mew/mew-auth.el
+share/emacs/site-lisp/mew/mew-xemacs.el
+share/emacs/site-lisp/mew/mew-win32.el
+share/emacs/site-lisp/mew/mew-virtual.el
+share/emacs/site-lisp/mew/mew-vars2.el
+share/emacs/site-lisp/mew/mew-vars.el
+share/emacs/site-lisp/mew/mew-unix.el
+share/emacs/site-lisp/mew/mew-temacs.el
+share/emacs/site-lisp/mew/mew-syntax.el
+share/emacs/site-lisp/mew/mew-summary.el
+share/emacs/site-lisp/mew/mew-ssh.el
+share/emacs/site-lisp/mew/mew-sort.el
+share/emacs/site-lisp/mew/mew-smtp.el
+share/emacs/site-lisp/mew/mew-scan.el
+share/emacs/site-lisp/mew/mew-refile.el
+share/emacs/site-lisp/mew/mew-pick.el
+share/emacs/site-lisp/mew/mew-pgp.el
+share/emacs/site-lisp/mew/mew-os2.el
+share/emacs/site-lisp/mew/mew-nntp.el
+share/emacs/site-lisp/mew/mew-mule3.el
+share/emacs/site-lisp/mew/mew-mule2.el
+share/emacs/site-lisp/mew/mew-mule0.el
+share/emacs/site-lisp/mew/mew-mule.el
+share/emacs/site-lisp/mew/mew-minibuf.el
+share/emacs/site-lisp/mew/mew-mime.el
+share/emacs/site-lisp/mew/mew-message.el
+share/emacs/site-lisp/mew/mew-mark.el
+share/emacs/site-lisp/mew/mew-lang-jp.el
+share/emacs/site-lisp/mew/mew-highlight.el
+share/emacs/site-lisp/mew/mew-header.el
+share/emacs/site-lisp/mew/mew-func.el
+share/emacs/site-lisp/mew/mew-fib.el
+share/emacs/site-lisp/mew/mew-ext.el
+share/emacs/site-lisp/mew/mew-env.el
+share/emacs/site-lisp/mew/mew-encode.el
+share/emacs/site-lisp/mew/mew-edit.el
+share/emacs/site-lisp/mew/mew-draft.el
+share/emacs/site-lisp/mew/mew-demo.el
+share/emacs/site-lisp/mew/mew-decode.el
+share/emacs/site-lisp/mew/mew-const.el
+share/emacs/site-lisp/mew/mew-config.el
+share/emacs/site-lisp/mew/mew-complete.el
+share/emacs/site-lisp/mew/mew.el
+share/emacs/site-lisp/mew/mew-cache.el
+share/emacs/site-lisp/mew/mew-bq.el
+share/emacs/site-lisp/mew/mew-blvs.el
+share/emacs/site-lisp/mew/mew-attach.el
+share/emacs/site-lisp/mew/mew-addrbook.elc
+share/emacs/site-lisp/mew/mew-md5.elc
+share/emacs/site-lisp/mew/mew-auth.elc
+share/emacs/site-lisp/mew/mew-virtual.elc
+share/emacs/site-lisp/mew/mew-vars2.elc
+share/emacs/site-lisp/mew/mew-vars.elc
+share/emacs/site-lisp/mew/mew-syntax.elc
+share/emacs/site-lisp/mew/mew-summary.elc
+share/emacs/site-lisp/mew/mew-ssh.elc
+share/emacs/site-lisp/mew/mew-sort.elc
+share/emacs/site-lisp/mew/mew-smtp.elc
+share/emacs/site-lisp/mew/mew-scan.elc
+share/emacs/site-lisp/mew/mew-refile.elc
+share/emacs/site-lisp/mew/mew-pick.elc
+share/emacs/site-lisp/mew/mew-pgp.elc
+share/emacs/site-lisp/mew/mew-nntp.elc
+share/emacs/site-lisp/mew/mew-minibuf.elc
+share/emacs/site-lisp/mew/mew-mime.elc
+share/emacs/site-lisp/mew/mew-message.elc
+share/emacs/site-lisp/mew/mew-mark.elc
+share/emacs/site-lisp/mew/mew-highlight.elc
+share/emacs/site-lisp/mew/mew-header.elc
+share/emacs/site-lisp/mew/mew-func.elc
+share/emacs/site-lisp/mew/mew-fib.elc
+share/emacs/site-lisp/mew/mew-ext.elc
+share/emacs/site-lisp/mew/mew-env.elc
+share/emacs/site-lisp/mew/mew-encode.elc
+share/emacs/site-lisp/mew/mew-edit.elc
+share/emacs/site-lisp/mew/mew-draft.elc
+share/emacs/site-lisp/mew/mew-demo.elc
+share/emacs/site-lisp/mew/mew-decode.elc
+share/emacs/site-lisp/mew/mew-const.elc
+share/emacs/site-lisp/mew/mew-config.elc
+share/emacs/site-lisp/mew/mew-complete.elc
+share/emacs/site-lisp/mew/mew-cache.elc
+share/emacs/site-lisp/mew/mew-bq.elc
+share/emacs/site-lisp/mew/mew-blvs.elc
+share/emacs/site-lisp/mew/mew-attach.elc
+share/emacs/site-lisp/mew/mew.elc
+@unexec install-info --delete %D/info/mew.info %D/info/dir
+@unexec install-info --delete %D/info/mew.jis.info %D/info/dir
 info/mew.info-3
 info/mew.info-2
 info/mew.info-1
@@ -98,4 +100,4 @@
 info/mew.jis.info-2
 info/mew.jis.info-1
 info/mew.jis.info
-@dirrm share/emacs/20.6/site-lisp/mew
+@dirrm share/emacs/site-lisp/mew

-- 
こいずみ  のりゆき
GBC01623@nifty.ne.jp