From owner-svn-ports-all@FreeBSD.ORG Mon May 5 07:19:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCCFA7F1; Mon, 5 May 2014 07:19:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B0711808; Mon, 5 May 2014 07:19:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s457JptS029380; Mon, 5 May 2014 07:19:51 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s457JoRw029373; Mon, 5 May 2014 07:19:50 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201405050719.s457JoRw029373@svn.freebsd.org> From: Kurt Jaeger Date: Mon, 5 May 2014 07:19:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352979 - in head/devel/magit: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2014 07:19:51 -0000 Author: pi Date: Mon May 5 07:19:50 2014 New Revision: 352979 URL: http://svnweb.freebsd.org/changeset/ports/352979 QAT: https://qat.redports.org/buildarchive/r352979/ Log: devel/magit: stagify, fix build and many details - 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 PR: ports/182284 Submitted by: Yasuhiro KIMURA Approved by: kuriyama (maintainer timeout), culot (mentor) Added: head/devel/magit/pkg-message (contents, props changed) Modified: head/devel/magit/Makefile head/devel/magit/files/patch-Makefile head/devel/magit/pkg-plist Modified: head/devel/magit/Makefile ============================================================================== --- head/devel/magit/Makefile Mon May 5 07:12:40 2014 (r352978) +++ head/devel/magit/Makefile Mon May 5 07:19:50 2014 (r352979) @@ -1,19 +1,31 @@ +# Created by: Jun Kuriyama # $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 Modified: head/devel/magit/files/patch-Makefile ============================================================================== --- head/devel/magit/files/patch-Makefile Mon May 5 07:12:40 2014 (r352978) +++ head/devel/magit/files/patch-Makefile Mon May 5 07:19:50 2014 (r352979) @@ -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 Added: head/devel/magit/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/magit/pkg-message Mon May 5 07:19:50 2014 (r352979) @@ -0,0 +1,6 @@ +********************************************************************** +To use Magit, you should add following line to your .emacs file: + +(require 'magit) + +********************************************************************** Modified: head/devel/magit/pkg-plist ============================================================================== --- head/devel/magit/pkg-plist Mon May 5 07:12:40 2014 (r352978) +++ head/devel/magit/pkg-plist Mon May 5 07:19:50 2014 (r352979) @@ -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%%