svn commit: r398132 - in head/devel: . git git-gui git-lite git-subversion

[Renato Botelho]

Author: garga
Date: Mon Sep 28 18:33:46 2015
New Revision: 398132
URL: https://svnweb.freebsd.org/changeset/ports/398132

Log:
  - Add devel/git-gui, a devel/git slave port with GUI option enabled
  - Register conflicts with master and other slave ports
  - Bump PORTREVISION
  
  PR:		202948

Added:
  head/devel/git-gui/
  head/devel/git-gui/Makefile   (contents, props changed)
  head/devel/git-gui/pkg-descr   (contents, props changed)
Modified:
  head/devel/Makefile
  head/devel/git-lite/Makefile
  head/devel/git-subversion/Makefile
  head/devel/git/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Sep 28 18:31:57 2015	(r398131)
+++ head/devel/Makefile	Mon Sep 28 18:33:46 2015	(r398132)
@@ -636,6 +636,7 @@
     SUBDIR += git-codereview
     SUBDIR += git-cola
     SUBDIR += git-extras
+    SUBDIR += git-gui
     SUBDIR += git-lite
     SUBDIR += git-merge-changelog
     SUBDIR += git-modes

Added: head/devel/git-gui/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/git-gui/Makefile	Mon Sep 28 18:33:46 2015	(r398132)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-gui
+
+COMMENT=	Distributed source code management tool (GUI enabled)
+
+MASTERDIR=	${.CURDIR}/../git
+
+DESCR=		${.CURDIR}/pkg-descr
+
+OPTIONS_SLAVE=	GUI
+
+CONFLICTS_INSTALL=	git-[0-9]* git-lite-[0-9]* git-subversion-[0-9]*
+
+DISTINFO_FILE=	${MASTERDIR}/distinfo
+
+.include "${MASTERDIR}/Makefile"

Added: head/devel/git-gui/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/git-gui/pkg-descr	Mon Sep 28 18:33:46 2015	(r398132)
@@ -0,0 +1,6 @@
+Git is a free and open source distributed version control system designed to
+handle everything from small to very large projects with speed and efficiency.
+
+This version provides a package with GUI option enabled.
+
+WWW: http://git-scm.com/

Modified: head/devel/git-lite/Makefile
==============================================================================
--- head/devel/git-lite/Makefile	Mon Sep 28 18:31:57 2015	(r398131)
+++ head/devel/git-lite/Makefile	Mon Sep 28 18:33:46 2015	(r398132)
@@ -10,7 +10,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 OPTIONS_EXCLUDE=GUI SVN GITWEB CONTRIB P4 CVS PERL
 
-CONFLICTS_INSTALL=	git-[0-9]* git-subversion-[0-9]*
+CONFLICTS_INSTALL=	git-[0-9]* git-gui-[0-9]* git-subversion-[0-9]*
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 

Modified: head/devel/git-subversion/Makefile
==============================================================================
--- head/devel/git-subversion/Makefile	Mon Sep 28 18:31:57 2015	(r398131)
+++ head/devel/git-subversion/Makefile	Mon Sep 28 18:33:46 2015	(r398132)
@@ -10,7 +10,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 OPTIONS_SLAVE=	SVN
 
-CONFLICTS_INSTALL=	git-[0-9]* git-lite-[0-9]*
+CONFLICTS_INSTALL=	git-[0-9]* git-gui-[0-9]* git-lite-[0-9]*
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Mon Sep 28 18:31:57 2015	(r398131)
+++ head/devel/git/Makefile	Mon Sep 28 18:33:46 2015	(r398132)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 PORTVERSION=	2.5.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -16,7 +17,7 @@ COMMENT?=	Distributed source code manage
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL?=	git-subversion-[0-9]* git-lite-[0-9]*
+CONFLICTS_INSTALL?=	git-gui-[0-9]* git-subversion-[0-9]* git-lite-[0-9]*
 
 USERS=		git_daemon
 GROUPS=		git_daemon