[Midnightbsd-cvs] mports [15625] update to git 1.8.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Nov 26 22:24:39 EST 2013
Revision: 15625
http://svnweb.midnightbsd.org/mports/?rev=15625
Author: laffer1
Date: 2013-11-26 22:24:38 -0500 (Tue, 26 Nov 2013)
Log Message:
-----------
update to git 1.8.4
Modified Paths:
--------------
trunk/devel/git/Makefile
trunk/devel/git/distinfo
trunk/devel/git/files/patch-Documentation__Makefile
trunk/devel/git/pkg-plist
Property Changed:
----------------
trunk/devel/git/files/git_daemon.in
trunk/devel/git/files/patch-Documentation__Makefile
trunk/devel/git/files/patch-Makefile
trunk/devel/git/files/patch-wrapper.c
trunk/devel/git/files/pkg-message.in
Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/Makefile 2013-11-27 03:24:38 UTC (rev 15625)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= git
-PORTVERSION= 1.8.3.1
+PORTVERSION= 1.8.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -11,10 +11,10 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Distributed source code management tool
+
LICENSE= gpl2
PROJECTHOST= git-core
-MAKE_JOBS_SAFE= yes
MAN1= git.1 \
git-add.1 \
@@ -30,6 +30,7 @@
git-cat-file.1 \
git-check-attr.1 \
git-check-ignore.1 \
+ git-check-mailmap.1 \
git-check-ref-format.1 \
git-checkout-index.1 \
git-checkout.1 \
@@ -200,7 +201,7 @@
CONFIGURE_ARGS= --enable-pthreads=-pthread
OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
- ETCSHELLS NLS
+ NLS
OPTIONS_DEFAULT= CONTRIB P4 CVS PERL ICONV CURL NLS
GITWEB_DESC= Install gitweb
@@ -208,7 +209,6 @@
P4_DESC= Enable Perforce support
CVS_DESC= Enable CVS support
HTMLDOCS_DESC= Install additional documentation
-ETCSHELLS_DESC= Modify /etc/shells
.include <bsd.mport.options.mk>
@@ -257,8 +257,8 @@
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
MAKE_ENV+= NEEDS_LIBICONV=yes \
- ICONVDIR=${LOCALBASE}
-CONFIGURE_ARGS+= --with-iconv=${LOCALBASE}
+ ICONVDIR=${ICONV_PREFIX}
+CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX}
.else
MAKE_ENV+= NO_ICONV=1
.endif
@@ -277,7 +277,7 @@
# Always fetch the htmldocs distfile in maintainer mode.
# Always include it when building distinfo (makesum)
-.if ${PORT_OPTIONS:MHTMLDOCS} || make(makesum) || (defined(PACKAGE_BUILDING)) || (defined(MAINTAINER_MODE) && make(fetch))
+.if ${PORT_OPTIONS:MHTMLDOCS} || make(makesum) || (defined(MAINTAINER_MODE) && make(fetch))
DISTFILES+= ${PORTNAME}-htmldocs-${PORTVERSION}${EXTRACT_SUFX}
PLIST_SUB+= HTMLDOCS=""
.else
@@ -327,10 +327,10 @@
.if ${PORT_OPTIONS:MCONTRIB}
PLIST_SUB+= CONTRIB=""
-BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
+BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
asciidoc:${PORTSDIR}/textproc/asciidoc \
${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450
-#MAN1+= git-subtree.1
+MAN1+= git-subtree.1
.else
PLIST_SUB+= CONTRIB="@comment "
.endif
@@ -352,13 +352,6 @@
RMMAN7+= gitcvs-migration.7
.endif
-.if ${PORT_OPTIONS:METCSHELLS}
-SHELLS= /etc/shells
-PLIST_SUB+= ETCSHELLS=""
-.else
-PLIST_SUB+= ETCSHELLS="@comment "
-.endif
-
post-extract:
.if ${PORT_OPTIONS:MHTMLDOCS}
@${MKDIR} ${WRKDIR}/htmldocs
@@ -418,7 +411,7 @@
(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
${LN} -s ${DOCSDIR}/git.html ${DOCSDIR}/index.html
.endif
- -${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
+ -${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/distinfo 2013-11-27 03:24:38 UTC (rev 15625)
@@ -1,6 +1,6 @@
-SHA256 (git-1.8.3.1.tar.gz) = ea2dde231b3f659da92dd0afc092a16720d63f1206cdcb271920e88f328bda83
-SIZE (git-1.8.3.1.tar.gz) = 4470932
-SHA256 (git-manpages-1.8.3.1.tar.gz) = ab574826814b9469c91cdb99ecf5ad66228d0e30197e54881a4fe8ce0a17caba
-SIZE (git-manpages-1.8.3.1.tar.gz) = 542717
-SHA256 (git-htmldocs-1.8.3.1.tar.gz) = 0be04c5efc831bbc7b1d80707d953bf7e9d500037eb202f6fd042c0fff0538ea
-SIZE (git-htmldocs-1.8.3.1.tar.gz) = 2114248
+SHA256 (git-1.8.4.tar.gz) = 51e8522c256ef8091c6fd5846b9cef8ba4e764819193b5b6cec570f530e6cb94
+SIZE (git-1.8.4.tar.gz) = 4657759
+SHA256 (git-manpages-1.8.4.tar.gz) = 854552e693b22a7ff1c25d2d710d87c8f7dad14888c946c10be60893fdee091f
+SIZE (git-manpages-1.8.4.tar.gz) = 564928
+SHA256 (git-htmldocs-1.8.4.tar.gz) = 5afc0d00e476975075c3658ffb628c2d4c4f11940ff379b600e2fdf8018d622a
+SIZE (git-htmldocs-1.8.4.tar.gz) = 2202854
Index: trunk/devel/git/files/git_daemon.in
===================================================================
--- trunk/devel/git/files/git_daemon.in 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/files/git_daemon.in 2013-11-27 03:24:38 UTC (rev 15625)
Property changes on: trunk/devel/git/files/git_daemon.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Modified: trunk/devel/git/files/patch-Documentation__Makefile
===================================================================
--- trunk/devel/git/files/patch-Documentation__Makefile 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/files/patch-Documentation__Makefile 2013-11-27 03:24:38 UTC (rev 15625)
@@ -1,20 +1,21 @@
---- ./Documentation/Makefile.orig 2011-05-04 21:16:14.000000000 -0400
-+++ ./Documentation/Makefile 2011-05-06 09:51:54.565045058 -0400
-@@ -30,10 +30,10 @@
- DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
- DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+--- ./Documentation/Makefile.orig 2013-08-27 12:08:25.000000000 -0400
++++ ./Documentation/Makefile 2013-08-27 12:09:18.000000000 -0400
+@@ -78,11 +78,11 @@
+ DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
+ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
--prefix?=$(HOME)
-+prefix?=$(PREFIX)
- bindir?=$(prefix)/bin
--htmldir?=$(prefix)/share/doc/git-doc
--pdfdir?=$(prefix)/share/doc/git-doc
-+htmldir?=$(prefix)/share/doc/git
-+pdfdir?=$(prefix)/share/doc/git
- mandir?=$(prefix)/share/man
- man1dir=$(mandir)/man1
- man5dir=$(mandir)/man5
-@@ -155,7 +155,7 @@
+-prefix ?= $(HOME)
++prefix ?= $(PREFIX)
+ bindir ?= $(prefix)/bin
+-htmldir ?= $(prefix)/share/doc/git-doc
++htmldir ?= $(prefix)/share/doc/git
+ infodir ?= $(prefix)/share/info
+-pdfdir ?= $(prefix)/share/doc/git-doc
++pdfdir ?= $(prefix)/share/doc/git
+ mandir ?= $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ man5dir = $(mandir)/man5
+@@ -196,7 +196,7 @@
endif
endif
Property changes on: trunk/devel/git/files/patch-Documentation__Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/devel/git/files/patch-Makefile
===================================================================
--- trunk/devel/git/files/patch-Makefile 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/files/patch-Makefile 2013-11-27 03:24:38 UTC (rev 15625)
Property changes on: trunk/devel/git/files/patch-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.9
\ No newline at end of property
Index: trunk/devel/git/files/patch-wrapper.c
===================================================================
--- trunk/devel/git/files/patch-wrapper.c 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/files/patch-wrapper.c 2013-11-27 03:24:38 UTC (rev 15625)
Property changes on: trunk/devel/git/files/patch-wrapper.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/git/files/pkg-message.in
===================================================================
--- trunk/devel/git/files/pkg-message.in 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/files/pkg-message.in 2013-11-27 03:24:38 UTC (rev 15625)
Property changes on: trunk/devel/git/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist 2013-11-27 02:52:55 UTC (rev 15624)
+++ trunk/devel/git/pkg-plist 2013-11-27 03:24:38 UTC (rev 15625)
@@ -39,6 +39,7 @@
libexec/git-core/git-cat-file
libexec/git-core/git-check-attr
libexec/git-core/git-check-ignore
+libexec/git-core/git-check-mailmap
libexec/git-core/git-check-ref-format
libexec/git-core/git-checkout
libexec/git-core/git-checkout-index
@@ -140,7 +141,6 @@
libexec/git-core/git-remote
libexec/git-core/git-remote-ext
libexec/git-core/git-remote-fd
-libexec/git-core/git-remote-testpy
libexec/git-core/git-remote-testsvn
%%CURL%%libexec/git-core/git-remote-http
%%CURL%%libexec/git-core/git-remote-https
@@ -162,8 +162,6 @@
libexec/git-core/git-sh-i18n--envsubst
libexec/git-core/git-sh-setup
libexec/git-core/git-shell
-%%ETCSHELLS%%@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >>/etc/shells; rm -f /etc/shells.bak
-%%ETCSHELLS%%@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >>/etc/shells; rm -f /etc/shells.bak
libexec/git-core/git-stage
libexec/git-core/git-shortlog
libexec/git-core/git-show
@@ -229,6 +227,7 @@
lib/xemacs/site-lisp/git/git-blame.el
%%NLS%%share/locale/da/LC_MESSAGES/git.mo
%%NLS%%share/locale/de/LC_MESSAGES/git.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/git.mo
%%NLS%%share/locale/is/LC_MESSAGES/git.mo
%%NLS%%share/locale/it/LC_MESSAGES/git.mo
%%NLS%%share/locale/nl/LC_MESSAGES/git.mo
@@ -491,6 +490,9 @@
%%HTMLDOCS%%%%DOCSDIR%%/cmds-purehelpers.txt
%%HTMLDOCS%%%%DOCSDIR%%/cmds-synchelpers.txt
%%HTMLDOCS%%%%DOCSDIR%%/cmds-synchingrepositories.txt
+%%HTMLDOCS%%%%DOCSDIR%%/line-range-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-mailmap.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-mailmap.txt
%%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
@@ -1001,16 +1003,20 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.2.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
+%%CONTRIB%%share/git-core/contrib/contacts/git-contacts
+%%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
%%CONTRIB%%share/git-core/contrib/diffall/README
%%CONTRIB%%share/git-core/contrib/diffall/git-diffall
%%CONTRIB%%share/git-core/contrib/README
-%%CONTRIB%%share/git-core/contrib/blameview/README
-%%CONTRIB%%share/git-core/contrib/blameview/blameview.perl
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm
@@ -1025,8 +1031,6 @@
%%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
%%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
%%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
%%CONTRIB%%share/git-core/contrib/convert-objects/git-convert-objects.txt
%%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
@@ -1085,11 +1089,22 @@
%%CONTRIB%%share/git-core/contrib/gitview/gitview.txt
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
%%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
+%%CONTRIB%%share/git-core/contrib/mw-to-git/git-mw.perl
%%CONTRIB%%share/git-core/contrib/mw-to-git/.gitignore
+%%CONTRIB%%share/git-core/contrib/mw-to-git/.perlcriticrc
+%%CONTRIB%%share/git-core/contrib/mw-to-git/Git/Mediawiki.pm
+%%CONTRIB%%share/git-core/contrib/mw-to-git/bin-wrapper/git
%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.perl
%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.txt
%%CONTRIB%%share/git-core/contrib/mw-to-git/Makefile
@@ -1113,7 +1128,6 @@
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.py
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.txt
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import
-%%CONTRIB%%share/git-core/contrib/patches/docbook-xsl-manpages-charmap.patch
%%CONTRIB%%share/git-core/contrib/remotes2config.sh
%%CONTRIB%%share/git-core/contrib/rerere-train.sh
%%CONTRIB%%share/git-core/contrib/persistent-https/client.go
@@ -1184,6 +1198,7 @@
%%CONTRIB%%@dirrm share/git-core/contrib/buildsystems
%%CONTRIB%%@dirrm share/git-core/contrib/ciabot
%%CONTRIB%%@dirrm share/git-core/contrib/completion
+%%CONTRIB%%@dirrm share/git-core/contrib/contacts
%%CONTRIB%%@dirrm share/git-core/contrib/continuous
%%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
%%CONTRIB%%@dirrm share/git-core/contrib/credential/gnome-keyring
@@ -1200,7 +1215,10 @@
%%CONTRIB%%@dirrm share/git-core/contrib/git-shell-commands
%%CONTRIB%%@dirrm share/git-core/contrib/gitview
%%CONTRIB%%@dirrm share/git-core/contrib/hg-to-git
+%%CONTRIB%%@dirrm share/git-core/contrib/hooks/multimail
%%CONTRIB%%@dirrm share/git-core/contrib/hooks
+%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/bin-wrapper
+%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/Git
%%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/
More information about the Midnightbsd-cvs
mailing list