From 42c20f8a7e7970e97b35c46379eaae662e982431 Mon Sep 17 00:00:00 2001 From: matthieu Date: Thu, 16 Nov 2006 19:28:53 +0000 Subject: [PATCH] - update to git 1.4.4 - add manual pages. ok aanriot@ --- devel/git/Makefile | 12 ++- devel/git/distinfo | 12 ++- devel/git/patches/patch-Makefile | 12 +-- devel/git/pkg/PLIST | 128 ++++++++++++++++++++++++++++++- 4 files changed, 151 insertions(+), 13 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 9c8eb7a2a23..aaaa9da4d38 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2006/11/16 19:28:53 matthieu Exp $ COMMENT= "GIT - Tree History Storage Tool" -DISTNAME= git-1.4.3.5 +V= 1.4.4 +DISTNAME= git-${V} CATEGORIES= devel HOMEPAGE= http://git.or.cz/ @@ -15,6 +16,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + git-manpages-${V}${EXTRACT_SUFX} + WANTLIB= c crypto iconv z MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -42,4 +46,8 @@ USE_GMAKE= Yes NO_REGRESS= Yes +post-install: + cd ${WRKDIR} ; \ + pax -rw -s,man7/git.7,man1/git.1, man* ${PREFIX}/man + .include diff --git a/devel/git/distinfo b/devel/git/distinfo index 1d2784501a2..69c77b0ca3c 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,4 +1,8 @@ -MD5 (git-1.4.3.5.tar.gz) = 05308dd2fadf8cbd4b223e52875d58ec -RMD160 (git-1.4.3.5.tar.gz) = ae6ba58b3bf2a66e1b27fd4a4dce5b209023ad32 -SHA1 (git-1.4.3.5.tar.gz) = 2a8b333c647eb767a227b62da3da45053ed243f5 -SIZE (git-1.4.3.5.tar.gz) = 1015697 +MD5 (git-1.4.4.tar.gz) = 0b85c66d9b7220f3b71745186d062941 +MD5 (git-manpages-1.4.4.tar.gz) = b1bde25549eb67f370397f9fc833c0ee +RMD160 (git-1.4.4.tar.gz) = bbc35bddc470c6ab8457f8884e4a755e8d2ec811 +RMD160 (git-manpages-1.4.4.tar.gz) = 51b9e96fb3bd5619910eb5ef9431d030236f6e70 +SHA1 (git-1.4.4.tar.gz) = b5eb9c736360f75da2d20f7d49ac0987ef5ac36d +SHA1 (git-manpages-1.4.4.tar.gz) = 187de9fe31ed0625a894fe525bfc4d91842bf72e +SIZE (git-1.4.4.tar.gz) = 1051442 +SIZE (git-manpages-1.4.4.tar.gz) = 154158 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 214bce401b6..0b23c11cfa5 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $ ---- Makefile.orig Sun Nov 12 06:03:32 2006 -+++ Makefile Mon Nov 13 21:59:36 2006 +$OpenBSD: patch-Makefile,v 1.3 2006/11/16 19:28:53 matthieu Exp $ +--- Makefile.orig Wed Nov 15 08:22:27 2006 ++++ Makefile Wed Nov 15 21:35:09 2006 @@ -106,13 +106,13 @@ uname_P := $(shell sh -c 'uname -p 2>/de # CFLAGS and LDFLAGS are for the users to override from the command line. @@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $ bindir = $(prefix)/bin gitexecdir = $(bindir) template_dir = $(prefix)/share/git-core/templates/ -@@ -135,7 +135,7 @@ GITWEB_FAVICON = git-favicon.png +@@ -137,7 +137,7 @@ GITWEB_SITE_FOOTER = export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR @@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $ AR = ar TAR = tar INSTALL = install -@@ -379,7 +379,6 @@ ifeq ($(uname_S),FreeBSD) +@@ -387,7 +387,6 @@ ifeq ($(uname_S),FreeBSD) BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),OpenBSD) @@ -34,7 +34,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $ NEEDS_LIBICONV = YesPlease BASIC_CFLAGS += -I/usr/local/include BASIC_LDFLAGS += -L/usr/local/lib -@@ -446,7 +445,7 @@ ifndef NO_CURL +@@ -454,7 +453,7 @@ ifndef NO_CURL endif ifndef NO_OPENSSL diff --git a/devel/git/pkg/PLIST b/devel/git/pkg/PLIST index 1ea20549400..7e86794feb1 100644 --- a/devel/git/pkg/PLIST +++ b/devel/git/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/12 15:59:05 matthieu Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/11/16 19:28:53 matthieu Exp $ bin/git bin/git-add bin/git-am @@ -36,6 +36,7 @@ bin/git-diff-tree bin/git-fetch bin/git-fetch-pack bin/git-fmt-merge-msg +bin/git-for-each-ref bin/git-format-patch bin/git-fsck-objects bin/git-get-tar-commit-id @@ -73,6 +74,7 @@ bin/git-mv bin/git-name-rev bin/git-pack-objects bin/git-pack-redundant +bin/git-pack-refs bin/git-parse-remote bin/git-patch-id bin/git-peek-remote @@ -104,6 +106,7 @@ bin/git-shortlog bin/git-show bin/git-show-branch bin/git-show-index +bin/git-show-ref bin/git-ssh-fetch bin/git-ssh-pull bin/git-ssh-push @@ -132,6 +135,129 @@ libdata/perl5/${MACHINE_ARCH}-openbsd/ libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/ libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod libdata/perl5/site_perl/Git.pm +@man man/man1/git-add.1 +@man man/man1/git-am.1 +@man man/man1/git-annotate.1 +@man man/man1/git-apply.1 +@man man/man1/git-applymbox.1 +@man man/man1/git-applypatch.1 +@man man/man1/git-archimport.1 +@man man/man1/git-archive.1 +@man man/man1/git-bisect.1 +@man man/man1/git-blame.1 +@man man/man1/git-branch.1 +@man man/man1/git-cat-file.1 +@man man/man1/git-check-ref-format.1 +@man man/man1/git-checkout-index.1 +@man man/man1/git-checkout.1 +@man man/man1/git-cherry-pick.1 +@man man/man1/git-cherry.1 +@man man/man1/git-clean.1 +@man man/man1/git-clone.1 +@man man/man1/git-commit-tree.1 +@man man/man1/git-commit.1 +@man man/man1/git-convert-objects.1 +@man man/man1/git-count-objects.1 +@man man/man1/git-cvsexportcommit.1 +@man man/man1/git-cvsimport.1 +@man man/man1/git-cvsserver.1 +@man man/man1/git-daemon.1 +@man man/man1/git-describe.1 +@man man/man1/git-diff-files.1 +@man man/man1/git-diff-index.1 +@man man/man1/git-diff-stages.1 +@man man/man1/git-diff-tree.1 +@man man/man1/git-diff.1 +@man man/man1/git-fetch-pack.1 +@man man/man1/git-fetch.1 +@man man/man1/git-fmt-merge-msg.1 +@man man/man1/git-for-each-ref.1 +@man man/man1/git-format-patch.1 +@man man/man1/git-fsck-objects.1 +@man man/man1/git-get-tar-commit-id.1 +@man man/man1/git-grep.1 +@man man/man1/git-hash-object.1 +@man man/man1/git-http-fetch.1 +@man man/man1/git-http-push.1 +@man man/man1/git-imap-send.1 +@man man/man1/git-index-pack.1 +@man man/man1/git-init-db.1 +@man man/man1/git-instaweb.1 +@man man/man1/git-local-fetch.1 +@man man/man1/git-log.1 +@man man/man1/git-lost-found.1 +@man man/man1/git-ls-files.1 +@man man/man1/git-ls-remote.1 +@man man/man1/git-ls-tree.1 +@man man/man1/git-mailinfo.1 +@man man/man1/git-mailsplit.1 +@man man/man1/git-merge-base.1 +@man man/man1/git-merge-index.1 +@man man/man1/git-merge-one-file.1 +@man man/man1/git-merge-tree.1 +@man man/man1/git-merge.1 +@man man/man1/git-mktag.1 +@man man/man1/git-mktree.1 +@man man/man1/git-mv.1 +@man man/man1/git-name-rev.1 +@man man/man1/git-p4import.1 +@man man/man1/git-pack-objects.1 +@man man/man1/git-pack-redundant.1 +@man man/man1/git-pack-refs.1 +@man man/man1/git-parse-remote.1 +@man man/man1/git-patch-id.1 +@man man/man1/git-peek-remote.1 +@man man/man1/git-prune-packed.1 +@man man/man1/git-prune.1 +@man man/man1/git-pull.1 +@man man/man1/git-push.1 +@man man/man1/git-quiltimport.1 +@man man/man1/git-read-tree.1 +@man man/man1/git-rebase.1 +@man man/man1/git-receive-pack.1 +@man man/man1/git-relink.1 +@man man/man1/git-repack.1 +@man man/man1/git-repo-config.1 +@man man/man1/git-request-pull.1 +@man man/man1/git-rerere.1 +@man man/man1/git-reset.1 +@man man/man1/git-resolve.1 +@man man/man1/git-rev-list.1 +@man man/man1/git-rev-parse.1 +@man man/man1/git-revert.1 +@man man/man1/git-rm.1 +@man man/man1/git-send-email.1 +@man man/man1/git-send-pack.1 +@man man/man1/git-sh-setup.1 +@man man/man1/git-shell.1 +@man man/man1/git-shortlog.1 +@man man/man1/git-show-branch.1 +@man man/man1/git-show-index.1 +@man man/man1/git-show-ref.1 +@man man/man1/git-show.1 +@man man/man1/git-ssh-fetch.1 +@man man/man1/git-ssh-upload.1 +@man man/man1/git-status.1 +@man man/man1/git-stripspace.1 +@man man/man1/git-svn.1 +@man man/man1/git-svnimport.1 +@man man/man1/git-symbolic-ref.1 +@man man/man1/git-tag.1 +@man man/man1/git-tar-tree.1 +@man man/man1/git-unpack-file.1 +@man man/man1/git-unpack-objects.1 +@man man/man1/git-update-index.1 +@man man/man1/git-update-ref.1 +@man man/man1/git-update-server-info.1 +@man man/man1/git-upload-archive.1 +@man man/man1/git-upload-pack.1 +@man man/man1/git-var.1 +@man man/man1/git-verify-pack.1 +@man man/man1/git-verify-tag.1 +@man man/man1/git-whatchanged.1 +@man man/man1/git-write-tree.1 +@man man/man1/git.1 +@man man/man1/gitk.1 @man man/man3p/Git.3p share/git-core/ share/git-core/python/