Use emacs.mk and only accept GNU emacsen

(a mailcrypt avatar for xemacs is in the xemacs-packages package).

4 files changed, 37 insertions, 20 deletions

diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 91d01daab02..7fcd721a6ce 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:27 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/09 14:24:35 seb Exp $
 # FreeBSD Id: ports/mail/mailcrypt/Makefile,v 1.7 2000/05/14 05:21:52 billf Exp
 
 DISTNAME=	mailcrypt-3.5.6
@@ -9,9 +9,12 @@ MAINTAINER=	sommerfeld@netbsd.org
 HOMEPAGE=	http://mailcrypt.sourceforge.net/
 COMMENT=	Emacs frontend for PGP and GPG
 
-BUILD_DEPENDS=	emacs>=19.34:../../editors/emacs
+# What we would like to say here is: "we want GNU emacs"
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 
 GNU_CONFIGURE=	yes
+MAKE_ENV+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
 
+.include "../../mk/emacs.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST
index 0eef222c836..4a7c6464f31 100644
--- a/mail/mailcrypt/PLIST
+++ b/mail/mailcrypt/PLIST
@@ -1,22 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:27 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/09 14:24:36 seb Exp $
 @unexec ${INSTALL_INFO} --delete %D/info/mailcrypt.info %D/info/dir
 info/mailcrypt.info
 info/mailcrypt.info-1
 info/mailcrypt.info-2
 @exec   ${INSTALL_INFO}          %D/info/mailcrypt.info %D/info/dir
-share/emacs/site-lisp/expect.el
-share/emacs/site-lisp/expect.elc
-share/emacs/site-lisp/mailcrypt.el
-share/emacs/site-lisp/mailcrypt.elc
-share/emacs/site-lisp/mc-gpg.el
-share/emacs/site-lisp/mc-gpg.elc
-share/emacs/site-lisp/mc-pgp.el
-share/emacs/site-lisp/mc-pgp.elc
-share/emacs/site-lisp/mc-pgp5.el
-share/emacs/site-lisp/mc-pgp5.elc
-share/emacs/site-lisp/mc-remail.el
-share/emacs/site-lisp/mc-remail.elc
-share/emacs/site-lisp/mc-setversion.el
-share/emacs/site-lisp/mc-setversion.elc
-share/emacs/site-lisp/mc-toplev.el
-share/emacs/site-lisp/mc-toplev.elc
+${EMACS_LISPPREFIX}/expect.el
+${EMACS_LISPPREFIX}/expect.elc
+${EMACS_LISPPREFIX}/mailcrypt.el
+${EMACS_LISPPREFIX}/mailcrypt.elc
+${EMACS_LISPPREFIX}/mc-gpg.el
+${EMACS_LISPPREFIX}/mc-gpg.elc
+${EMACS_LISPPREFIX}/mc-pgp.el
+${EMACS_LISPPREFIX}/mc-pgp.elc
+${EMACS_LISPPREFIX}/mc-pgp5.el
+${EMACS_LISPPREFIX}/mc-pgp5.elc
+${EMACS_LISPPREFIX}/mc-remail.el
+${EMACS_LISPPREFIX}/mc-remail.elc
+${EMACS_LISPPREFIX}/mc-setversion.el
+${EMACS_LISPPREFIX}/mc-setversion.elc
+${EMACS_LISPPREFIX}/mc-toplev.el
+${EMACS_LISPPREFIX}/mc-toplev.elc
diff --git a/mail/mailcrypt/distinfo b/mail/mailcrypt/distinfo
index baf68c21a01..3e8f6acf066 100644
--- a/mail/mailcrypt/distinfo
+++ b/mail/mailcrypt/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/07/22 20:34:41 sommerfeld Exp $
+$NetBSD: distinfo,v 1.2 2003/07/09 14:24:36 seb Exp $
 
 SHA1 (mailcrypt-3.5.6.tar.gz) = ac53c42c5e1b7f2200582204217f321a46b5f436
 Size (mailcrypt-3.5.6.tar.gz) = 158813 bytes
+SHA1 (patch-aa) = 172c852a96ecbad78fe6710190298d1bee2b2e53
diff --git a/mail/mailcrypt/patches/patch-aa b/mail/mailcrypt/patches/patch-aa
new file mode 100644
index 00000000000..161ca9bbbc0
--- /dev/null
+++ b/mail/mailcrypt/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/07/09 14:24:36 seb Exp $
+
+--- Makefile.in.orig	2000-10-29 10:41:52.000000000 +0000
++++ Makefile.in
+@@ -12,7 +12,7 @@ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/share
+ 
+ # Where to put the .el and .elc files
+-lispdir=$(datadir)/emacs/site-lisp
++lispdir=$(EMACS_LISPPREFIX)
+ 
+ # Where to put the Info files
+ infodir=$(prefix)/info