Changes 2.8.1: * "make rpmbuild" target was broken as its input, git.spec.in, was not updated to match a file it describes that has been renamed recently. This has been fixed.diff -r1.39 -r1.40 pkgsrc/devel/git/Makefile.version
(adam)
| @@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
| 1 | # $NetBSD: Makefile.version,v 1.39 2016/03/12 11:33:32 adam Exp $ | 1 | # $NetBSD: Makefile.version,v 1.40 2016/04/07 13:26:36 adam Exp $ | |
| 2 | # | 2 | # | |
| 3 | # used by devel/git/Makefile.common | 3 | # used by devel/git/Makefile.common | |
| 4 | # used by devel/git-svn/Makefile | 4 | # used by devel/git-svn/Makefile | |
| 5 | 5 | |||
| 6 | GIT_VERSION= 2.7.3 | 6 | GIT_VERSION= 2.8.1 |
| @@ -1,16 +1,15 @@ | @@ -1,16 +1,15 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.23 2016/03/16 19:38:52 sevan Exp $ | 1 | # $NetBSD: Makefile,v 1.24 2016/04/07 13:26:37 adam Exp $ | |
| 2 | 2 | |||
| 3 | PKGREVISION= 1 | |||
| 4 | .include "../../devel/git/Makefile.common" | 3 | .include "../../devel/git/Makefile.common" | |
| 5 | 4 | |||
| 6 | PKGNAME= git-base-${GIT_VERSION} | 5 | PKGNAME= git-base-${GIT_VERSION} | |
| 7 | COMMENT= GIT Tree History Storage Tool (base package) | 6 | COMMENT= GIT Tree History Storage Tool (base package) | |
| 8 | 7 | |||
| 9 | CONFLICTS+= scmgit-base-[0-9]* | 8 | CONFLICTS+= scmgit-base-[0-9]* | |
| 10 | SUPERSEDES+= scmgit-base-[0-9]* | 9 | SUPERSEDES+= scmgit-base-[0-9]* | |
| 11 | 10 | |||
| 12 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error | 11 | DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error | |
| 13 | # for git-send-email | 12 | # for git-send-email | |
| 14 | #DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64 | 13 | #DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64 | |
| 15 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid | 14 | DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid | |
| 16 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools | 15 | DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools |
| @@ -1,25 +1,15 @@ | @@ -1,25 +1,15 @@ | |||
| 1 | $NetBSD: distinfo,v 1.46 2016/03/16 19:38:52 sevan Exp $ | 1 | $NetBSD: distinfo,v 1.47 2016/04/07 13:26:37 adam Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (git-2.7.3.tar.xz) = d7be9af73cc56c606e0744beb0091b612b416909 | 3 | SHA1 (git-2.8.1.tar.xz) = fc97f987bbdc9dc302a525047bf8a014f6574f92 | |
| 4 | RMD160 (git-2.7.3.tar.xz) = 5111811158362bbc6d4e0a97ec8df8e56c1bd674 | 4 | RMD160 (git-2.8.1.tar.xz) = d56f74e516ec38b8989e715bd31f6192f8c2cba7 | |
| 5 | SHA512 (git-2.7.3.tar.xz) = f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 | 5 | SHA512 (git-2.8.1.tar.xz) = 67846ac7815a08b79c67007af411220ec96d5f54c77dcec602f602b87ae50c590d743fe35e6cfb67196ab28a892c383c21b57d4a3dfab30a2bf67ca29f848c3c | |
| 6 | Size (git-2.7.3.tar.xz) = 3909636 bytes | 6 | Size (git-2.8.1.tar.xz) = 3970056 bytes | |
| 7 | SHA1 (patch-aa) = 892e2dc9336a794399046ac2b4c59f3650d458f8 | 7 | SHA1 (patch-aa) = 38893bb1cff2668ac66e39fe1aa33de9636180d1 | |
| 8 | SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba | 8 | SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba | |
| 9 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | 9 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | |
| 10 | SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 | 10 | SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 | |
| 11 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | 11 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | |
| 12 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | 12 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | |
| 13 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | 13 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | |
| 14 | SHA1 (patch-builtin_pack-objects.c) = 8038e9fca76f465c87d6e4265cb657965fca5fee | |||
| 15 | SHA1 (patch-builtin_rev-list.c) = 52605a6e05e62e45a161e09dba5cf0ae448d642c | |||
| 16 | SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 | 14 | SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 | |
| 17 | SHA1 (patch-http-push.c) = ff931b9043ca8ddedc336d27efe8102e5372b66a | |||
| 18 | SHA1 (patch-list-objects.c) = 0250fb74b635d27694dc8e7c99f48a0ba1f23ab7 | |||
| 19 | SHA1 (patch-list-objects.h) = e341343431e6b64bb6bf4463d632f50107110f37 | |||
| 20 | SHA1 (patch-pack-bitmap-write.c) = 31492718f3812a9229d33ebe4b8bfcebce0e5805 | |||
| 21 | SHA1 (patch-pack-bitmap.c) = 76c23b6b328a6b113b58ef026231623d73d1f088 | |||
| 22 | SHA1 (patch-reachable.c) = b58b59073662b74bbae02f83a5e05c29dee76185 | |||
| 23 | SHA1 (patch-revision.c) = d9b372b3930578817f5517cc76639fce832a0c58 | |||
| 24 | SHA1 (patch-revision.h) = 3258d405f6d2d3e5103d1e34cbcefec3da767298 | |||
| 25 | SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f | 15 | SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f |
| @@ -1,51 +1,51 @@ | @@ -1,51 +1,51 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.6 2016/04/07 13:26:37 adam Exp $ | |
| 2 | 2 | |||
| 3 | --- Makefile.orig 2015-10-16 21:58:26.000000000 +0000 | 3 | --- Makefile.orig 2016-04-03 19:07:18.000000000 +0000 | |
| 4 | +++ Makefile | 4 | +++ Makefile | |
| 5 | @@ -371,8 +371,6 @@ GIT-VERSION-FILE: FORCE | 5 | @@ -379,8 +379,6 @@ GIT-VERSION-FILE: FORCE | |
| 6 | 6 | |||
| 7 | CFLAGS = -g -O2 -Wall | 7 | CFLAGS = -g -O2 -Wall | |
| 8 | LDFLAGS = | 8 | LDFLAGS = | |
| 9 | -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) | 9 | -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) | |
| 10 | -ALL_LDFLAGS = $(LDFLAGS) | 10 | -ALL_LDFLAGS = $(LDFLAGS) | |
| 11 | STRIP ?= strip | 11 | STRIP ?= strip | |
| 12 | 12 | |||
| 13 | # Create as necessary, replace existing, make ranlib unneeded. | 13 | ifdef DEVELOPER | |
| 14 | @@ -416,13 +414,9 @@ htmldir_relative = $(patsubst $(prefix)/ | 14 | @@ -436,13 +434,9 @@ htmldir_relative = $(patsubst $(prefix)/ | |
| 15 | 15 | |||
| 16 | export prefix bindir sharedir sysconfdir gitwebdir localedir | 16 | export prefix bindir sharedir sysconfdir gitwebdir localedir | |
| 17 | 17 | |||
| 18 | -CC = cc | 18 | -CC = cc | |
| 19 | -AR = ar | 19 | -AR = ar | |
| 20 | RM = rm -f | 20 | RM = rm -f | |
| 21 | DIFF = diff | 21 | DIFF = diff | |
| 22 | -TAR = tar | 22 | -TAR = tar | |
| 23 | FIND = find | 23 | FIND = find | |
| 24 | -INSTALL = install | 24 | -INSTALL = install | |
| 25 | RPMBUILD = rpmbuild | 25 | RPMBUILD = rpmbuild | |
| 26 | TCL_PATH = tclsh | 26 | TCL_PATH = tclsh | |
| 27 | TCLTK_PATH = wish | 27 | TCLTK_PATH = wish | |
| 28 | @@ -1586,8 +1580,8 @@ ifdef DEFAULT_HELP_FORMAT | 28 | @@ -1619,8 +1613,8 @@ ifdef DEFAULT_HELP_FORMAT | |
| 29 | BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' | 29 | BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' | |
| 30 | endif | 30 | endif | |
| 31 | 31 | |||
| 32 | -ALL_CFLAGS += $(BASIC_CFLAGS) | 32 | -ALL_CFLAGS += $(BASIC_CFLAGS) | |
| 33 | -ALL_LDFLAGS += $(BASIC_LDFLAGS) | 33 | -ALL_LDFLAGS += $(BASIC_LDFLAGS) | |
| 34 | +ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) | 34 | +ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) | |
| 35 | +ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS) | 35 | +ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS) | |
| 36 | 36 | |||
| 37 | export DIFF TAR INSTALL DESTDIR SHELL_PATH | 37 | export DIFF TAR INSTALL DESTDIR SHELL_PATH | |
| 38 | 38 | |||
| 39 | @@ -2278,11 +2272,10 @@ install: all | 39 | @@ -2315,11 +2309,10 @@ install: all | |
| 40 | ifndef NO_GETTEXT | 40 | ifndef NO_GETTEXT | |
| 41 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)' | 41 | $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)' | |
| 42 | (cd po/build/locale && $(TAR) cf - .) | \ | 42 | (cd po/build/locale && $(TAR) cf - .) | \ | |
| 43 | - (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -) | 43 | - (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -) | |
| 44 | + (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -) | 44 | + (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -) | |
| 45 | endif | 45 | endif | |
| 46 | ifndef NO_PERL | 46 | ifndef NO_PERL | |
| 47 | $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install | 47 | $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install | |
| 48 | - $(MAKE) -C gitweb install | 48 | - $(MAKE) -C gitweb install | |
| 49 | endif | 49 | endif | |
| 50 | ifndef NO_TCLTK | 50 | ifndef NO_TCLTK | |
| 51 | $(MAKE) -C gitk-git install | 51 | $(MAKE) -C gitk-git install |