Changes 1.8.1.2: * An element on GIT_CEILING_DIRECTORIES list that does not name the real path to a directory (i.e. a symbolic link) could have caused the GIT_DIR discovery logic to escape the ceiling. * Command line completion for "tcsh" emitted an unwanted space after completing a single directory name. * Command line completion leaked an unnecessary error message while looking for possible matches with paths in <tree-ish>. * "git archive" did not record uncompressed size in the header when streaming a zip archive, which confused some implementations of unzip. * When users spelled "cc:" in lowercase in the fake "header" in the trailer part, "git send-email" failed to pick up the addresses from there. As e-mail headers field names are case insensitive, this script should follow suit and treat "cc:" and "Cc:" the same way.diff -r1.32 -r1.33 pkgsrc/devel/scmgit/Makefile
(adam)
@@ -1,20 +1,19 @@ | @@ -1,20 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.32 2013/01/30 14:45:00 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.33 2013/01/30 17:39:39 adam Exp $ | |
2 | 2 | |||
3 | .include "../../devel/scmgit/Makefile.version" | 3 | .include "../../devel/scmgit/Makefile.version" | |
4 | 4 | |||
5 | DISTNAME= # empty | 5 | DISTNAME= # empty | |
6 | PKGNAME= scmgit-${GIT_VERSION} | 6 | PKGNAME= scmgit-${GIT_VERSION} | |
7 | PKGREVISION= 1 | |||
8 | CATEGORIES+= meta-pkgs devel | 7 | CATEGORIES+= meta-pkgs devel | |
9 | DISTFILES= # empty | 8 | DISTFILES= # empty | |
10 | MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ | 9 | MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ | |
11 | 10 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | COMMENT= GIT version control suite meta-package | 12 | COMMENT= GIT version control suite meta-package | |
14 | 13 | |||
15 | META_PACKAGE= yes | 14 | META_PACKAGE= yes | |
16 | 15 | |||
17 | DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base | 16 | DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base | |
18 | DEPENDS+= scmgit-docs>=${GIT_VERSION}:../../devel/scmgit-docs | 17 | DEPENDS+= scmgit-docs>=${GIT_VERSION}:../../devel/scmgit-docs | |
19 | DEPENDS+= scmgit-gitk>=${GIT_VERSION}:../../devel/scmgit-gitk | 18 | DEPENDS+= scmgit-gitk>=${GIT_VERSION}:../../devel/scmgit-gitk | |
20 | 19 |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | # $NetBSD: Makefile.version,v 1.52 2013/01/28 15:22:09 adam Exp $ | 1 | # $NetBSD: Makefile.version,v 1.53 2013/01/30 17:39:39 adam Exp $ | |
2 | # | 2 | # | |
3 | # used by devel/scmgit/Makefile.common | 3 | # used by devel/scmgit/Makefile.common | |
4 | # used by www/gitweb/Makefile | 4 | # used by www/gitweb/Makefile | |
5 | 5 | |||
6 | GIT_VERSION= 1.8.1.1 | 6 | GIT_VERSION= 1.8.1.2 |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.66 2013/01/28 15:22:09 adam Exp $ | 1 | $NetBSD: distinfo,v 1.67 2013/01/30 17:39:39 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (git-1.8.1.1.tar.gz) = 44b90aab937b0e0dbb0661eb5ec4ca6182e60854 | 3 | SHA1 (git-1.8.1.2.tar.gz) = 29a2dee568b1f86e9d3d8f9dcc376f24439b6a0c | |
4 | RMD160 (git-1.8.1.1.tar.gz) = 724ece9b533e50dc27902ea839c3678f0bd89b9b | 4 | RMD160 (git-1.8.1.2.tar.gz) = d67332f59e180eb8b1cc0f7c429e4d9f030ac843 | |
5 | Size (git-1.8.1.1.tar.gz) = 4295398 bytes | 5 | Size (git-1.8.1.2.tar.gz) = 4297221 bytes | |
6 | SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a | 6 | SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a | |
7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | 7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | |
8 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | 8 | SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca | |
9 | SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c | 9 | SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c | |
10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | 10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | |
11 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | 11 | SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 | |
12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | 12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e |
@@ -1,30 +1,27 @@ | @@ -1,30 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2012/10/31 11:19:44 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2013/01/30 17:39:39 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= scmgit-gitk-${GIT_VERSION} | 3 | PKGNAME= scmgit-gitk-${GIT_VERSION} | |
4 | COMMENT= GIT Tree History Storage Tool (gitk) | 4 | COMMENT= GIT Tree History Storage Tool (gitk) | |
5 | 5 | |||
6 | CONFLICTS+= scmgit-base<1.7.12nb1 | 6 | CONFLICTS+= scmgit-base<1.7.12nb1 | |
7 | DEPENDS+= scmgit-base>=1.7.12nb1:../../devel/scmgit-base | 7 | DEPENDS+= scmgit-base>=1.7.12nb1:../../devel/scmgit-base | |
8 | 8 | |||
9 | USE_LANGUAGES= c | 9 | USE_LANGUAGES= c | |
10 | 10 | |||
11 | BUILD_DIRS= git-gui gitk-git | 11 | BUILD_DIRS= git-gui gitk-git | |
12 | INSTALL_DIRS= ${BUILD_DIRS} | 12 | INSTALL_DIRS= ${BUILD_DIRS} | |
13 | MAKE_ENV+= prefix=${PREFIX} | 13 | MAKE_ENV+= prefix=${PREFIX} | |
14 | 14 | |||
15 | PATCHDIR= ${.CURDIR}/../../devel/scmgit-base/patches | |||
16 | DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo | |||
17 | ||||
18 | USE_TOOLS+= wish:run | 15 | USE_TOOLS+= wish:run | |
19 | CONFIGURE_ARGS+= --with-tcltk=${WISH:Q} | 16 | CONFIGURE_ARGS+= --with-tcltk=${WISH:Q} | |
20 | 17 | |||
21 | INSTALLATION_DIRS+= bin | 18 | INSTALLATION_DIRS+= bin | |
22 | PLIST_VARS+= macosx | 19 | PLIST_VARS+= macosx | |
23 | 20 | |||
24 | .include "../../mk/bsd.prefs.mk" | 21 | .include "../../mk/bsd.prefs.mk" | |
25 | 22 | |||
26 | .if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework) | 23 | .if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework) | |
27 | . if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app) | 24 | . if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app) | |
28 | WISH_APP=Wish | 25 | WISH_APP=Wish | |
29 | . else | 26 | . else | |
30 | WISH_APP=Wish Shell | 27 | WISH_APP=Wish Shell |