- Update to git snapshot 5c9ad35f

- Add git commit id to PORTVERSION as upstream has switched to git

3 files changed, 32 insertions, 10 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index d9331534e887..eb4f18872ef9 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	5
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -23,7 +22,7 @@ CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	25.0.50
-EMACS_REV=	118251
+EMACS_REV=	20150206.5c9ad35f
 GNU_CONFIGURE=	yes
 USES=		gmake makeinfo ncurses pkgconfig shebangfix tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -34,7 +33,6 @@ USE_AUTOTOOLS=	autoconf:env aclocal:env automake:env autoheader:env
 
 SUB_FILES=	pkg-install
 SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
-SHEBANG_FILES=	${WRKSRC}/lib-src/grep-changelog
 
 # Append --without-compress-install to prevent emacs from compressing info
 # which bsd.port.mk is not able to detect
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 8defc2353f03..5d8e760a1afe 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-25.0.50.118251.tar.xz) = 04432a2142915605b9252083d6c834e69eb2beeee89b0bc5e0925eed73826f41
-SIZE (emacs-25.0.50.118251.tar.xz) = 31481040
+SHA256 (emacs-25.0.50.20150206.5c9ad35f.tar.xz) = 7e44251913596e2181e1697dca000afcc49f2566c196ff2a28df1e16995ce65b
+SIZE (emacs-25.0.50.20150206.5c9ad35f.tar.xz) = 24728492
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 32462d571068..f43327ea454f 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -4,7 +4,6 @@ bin/emacs
 bin/emacs-%%EMACS_VER%%
 bin/emacsclient
 bin/etags
-bin/grep-changelog
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
@@ -13,7 +12,6 @@ libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
 man/man1/emacs.1.gz
 man/man1/ctags.1.gz
 man/man1/etags.1.gz
-man/man1/grep-changelog.1.gz
 man/man1/emacsclient.1.gz
 man/man1/ebrowse.1.gz
 share/applications/emacs.desktop
@@ -158,6 +156,7 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.eps
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex.in
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/Makefile
@@ -324,7 +323,6 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
 %%DATADIR%%/%%EMACS_VER%%/etc/TERMS
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/etc/CONTRIBUTE
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/01720-0173F.el
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/00100-0017F.el
@@ -922,6 +920,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/descr-text.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-file.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/info-look.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/dom.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/dom.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/uni-input.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/4Corner.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/PY-b5.elc
@@ -1927,6 +1927,10 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/reposition.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/foldout.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/find-dired.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-filewise.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-filewise.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-src.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-src.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/compare-w.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/ediff-merg.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/pcvs-util.el
@@ -1949,7 +1953,6 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/cvs-status.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-hooks.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dir.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-arch.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-rcs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/ediff-vers.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-mtn.elc
@@ -1979,7 +1982,6 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/emerge.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/pcvs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/add-log.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-arch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-hg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-bzr.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/smerge-mode.el
@@ -2537,6 +2539,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/ido.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/elide-head.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xref.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/xref.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/meta-mode.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/hideif.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-langs.el
@@ -2728,6 +2732,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/thingatpt.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/thingatpt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-client.elc
@@ -3147,6 +3153,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/kermit.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.el
@@ -3543,6 +3551,10 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/config.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/config.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/detect.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/detect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-shared.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-misc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/custom.elc
@@ -3618,6 +3630,14 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/data-debug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-idutils.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-generic.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-generic.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/unsafep.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elp.el
@@ -3765,6 +3785,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/syntax.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/easymenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/advice.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/informat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/wdired.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el
@@ -3798,6 +3820,8 @@ share/appdata/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoinsert.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/files.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/let-alist.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/let-alist.elc
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/macuvs.h