pkg/47481: [PATCH] devel/magit installs *.el{,c} files just under site-lisp

[makoto%ki.nu@localhost]

>Number:         47481
>Category:       pkg
>Synopsis:       devel/magit installs *.el{,c} files just under site-lisp
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 21 13:50:00 +0000 2013
>Originator:     Makoto Fujiwara
>Release:        NetBSD 6.0.1
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD modena 6.0.1 NetBSD 6.0.1 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
        devel/magit installs files just under emacs/site-lisp, resulting
        many files are spreaded out, and I don't believe following regular
        practice. I've reported it as
            https://github.com/magit/magit/issues/543
>How-To-Repeat:
        (cd /usr/pkgsrc/devel/magit; make package-install);
        ls -l /usr/pkg/share/emacs/site-lisp;
>Fix:
Index: devel/magit/PLIST
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/magit/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- devel/magit/PLIST   24 Dec 2012 06:42:56 -0000      1.2
+++ devel/magit/PLIST   21 Jan 2013 13:23:39 -0000
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/24 06:42:56 dholland Exp $
+@comment $NetBSD$
 etc/emacs/site-start.d/50magit.el
-${EMACS_LISPPREFIX}/magit-bisect.el
-${EMACS_LISPPREFIX}/magit-bisect.elc
-${EMACS_LISPPREFIX}/magit-blame.el
-${EMACS_LISPPREFIX}/magit-blame.elc
-${EMACS_LISPPREFIX}/magit-key-mode.el
-${EMACS_LISPPREFIX}/magit-key-mode.elc
-${EMACS_LISPPREFIX}/magit-stgit.el
-${EMACS_LISPPREFIX}/magit-stgit.elc
-${EMACS_LISPPREFIX}/magit-svn.el
-${EMACS_LISPPREFIX}/magit-svn.elc
-${EMACS_LISPPREFIX}/magit-topgit.el
-${EMACS_LISPPREFIX}/magit-topgit.elc
-${EMACS_LISPPREFIX}/magit-wip.el
-${EMACS_LISPPREFIX}/magit-wip.elc
-${EMACS_LISPPREFIX}/magit.el
-${EMACS_LISPPREFIX}/magit.elc
-${EMACS_LISPPREFIX}/rebase-mode.el
-${EMACS_LISPPREFIX}/rebase-mode.elc
 info/magit.info
+${EMACS_LISPPREFIX}/magit/magit-bisect.el
+${EMACS_LISPPREFIX}/magit/magit-bisect.elc
+${EMACS_LISPPREFIX}/magit/magit-blame.el
+${EMACS_LISPPREFIX}/magit/magit-blame.elc
+${EMACS_LISPPREFIX}/magit/magit-key-mode.el
+${EMACS_LISPPREFIX}/magit/magit-key-mode.elc
+${EMACS_LISPPREFIX}/magit/magit-stgit.el
+${EMACS_LISPPREFIX}/magit/magit-stgit.elc
+${EMACS_LISPPREFIX}/magit/magit-svn.el
+${EMACS_LISPPREFIX}/magit/magit-svn.elc
+${EMACS_LISPPREFIX}/magit/magit-topgit.el
+${EMACS_LISPPREFIX}/magit/magit-topgit.elc
+${EMACS_LISPPREFIX}/magit/magit-wip.el
+${EMACS_LISPPREFIX}/magit/magit-wip.elc
+${EMACS_LISPPREFIX}/magit/magit.el
+${EMACS_LISPPREFIX}/magit/magit.elc
+${EMACS_LISPPREFIX}/magit/rebase-mode.el
+${EMACS_LISPPREFIX}/magit/rebase-mode.elc
Index: devel/magit/distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/magit/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- devel/magit/distinfo        6 Oct 2012 22:04:02 -0000       1.1
+++ devel/magit/distinfo        21 Jan 2013 13:23:39 -0000
@@ -3,3 +3,4 @@
 SHA1 (magit-1.2.0.tar.gz) = b4d9531e9f66202f8a74cde38ad53ca1a6b4516d
 RMD160 (magit-1.2.0.tar.gz) = 6afbfd0c29b351e7c78c39ebaf74408b3a10a02d
 Size (magit-1.2.0.tar.gz) = 163318 bytes
+SHA1 (patch-Makefile) = a236dd8ff4b35bff733936354a3e1372e1a5f0a1
--- /dev/null   2013-01-21 21:23:50.000000000 +0900
+++ devel/magit/patches/patch-Makefile  2013-01-21 21:10:02.000000000 +0900
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Original installs files just below share/emacs/site-lisp.
+This bundles them under            share/emacs/site-lisp/magit.
+
+--- Makefile.orig      2013-01-20 23:25:02.000000000 +0900
++++ Makefile   2013-01-21 21:04:49.000000000 +0900
+@@ -64,8 +64,8 @@ magit-$(VERSION).tar: $(ELPA_FILES)
+ 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/magit
++      install -m 644 $(ELS) $(ELCS) 
$(DESTDIR)$(PREFIX)/share/emacs/site-lisp/magit
+       mkdir -p $(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d
+       install -m 644 50magit.el 
$(DESTDIR)$(SYSCONFDIR)/emacs/site-start.d/50magit.el
+ 

>Unformatted: