diff options
| -rw-r--r-- | devel/git-base/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-base/PLIST | 3 | ||||
| -rw-r--r-- | devel/git-base/distinfo | 18 | ||||
| -rw-r--r-- | devel/git-base/patches/patch-Documentation_Makefile (renamed from devel/git-base/patches/patch-af) | 2 | ||||
| -rw-r--r-- | devel/git-base/patches/patch-git-gui_Makefile (renamed from devel/git-base/patches/patch-ah) | 23 | ||||
| -rw-r--r-- | devel/git-base/patches/patch-gitk-git_Makefile (renamed from devel/git-base/patches/patch-ac) | 2 | ||||
| -rw-r--r-- | devel/git-base/patches/patch-templates_Makefile (renamed from devel/git-base/patches/patch-ag) | 2 | ||||
| -rw-r--r-- | devel/git-gitk/Makefile | 4 | ||||
| -rw-r--r-- | devel/git-gitk/PLIST | 8 | ||||
| -rw-r--r-- | devel/git/Makefile.version | 4 |
10 files changed, 33 insertions, 36 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index d70d4ef3882..a97c2942ea8 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/08 12:24:31 adam Exp $ -PKGREVISION= 1 .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST index c252c6e30f1..d4d4b9f13d8 100644 --- a/devel/git-base/PLIST +++ b/devel/git-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2019/08/20 13:00:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.27 2019/11/08 12:24:31 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -226,6 +226,7 @@ share/examples/git/templates/hooks/fsmonitor-watchman.sample share/examples/git/templates/hooks/post-update.sample share/examples/git/templates/hooks/pre-applypatch.sample share/examples/git/templates/hooks/pre-commit.sample +share/examples/git/templates/hooks/pre-merge-commit.sample share/examples/git/templates/hooks/pre-push.sample share/examples/git/templates/hooks/pre-rebase.sample share/examples/git/templates/hooks/pre-receive.sample diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index 2154e6ba3ca..26d65d648df 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.90 2019/08/20 13:00:02 adam Exp $ +$NetBSD: distinfo,v 1.91 2019/11/08 12:24:31 adam Exp $ -SHA1 (git-2.23.0.tar.xz) = fc627f8cb994c60ae6c4580ca514af2a18c464d7 -RMD160 (git-2.23.0.tar.xz) = fc260e2f2e762f0156ba0639853d8708cffe5b38 -SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 -Size (git-2.23.0.tar.xz) = 5707148 bytes +SHA1 (git-2.24.0.tar.xz) = 851537fc03f5a99419ef20e9b836de965c7928bd +RMD160 (git-2.24.0.tar.xz) = 28b19ca928fcf8182f27031b3e2ec3e08a2b0584 +SHA512 (git-2.24.0.tar.xz) = 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 +Size (git-2.24.0.tar.xz) = 5766056 bytes +SHA1 (patch-Documentation_Makefile) = 06460f220b4703a1ff98809006ec1aed5017bb23 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6 -SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98 -SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 -SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 -SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 +SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 +SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 +SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 diff --git a/devel/git-base/patches/patch-af b/devel/git-base/patches/patch-Documentation_Makefile index f5ca295dc9a..f5e06dbdcb2 100644 --- a/devel/git-base/patches/patch-af +++ b/devel/git-base/patches/patch-Documentation_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2014/11/30 18:43:41 adam Exp $ +$NetBSD: patch-Documentation_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ * Use BSR_INSTALL_*. * FIXME: Add "--skip-validation" to xmlto command. diff --git a/devel/git-base/patches/patch-ah b/devel/git-base/patches/patch-git-gui_Makefile index 957b4e24f8e..788301055ee 100644 --- a/devel/git-base/patches/patch-ah +++ b/devel/git-base/patches/patch-git-gui_Makefile @@ -1,6 +1,9 @@ -$NetBSD: patch-ah,v 1.1 2013/09/09 13:54:44 wiz Exp $ +$NetBSD: patch-git-gui_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ ---- git-gui/Makefile.orig 2010-12-16 02:52:11.000000000 +0000 +Fix installation. +Do not build Git Gui.app on Darwin. + +--- git-gui/Makefile.orig 2019-11-04 05:07:07.000000000 +0000 +++ git-gui/Makefile @@ -48,11 +48,11 @@ endif RM_RF ?= rm -rf @@ -32,12 +35,12 @@ $NetBSD: patch-ah,v 1.1 2013/09/09 13:54:44 wiz Exp $ INSTALL_A0 = src= INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud -@@ -105,7 +105,7 @@ endif - +@@ -157,7 +157,7 @@ else + endif ifeq ($(uname_S),Darwin) - TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app -- ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n) -+ ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 8) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app - ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app + ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) +- GITGUI_MACOSXAPP := YesPlease ++ GITGUI_MACOSXAPP := + endif + endif + ifneq (,$(findstring MINGW,$(uname_S))) diff --git a/devel/git-base/patches/patch-ac b/devel/git-base/patches/patch-gitk-git_Makefile index 589ad2a623e..f7d16a6465f 100644 --- a/devel/git-base/patches/patch-ac +++ b/devel/git-base/patches/patch-gitk-git_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2017/02/25 08:32:57 adam Exp $ +$NetBSD: patch-gitk-git_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ --- gitk-git/Makefile.orig 2017-02-24 19:17:39.000000000 +0000 +++ gitk-git/Makefile diff --git a/devel/git-base/patches/patch-ag b/devel/git-base/patches/patch-templates_Makefile index 991e9bc5cab..b5baca74b5b 100644 --- a/devel/git-base/patches/patch-ag +++ b/devel/git-base/patches/patch-templates_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2013/09/09 13:54:44 wiz Exp $ +$NetBSD: patch-templates_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ --- templates/Makefile.orig 2010-10-22 03:49:16.000000000 +0000 +++ templates/Makefile diff --git a/devel/git-gitk/Makefile b/devel/git-gitk/Makefile index d2982f3d297..dfdeec2e9e4 100644 --- a/devel/git-gitk/Makefile +++ b/devel/git-gitk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:12 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/08 12:24:31 adam Exp $ PKGNAME= git-gitk-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (gitk) @@ -17,7 +17,6 @@ USE_TOOLS+= wish:run CONFIGURE_ARGS+= --with-tcltk=${WISH:Q} INSTALLATION_DIRS+= bin -PLIST_VARS+= macosx .include "../../mk/bsd.prefs.mk" @@ -28,7 +27,6 @@ WISH_APP= Wish WISH_APP= Wish Shell . endif PLIST_SUBST+= WISH_APP=${WISH_APP:Q} -PLIST.macosx= yes .endif .include "../../devel/git/Makefile.common" diff --git a/devel/git-gitk/PLIST b/devel/git-gitk/PLIST index 94f921b9966..720c8658096 100644 --- a/devel/git-gitk/PLIST +++ b/devel/git-gitk/PLIST @@ -1,12 +1,8 @@ -@comment $NetBSD: PLIST,v 1.8 2019/08/31 23:51:52 maya Exp $ +@comment $NetBSD: PLIST,v 1.9 2019/11/08 12:24:31 adam Exp $ bin/gitk libexec/git-core/git-citool libexec/git-core/git-gui libexec/git-core/git-gui--askpass -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl -${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns share/git-gui/lib/about.tcl share/git-gui/lib/blame.tcl share/git-gui/lib/branch.tcl @@ -28,7 +24,6 @@ share/git-gui/lib/diff.tcl share/git-gui/lib/encoding.tcl share/git-gui/lib/error.tcl share/git-gui/lib/git-gui.ico -${PLIST.macosx}share/git-gui/lib/git-gui.tcl share/git-gui/lib/index.tcl share/git-gui/lib/line.tcl share/git-gui/lib/logo.tcl @@ -77,3 +72,4 @@ share/gitk/lib/msgs/pt_pt.msg share/gitk/lib/msgs/ru.msg share/gitk/lib/msgs/sv.msg share/gitk/lib/msgs/vi.msg +share/gitk/lib/msgs/zh_cn.msg diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 7500f1ab8d9..d5d14f58c0a 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.version,v 1.80 2019/08/20 13:00:02 adam Exp $ +# $NetBSD: Makefile.version,v 1.81 2019/11/08 12:24:31 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-cvs/Makefile # used by devel/git-svn/Makefile -GIT_VERSION= 2.23.0 +GIT_VERSION= 2.24.0 |