Date: Wed, 25 Feb 2015 11:19:46 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379896 - head/devel/git Message-ID: <201502251119.t1PBJkOt043659@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Wed Feb 25 11:19:45 2015 New Revision: 379896 URL: https://svnweb.freebsd.org/changeset/ports/379896 QAT: https://qat.redports.org/buildarchive/r379896/ Log: - Update to 2.3.1 - Add upcoming git-lite to the list of CONFLICTS - Modernize Makefile Modified: head/devel/git/Makefile head/devel/git/distinfo head/devel/git/pkg-plist Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Wed Feb 25 11:03:09 2015 (r379895) +++ head/devel/git/Makefile Wed Feb 25 11:19:45 2015 (r379896) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG MASTER_SITE_SUBDIR= software/scm/git @@ -17,13 +17,12 @@ COMMENT?= Distributed source code manage LICENSE= GPLv2 -CONFLICTS?= git-subversion-[0-9]* +CONFLICTS?= git-subversion-[0-9]* git-lite-[0-9]* -USERS= git_daemon -GROUPS= git_daemon +USERS= git_daemon +GROUPS= git_daemon SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message GNU_CONFIGURE= yes USES= gmake shebangfix tar:xz @@ -43,6 +42,7 @@ CONFIGURE_ARGS= --enable-pthreads=-pthre OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \ ETCSHELLS NLS OPTIONS_DEFAULT= CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS NLS +OPTIONS_SUB= yes GITWEB_DESC= Install gitweb CONTRIB_DESC= Install contributed scripts @@ -51,15 +51,47 @@ CVS_DESC= Enable CVS support HTMLDOCS_DESC= Install additional documentation ETCSHELLS_DESC= Modify /etc/shells -.include <bsd.port.options.mk> +NLS_USES= gettext +NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -MAKE_ARGS+= NO_GETTEXT=yes -.endif +PERL_USES= perl5 +PERL_MAKE_ENV= PERL_PATH=${PERL} +PERL_BUILD_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error +PERL_RUN_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error \ + p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \ + p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL +PERL_MAKE_ARGS_OFF= NO_PERL=1 + +ICONV_USES= iconv +ICONV_MAKE_ARGS_OFF= NO_ICONV=1 + +CURL_MAKE_ENV= CURLDIR=${LOCALBASE} +CURL_BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl +CURL_RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl +CURL_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +CURL_MAKE_ARGS_OFF= NO_CURL=1 NO_EXPAT=1 + +HTMLDOCS_DISTFILES= ${PORTNAME}-htmldocs-${PORTVERSION}${EXTRACT_SUFX} + +GUI_USES= tk +GUI_MAKE_ARGS= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH} +GUI_MAKE_ARGS_OFF= NO_TCLTK=yes + +# While this port does not explicity honor WITH_SUBVERSION_VER knob it does +# depend upon devel/p5-subversion, which does honor that knob. If you want +# to have git use devel/subversion16 it will be brought in through +# devel/p5-subversion if you set WITH_SUBVERSION_VER=16. Otherwise +# devel/subversion will be brought in. +SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ + p5-subversion>=0:${PORTSDIR}/devel/p5-subversion + +CONTRIB_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ + asciidoc:${PORTSDIR}/textproc/asciidoc \ + docbook-xml>0:${PORTSDIR}/textproc/docbook-xml + +CVS_RUN_DEPENDS= cvsps:${PORTSDIR}/devel/cvsps + +.include <bsd.port.options.mk> # This is intentionally not exposed as an option. .ifndef (WITH_DEBUG) @@ -68,121 +100,32 @@ ALL_TARGET= all strip .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB} USES+= python -PLIST_SUB+= PYTHON_VER=${PYTHON_VER} PYTHON="" CONFIGURE_ARGS+= --with-python=${PYTHON_CMD} .else CONFIGURE_ARGS+= --without-python -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -MAKE_ENV+= PERL_PATH=${PERL} -BUILD_DEPENDS+= p5-Error>=0:${PORTSDIR}/lang/p5-Error -RUN_DEPENDS+= p5-Error>=0:${PORTSDIR}/lang/p5-Error \ - p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \ - p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL -PLIST_SUB+= PERLSUB="" -.else -MAKE_ARGS+= NO_PERL=1 -PLIST_SUB+= PERLSUB="@comment " -.endif - -.if ${PORT_OPTIONS:MICONV} -USES+= iconv -.else -MAKE_ARGS+= NO_ICONV=1 -.endif - -.if ${PORT_OPTIONS:MCURL} -MAKE_ENV+= CURLDIR=${LOCALBASE} -BUILD_DEPENDS+= curl:${PORTSDIR}/ftp/curl -RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl -LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 -PLIST_SUB+= CURL="" -.else -MAKE_ARGS+= NO_CURL=1 \ - NO_EXPAT=1 -PLIST_SUB+= CURL="@comment " -.endif - -# Always fetch the htmldocs distfile in maintainer mode. -# Always include it when building distinfo (makesum) -.if ${PORT_OPTIONS:MHTMLDOCS} || make(makesum) || (defined(MAINTAINER_MODE) && make(fetch)) -DISTFILES+= ${PORTNAME}-htmldocs-${PORTVERSION}${EXTRACT_SUFX} -PLIST_SUB+= HTMLDOCS="" -.else -PLIST_SUB+= HTMLDOCS="@comment " .endif -.if ${PORT_OPTIONS:MGUI} -USES+= tk -PLIST_SUB+= GUI="" -MAKE_ARGS+= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH} -.else +.if empty(PORT_OPTIONS:MGUI) RMMAN1+= git-citool.1 \ git-gui.1 \ gitk.1 -PLIST_SUB+= GUI="@comment " -MAKE_ARGS+= NO_TCLTK=yes .endif -# While this port does not explicity honor WITH_SUBVERSION_VER knob it does -# depend upon devel/p5-subversion, which does honor that knob. If you want -# to have git use devel/subversion16 it will be brought in through -# devel/p5-subversion if you set WITH_SUBVERSION_VER=16. Otherwise -# devel/subversion will be brought in. -.if ${PORT_OPTIONS:MSVN} -RUN_DEPENDS+= p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ - p5-subversion>=0:${PORTSDIR}/devel/p5-subversion -PLIST_SUB+= SVN="" -.else -PLIST_SUB+= SVN="@comment " +.if empty(PORT_OPTIONS:MSVN) RMMAN1+= git-svn.1 .endif -.if ${PORT_OPTIONS:MGITWEB} -PLIST_SUB+= GITWEB="" -.else -PLIST_SUB+= GITWEB="@comment " -.endif - .if ${PORT_OPTIONS:MGITWEB} && empty(PORT_OPTIONS:MPERL) IGNORE= using GITWEB support requires PERL support .endif -.if ${PORT_OPTIONS:MCONTRIB} -PLIST_SUB+= CONTRIB="" -BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \ - asciidoc:${PORTSDIR}/textproc/asciidoc \ - docbook-xml>0:${PORTSDIR}/textproc/docbook-xml -.else -PLIST_SUB+= CONTRIB="@comment " -.endif - -.if ${PORT_OPTIONS:MP4} -PLIST_SUB+= P4="" -.else -PLIST_SUB+= P4="@comment " -.endif - -.if ${PORT_OPTIONS:MCVS} -PLIST_SUB+= CVS="" -RUN_DEPENDS+= cvsps:${PORTSDIR}/devel/cvsps -.else -PLIST_SUB+= CVS="@comment " +.if empty(PORT_OPTIONS:MCVS) RMMAN1+= git-cvsimport.1 \ git-cvsexportcommit.1 \ git-cvsserver.1 RMMAN7+= gitcvs-migration.7 .endif -.if ${PORT_OPTIONS:METCSHELLS} -PLIST_SUB+= ETCSHELLS="" -.else -PLIST_SUB+= ETCSHELLS="@comment " -.endif - post-extract: .if ${PORT_OPTIONS:MHTMLDOCS} @${MKDIR} ${WRKDIR}/htmldocs Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Wed Feb 25 11:03:09 2015 (r379895) +++ head/devel/git/distinfo Wed Feb 25 11:19:45 2015 (r379896) @@ -1,6 +1,6 @@ -SHA256 (git-2.3.0.tar.xz) = 94b23a14d66df536cfe7de37551f55acf908f8bddf30a0f5325a255bb57b0aca -SIZE (git-2.3.0.tar.xz) = 3608648 -SHA256 (git-manpages-2.3.0.tar.xz) = 1641d4fb67159961b4c295d2d5a05954bae19ebcaaa67728b6d72b70020b7842 -SIZE (git-manpages-2.3.0.tar.xz) = 370864 -SHA256 (git-htmldocs-2.3.0.tar.xz) = e8e202bae7a89f22a815e15753e9742f2e140b3c0ca548e9a831cfdbfad3a873 -SIZE (git-htmldocs-2.3.0.tar.xz) = 980936 +SHA256 (git-2.3.1.tar.xz) = 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 +SIZE (git-2.3.1.tar.xz) = 3609908 +SHA256 (git-manpages-2.3.1.tar.xz) = c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940 +SIZE (git-manpages-2.3.1.tar.xz) = 370756 +SHA256 (git-htmldocs-2.3.1.tar.xz) = 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad +SIZE (git-htmldocs-2.3.1.tar.xz) = 981748 Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Wed Feb 25 11:03:09 2015 (r379895) +++ head/devel/git/pkg-plist Wed Feb 25 11:19:45 2015 (r379896) @@ -157,14 +157,14 @@ man/man1/git-write-tree.1.gz %%GUI%%man/man1/gitk.1.gz man/man1/gitremote-helpers.1.gz man/man1/gitweb.1.gz -%%PERLSUB%%man/man3/Git.3.gz -%%PERLSUB%%man/man3/Git::I18N.3.gz -%%PERLSUB%%man/man3/Git::SVN::Editor.3.gz -%%PERLSUB%%man/man3/Git::SVN::Fetcher.3.gz -%%PERLSUB%%man/man3/Git::SVN::Memoize::YAML.3.gz -%%PERLSUB%%man/man3/Git::SVN::Prompt.3.gz -%%PERLSUB%%man/man3/Git::SVN::Ra.3.gz -%%PERLSUB%%man/man3/Git::SVN::Utils.3.gz +%%PERL%%man/man3/Git.3.gz +%%PERL%%man/man3/Git::I18N.3.gz +%%PERL%%man/man3/Git::SVN::Editor.3.gz +%%PERL%%man/man3/Git::SVN::Fetcher.3.gz +%%PERL%%man/man3/Git::SVN::Memoize::YAML.3.gz +%%PERL%%man/man3/Git::SVN::Prompt.3.gz +%%PERL%%man/man3/Git::SVN::Ra.3.gz +%%PERL%%man/man3/Git::SVN::Utils.3.gz man/man5/gitattributes.5.gz man/man5/githooks.5.gz man/man5/gitignore.5.gz @@ -374,19 +374,19 @@ libexec/git-core/mergetools/opendiff libexec/git-core/mergetools/emerge libexec/git-core/mergetools/araxis %%GUI%%bin/gitk -%%PERLSUB%%%%SITE_PERL%%/Git.pm -%%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN.pm -%%PERLSUB%%%%SITE_PERL%%/Git/IndexInfo.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Memoize/YAML.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Migration.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Log.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/GlobSpec.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Utils.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Ra.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Prompt.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Editor.pm -%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Fetcher.pm +%%PERL%%%%SITE_PERL%%/Git.pm +%%PERL%%%%SITE_PERL%%/Git/I18N.pm +%%PERL%%%%SITE_PERL%%/Git/SVN.pm +%%PERL%%%%SITE_PERL%%/Git/IndexInfo.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Memoize/YAML.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Migration.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Log.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/GlobSpec.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Utils.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Ra.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Prompt.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Editor.pm +%%PERL%%%%SITE_PERL%%/Git/SVN/Fetcher.pm lib/xemacs/site-lisp/git/git.el lib/xemacs/site-lisp/git/git-blame.el %%NLS%%share/locale/bg/LC_MESSAGES/git.mo @@ -1214,6 +1214,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.1.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502251119.t1PBJkOt043659>