Date: Sun, 22 Sep 2013 02:23:19 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182284: [PATCH] devel/magit: change directory of elisp files and etc. Message-ID: <20130921172319.CED484E63F@eastasia.home.utahime.org> Resent-Message-ID: <201309211740.r8LHe1Xh086095@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182284
>Category: ports
>Synopsis: [PATCH] devel/magit: change directory of elisp files and etc.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 21 17:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro KIMURA
>Release: FreeBSD 9.1-RELEASE-p7 amd64
>Organization:
>Environment:
System: FreeBSD xxxx 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0 r255449: Tue Sep 10 22:31:57 JST 2013 xxxx amd64
>Description:
* change elisp directory into ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/magit.
* stop installing 50magit.el and add pkg-message to show how to setup instead.
* update WWW URL in pkg-descr.
* add 'Created by' header in Makefile.
* set PKGNAMESUFFIX.
* add license information.
* add runtime dependency to devel/git.
* bump PORTREVISION.
>How-To-Repeat:
>Fix:
--- patch-magit begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 327787)
+++ Makefile (working copy)
@@ -1,19 +1,36 @@
+# 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
+
USE_EMACS= YES
USE_GMAKE= YES
INFO= magit
+ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+
+MAKE_ENV+= ELISPDIR=${PREFIX}/${ELISPDIR} \
+ INFODIR=${PREFIX}/${INFO_PATH}
+PLIST_SUB+= ELISPDIR=${ELISPDIR}
+
NO_STAGE= yes
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
+
.include <bsd.port.mk>
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 327787)
+++ files/patch-Makefile (working copy)
@@ -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
Index: pkg-descr
===================================================================
--- pkg-descr (revision 327787)
+++ pkg-descr (working copy)
@@ -4,4 +4,4 @@
changes. There is support for cherry picking, reverting, merging,
rebasing, and other common Git operations.
-WWW: http://philjackson.github.com/magit/
+WWW: http://magit.github.io/magit/
Index: pkg-message
===================================================================
--- pkg-message (revision 0)
+++ pkg-message (working copy)
@@ -0,0 +1,6 @@
+**********************************************************************
+To use Magit, you should add following line to your .emacs file:
+
+(require 'magit)
+
+**********************************************************************
Property changes on: pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 327787)
+++ pkg-plist (working copy)
@@ -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%%
--- patch-magit ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130921172319.CED484E63F>