From owner-svn-ports-head@freebsd.org Wed Jul 22 02:00:26 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DB419A8A78; Wed, 22 Jul 2015 02:00:26 +0000 (UTC) (envelope-from kuriyama@FreeBSD.org) Received: from repo.freebsd.org (repo.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 210DA1B07; Wed, 22 Jul 2015 02:00:26 +0000 (UTC) (envelope-from kuriyama@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6M20PdZ073943; Wed, 22 Jul 2015 02:00:25 GMT (envelope-from kuriyama@FreeBSD.org) Received: (from kuriyama@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6M20OtG073939; Wed, 22 Jul 2015 02:00:24 GMT (envelope-from kuriyama@FreeBSD.org) Message-Id: <201507220200.t6M20OtG073939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kuriyama set sender to kuriyama@FreeBSD.org using -f From: Jun Kuriyama Date: Wed, 22 Jul 2015 02:00:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392655 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2015 02:00:26 -0000 Author: kuriyama Date: Wed Jul 22 02:00:23 2015 New Revision: 392655 URL: https://svnweb.freebsd.org/changeset/ports/392655 Log: - Upgrade to 2.1.0. PR: ports/201654 Submitted by: Yasuhiro KIMURA Added: head/devel/magit/files/ head/devel/magit/files/patch-default.mk (contents, props changed) Modified: head/devel/magit/Makefile head/devel/magit/distinfo head/devel/magit/pkg-plist Modified: head/devel/magit/Makefile ============================================================================== --- head/devel/magit/Makefile Wed Jul 22 01:42:15 2015 (r392654) +++ head/devel/magit/Makefile Wed Jul 22 02:00:23 2015 (r392655) @@ -2,33 +2,37 @@ # $FreeBSD$ PORTNAME= magit -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= devel elisp PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Interface to Git for Emacs -LICENSE= GFDL GPLv3 -LICENSE_COMB= multi +LICENSE= GPLv3 -BUILD_DEPENDS= git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes -RUN_DEPENDS= git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes +BUILD_DEPENDS= git:${PORTSDIR}/devel/git \ + dash.el>0:${PORTSDIR}/devel/dash.el +RUN_DEPENDS= dash.el>0:${PORTSDIR}/devel/dash.el USE_GITHUB= yes USES= gmake makeinfo USE_EMACS= YES -INFO= magit +INFO= magit magit-popup with-editor PORTDOCS= AUTHORS.md +NO_ARCH= YES -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS GIT_SUBVERSION +GIT_SUBVERSION_DESC= Use devel/git-subversion as backend +GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:${PORTSDIR}/devel/git-subversion +GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:${PORTSDIR}/devel/git .include ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} -MAKE_ENV+= EFLAGS="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/git-modes" \ +MAKE_ENV+= LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \ + VERSION=${PORTVERSION} \ lispdir=${PREFIX}/${ELISPDIR} \ infodir=${PREFIX}/${INFO_PATH} \ docdir=${DOCSDIR} Modified: head/devel/magit/distinfo ============================================================================== --- head/devel/magit/distinfo Wed Jul 22 01:42:15 2015 (r392654) +++ head/devel/magit/distinfo Wed Jul 22 02:00:23 2015 (r392655) @@ -1,2 +1,2 @@ -SHA256 (magit-magit-1.4.0_GH0.tar.gz) = 03cdc29fe5d5d3c5b1d975bccfcf0bb12318c6e5c198575c395caa3eb14e3878 -SIZE (magit-magit-1.4.0_GH0.tar.gz) = 132600 +SHA256 (magit-magit-2.1.0_GH0.tar.gz) = e1c246ce1ea51cbf59b04eecaee9280a31429a725ad81b3eb497c6e8246d68d9 +SIZE (magit-magit-2.1.0_GH0.tar.gz) = 293857 Added: head/devel/magit/files/patch-default.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/magit/files/patch-default.mk Wed Jul 22 02:00:23 2015 (r392655) @@ -0,0 +1,14 @@ +--- default.mk.orig 2015-07-18 04:15:03 UTC ++++ default.mk +@@ -71,11 +71,3 @@ EMACSOLD := $(shell $(BATCH) --eval \ + ifeq "$(EMACSOLD)" "true" + $(error At least version 24.4 of Emacs is required) + endif +- +-VERSION := $(shell \ +- test -e $(TOP).git\ +- && git describe --tags --dirty 2> /dev/null\ +- || $(BATCH) --eval "(progn\ +- (fset 'message (lambda (&rest _)))\ +- (load-file \"magit-version.el\")\ +- (princ magit-version))") Modified: head/devel/magit/pkg-plist ============================================================================== --- head/devel/magit/pkg-plist Wed Jul 22 01:42:15 2015 (r392654) +++ head/devel/magit/pkg-plist Wed Jul 22 02:00:23 2015 (r392655) @@ -1,10 +1,48 @@ +%%ELISPDIR%%/git-commit.el +%%ELISPDIR%%/git-commit.elc +%%ELISPDIR%%/git-rebase.el +%%ELISPDIR%%/git-rebase.elc +%%ELISPDIR%%/magit-apply.el +%%ELISPDIR%%/magit-apply.elc %%ELISPDIR%%/magit-autoloads.el +%%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-commit.el +%%ELISPDIR%%/magit-commit.elc +%%ELISPDIR%%/magit-core.el +%%ELISPDIR%%/magit-core.elc +%%ELISPDIR%%/magit-diff.el +%%ELISPDIR%%/magit-diff.elc +%%ELISPDIR%%/magit-ediff.el +%%ELISPDIR%%/magit-ediff.elc +%%ELISPDIR%%/magit-extras.el +%%ELISPDIR%%/magit-extras.elc +%%ELISPDIR%%/magit-git.el +%%ELISPDIR%%/magit-git.elc +%%ELISPDIR%%/magit-log.el +%%ELISPDIR%%/magit-log.elc +%%ELISPDIR%%/magit-mode.el +%%ELISPDIR%%/magit-mode.elc +%%ELISPDIR%%/magit-popup.el +%%ELISPDIR%%/magit-popup.elc +%%ELISPDIR%%/magit-process.el +%%ELISPDIR%%/magit-process.elc +%%ELISPDIR%%/magit-remote.el +%%ELISPDIR%%/magit-remote.elc +%%ELISPDIR%%/magit-section.el +%%ELISPDIR%%/magit-section.elc +%%ELISPDIR%%/magit-sequence.el +%%ELISPDIR%%/magit-sequence.elc +%%ELISPDIR%%/magit-stash.el +%%ELISPDIR%%/magit-stash.elc +%%ELISPDIR%%/magit-utils.el +%%ELISPDIR%%/magit-utils.elc %%ELISPDIR%%/magit-version.el %%ELISPDIR%%/magit-wip.el %%ELISPDIR%%/magit-wip.elc %%ELISPDIR%%/magit.el %%ELISPDIR%%/magit.elc +%%ELISPDIR%%/with-editor.el +%%ELISPDIR%%/with-editor.elc