diff options
| -rw-r--r-- | devel/scmgit/Makefile | 14 | ||||
| -rw-r--r-- | devel/scmgit/PLIST | 23 | ||||
| -rw-r--r-- | devel/scmgit/distinfo | 10 | ||||
| -rw-r--r-- | devel/scmgit/patches/patch-aa | 16 |
4 files changed, 44 insertions, 19 deletions
diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile index 3378f435ae8..ca41c01c0b5 100644 --- a/devel/scmgit/Makefile +++ b/devel/scmgit/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2006/11/19 11:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/11/26 22:34:30 wiz Exp $ # -DISTNAME= git-1.4.1 +DISTNAME= git-1.4.4.1 PKGNAME= scm${DISTNAME} -PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -28,6 +27,9 @@ BUILD_TARGET= all doc INSTALL_TARGET= install install-doc MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} +PERL5_PACKLIST= auto/Git/.packlist +PERL5_CONFIGURE_DIRS= ${WRKSRC}/perl + .include "../../lang/python/application.mk" NEEDS_SUBPROCESS_PY!= \ @@ -39,6 +41,12 @@ PLIST_SUBST+= IF_NEEDS_SUBPROCESS_PY="" PLIST_SUBST+= IF_NEEDS_SUBPROCESS_PY="@comment " .endif +post-install: + chmod 644 ${PREFIX}/${PKGMANDIR}/man1/git*.1 + chmod 644 ${PREFIX}/${PKGMANDIR}/man7/git*.7 + chmod 644 ${PREFIX}/share/git-core/python/*.py + +.include "../../lang/perl5/module.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST index b5ff7921cb2..ad47e697fb5 100644 --- a/devel/scmgit/PLIST +++ b/devel/scmgit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/09/07 22:21:06 rillig Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/11/26 22:34:30 wiz Exp $ bin/git bin/git-add bin/git-am @@ -7,6 +7,7 @@ bin/git-apply bin/git-applymbox bin/git-applypatch bin/git-archimport +bin/git-archive bin/git-bisect bin/git-blame bin/git-branch @@ -35,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 @@ -45,6 +47,7 @@ bin/git-http-push bin/git-imap-send bin/git-index-pack bin/git-init-db +bin/git-instaweb bin/git-local-fetch bin/git-log bin/git-lost-found @@ -59,7 +62,9 @@ bin/git-merge-index bin/git-merge-octopus bin/git-merge-one-file bin/git-merge-ours +bin/git-merge-recur bin/git-merge-recursive +bin/git-merge-recursive-old bin/git-merge-resolve bin/git-merge-stupid bin/git-merge-tree @@ -69,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 @@ -91,6 +97,7 @@ bin/git-rev-list bin/git-rev-parse bin/git-revert bin/git-rm +bin/git-runstatus bin/git-send-email bin/git-send-pack bin/git-sh-setup @@ -99,12 +106,14 @@ 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 bin/git-ssh-upload bin/git-status bin/git-stripspace +bin/git-svn bin/git-svnimport bin/git-symbolic-ref bin/git-tag @@ -114,8 +123,8 @@ bin/git-unpack-objects bin/git-update-index bin/git-update-ref bin/git-update-server-info +bin/git-upload-archive bin/git-upload-pack -bin/git-upload-tar bin/git-var bin/git-verify-pack bin/git-verify-tag @@ -129,6 +138,7 @@ man/man1/git-apply.1 man/man1/git-applymbox.1 man/man1/git-applypatch.1 man/man1/git-archimport.1 +man/man1/git-archive.1 man/man1/git-bisect.1 man/man1/git-blame.1 man/man1/git-branch.1 @@ -157,6 +167,7 @@ man/man1/git-diff.1 man/man1/git-fetch-pack.1 man/man1/git-fetch.1 man/man1/git-fmt-merge-msg.1 +man/man1/git-for-each-ref.1 man/man1/git-format-patch.1 man/man1/git-fsck-objects.1 man/man1/git-get-tar-commit-id.1 @@ -167,6 +178,7 @@ man/man1/git-http-push.1 man/man1/git-imap-send.1 man/man1/git-index-pack.1 man/man1/git-init-db.1 +man/man1/git-instaweb.1 man/man1/git-local-fetch.1 man/man1/git-log.1 man/man1/git-lost-found.1 @@ -187,6 +199,7 @@ man/man1/git-name-rev.1 man/man1/git-p4import.1 man/man1/git-pack-objects.1 man/man1/git-pack-redundant.1 +man/man1/git-pack-refs.1 man/man1/git-parse-remote.1 man/man1/git-patch-id.1 man/man1/git-peek-remote.1 @@ -209,6 +222,7 @@ man/man1/git-rev-list.1 man/man1/git-rev-parse.1 man/man1/git-revert.1 man/man1/git-rm.1 +man/man1/git-runstatus.1 man/man1/git-send-email.1 man/man1/git-send-pack.1 man/man1/git-sh-setup.1 @@ -216,11 +230,13 @@ man/man1/git-shell.1 man/man1/git-shortlog.1 man/man1/git-show-branch.1 man/man1/git-show-index.1 +man/man1/git-show-ref.1 man/man1/git-show.1 man/man1/git-ssh-fetch.1 man/man1/git-ssh-upload.1 man/man1/git-status.1 man/man1/git-stripspace.1 +man/man1/git-svn.1 man/man1/git-svnimport.1 man/man1/git-symbolic-ref.1 man/man1/git-tag.1 @@ -230,8 +246,8 @@ man/man1/git-unpack-objects.1 man/man1/git-update-index.1 man/man1/git-update-ref.1 man/man1/git-update-server-info.1 +man/man1/git-upload-archive.1 man/man1/git-upload-pack.1 -man/man1/git-upload-tar.1 man/man1/git-var.1 man/man1/git-verify-pack.1 man/man1/git-verify-tag.1 @@ -259,3 +275,4 @@ share/git-core/templates/info/exclude @dirrm share/git-core/templates/branches @dirrm share/git-core/templates @dirrm share/git-core/python +@dirrm share/git-core diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo index a0aa6867e82..6262f0c54be 100644 --- a/devel/scmgit/distinfo +++ b/devel/scmgit/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/09/02 17:11:07 rillig Exp $ +$NetBSD: distinfo,v 1.2 2006/11/26 22:34:30 wiz Exp $ -SHA1 (git-1.4.1.tar.gz) = 3471aa743752d8963c19d5e1440cfb1dece42ecb -RMD160 (git-1.4.1.tar.gz) = a4d404d87f4bf4160639f137fc588159bc952e9e -Size (git-1.4.1.tar.gz) = 888274 bytes -SHA1 (patch-aa) = fb4753cb046c99c4985a2de50bc1feb562eee743 +SHA1 (git-1.4.4.1.tar.gz) = 5e22daf46866068fd2734ddab3f2a0ca7cc517a8 +RMD160 (git-1.4.4.1.tar.gz) = 7881c835a382a001267ff89d0d738a1de97ffb95 +Size (git-1.4.4.1.tar.gz) = 1052897 bytes +SHA1 (patch-aa) = c7a6d9164702fe13390143a9df61a9662d8a2f41 diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa index da28e154e01..431214dd4e9 100644 --- a/devel/scmgit/patches/patch-aa +++ b/devel/scmgit/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/09/02 17:11:07 rillig Exp $ +$NetBSD: patch-aa,v 1.2 2006/11/26 22:34:30 wiz Exp $ NetBSD 3.0 needs -liconv, too. ---- Makefile.orig 2006-06-10 21:41:54.000000000 +0200 -+++ Makefile 2006-07-06 20:28:19.000000000 +0200 -@@ -297,9 +297,7 @@ ifeq ($(uname_S),OpenBSD) - ALL_LDFLAGS += -L/usr/local/lib +--- Makefile.orig 2006-11-23 02:38:07.000000000 +0000 ++++ Makefile +@@ -393,9 +393,7 @@ ifeq ($(uname_S),OpenBSD) + BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),NetBSD) - ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) - NEEDS_LIBICONV = YesPlease - endif + NEEDS_LIBICONV = YesPlease - ALL_CFLAGS += -I/usr/pkg/include - ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib - endif + BASIC_CFLAGS += -I/usr/pkg/include + BASIC_LDFLAGS += -L/usr/pkg/lib + ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib |