Date: Tue, 16 Oct 2012 04:17:02 +0000 (UTC) From: Wesley Shields <wxs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305948 - head/devel/git Message-ID: <201210160417.q9G4H2Ou043179@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wxs Date: Tue Oct 16 04:17:02 2012 New Revision: 305948 URL: http://svn.freebsd.org/changeset/ports/305948 Log: Update to 1.7.12.3. Stop using LIBMD_SHA1, it's been useless for a while now. If we want to not use SHA1 from OpenSSL I can put BLK_SHA1 in, but since nobody has complained that we silently fell back to OpenSSL I'm going to stick with that for now. Pass NO_GETTEXT in MAKE_ARGS instead of MAKE_ENV. This actually works now[1]. PR: [1]: ports/171939 Submitted by: ohauer@ Feature safe: yes Modified: head/devel/git/Makefile head/devel/git/distinfo (contents, props changed) head/devel/git/pkg-plist (contents, props changed) Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Tue Oct 16 03:39:28 2012 (r305947) +++ head/devel/git/Makefile Tue Oct 16 04:17:02 2012 (r305948) @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.7.11.5 +PORTVERSION= 1.7.12.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ @@ -46,6 +46,7 @@ MAN1= git.1 \ git-commit.1 \ git-config.1 \ git-count-objects.1 \ + git-credential.1 \ git-credential-cache--daemon.1 \ git-credential-cache.1 \ git-credential-store.1 \ @@ -190,8 +191,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= LIBMD_SHA1=yes \ - V=1 +MAKE_ENV+= V=1 MAKE_ARGS+= prefix="${PREFIX}" USE_OPENSSL= yes USE_RC_SUBR= git_daemon @@ -217,7 +217,7 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " -MAKE_ENV+= NO_GETTEXT=yes +MAKE_ARGS+= NO_GETTEXT=yes .endif # This is intentionally not exposed as an option. @@ -246,7 +246,8 @@ MAN3= Git.3 \ Git::SVN::Fetcher.3 \ Git::SVN::Memoize::YAML.3 \ Git::SVN::Prompt.3 \ - Git::SVN::Ra.3 + Git::SVN::Ra.3 \ + Git::SVN::Utils.3 PLIST_SUB+= PERLSUB="" .else MAKE_ENV+= NO_PERL=1 Modified: head/devel/git/distinfo ============================================================================== --- head/devel/git/distinfo Tue Oct 16 03:39:28 2012 (r305947) +++ head/devel/git/distinfo Tue Oct 16 04:17:02 2012 (r305948) @@ -1,6 +1,6 @@ -SHA256 (git-1.7.11.5.tar.gz) = 212408bd618b686c9ab0c3fb55414d7d112c70a482274ade97f37f1335f92662 -SIZE (git-1.7.11.5.tar.gz) = 4018975 -SHA256 (git-manpages-1.7.11.5.tar.gz) = 6b27611ac82a564001573577b0706630f64c92bde42694f10b436e3c92aeeb81 -SIZE (git-manpages-1.7.11.5.tar.gz) = 515022 -SHA256 (git-htmldocs-1.7.11.5.tar.gz) = 350b87224252780af4bd310575f6ac007c4cdf00dc91d57dd3d30c2ed6096a5c -SIZE (git-htmldocs-1.7.11.5.tar.gz) = 1779177 +SHA256 (git-1.7.12.3.tar.gz) = 5d0959c316a2cdebaaf72cf27ac87d2e5616596a530dddeeb3a961c615494094 +SIZE (git-1.7.12.3.tar.gz) = 4109011 +SHA256 (git-manpages-1.7.12.3.tar.gz) = fa85885f813c5081071629e3dd8832cad730b8e481f33e9cbb00edfb3af4f24f +SIZE (git-manpages-1.7.12.3.tar.gz) = 521149 +SHA256 (git-htmldocs-1.7.12.3.tar.gz) = ec8e10b989e8f94d1607ecece7d4a2e91fa07e5f47e02944fdab3b7904f51a3f +SIZE (git-htmldocs-1.7.12.3.tar.gz) = 1797128 Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Tue Oct 16 03:39:28 2012 (r305947) +++ head/devel/git/pkg-plist Tue Oct 16 04:17:02 2012 (r305948) @@ -51,6 +51,7 @@ libexec/git-core/git-commit libexec/git-core/git-commit-tree libexec/git-core/git-config libexec/git-core/git-count-objects +libexec/git-core/git-credential libexec/git-core/git-credential-cache--daemon libexec/git-core/git-credential-cache libexec/git-core/git-credential-store @@ -208,7 +209,13 @@ libexec/git-core/mergetools/araxis %%PERLSUB%%%%SITE_PERL%%/Git.pm %%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist %%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 @@ -535,6 +542,8 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/howto/use-git-daemon.txt %%HTMLDOCS%%%%DOCSDIR%%/howto/using-signed-tag-in-pull-request.html %%HTMLDOCS%%%%DOCSDIR%%/howto/using-signed-tag-in-pull-request.txt +%%HTMLDOCS%%%%DOCSDIR%%/git-credential.html +%%HTMLDOCS%%%%DOCSDIR%%/git-credential.txt %%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache--daemon.html %%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache--daemon.txt %%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache.html @@ -936,6 +945,12 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.11.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.11.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.11.5.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.11.6.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.11.7.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.12.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.12.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.12.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.12.3.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css @@ -953,9 +968,11 @@ share/git-core/templates/info/exclude %%CONTRIB%%share/git-core/contrib/buildsystems/generate %%CONTRIB%%share/git-core/contrib/buildsystems/parse.pl %%CONTRIB%%share/git-core/contrib/ciabot/README +%%CONTRIB%%share/git-core/contrib/ciabot/INSTALL %%CONTRIB%%share/git-core/contrib/ciabot/ciabot.py %%CONTRIB%%share/git-core/contrib/ciabot/ciabot.sh %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash +%%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh %%CONTRIB%%share/git-core/contrib/continuous/cidaemon %%CONTRIB%%share/git-core/contrib/continuous/post-receive-cinotify %%CONTRIB%%share/git-core/contrib/convert-objects/convert-objects.c @@ -1013,6 +1030,23 @@ share/git-core/templates/info/exclude %%CONTRIB%%share/git-core/contrib/hooks/update-paranoid %%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki %%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.txt +%%CONTRIB%%share/git-core/contrib/mw-to-git/Makefile +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/.gitignore +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/LocalSettings.php +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki/db_install.php +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/Makefile +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/README +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/push-pull-tests.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9364-pull-by-rev.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw-lib.sh +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw.pl +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/.gitignore +%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test.config %%CONTRIB%%share/git-core/contrib/p4import/README %%CONTRIB%%share/git-core/contrib/p4import/git-p4import.py %%CONTRIB%%share/git-core/contrib/p4import/git-p4import.txt @@ -1094,6 +1128,8 @@ share/git-core/templates/info/exclude %%CONTRIB%%@dirrm share/git-core/contrib/gitview %%CONTRIB%%@dirrm share/git-core/contrib/hg-to-git %%CONTRIB%%@dirrm share/git-core/contrib/hooks +%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/install-wiki +%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/ %%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git %%CONTRIB%%@dirrm share/git-core/contrib/p4import %%CONTRIB%%@dirrm share/git-core/contrib/patches
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210160417.q9G4H2Ou043179>