[Midnightbsd-cvs] mports [16725] trunk/devel/git: git 2.0.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 30 11:50:38 EDT 2014
Revision: 16725
http://svnweb.midnightbsd.org/mports/?rev=16725
Author: laffer1
Date: 2014-08-30 11:50:36 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
git 2.0.2
Modified Paths:
--------------
trunk/devel/git/Makefile
trunk/devel/git/distinfo
trunk/devel/git/pkg-plist
Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile 2014-08-30 15:42:37 UTC (rev 16724)
+++ trunk/devel/git/Makefile 2014-08-30 15:50:36 UTC (rev 16725)
@@ -1,21 +1,21 @@
# $MidnightBSD$
PORTNAME= git
-PORTVERSION= 1.9.0
+PORTVERSION= 2.0.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= KERNEL_ORG
+MASTER_SITE_SUBDIR= software/scm/git
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
+# We manually extract the htmldocs.
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Distributed source code management tool
+COMMENT?= Distributed source code management tool
LICENSE= gpl2
-PROJECTHOST= git-core
-
CONFLICTS?= git-subversion-[0-9]*
USERS= git_daemon
@@ -29,11 +29,15 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= V=1
-MAKE_ARGS+= prefix="${PREFIX}"
USE_OPENSSL= yes
USE_RC_SUBR= git_daemon
+SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
+ contrib/hooks/update-paranoid \
+ contrib/credential/netrc/git-credential-netrc \
+ contrib/diff-highlight/diff-highlight \
+ contrib/buildsystems/generate contrib/contacts/git-contacts
-CONFIGURE_ARGS= --enable-pthreads=-pthread
+CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no
OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
NLS
@@ -74,7 +78,9 @@
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-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
+ p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
+ p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
PLIST_SUB+= PERLSUB=""
.else
MAKE_ARGS+= NO_PERL=1
@@ -91,7 +97,7 @@
MAKE_ENV+= CURLDIR=${LOCALBASE}
BUILD_DEPENDS+= curl:${PORTSDIR}/ftp/curl
RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl
-LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2
PLIST_SUB+= CURL=""
.else
MAKE_ARGS+= NO_CURL=1 \
@@ -238,15 +244,18 @@
${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
.if ${PORT_OPTIONS:MCONTRIB}
@${ECHO_MSG} "===> Installing contributed scripts"
- ${MKDIR} ${PREFIX}/share/git-core/contrib
- ${CP} -R ${WRKSRC}/contrib/* ${PREFIX}/share/git-core/contrib
- cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} ${FAKE_MAKEENV} \
- ${MAKE_CMD} ${MAKE_FLAGS} ${FAKE_MAKEFLAGS} Makefile ${MAKE_ARGS} ${FAKE_MAKEARGS} install install-doc
- ${MKDIR} ${PREFIX}/libexec/git-core
- ${CP} ${FAKE_DESTDIR}${PREFIX}/libexec/git-core/git-subtree ${PREFIX}/libexec/git-core/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
+ ${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
+ cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
.endif
.if ${PORT_OPTIONS:MP4}
- ${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
.endif
+post-stage:
+.if ${PORT_OPTIONS:MPERL}
+ ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
+.endif
+
.include <bsd.port.mk>
Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo 2014-08-30 15:42:37 UTC (rev 16724)
+++ trunk/devel/git/distinfo 2014-08-30 15:50:36 UTC (rev 16725)
@@ -1,6 +1,6 @@
-SHA256 (git-1.9.0.tar.gz) = de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882
-SIZE (git-1.9.0.tar.gz) = 4839724
-SHA256 (git-manpages-1.9.0.tar.gz) = a51e2b64a8adde39e774f052843e0f513b5d3318492b515e752e339b0d3a85c7
-SIZE (git-manpages-1.9.0.tar.gz) = 571616
-SHA256 (git-htmldocs-1.9.0.tar.gz) = e4e619b7dd5b24ab4ef17e598803497704aa5b0a7821bb544940f2cdd7cac60e
-SIZE (git-htmldocs-1.9.0.tar.gz) = 2240600
+SHA256 (git-2.0.2.tar.gz) = 0f0a3b438ae1dde5b21c93c33173c8edd2c6dc4f3e4c396ce936784c5c97bdee
+SIZE (git-2.0.2.tar.gz) = 4904754
+SHA256 (git-manpages-2.0.2.tar.gz) = e90bfa54fbb5ff4cf75f9d0272aaecc2d4bf5aae1eaddc85f2dbc02a98c61dd0
+SIZE (git-manpages-2.0.2.tar.gz) = 575491
+SHA256 (git-htmldocs-2.0.2.tar.gz) = e74adf2adaf01883af64f3f6d84f4821521da56918358efd3b2149042bb15b4d
+SIZE (git-htmldocs-2.0.2.tar.gz) = 2278282
Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist 2014-08-30 15:42:37 UTC (rev 16724)
+++ trunk/devel/git/pkg-plist 2014-08-30 15:50:36 UTC (rev 16725)
@@ -365,6 +365,7 @@
libexec/git-core/mergetools/araxis
%%GUI%%bin/gitk
%%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
@@ -740,6 +741,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
%%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/bitmap-format.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
@@ -750,7 +752,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
@@ -774,7 +776,7 @@
%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
@@ -1170,6 +1172,13 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.2.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1251,6 +1260,7 @@
%%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/CHANGES
%%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
@@ -1295,13 +1305,9 @@
%%CONTRIB%%share/git-core/contrib/persistent-https/main.go
%%CONTRIB%%share/git-core/contrib/persistent-https/proxy.go
%%CONTRIB%%share/git-core/contrib/persistent-https/socket.go
-%%CONTRIB%%share/git-core/contrib/remote-helpers/Makefile
+%%CONTRIB%%share/git-core/contrib/remote-helpers/README
%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-bzr
%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-hg
-%%CONTRIB%%share/git-core/contrib/remote-helpers/test-bzr.sh
-%%CONTRIB%%share/git-core/contrib/remote-helpers/test-hg.sh
-%%CONTRIB%%share/git-core/contrib/remote-helpers/test-hg-bidi.sh
-%%CONTRIB%%share/git-core/contrib/remote-helpers/test-hg-hg-git.sh
%%CONTRIB%%share/git-core/contrib/subtree/t/Makefile
%%CONTRIB%%share/git-core/contrib/subtree/t/t7900-subtree.sh
%%CONTRIB%%share/git-core/contrib/subtree/COPYING
More information about the Midnightbsd-cvs
mailing list