diff options
| -rw-r--r-- | devel/scmgit-base/Makefile | 6 | ||||
| -rw-r--r-- | devel/scmgit-base/distinfo | 9 | ||||
| -rw-r--r-- | devel/scmgit-base/patches/patch-ak | 18 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.common | 5 | ||||
| -rw-r--r-- | devel/scmgit/Makefile.version | 4 |
5 files changed, 33 insertions, 9 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index ab00e8acd7d..9d063be0f91 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/06/24 08:21:04 bjs Exp $ +# $NetBSD: Makefile,v 1.8 2008/07/24 23:22:54 bjs Exp $ # .include "${.CURDIR}/../scmgit/Makefile.common" @@ -10,6 +10,8 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS+= git-[0-9]* # misc/git +DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error + USE_LANGUAGES= c99 USE_TOOLS+= perl:run sh:run msgfmt @@ -28,7 +30,7 @@ PERL5_CONFIGURE= no PERL5_PACKLIST= auto/Git/.packlist REPLACE_PERL+= *.perl */*.perl */*/*.perl -GITCOREDIR= ${PREFIX}/libexec/git-core/ +GITCOREDIR= ${PREFIX}/libexec/git-core CONFIGURE_ENV+= gitexecdir=${GITCOREDIR:Q} diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index 75d813f1262..80cd868df30 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2008/06/24 08:21:04 bjs Exp $ +$NetBSD: distinfo,v 1.10 2008/07/24 23:22:54 bjs Exp $ -SHA1 (git-1.5.6.tar.gz) = 2b0ea373e78c8bc3f4476dbd5738594abe9abf46 -RMD160 (git-1.5.6.tar.gz) = 50adf026374d834f4d82f862987598a64e6e0b6e -Size (git-1.5.6.tar.gz) = 2087708 bytes +SHA1 (git-1.5.6.4.tar.gz) = 85d7b109af3746f47840ca0ad018fa406f701854 +RMD160 (git-1.5.6.4.tar.gz) = 227f6c85e5ab9d700a228665419da5727fd24364 +Size (git-1.5.6.4.tar.gz) = 2100615 bytes SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375 SHA1 (patch-ab) = 519c6b2892d9483c08b08f7874790ab05bc3f2d6 SHA1 (patch-ac) = 1f358de94d7476212c02374de888fbc372b60f32 @@ -13,3 +13,4 @@ SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5 SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790 SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5 SHA1 (patch-aj) = 54c2200363b4d2cc5eb6266c4b62d4a7fc43dd07 +SHA1 (patch-ak) = 0ebbc84a5ab56e6f7e52284e9aeef81ca7fd7f30 diff --git a/devel/scmgit-base/patches/patch-ak b/devel/scmgit-base/patches/patch-ak new file mode 100644 index 00000000000..ff12996e78d --- /dev/null +++ b/devel/scmgit-base/patches/patch-ak @@ -0,0 +1,18 @@ +$NetBSD: patch-ak,v 1.1 2008/07/24 23:22:54 bjs Exp $ + +--- perl/Makefile.PL.orig 2008-07-19 20:23:11.000000000 -0400 ++++ perl/Makefile.PL +@@ -1,4 +1,5 @@ + use ExtUtils::MakeMaker; ++use Config; + + sub MY::postamble { + return <<'MAKE_FRAG'; +@@ -26,5 +27,6 @@ WriteMakefile( + VERSION_FROM => 'Git.pm', + PM => \%pm, + MAKEFILE => 'perl.mak', +- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3' ++ INSTALLARCHLIB => $Config{installsitearch}, ++ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3' + ); diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common index e9a4770443f..4fa237fb309 100644 --- a/devel/scmgit/Makefile.common +++ b/devel/scmgit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2008/06/14 16:21:03 bjs Exp $ +# $NetBSD: Makefile.common,v 1.12 2008/07/24 23:22:54 bjs Exp $ # # used by devel/scmgit-base/Makefile # used by devel/scmgit-docs/Makefile @@ -23,7 +23,10 @@ GNU_CONFIGURE?= yes USE_TOOLS+= gmake tar perl sh EXTRACT_USING= gtar +PKG_SYSCONFSUBDIR= git + CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-shell=${SH:Q} CONFIGURE_ARGS+= --with-tar=${TAR:Q} CONFIGURE_ARGS+= --mandir=${${PREFIX}/${PKGMANDIR}:L:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index 3ae1d945f6b..85772c4f4f3 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.2 2008/06/24 10:29:20 bjs Exp $ +# $NetBSD: Makefile.version,v 1.3 2008/07/24 23:22:54 bjs Exp $ # -GIT_VERSION= 1.5.6 +GIT_VERSION= 1.5.6.4 |