j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> This is needed for ports bulk, and could be useful for multiuser boxes
> where people want to run different emacs versions.  Here's a first step
> to make this possible.  emacs21 users are the affected, I hope they
> won't mind writing shell aliases/functions/wrapper scripts to keep their
> habits.
>
> Next, cleaning up the rest of the ports tree...

Here's an attempt.  Feedback welcome!

ZZZ

Index: devel/automake/1.10/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- devel/automake/1.10/Makefile        9 Nov 2013 23:19:02 -0000       1.17
+++ devel/automake/1.10/Makefile        8 Jul 2014 21:59:17 -0000
@@ -32,7 +32,7 @@ TEST_DEPENDS= ${BASE_PKGPATH} \
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        devel/dejagnu
 
 TEST_ENV=              AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/automake/1.11/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/automake/1.11/Makefile        9 Nov 2013 23:19:02 -0000       1.15
+++ devel/automake/1.11/Makefile        8 Jul 2014 21:59:33 -0000
@@ -30,7 +30,7 @@ TEST_DEPENDS= ${BASE_PKGPATH} \
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        devel/dejagnu
 
 TEST_ENV=              AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/automake/1.12/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.12/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/automake/1.12/Makefile        9 Nov 2013 23:19:02 -0000       1.11
+++ devel/automake/1.12/Makefile        8 Jul 2014 21:59:54 -0000
@@ -31,7 +31,7 @@ TEST_DEPENDS= ${BASE_PKGPATH} \
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        devel/dejagnu
 
 TEST_ENV=              AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/automake/1.13/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.13/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/automake/1.13/Makefile        9 Nov 2013 23:19:02 -0000       1.6
+++ devel/automake/1.13/Makefile        8 Jul 2014 22:00:05 -0000
@@ -31,7 +31,7 @@ TEST_DEPENDS= ${BASE_PKGPATH} \
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        devel/dejagnu
 
 TEST_ENV=              AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/automake/1.14/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.14/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/automake/1.14/Makefile        4 Feb 2014 09:15:23 -0000       1.3
+++ devel/automake/1.14/Makefile        8 Jul 2014 21:58:59 -0000
@@ -30,7 +30,7 @@ TEST_DEPENDS= ${BASE_PKGPATH} \
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        devel/dejagnu
 
 TEST_ENV=              AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: devel/automake/1.9/Makefile
===================================================================
RCS file: /cvs/ports/devel/automake/1.9/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- devel/automake/1.9/Makefile 9 Nov 2013 23:19:02 -0000       1.26
+++ devel/automake/1.9/Makefile 8 Jul 2014 23:25:53 -0000
@@ -29,7 +29,7 @@ TEST_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
                        devel/gmake \
                        archivers/bzip2 \
                        devel/bison \
-                       editors/emacs21 \
+                       editors/emacs \
                        print/texlive/base \
                        devel/dejagnu
 
Index: inputmethods/anthy/Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/anthy/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- inputmethods/anthy/Makefile 7 Dec 2013 23:42:04 -0000       1.17
+++ inputmethods/anthy/Makefile 8 Jul 2014 21:43:49 -0000
@@ -35,11 +35,16 @@ CONFIGURE_ENV =     CPPFLAGS='-I${LOCALBASE}
 PSEUDO_FLAVORS = no_emacs
 FLAVOR ?=
 
+EMACS_VERSION?=        24.3
+
 MULTI_PACKAGES = -main -emacs
 .include <bsd.port.arch.mk>
 
 .if ${BUILD_PACKAGES:M-emacs}
-BUILD_DEPENDS =        editors/emacs21
+BUILD_DEPENDS =        emacs->=24:editors/emacs
+CONFIGURE_ENV += EMACS=${LOCALBASE}/bin/emacs-${EMACS_VERSION}
+.else
+CONFIGURE_ENV += EMACS=no
 .endif
 
 # can't make sense of any of these tests
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- mail/mew/Makefile   11 Mar 2013 11:23:51 -0000      1.6
+++ mail/mew/Makefile   31 May 2014 15:05:24 -0000
@@ -3,7 +3,7 @@
 COMMENT=       emacs-based mail client
 
 DISTNAME=      mew-5.2
-REVISION=              0
+REVISION=      1
 CATEGORIES=    mail
 HOMEPAGE=      http://www.mew.org/
 
@@ -15,12 +15,16 @@ WANTLIB=            c z
 
 MASTER_SITES=          http://www.mew.org/Release/
 
-RUN_DEPENDS=           editors/emacs21
+EMACS_VERSION=         21.4
+SUBST_VARS=            EMACS_VERSION
+
+RUN_DEPENDS=           emacs->=21,<22:editors/emacs21
 BUILD_DEPENDS=         ${RUN_DEPENDS}
 
 CONFIGURE_STYLE=       simple
-CONFIGURE_ARGS+=       elispdir=$(PREFIX)/share/emacs/site-lisp \
-                       etcdir=$(PREFIX)/share/emacs/site-lisp/etc
+CONFIGURE_ARGS+=       --with-emacs=${LOCALBASE}/bin/emacs-${EMACS_VERSION} \
+                       
elispdir=$(PREFIX)/share/emacs/${EMACS_VERSION}/site-lisp/mew \
+                       
etcdir=$(PREFIX)/share/emacs/${EMACS_VERSION}/site-lisp/mew/etc
 
 USE_GROFF =    Yes
 NO_TEST=       Yes
Index: mail/mew/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mew/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- mail/mew/pkg/PLIST  31 May 2007 18:06:54 -0000      1.1.1.1
+++ mail/mew/pkg/PLIST  8 Jul 2014 20:27:14 -0000
@@ -1,11 +1,11 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/05/31 18:06:54 aanriot Exp $
-bin/incm
+@bin bin/incm
 bin/mew-pinentry
-bin/mewcat
-bin/mewdecode
-bin/mewencode
+@bin bin/mewcat
+@bin bin/mewdecode
+@bin bin/mewencode
 bin/mewest
-bin/mewl
+@bin bin/mewl
 info/mew.info
 info/mew.info-1
 info/mew.info-2
@@ -18,184 +18,183 @@ info/mew.info-4
 @man man/man1/mewencode.1
 @man man/man1/mewest.1
 @man man/man1/mewl.1
-share/emacs/site-lisp/etc/
-share/emacs/site-lisp/etc/Mew.img
-share/emacs/site-lisp/etc/Mew.png
-share/emacs/site-lisp/etc/Mew.xbm
-share/emacs/site-lisp/etc/Mew.xpm
-share/emacs/site-lisp/etc/etc/
-share/emacs/site-lisp/etc/etc/COLOR
-share/emacs/site-lisp/etc/etc/mew-Plain.xpm
-share/emacs/site-lisp/etc/etc/mew-curr.xpm
-share/emacs/site-lisp/etc/etc/mew-folder.xpm
-share/emacs/site-lisp/etc/etc/mew-inc2.xpm
-share/emacs/site-lisp/etc/etc/mew-kill.xpm
-share/emacs/site-lisp/etc/mew-Audio.xpm
-share/emacs/site-lisp/etc/mew-Blank.xpm
-share/emacs/site-lisp/etc/mew-External.xpm
-share/emacs/site-lisp/etc/mew-Folder.xpm
-share/emacs/site-lisp/etc/mew-Image.xpm
-share/emacs/site-lisp/etc/mew-Octet-Stream.xpm
-share/emacs/site-lisp/etc/mew-Postscript.xpm
-share/emacs/site-lisp/etc/mew-Rfc822.xpm
-share/emacs/site-lisp/etc/mew-Text.xpm
-share/emacs/site-lisp/etc/mew-Unknown.xpm
-share/emacs/site-lisp/etc/mew-Video.xpm
-share/emacs/site-lisp/etc/mew-attach.xpm
-share/emacs/site-lisp/etc/mew-cite.xpm
-share/emacs/site-lisp/etc/mew-forward.xpm
-share/emacs/site-lisp/etc/mew-inc.xpm
-share/emacs/site-lisp/etc/mew-lock.xpm
-share/emacs/site-lisp/etc/mew-next.xpm
-share/emacs/site-lisp/etc/mew-pgp-enc.xpm
-share/emacs/site-lisp/etc/mew-pgp-sigenc.xpm
-share/emacs/site-lisp/etc/mew-pgp-sign.xpm
-share/emacs/site-lisp/etc/mew-prev.xpm
-share/emacs/site-lisp/etc/mew-queue.xpm
-share/emacs/site-lisp/etc/mew-refile.xpm
-share/emacs/site-lisp/etc/mew-reply.xpm
-share/emacs/site-lisp/etc/mew-send.xpm
-share/emacs/site-lisp/etc/mew-sep.xpm
-share/emacs/site-lisp/etc/mew-show.xpm
-share/emacs/site-lisp/etc/mew-write.xpm
-share/emacs/site-lisp/etc/mew-yank.xpm
-share/emacs/site-lisp/mew-addrbook.el
-share/emacs/site-lisp/mew-addrbook.elc
-share/emacs/site-lisp/mew-attach.el
-share/emacs/site-lisp/mew-attach.elc
-share/emacs/site-lisp/mew-auth.el
-share/emacs/site-lisp/mew-auth.elc
-share/emacs/site-lisp/mew-blvs.el
-share/emacs/site-lisp/mew-blvs.elc
-share/emacs/site-lisp/mew-bq.el
-share/emacs/site-lisp/mew-bq.elc
-share/emacs/site-lisp/mew-cache.el
-share/emacs/site-lisp/mew-cache.elc
-share/emacs/site-lisp/mew-complete.el
-share/emacs/site-lisp/mew-complete.elc
-share/emacs/site-lisp/mew-config.el
-share/emacs/site-lisp/mew-config.elc
-share/emacs/site-lisp/mew-const.el
-share/emacs/site-lisp/mew-const.elc
-share/emacs/site-lisp/mew-darwin.el
-share/emacs/site-lisp/mew-darwin.elc
-share/emacs/site-lisp/mew-decode.el
-share/emacs/site-lisp/mew-decode.elc
-share/emacs/site-lisp/mew-demo.el
-share/emacs/site-lisp/mew-demo.elc
-share/emacs/site-lisp/mew-draft.el
-share/emacs/site-lisp/mew-draft.elc
-share/emacs/site-lisp/mew-edit.el
-share/emacs/site-lisp/mew-edit.elc
-share/emacs/site-lisp/mew-encode.el
-share/emacs/site-lisp/mew-encode.elc
-share/emacs/site-lisp/mew-env.el
-share/emacs/site-lisp/mew-env.elc
-share/emacs/site-lisp/mew-exec.el
-share/emacs/site-lisp/mew-exec.elc
-share/emacs/site-lisp/mew-ext.el
-share/emacs/site-lisp/mew-ext.elc
-share/emacs/site-lisp/mew-fib.el
-share/emacs/site-lisp/mew-fib.elc
-share/emacs/site-lisp/mew-func.el
-share/emacs/site-lisp/mew-func.elc
-share/emacs/site-lisp/mew-gemacs.el
-share/emacs/site-lisp/mew-gemacs.elc
-share/emacs/site-lisp/mew-header.el
-share/emacs/site-lisp/mew-header.elc
-share/emacs/site-lisp/mew-highlight.el
-share/emacs/site-lisp/mew-highlight.elc
-share/emacs/site-lisp/mew-imap.el
-share/emacs/site-lisp/mew-imap.elc
-share/emacs/site-lisp/mew-imap2.el
-share/emacs/site-lisp/mew-imap2.elc
-share/emacs/site-lisp/mew-key.el
-share/emacs/site-lisp/mew-key.elc
-share/emacs/site-lisp/mew-lang-jp.el
-share/emacs/site-lisp/mew-lang-jp.elc
-share/emacs/site-lisp/mew-lang-kr.el
-share/emacs/site-lisp/mew-lang-kr.elc
-share/emacs/site-lisp/mew-lang-latin.el
-share/emacs/site-lisp/mew-lang-latin.elc
-share/emacs/site-lisp/mew-local.el
-share/emacs/site-lisp/mew-local.elc
-share/emacs/site-lisp/mew-mark.el
-share/emacs/site-lisp/mew-mark.elc
-share/emacs/site-lisp/mew-md5.el
-share/emacs/site-lisp/mew-md5.elc
-share/emacs/site-lisp/mew-message.el
-share/emacs/site-lisp/mew-message.elc
-share/emacs/site-lisp/mew-mime.el
-share/emacs/site-lisp/mew-mime.elc
-share/emacs/site-lisp/mew-minibuf.el
-share/emacs/site-lisp/mew-minibuf.elc
-share/emacs/site-lisp/mew-mule.el
-share/emacs/site-lisp/mew-mule.elc
-share/emacs/site-lisp/mew-mule0.el
-share/emacs/site-lisp/mew-mule0.elc
-share/emacs/site-lisp/mew-mule3.el
-share/emacs/site-lisp/mew-mule3.elc
-share/emacs/site-lisp/mew-net.el
-share/emacs/site-lisp/mew-net.elc
-share/emacs/site-lisp/mew-nmz.el
-share/emacs/site-lisp/mew-nmz.elc
-share/emacs/site-lisp/mew-nntp.el
-share/emacs/site-lisp/mew-nntp.elc
-share/emacs/site-lisp/mew-nntp2.el
-share/emacs/site-lisp/mew-nntp2.elc
-share/emacs/site-lisp/mew-passwd.el
-share/emacs/site-lisp/mew-passwd.elc
-share/emacs/site-lisp/mew-pgp.el
-share/emacs/site-lisp/mew-pgp.elc
-share/emacs/site-lisp/mew-pick.el
-share/emacs/site-lisp/mew-pick.elc
-share/emacs/site-lisp/mew-pop.el
-share/emacs/site-lisp/mew-pop.elc
-share/emacs/site-lisp/mew-refile.el
-share/emacs/site-lisp/mew-refile.elc
-share/emacs/site-lisp/mew-scan.el
-share/emacs/site-lisp/mew-scan.elc
-share/emacs/site-lisp/mew-search.el
-share/emacs/site-lisp/mew-search.elc
-share/emacs/site-lisp/mew-smime.el
-share/emacs/site-lisp/mew-smime.elc
-share/emacs/site-lisp/mew-smtp.el
-share/emacs/site-lisp/mew-smtp.elc
-share/emacs/site-lisp/mew-sort.el
-share/emacs/site-lisp/mew-sort.elc
-share/emacs/site-lisp/mew-ssh.el
-share/emacs/site-lisp/mew-ssh.elc
-share/emacs/site-lisp/mew-ssl.el
-share/emacs/site-lisp/mew-ssl.elc
-share/emacs/site-lisp/mew-summary.el
-share/emacs/site-lisp/mew-summary.elc
-share/emacs/site-lisp/mew-summary2.el
-share/emacs/site-lisp/mew-summary2.elc
-share/emacs/site-lisp/mew-summary3.el
-share/emacs/site-lisp/mew-summary3.elc
-share/emacs/site-lisp/mew-summary4.el
-share/emacs/site-lisp/mew-summary4.elc
-share/emacs/site-lisp/mew-syntax.el
-share/emacs/site-lisp/mew-syntax.elc
-share/emacs/site-lisp/mew-temacs.el
-share/emacs/site-lisp/mew-temacs.elc
-share/emacs/site-lisp/mew-thread.el
-share/emacs/site-lisp/mew-thread.elc
-share/emacs/site-lisp/mew-unix.el
-share/emacs/site-lisp/mew-unix.elc
-share/emacs/site-lisp/mew-vars.el
-share/emacs/site-lisp/mew-vars.elc
-share/emacs/site-lisp/mew-vars2.el
-share/emacs/site-lisp/mew-vars2.elc
-share/emacs/site-lisp/mew-vars3.el
-share/emacs/site-lisp/mew-vars3.elc
-share/emacs/site-lisp/mew-varsx.el
-share/emacs/site-lisp/mew-varsx.elc
-share/emacs/site-lisp/mew-virtual.el
-share/emacs/site-lisp/mew-virtual.elc
-share/emacs/site-lisp/mew-win32.el
-share/emacs/site-lisp/mew-win32.elc
-share/emacs/site-lisp/mew-xemacs.el
-share/emacs/site-lisp/mew-xemacs.elc
-share/emacs/site-lisp/mew.el
-share/emacs/site-lisp/mew.elc
+share/emacs/${EMACS_VERSION}/etc/Mew.img
+share/emacs/${EMACS_VERSION}/etc/Mew.png
+share/emacs/${EMACS_VERSION}/etc/Mew.xbm
+share/emacs/${EMACS_VERSION}/etc/Mew.xpm
+share/emacs/${EMACS_VERSION}/etc/etc/
+share/emacs/${EMACS_VERSION}/etc/etc/COLOR
+share/emacs/${EMACS_VERSION}/etc/etc/mew-Plain.xpm
+share/emacs/${EMACS_VERSION}/etc/etc/mew-curr.xpm
+share/emacs/${EMACS_VERSION}/etc/etc/mew-folder.xpm
+share/emacs/${EMACS_VERSION}/etc/etc/mew-inc2.xpm
+share/emacs/${EMACS_VERSION}/etc/etc/mew-kill.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Audio.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Blank.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-External.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Folder.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Image.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Octet-Stream.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Postscript.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Rfc822.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Text.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Unknown.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-Video.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-attach.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-cite.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-forward.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-inc.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-lock.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-next.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-pgp-enc.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-pgp-sigenc.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-pgp-sign.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-prev.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-queue.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-refile.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-reply.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-send.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-sep.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-show.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-write.xpm
+share/emacs/${EMACS_VERSION}/etc/mew-yank.xpm
+share/emacs/${EMACS_VERSION}/site-lisp/mew-addrbook.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-addrbook.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-attach.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-attach.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-auth.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-auth.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-blvs.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-blvs.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-bq.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-bq.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-cache.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-cache.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-complete.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-complete.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-config.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-config.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-const.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-const.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-darwin.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-darwin.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-decode.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-decode.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-demo.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-demo.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-draft.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-draft.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-edit.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-edit.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-encode.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-encode.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-env.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-env.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-exec.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-exec.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ext.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ext.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-fib.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-fib.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-func.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-func.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-gemacs.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-gemacs.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-header.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-header.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-highlight.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-highlight.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-imap.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-imap.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-imap2.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-imap2.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-key.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-key.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-jp.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-jp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-kr.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-kr.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-latin.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-lang-latin.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-local.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-local.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mark.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mark.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-md5.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-md5.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-message.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-message.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mime.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mime.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-minibuf.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-minibuf.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule0.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule0.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule3.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-mule3.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-net.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-net.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nmz.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nmz.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nntp.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nntp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nntp2.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-nntp2.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-passwd.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-passwd.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pgp.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pgp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pick.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pick.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pop.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-pop.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-refile.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-refile.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-scan.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-scan.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-search.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-search.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-smime.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-smime.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-smtp.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-smtp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-sort.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-sort.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ssh.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ssh.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ssl.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-ssl.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary2.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary2.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary3.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary3.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary4.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-summary4.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-syntax.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-syntax.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-temacs.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-temacs.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-thread.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-thread.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-unix.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-unix.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars2.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars2.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars3.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-vars3.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-varsx.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-varsx.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-virtual.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-virtual.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-win32.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-win32.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew-xemacs.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew-xemacs.elc
+share/emacs/${EMACS_VERSION}/site-lisp/mew.el
+share/emacs/${EMACS_VERSION}/site-lisp/mew.elc
Index: math/gnuplot/Makefile
===================================================================
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- math/gnuplot/Makefile       18 Mar 2014 11:33:29 -0000      1.58
+++ math/gnuplot/Makefile       8 Jul 2014 21:48:04 -0000
@@ -17,7 +17,8 @@ PERMIT_PACKAGE_CDROM =        Yes
 
 WANTLIB += c m ncurses pthread readline stdc++ z
 
-BUILD_DEPENDS =        editors/emacs21
+EMACS_VERSION  = 21.4
+BUILD_DEPENDS  = emacs->=21,<22:editors/emacs21
 
 FLAVORS =      no_cairo no_x11
 FLAVOR ?=
@@ -33,7 +34,8 @@ CONFIGURE_ARGS =      --without-linux-vga \
                        --without-lua \
                        --without-pdf
 CONFIGURE_ENV =                CPPFLAGS="-I${LOCALBASE}/include" \
-                       LDFLAGS="-L${LOCALBASE}/lib"
+                       LDFLAGS="-L${LOCALBASE}/lib" \
+                       EMACS="${LOCALBASE}/bin/emacs-${EMACS_VERSION}"
 
 FAKE_FLAGS =           appdefaultdir="${PREFIX}/lib/X11/app-defaults/"
 
Index: math/gnuplot/pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/gnuplot/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- math/gnuplot/pkg/PLIST      29 May 2013 14:32:11 -0000      1.17
+++ math/gnuplot/pkg/PLIST      31 May 2014 17:45:51 -0000
@@ -4,8 +4,14 @@ bin/lasergnu
 @info info/gnuplot.info
 @man man/man1/gnuplot.1
 @man man/man1/lasergnu.1
+share/emacs/
+share/emacs/site-lisp/
 share/emacs/site-lisp/gnuplot-eldoc.el
 share/emacs/site-lisp/gnuplot-eldoc.elc
+share/emacs/site-lisp/gnuplot-gui.el
+share/emacs/site-lisp/gnuplot-gui.elc
+share/emacs/site-lisp/gnuplot.el
+share/emacs/site-lisp/gnuplot.elc
 share/gnuplot/
 !%%no_x11%%
 share/gnuplot/${V}/
Index: net/zenirc/Makefile
===================================================================
RCS file: /cvs/ports/net/zenirc/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- net/zenirc/Makefile 11 Mar 2013 11:35:58 -0000      1.4
+++ net/zenirc/Makefile 8 Jul 2014 20:59:07 -0000
@@ -5,7 +5,7 @@ COMMENT-el=     elisp sources of zenirc
 
 VERSION=       2.112
 DISTNAME=      zenirc-${VERSION}
-REVISION=              0
+REVISION=      1
 PKGNAME-main=  emacs-zenirc-${VERSION}
 PKGNAME-el=    emacs-zenirc-el-${VERSION}
 CATEGORIES=    net
@@ -21,17 +21,22 @@ MASTER_SITES=       ftp://ftp.zenirc.org/pub/z
 
 CONFIGURE_STYLE=gnu old dest
 
-RUN_DEPENDS=   editors/emacs21
+RUN_DEPENDS=   emacs->=21,<22:editors/emacs21
 BUILD_DEPENDS= ${RUN_DEPENDS}
 
 MULTI_PACKAGES=        -main -el
 
+EMACS_VERSION= 21.4
+SUBST_VARS=    EMACS_VERSION
+
+MAKE_FLAGS=    EMACS="${LOCALBASE}/bin/emacs-${EMACS_VERSION}"
+FAKE_FLAGS=    
elispdir="${DESTDIR}/${PREFIX}/share/emacs/${EMACS_VERSION}/site-lisp/"
+
 post-extract:
        @cp ${FILESDIR}/zenirc-chanbuf.el ${WRKSRC}/src/
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/lisp/zenirc/
-       @cp ${WRKSRC}/src/*.el ${PREFIX}/share/emacs/lisp/zenirc/
+       ${INSTALL_DATA} ${WRKSRC}/src/*.el 
${PREFIX}/share/emacs/${EMACS_VERSION}/site-lisp/
 
 NO_TEST=       Yes
 
Index: net/zenirc/pkg/PLIST-el
===================================================================
RCS file: /cvs/ports/net/zenirc/pkg/PLIST-el,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-el
--- net/zenirc/pkg/PLIST-el     14 Oct 2007 09:28:12 -0000      1.1.1.1
+++ net/zenirc/pkg/PLIST-el     8 Jul 2014 20:53:36 -0000
@@ -1,44 +1,44 @@
 @comment $OpenBSD: PLIST-el,v 1.1.1.1 2007/10/14 09:28:12 aanriot Exp $
 share/emacs/lisp/
-share/emacs/lisp/zenirc/
-share/emacs/lisp/zenirc/zenirc-18.el
-share/emacs/lisp/zenirc/zenirc-8ball.el
-share/emacs/lisp/zenirc/zenirc-away.el
-share/emacs/lisp/zenirc/zenirc-bork.el
-share/emacs/lisp/zenirc/zenirc-chanbuf.el
-share/emacs/lisp/zenirc/zenirc-color.el
-share/emacs/lisp/zenirc/zenirc-command-queue.el
-share/emacs/lisp/zenirc/zenirc-complete.el
-share/emacs/lisp/zenirc/zenirc-ctcp-flood.el
-share/emacs/lisp/zenirc/zenirc-dcc.el
-share/emacs/lisp/zenirc/zenirc-doto.el
-share/emacs/lisp/zenirc/zenirc-eval.el
-share/emacs/lisp/zenirc/zenirc-example.el
-share/emacs/lisp/zenirc/zenirc-fill.el
-share/emacs/lisp/zenirc/zenirc-finnish.el
-share/emacs/lisp/zenirc/zenirc-format.el
-share/emacs/lisp/zenirc/zenirc-fortran.el
-share/emacs/lisp/zenirc/zenirc-french.el
-share/emacs/lisp/zenirc/zenirc-history.el
-share/emacs/lisp/zenirc/zenirc-ignore.el
-share/emacs/lisp/zenirc/zenirc-iwantop.el
-share/emacs/lisp/zenirc/zenirc-klingon.el
-share/emacs/lisp/zenirc/zenirc-latin.el
-share/emacs/lisp/zenirc/zenirc-make.el
-share/emacs/lisp/zenirc/zenirc-meditate.el
-share/emacs/lisp/zenirc/zenirc-netsplit.el
-share/emacs/lisp/zenirc/zenirc-notify.el
-share/emacs/lisp/zenirc/zenirc-oink.el
-share/emacs/lisp/zenirc/zenirc-ojnk.el
-share/emacs/lisp/zenirc/zenirc-pjg.el
-share/emacs/lisp/zenirc/zenirc-popup.el
-share/emacs/lisp/zenirc/zenirc-prime-p.el
-share/emacs/lisp/zenirc/zenirc-random-away.el
-share/emacs/lisp/zenirc/zenirc-random-nick.el
-share/emacs/lisp/zenirc/zenirc-signal.el
-share/emacs/lisp/zenirc/zenirc-stamp.el
-share/emacs/lisp/zenirc/zenirc-swedish.el
-share/emacs/lisp/zenirc/zenirc-trigger.el
-share/emacs/lisp/zenirc/zenirc-yow-filter.el
-share/emacs/lisp/zenirc/zenirc-yow.el
-share/emacs/lisp/zenirc/zenirc.el
+share/emacs/${EMACS_VERSION}/site-lisp/
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-18.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-8ball.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-away.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-bork.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-chanbuf.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-color.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-command-queue.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-complete.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ctcp-flood.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-dcc.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-doto.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-eval.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-example.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-fill.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-finnish.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-format.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-fortran.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-french.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-history.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ignore.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-iwantop.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-klingon.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-latin.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-make.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-meditate.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-netsplit.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-notify.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-oink.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ojnk.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-pjg.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-popup.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-prime-p.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-random-away.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-random-nick.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-signal.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-stamp.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-swedish.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-trigger.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-yow-filter.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-yow.el
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc.el
Index: net/zenirc/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/zenirc/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- net/zenirc/pkg/PLIST-main   14 Oct 2007 09:28:12 -0000      1.1.1.1
+++ net/zenirc/pkg/PLIST-main   8 Jul 2014 20:52:42 -0000
@@ -1,41 +1,41 @@
 @comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/10/14 09:28:12 aanriot Exp $
-share/emacs/site-lisp/zenirc-18.elc
-share/emacs/site-lisp/zenirc-8ball.elc
-share/emacs/site-lisp/zenirc-away.elc
-share/emacs/site-lisp/zenirc-bork.elc
-share/emacs/site-lisp/zenirc-chanbuf.elc
-share/emacs/site-lisp/zenirc-color.elc
-share/emacs/site-lisp/zenirc-command-queue.elc
-share/emacs/site-lisp/zenirc-complete.elc
-share/emacs/site-lisp/zenirc-ctcp-flood.elc
-share/emacs/site-lisp/zenirc-dcc.elc
-share/emacs/site-lisp/zenirc-doto.elc
-share/emacs/site-lisp/zenirc-eval.elc
-share/emacs/site-lisp/zenirc-example.elc
-share/emacs/site-lisp/zenirc-fill.elc
-share/emacs/site-lisp/zenirc-finnish.elc
-share/emacs/site-lisp/zenirc-format.elc
-share/emacs/site-lisp/zenirc-fortran.elc
-share/emacs/site-lisp/zenirc-french.elc
-share/emacs/site-lisp/zenirc-history.elc
-share/emacs/site-lisp/zenirc-ignore.elc
-share/emacs/site-lisp/zenirc-iwantop.elc
-share/emacs/site-lisp/zenirc-klingon.elc
-share/emacs/site-lisp/zenirc-latin.elc
-share/emacs/site-lisp/zenirc-meditate.elc
-share/emacs/site-lisp/zenirc-netsplit.elc
-share/emacs/site-lisp/zenirc-notify.elc
-share/emacs/site-lisp/zenirc-oink.elc
-share/emacs/site-lisp/zenirc-ojnk.elc
-share/emacs/site-lisp/zenirc-pjg.elc
-share/emacs/site-lisp/zenirc-popup.elc
-share/emacs/site-lisp/zenirc-prime-p.elc
-share/emacs/site-lisp/zenirc-random-away.elc
-share/emacs/site-lisp/zenirc-random-nick.elc
-share/emacs/site-lisp/zenirc-signal.elc
-share/emacs/site-lisp/zenirc-stamp.elc
-share/emacs/site-lisp/zenirc-swedish.elc
-share/emacs/site-lisp/zenirc-trigger.elc
-share/emacs/site-lisp/zenirc-yow-filter.elc
-share/emacs/site-lisp/zenirc-yow.elc
-share/emacs/site-lisp/zenirc.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-18.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-8ball.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-away.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-bork.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-chanbuf.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-color.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-command-queue.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-complete.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ctcp-flood.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-dcc.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-doto.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-eval.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-example.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-fill.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-finnish.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-format.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-fortran.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-french.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-history.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ignore.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-iwantop.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-klingon.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-latin.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-meditate.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-netsplit.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-notify.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-oink.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-ojnk.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-pjg.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-popup.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-prime-p.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-random-away.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-random-nick.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-signal.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-stamp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-swedish.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-trigger.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-yow-filter.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc-yow.elc
+share/emacs/${EMACS_VERSION}/site-lisp/zenirc.elc
Index: print/auctex/Makefile
===================================================================
RCS file: /cvs/ports/print/auctex/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- print/auctex/Makefile       9 Nov 2013 23:19:03 -0000       1.13
+++ print/auctex/Makefile       31 May 2014 18:30:40 -0000
@@ -1,9 +1,9 @@
 # $OpenBSD: Makefile,v 1.13 2013/11/09 23:19:03 naddy Exp $
 
-COMMENT=       extensible emacs interface for TeX
+COMMENT=       extensible emacs 21 interface for TeX
 
 DISTNAME=      auctex-11.14
-REVISION=      5
+REVISION=      6
 CATEGORIES=    print
 
 HOMEPAGE=      https://www.gnu.org/software/auctex/
@@ -15,13 +15,19 @@ PERMIT_PACKAGE_CDROM=       Yes
 
 MASTER_SITES=  ${MASTER_SITE_GNU:=auctex/11.14/}
 
-FAKE_FLAGS=    lispdir=${DESTDIR}${PREFIX}/share/emacs/site-lisp
+EMACS_VERSION= 21.4
+SUBST_VARS=    EMACS_VERSION
+
+lispdir=       ${PREFIX}/share/emacs/${EMACS_VERSION}/site-lisp
+
+MAKE_FLAGS=    EMACS=${LOCALBASE}/bin/emacs-${EMACS_VERSION}
+FAKE_FLAGS=    lispdir=${DESTDIR}${lispdir}
 
 RUN_DEPENDS=   emacs->=21,<22:editors/emacs21 \
                print/texlive/base
 BUILD_DEPENDS= emacs->=21,<22:editors/emacs21
 
 post-install:
-       @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs/site-lisp/auctex
+       @chown -R ${SHAREOWN}:${SHAREGRP} ${lispdir}/auctex
 
 .include <bsd.port.mk>
Index: print/auctex/pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/auctex/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- print/auctex/pkg/PLIST      15 Sep 2004 18:32:13 -0000      1.2
+++ print/auctex/pkg/PLIST      31 May 2014 14:49:07 -0000
@@ -1,131 +1,131 @@
 @comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:32:13 espie Exp $
-share/emacs/site-lisp/auctex/
-share/emacs/site-lisp/auctex/auc-old.el
-share/emacs/site-lisp/auctex/auc-old.elc
-share/emacs/site-lisp/auctex/auto/
-share/emacs/site-lisp/auctex/auto/.nosearch
-share/emacs/site-lisp/auctex/font-latex.el
-share/emacs/site-lisp/auctex/font-latex.elc
-share/emacs/site-lisp/auctex/latex.el
-share/emacs/site-lisp/auctex/latex.elc
-share/emacs/site-lisp/auctex/multi-prompt.el
-share/emacs/site-lisp/auctex/multi-prompt.elc
-share/emacs/site-lisp/auctex/style/
-share/emacs/site-lisp/auctex/style/.nosearch
-share/emacs/site-lisp/auctex/style/amsart.el
-share/emacs/site-lisp/auctex/style/amsart.elc
-share/emacs/site-lisp/auctex/style/amsbook.el
-share/emacs/site-lisp/auctex/style/amsbook.elc
-share/emacs/site-lisp/auctex/style/amsbsy.el
-share/emacs/site-lisp/auctex/style/amsbsy.elc
-share/emacs/site-lisp/auctex/style/amsmath.el
-share/emacs/site-lisp/auctex/style/amsmath.elc
-share/emacs/site-lisp/auctex/style/amsopn.el
-share/emacs/site-lisp/auctex/style/amsopn.elc
-share/emacs/site-lisp/auctex/style/amstex.el
-share/emacs/site-lisp/auctex/style/amstex.elc
-share/emacs/site-lisp/auctex/style/amstext.el
-share/emacs/site-lisp/auctex/style/amstext.elc
-share/emacs/site-lisp/auctex/style/amsthm.el
-share/emacs/site-lisp/auctex/style/amsthm.elc
-share/emacs/site-lisp/auctex/style/article.el
-share/emacs/site-lisp/auctex/style/article.elc
-share/emacs/site-lisp/auctex/style/book.el
-share/emacs/site-lisp/auctex/style/book.elc
-share/emacs/site-lisp/auctex/style/czech.el
-share/emacs/site-lisp/auctex/style/czech.elc
-share/emacs/site-lisp/auctex/style/danish.el
-share/emacs/site-lisp/auctex/style/danish.elc
-share/emacs/site-lisp/auctex/style/dinbrief.el
-share/emacs/site-lisp/auctex/style/dinbrief.elc
-share/emacs/site-lisp/auctex/style/dk.el
-share/emacs/site-lisp/auctex/style/dk.elc
-share/emacs/site-lisp/auctex/style/dutch.el
-share/emacs/site-lisp/auctex/style/dutch.elc
-share/emacs/site-lisp/auctex/style/epsf.el
-share/emacs/site-lisp/auctex/style/epsf.elc
-share/emacs/site-lisp/auctex/style/fancyref.el
-share/emacs/site-lisp/auctex/style/fancyref.elc
-share/emacs/site-lisp/auctex/style/foils.el
-share/emacs/site-lisp/auctex/style/foils.elc
-share/emacs/site-lisp/auctex/style/german.el
-share/emacs/site-lisp/auctex/style/german.elc
-share/emacs/site-lisp/auctex/style/graphics.el
-share/emacs/site-lisp/auctex/style/graphics.elc
-share/emacs/site-lisp/auctex/style/graphicx.el
-share/emacs/site-lisp/auctex/style/graphicx.elc
-share/emacs/site-lisp/auctex/style/harvard.el
-share/emacs/site-lisp/auctex/style/harvard.elc
-share/emacs/site-lisp/auctex/style/index.el
-share/emacs/site-lisp/auctex/style/index.elc
-share/emacs/site-lisp/auctex/style/j-article.el
-share/emacs/site-lisp/auctex/style/j-article.elc
-share/emacs/site-lisp/auctex/style/j-book.el
-share/emacs/site-lisp/auctex/style/j-book.elc
-share/emacs/site-lisp/auctex/style/j-report.el
-share/emacs/site-lisp/auctex/style/j-report.elc
-share/emacs/site-lisp/auctex/style/jarticle.el
-share/emacs/site-lisp/auctex/style/jarticle.elc
-share/emacs/site-lisp/auctex/style/jbook.el
-share/emacs/site-lisp/auctex/style/jbook.elc
-share/emacs/site-lisp/auctex/style/jreport.el
-share/emacs/site-lisp/auctex/style/jreport.elc
-share/emacs/site-lisp/auctex/style/latexinfo.el
-share/emacs/site-lisp/auctex/style/latexinfo.elc
-share/emacs/site-lisp/auctex/style/letter.el
-share/emacs/site-lisp/auctex/style/letter.elc
-share/emacs/site-lisp/auctex/style/makeidx.el
-share/emacs/site-lisp/auctex/style/makeidx.elc
-share/emacs/site-lisp/auctex/style/mdwlist.el
-share/emacs/site-lisp/auctex/style/mdwlist.elc
-share/emacs/site-lisp/auctex/style/multind.el
-share/emacs/site-lisp/auctex/style/multind.elc
-share/emacs/site-lisp/auctex/style/natbib.el
-share/emacs/site-lisp/auctex/style/natbib.elc
-share/emacs/site-lisp/auctex/style/ngerman.el
-share/emacs/site-lisp/auctex/style/ngerman.elc
-share/emacs/site-lisp/auctex/style/plfonts.el
-share/emacs/site-lisp/auctex/style/plfonts.elc
-share/emacs/site-lisp/auctex/style/plhb.el
-share/emacs/site-lisp/auctex/style/plhb.elc
-share/emacs/site-lisp/auctex/style/prosper.el
-share/emacs/site-lisp/auctex/style/prosper.elc
-share/emacs/site-lisp/auctex/style/psfig.el
-share/emacs/site-lisp/auctex/style/psfig.elc
-share/emacs/site-lisp/auctex/style/report.el
-share/emacs/site-lisp/auctex/style/report.elc
-share/emacs/site-lisp/auctex/style/scrartcl.el
-share/emacs/site-lisp/auctex/style/scrartcl.elc
-share/emacs/site-lisp/auctex/style/scrbase.el
-share/emacs/site-lisp/auctex/style/scrbase.elc
-share/emacs/site-lisp/auctex/style/scrbook.el
-share/emacs/site-lisp/auctex/style/scrbook.elc
-share/emacs/site-lisp/auctex/style/scrlttr2.el
-share/emacs/site-lisp/auctex/style/scrlttr2.elc
-share/emacs/site-lisp/auctex/style/scrreprt.el
-share/emacs/site-lisp/auctex/style/scrreprt.elc
-share/emacs/site-lisp/auctex/style/slides.el
-share/emacs/site-lisp/auctex/style/slides.elc
-share/emacs/site-lisp/auctex/style/slovak.el
-share/emacs/site-lisp/auctex/style/slovak.elc
-share/emacs/site-lisp/auctex/style/swedish.el
-share/emacs/site-lisp/auctex/style/swedish.elc
-share/emacs/site-lisp/auctex/style/varioref.el
-share/emacs/site-lisp/auctex/style/varioref.elc
-share/emacs/site-lisp/auctex/style/verbatim.el
-share/emacs/site-lisp/auctex/style/verbatim.elc
-share/emacs/site-lisp/auctex/style/virtex.el
-share/emacs/site-lisp/auctex/style/virtex.elc
-share/emacs/site-lisp/auctex/tex-buf.el
-share/emacs/site-lisp/auctex/tex-buf.elc
-share/emacs/site-lisp/auctex/tex-font.el
-share/emacs/site-lisp/auctex/tex-font.elc
-share/emacs/site-lisp/auctex/tex-info.el
-share/emacs/site-lisp/auctex/tex-info.elc
-share/emacs/site-lisp/auctex/tex-mik.el
-share/emacs/site-lisp/auctex/tex-mik.elc
-share/emacs/site-lisp/auctex/tex.el
-share/emacs/site-lisp/auctex/tex.elc
-share/emacs/site-lisp/auctex/texmathp.el
-share/emacs/site-lisp/auctex/texmathp.elc
-share/emacs/site-lisp/tex-site.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/auc-old.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/auc-old.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/auto/
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/auto/.nosearch
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/font-latex.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/font-latex.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/latex.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/latex.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/multi-prompt.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/multi-prompt.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/.nosearch
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsart.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsart.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsbook.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsbook.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsbsy.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsbsy.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsmath.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsmath.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsopn.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsopn.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amstex.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amstex.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amstext.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amstext.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsthm.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/amsthm.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/article.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/article.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/book.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/book.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/czech.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/czech.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/danish.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/danish.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dinbrief.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dinbrief.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dk.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dk.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dutch.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/dutch.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/epsf.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/epsf.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/fancyref.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/fancyref.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/foils.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/foils.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/german.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/german.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/graphics.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/graphics.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/graphicx.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/graphicx.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/harvard.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/harvard.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/index.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/index.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-article.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-article.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-book.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-book.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-report.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/j-report.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jarticle.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jarticle.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jbook.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jbook.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jreport.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/jreport.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/latexinfo.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/latexinfo.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/letter.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/letter.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/makeidx.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/makeidx.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/mdwlist.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/mdwlist.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/multind.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/multind.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/natbib.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/natbib.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/ngerman.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/ngerman.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/plfonts.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/plfonts.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/plhb.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/plhb.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/prosper.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/prosper.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/psfig.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/psfig.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/report.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/report.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrartcl.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrartcl.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrbase.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrbase.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrbook.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrbook.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrlttr2.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrlttr2.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrreprt.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/scrreprt.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/slides.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/slides.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/slovak.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/slovak.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/swedish.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/swedish.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/varioref.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/varioref.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/verbatim.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/verbatim.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/virtex.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/style/virtex.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-buf.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-buf.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-font.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-font.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-info.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-info.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-mik.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex-mik.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/tex.elc
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/texmathp.el
+share/emacs/${EMACS_VERSION}/site-lisp/auctex/texmathp.elc
+share/emacs/${EMACS_VERSION}/site-lisp/tex-site.el


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to