4 files changed, 59 insertions, 34 deletions

diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 1ad90b106a2f..d1914cde0dec 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -1,19 +1,31 @@
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	magit
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://cloud.github.com/downloads/magit/magit/
 MASTER_SITE_SUBDIR=	kuriyama
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Interface to Git for Emacs
 
+LICENSE=	GFDL GPLv3
+LICENSE_COMB=	multi
+
+RUN_DEPENDS=	git>0:${PORTSDIR}/devel/git
+
+USES=		gmake
 USE_EMACS=	YES
-USE_GMAKE=	YES
 INFO=		magit
 
-NO_STAGE=	yes
+ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+
+MAKE_ENV+=	ELISPDIR=${STAGEDIR}${PREFIX}/${ELISPDIR} \
+		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
+PLIST_SUB+=	ELISPDIR=${ELISPDIR}
+
 .include <bsd.port.mk>
diff --git a/devel/magit/files/patch-Makefile b/devel/magit/files/patch-Makefile
index 1d2ba86cc5ff..317c60831ee6 100644
--- a/devel/magit/files/patch-Makefile
+++ b/devel/magit/files/patch-Makefile
@@ -1,21 +1,30 @@
---- Makefile.orig	2012-02-25 20:11:08.159711102 +0900
-+++ Makefile	2012-02-25 20:13:34.152398624 +0900
-@@ -61,13 +61,13 @@
+--- Makefile.orig	2012-09-25 04:41:19.000000000 +0900
++++ Makefile	2013-09-21 23:01:04.000000000 +0900
+@@ -1,5 +1,5 @@
+ VERSION=1.2.0
+-EMACS=emacs
++#EMACS=emacs
+ PREFIX=/usr/local
+ SYSCONFDIR=/etc
+ ELS=magit.el magit-svn.el magit-topgit.el magit-stgit.el magit-key-mode.el magit-bisect.el magit-wip.el rebase-mode.el magit-blame.el
+@@ -64,15 +64,13 @@
+ install: install_core install_docs
+ 
  install_core: core
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
- 	install -m 644 $(ELS) $(ELCS) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
+-	install -m 644 $(ELS) $(ELCS) $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
 -	mkdir -p $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d
 -	install -m 644 50magit.el $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d/50magit.el
-+	mkdir -p $(DESTDIR)$(PREFIX)$(SYSCONFDIR)/emacs/site-start.d
-+	install -m 644 50magit.el $(DESTDIR)$(PREFIX)$(SYSCONFDIR)/emacs/site-start.d/50magit.el
++	mkdir -p $(ELISPDIR)
++	install -m 644 $(ELS) $(ELCS) $(ELISPDIR)
  
  install_docs: docs
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/info
 -	install -m 644 magit.info $(DESTDIR)$(PREFIX)/share/info
 -	install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info
-+	mkdir -p $(DESTDIR)$(PREFIX)/info
-+	install -m 644 magit.info $(DESTDIR)$(PREFIX)/info
-+	install-info --info-dir=$(DESTDIR)$(PREFIX)/info $(DESTDIR)$(PREFIX)/info/magit.info
++	mkdir -p $(INFODIR)
++	install -m 644 magit.info $(INFODIR)
++	install-info --info-dir=$(INFODIR) $(INFODIR)/magit.info
  
  install_contrib: contrib
  	mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
diff --git a/devel/magit/pkg-message b/devel/magit/pkg-message
new file mode 100644
index 000000000000..f4a23d6a21b1
--- /dev/null
+++ b/devel/magit/pkg-message
@@ -0,0 +1,6 @@
+**********************************************************************
+To use Magit, you should add following line to your .emacs file:
+
+(require 'magit)
+
+**********************************************************************
diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist
index 163e0d7b6cfe..6001dbce8e0f 100644
--- a/devel/magit/pkg-plist
+++ b/devel/magit/pkg-plist
@@ -1,21 +1,19 @@
-etc/emacs/site-start.d/50magit.el
-share/emacs/site-lisp/magit-bisect.el
-share/emacs/site-lisp/magit-bisect.elc
-share/emacs/site-lisp/magit-blame.el
-share/emacs/site-lisp/magit-blame.elc
-share/emacs/site-lisp/magit-key-mode.el
-share/emacs/site-lisp/magit-key-mode.elc
-share/emacs/site-lisp/magit-stgit.el
-share/emacs/site-lisp/magit-stgit.elc
-share/emacs/site-lisp/magit-svn.el
-share/emacs/site-lisp/magit-svn.elc
-share/emacs/site-lisp/magit-topgit.el
-share/emacs/site-lisp/magit-topgit.elc
-share/emacs/site-lisp/magit-wip.el
-share/emacs/site-lisp/magit-wip.elc
-share/emacs/site-lisp/magit.el
-share/emacs/site-lisp/magit.elc
-share/emacs/site-lisp/rebase-mode.el
-share/emacs/site-lisp/rebase-mode.elc
-@dirrmtry etc/emacs/site-start.d
-@dirrmtry etc/emacs
+%%ELISPDIR%%/magit-bisect.el
+%%ELISPDIR%%/magit-bisect.elc
+%%ELISPDIR%%/magit-blame.el
+%%ELISPDIR%%/magit-blame.elc
+%%ELISPDIR%%/magit-key-mode.el
+%%ELISPDIR%%/magit-key-mode.elc
+%%ELISPDIR%%/magit-stgit.el
+%%ELISPDIR%%/magit-stgit.elc
+%%ELISPDIR%%/magit-svn.el
+%%ELISPDIR%%/magit-svn.elc
+%%ELISPDIR%%/magit-topgit.el
+%%ELISPDIR%%/magit-topgit.elc
+%%ELISPDIR%%/magit-wip.el
+%%ELISPDIR%%/magit-wip.elc
+%%ELISPDIR%%/magit.el
+%%ELISPDIR%%/magit.elc
+%%ELISPDIR%%/rebase-mode.el
+%%ELISPDIR%%/rebase-mode.elc
+@dirrm %%ELISPDIR%%