ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-10 02:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
Oleg Borodin
2025-08-18 08:28:50 +02:00
parent 719960cacc
commit c772be58a3
20 changed files with 186 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/pixz/Makefile
View File

@@ -2,10 +2,10 @@
# $Id$ # $Id$
# #
PORTNAME= pixz PORTNAME= pixz
PORTVERSION= 1.0.7 PORTVERSION= 1.0.2
CATEGORIES= archivers CATEGORIES= archivers
MASTER_SITES= SF/pixz MASTER_SITES= SF/pixz
EXTRACT_SUFX= .tar.gz EXTRACT_SUFX= .tgz
MAINTAINER= onborodin@gmail.com MAINTAINER= onborodin@gmail.com
COMMENT= Parallel, indexing version of XZ COMMENT= Parallel, indexing version of XZ

1
arch/pixz/distinfo
View File

@@ -1,2 +1,3 @@
TIMESTAMP = 1755469280
SHA256 (pixz-1.0.2.tgz) = af9dac41edd6bf57953471f7fcbd4793810003bf911593ba4c84f7cccb5f74af SHA256 (pixz-1.0.2.tgz) = af9dac41edd6bf57953471f7fcbd4793810003bf911593ba4c84f7cccb5f74af
SIZE (pixz-1.0.2.tgz) = 21425 SIZE (pixz-1.0.2.tgz) = 21425

57
devel/git/Makefile
View File

@@ -2,7 +2,7 @@
# $Id$ # $Id$
# #
PORTNAME= git PORTNAME= git
DISTVERSION= 2.38.1 DISTVERSION= 2.50.1 #2.38.1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
@@ -17,37 +17,34 @@ LIB_DEPENDS+= libintl.so:devel/gettext
LIB_DEPENDS+= libcurl.so:net/libcurl LIB_DEPENDS+= libcurl.so:net/libcurl
LIB_DEPENDS+= libexpat.so:text/libexpat LIB_DEPENDS+= libexpat.so:text/libexpat
PATCH_SITES= https://gitlab.com/gitlab-org/gitaly/-/raw/master/_support/git-patches/v2.37.1.gl1/ PATCH_SITES= -isystem${LOCALBASE}/include
PATCHFILES= 0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch \
0002-refs-allow-passing-flags-when-beginning-transactions.patch \
0003-refs-allow-skipping-the-reference-transaction-hook.patch \
0004-refs-demonstrate-excessive-execution-of-the-referenc.patch \
0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch \
0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch
PATCH_DIST_STRIP= -p1
GNU_CONFIGURE= yes
USES= gmake shebangfix tar:xz perl5
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= V=1 MAKE_ENV+= V=1
SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \ GNU_CONFIGURE= yes
t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \ USES = gmake
git-p4.py \ #SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
contrib/hg-to-git/hg-to-git.py \ # t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \
contrib/hooks/update-paranoid \ # git-p4.py \
# contrib/hg-to-git/hg-to-git.py \
# contrib/hooks/update-paranoid \
# contrib/fast-import/import-zips.py \
# contrib/remote-helpers/git-remote-bzr \
# contrib/remote-helpers/git-remote-hg \
# contrib/credential/netrc/git-credential-netrc.perl \
# contrib/buildsystems/generate contrib/contacts/git-contacts \
# templates/hooks--fsmonitor-watchman.sample
SHEBANG_FILES= Documentation/*.perl \
contrib/*/*.perl \
contrib/*/*.pl \
contrib/*/*/*.perl \
contrib/*/*/*.pl \
contrib/contacts/git-contacts \
contrib/fast-import/import-zips.py \ contrib/fast-import/import-zips.py \
contrib/remote-helpers/git-remote-bzr \ contrib/hooks/update-paranoid \
contrib/remote-helpers/git-remote-hg \ git-p4.py \
contrib/credential/netrc/git-credential-netrc.perl \ templates/hooks/fsmonitor-watchman.sample
contrib/buildsystems/generate contrib/contacts/git-contacts \
templates/hooks--fsmonitor-watchman.sample
CONFIGURE_ARGS+= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no CONFIGURE_ARGS+= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no
CONFIGURE_ARGS+= --with-editor="${LOCALBASE}/bin/vim" CONFIGURE_ARGS+= --with-editor="${LOCALBASE}/bin/vim"
@@ -93,15 +90,12 @@ PORTEXAMPLES= *
post-patch: post-patch:
${REINPLACE_CMD} -e "s,%%SITE_PERL%%,${SITE_PERL},g" ${WRKSRC}/Makefile ${REINPLACE_CMD} -e "s,%%SITE_PERL%%,${SITE_PERL},g" ${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \ ${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
/git-cvsimport.perl/d; \ /git-cvsimport.perl/d; \
/git-cvsserver.perl/d; \ /git-cvsserver.perl/d; \
/documented,gitcvs-migration/d; \ /documented,gitcvs-migration/d; \
s/git-cvsserver//' \ s/git-cvsserver//' \
${WRKSRC}/Makefile ${WRKSRC}/Makefile
# ${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/gitweb-lib.sh
${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/contrib/subtree/git-subtree.sh ${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/contrib/subtree/git-subtree.sh
@@ -113,7 +107,6 @@ post-install:
cd ${WRKDIR}/man5 && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5 cd ${WRKDIR}/man5 && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5
cd ${WRKDIR}/man7 && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7 cd ${WRKDIR}/man7 && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7
post-stage: post-stage:
.include <bsd.port.mk> .include <bsd.port.mk>

22
devel/git/distinfo
View File

@@ -1,17 +1,5 @@
TIMESTAMP = 1666183854 TIMESTAMP = 1755496902
SHA256 (git-2.38.1.tar.xz) = 97ddf8ea58a2b9e0fbc2508e245028ca75911bd38d1551616b148c1aa5740ad9 SHA256 (git-2.50.1.tar.gz) = 522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915
SIZE (git-2.38.1.tar.xz) = 7088208 SIZE (git-2.50.1.tar.gz) = 11755615
SHA256 (git-manpages-2.38.1.tar.xz) = 47f9090252dc7d48fcca6c597495b912d81bf07de8547d1719bc950d9ad1759d SHA256 (git-manpages-2.50.1.tar.gz) = 96088c583129c97ed9a2b01771b8b28ad79d9f2997b46786616df3e34b180ee4
SIZE (git-manpages-2.38.1.tar.xz) = 553484 SIZE (git-manpages-2.50.1.tar.gz) = 1023050
SHA256 (0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch) = c9c6b619d43ee49ac9beff22ec722a2a8a6a704a8039dc3de4dbfa1f89f77d34
SIZE (0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch) = 5453
SHA256 (0002-refs-allow-passing-flags-when-beginning-transactions.patch) = 95df2fc83975b5fb0f1ba871163cb9e28319639eea34d1eb5d74dd15ed64f78e
SIZE (0002-refs-allow-passing-flags-when-beginning-transactions.patch) = 6773
SHA256 (0003-refs-allow-skipping-the-reference-transaction-hook.patch) = fa115c854db9ee7960a9b0d7a50d9e47024e84d3139bf7fe9fda1fce88766222
SIZE (0003-refs-allow-skipping-the-reference-transaction-hook.patch) = 1981
SHA256 (0004-refs-demonstrate-excessive-execution-of-the-referenc.patch) = c102be748305bd569a9546dffb9fb97161fb60924e7cdd9a023226b2c0b3c18c
SIZE (0004-refs-demonstrate-excessive-execution-of-the-referenc.patch) = 3143
SHA256 (0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch) = 526b06c57d0acef49feb2a456622c57ed870bfbfcfee1d4daab43a13fd0be9a0
SIZE (0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch) = 3106
SHA256 (0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch) = 927559891fc520dd3723eb1aad4a2ee4ab8337a14b25bf2f91502eb7904ec181
SIZE (0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch) = 4441

3
devel/git/files/git_daemon.in
View File

@@ -1,7 +1,4 @@
#! /bin/sh #! /bin/sh
#
# $FreeBSD: head/devel/git/files/git_daemon.in 307344 2012-11-12 20:32:17Z wxs $
#
# PROVIDE: git_daemon # PROVIDE: git_daemon
# REQUIRE: DAEMON # REQUIRE: DAEMON

16
devel/git/files/patch-Documentation__Makefile
View File

@@ -1,8 +1,8 @@
--- Documentation/Makefile.orig 2021-08-16 21:18:43 UTC --- Documentation/Makefile.orig 2025-06-16 05:42:57 UTC
+++ Documentation/Makefile +++ Documentation/Makefile
@@ -120,11 +120,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER) @@ -144,11 +144,11 @@ DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER
DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT))) DOC_MAN5 = $(patsubst %.adoc,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT))) DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
-prefix ?= $(HOME) -prefix ?= $(HOME)
+prefix ?= $(PREFIX) +prefix ?= $(PREFIX)
@@ -15,12 +15,12 @@
mandir ?= $(prefix)/share/man mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
man5dir = $(mandir)/man5 man5dir = $(mandir)/man5
@@ -241,7 +241,7 @@ ifndef V @@ -246,7 +246,7 @@ endif
endif ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
endif endif
-all: html man -all:: html man
+all: html +all:: html
html: $(DOC_HTML) html: $(DOC_HTML)

36
devel/git/files/patch-Makefile
View File

@@ -1,13 +1,12 @@
--- Makefile.orig 2022-10-02 23:02:46 UTC --- Makefile.orig 2025-06-16 05:42:57 UTC
+++ Makefile +++ Makefile
@@ -542,17 +542,17 @@ bindir = $(prefix)/bin @@ -614,17 +614,17 @@ mandir = $(prefix)/share/man
prefix = $(HOME) prefix = $(HOME)
bindir = $(prefix)/bin bindir = $(prefix)/bin
-mandir = $(prefix)/share/man mandir = $(prefix)/share/man
-infodir = $(prefix)/share/info -infodir = $(prefix)/share/info
+mandir = $(prefix)/man
+infodir = $(prefix)/info +infodir = $(prefix)/info
bash_completion_dir = $(prefix)/share/bash-completion/completions
gitexecdir = libexec/git-core gitexecdir = libexec/git-core
mergetoolsdir = $(gitexecdir)/mergetools mergetoolsdir = $(gitexecdir)/mergetools
sharedir = $(prefix)/share sharedir = $(prefix)/share
@@ -23,7 +22,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib lib = lib
@@ -577,8 +577,8 @@ INSTALL = install @@ -649,8 +649,8 @@ INSTALL = install
TAR = tar TAR = tar
FIND = find FIND = find
INSTALL = install INSTALL = install
@@ -34,20 +33,20 @@
XGETTEXT = xgettext XGETTEXT = xgettext
MSGCAT = msgcat MSGCAT = msgcat
MSGFMT = msgfmt MSGFMT = msgfmt
@@ -1539,9 +1539,9 @@ ifndef NO_OPENSSL @@ -1723,9 +1723,9 @@ ifndef NO_OPENSSL
ifndef NO_OPENSSL ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl OPENSSL_LIBSSL = -lssl
- ifdef OPENSSLDIR - ifdef OPENSSLDIR
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include - BASIC_CFLAGS += -I$(OPENSSLDIR)/include
- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) - OPENSSL_LINK = $(call libpath_template,$(OPENSSLDIR)/$(lib))
+ ifdef OPENSSLBASE + ifdef OPENSSLBASE
+ BASIC_CFLAGS += -I$(OPENSSLBASE)/include + BASIC_CFLAGS += -I$(OPENSSLBASE)/include
+ OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib) + OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
else else
OPENSSL_LINK = OPENSSL_LINK =
endif endif
@@ -2442,7 +2442,7 @@ else # NO_PERL @@ -2672,7 +2672,7 @@ else # NO_PERL
chmod +x $@+ && \ chmod +x $@+ && \
mv $@+ $@ mv $@+ $@
else # NO_PERL else # NO_PERL
@@ -55,17 +54,8 @@
+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh +$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
$(QUIET_GEN) \ $(QUIET_GEN) \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
@@ -2458,7 +2458,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py @@ -3540,7 +3540,7 @@ install: all
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(SCRIPT_PYTHON_GEN): % : %.py
$(QUIET_GEN) \
- sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+ sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
$< >$@+ && \
chmod +x $@+ && \
mv $@+ $@
@@ -3238,7 +3238,7 @@ install: all
$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'

79
devel/git/files/patch-configure.ac
View File

@@ -1,9 +1,9 @@
# Specify 'allow-without' to allow --without-perl to be used # Specify 'allow-without' to allow --without-perl to be used
# TODO: Upstream # TODO: Upstream
--- configure.ac.orig 2018-04-02 17:44:04 UTC --- configure.ac.orig 2025-06-16 05:42:57 UTC
+++ configure.ac +++ configure.ac
@@ -414,7 +414,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFAULT_EDITOR, @@ -396,7 +396,7 @@ GIT_ARG_SET_PATH(shell)
GIT_ARG_SET_PATH(shell) GIT_ARG_SET_PATH(shell)
# #
# Define PERL_PATH to provide path to Perl. # Define PERL_PATH to provide path to Perl.
@@ -12,3 +12,78 @@
# #
# Define PYTHON_PATH to provide path to Python. # Define PYTHON_PATH to provide path to Python.
GIT_ARG_SET_PATH(python, allow-without) GIT_ARG_SET_PATH(python, allow-without)
@@ -1068,32 +1068,6 @@ GIT_CONF_SUBST([CHARSET_LIB])
GIT_CONF_SUBST([CHARSET_LIB])
#
-# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
-#
-AC_DEFUN([HAVE_SYSINFO_SRC], [
-AC_LANG_PROGRAM([[
-#include <stdint.h>
-#include <sys/sysinfo.h>
-]], [[
-struct sysinfo si;
-uint64_t t = 0;
-if (!sysinfo(&si)) {
- t = si.totalram;
- if (si.mem_unit > 1)
- t *= (uint64_t)si.mem_unit;
-}
-return t;
-]])])
-
-AC_MSG_CHECKING([for sysinfo])
-AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
- [AC_MSG_RESULT([yes])
- HAVE_SYSINFO=YesPlease],
- [AC_MSG_RESULT([no])
- HAVE_SYSINFO=])
-GIT_CONF_SUBST([HAVE_SYSINFO])
-
-#
# Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
GIT_CHECK_FUNC(clock_gettime,
[HAVE_CLOCK_GETTIME=YesPlease],
@@ -1220,6 +1194,41 @@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
[AC_MSG_RESULT([no])
HAVE_BSD_SYSCTL=])
GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
+
+#
+# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
+#
+
+HAVE_SYSINFO=
+# on a *BSD system, sysctl() takes precedence over the
+# sysinfo() compatibility library (if installed).
+
+if test -z "$HAVE_BSD_SYSCTL"; then
+
+ AC_DEFUN([HAVE_SYSINFO_SRC], [
+ AC_LANG_PROGRAM([[
+ #include <stdint.h>
+ #include <sys/sysinfo.h>
+ ]], [[
+ struct sysinfo si;
+ uint64_t t = 0;
+ if (!sysinfo(&si)) {
+ t = si.totalram;
+ if (si.mem_unit > 1)
+ t *= (uint64_t)si.mem_unit;
+ }
+ return t;
+ ]])])
+
+ AC_MSG_CHECKING([for sysinfo])
+ AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
+ [AC_MSG_RESULT([yes])
+ HAVE_SYSINFO=YesPlease],
+ [AC_MSG_RESULT([no])
+ HAVE_SYSINFO=])
+ GIT_CONF_SUBST([HAVE_SYSINFO])
+
+fi
## Other checks.
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.

108
devel/git/pkg-plist
View File

@@ -4,35 +4,15 @@ bin/git-shell
bin/git-upload-archive bin/git-upload-archive
bin/git-upload-pack bin/git-upload-pack
bin/scalar bin/scalar
%%SITE_PERL%%/FromCPAN/Error.pm
%%SITE_PERL%%/FromCPAN/Mail/Address.pm
%%SITE_PERL%%/Git.pm
%%SITE_PERL%%/Git/I18N.pm
%%SITE_PERL%%/Git/IndexInfo.pm
%%SITE_PERL%%/Git/LoadCPAN.pm
%%SITE_PERL%%/Git/LoadCPAN/Error.pm
%%SITE_PERL%%/Git/LoadCPAN/Mail/Address.pm
%%SITE_PERL%%/Git/Packet.pm
%%SITE_PERL%%/Git/SVN.pm
%%SITE_PERL%%/Git/SVN/Editor.pm
%%SITE_PERL%%/Git/SVN/Fetcher.pm
%%SITE_PERL%%/Git/SVN/GlobSpec.pm
%%SITE_PERL%%/Git/SVN/Log.pm
%%SITE_PERL%%/Git/SVN/Memoize/YAML.pm
%%SITE_PERL%%/Git/SVN/Migration.pm
%%SITE_PERL%%/Git/SVN/Prompt.pm
%%SITE_PERL%%/Git/SVN/Ra.pm
%%SITE_PERL%%/Git/SVN/Utils.pm
libexec/git-core/git libexec/git-core/git
libexec/git-core/git-add libexec/git-core/git-add
libexec/git-core/git-add--interactive
libexec/git-core/git-am libexec/git-core/git-am
libexec/git-core/git-annotate libexec/git-core/git-annotate
libexec/git-core/git-apply libexec/git-core/git-apply
libexec/git-core/git-archimport libexec/git-core/git-archimport
libexec/git-core/git-archive libexec/git-core/git-archive
libexec/git-core/git-backfill
libexec/git-core/git-bisect libexec/git-core/git-bisect
libexec/git-core/git-bisect--helper
libexec/git-core/git-blame libexec/git-core/git-blame
libexec/git-core/git-branch libexec/git-core/git-branch
libexec/git-core/git-bugreport libexec/git-core/git-bugreport
@@ -65,10 +45,10 @@ libexec/git-core/git-diagnose
libexec/git-core/git-diff libexec/git-core/git-diff
libexec/git-core/git-diff-files libexec/git-core/git-diff-files
libexec/git-core/git-diff-index libexec/git-core/git-diff-index
libexec/git-core/git-diff-pairs
libexec/git-core/git-diff-tree libexec/git-core/git-diff-tree
libexec/git-core/git-difftool libexec/git-core/git-difftool
libexec/git-core/git-difftool--helper libexec/git-core/git-difftool--helper
libexec/git-core/git-env--helper
libexec/git-core/git-fast-export libexec/git-core/git-fast-export
libexec/git-core/git-fast-import libexec/git-core/git-fast-import
libexec/git-core/git-fetch libexec/git-core/git-fetch
@@ -94,7 +74,6 @@ libexec/git-core/git-imap-send
libexec/git-core/git-index-pack libexec/git-core/git-index-pack
libexec/git-core/git-init libexec/git-core/git-init
libexec/git-core/git-init-db libexec/git-core/git-init-db
libexec/git-core/git-instaweb
libexec/git-core/git-interpret-trailers libexec/git-core/git-interpret-trailers
libexec/git-core/git-log libexec/git-core/git-log
libexec/git-core/git-ls-files libexec/git-core/git-ls-files
@@ -136,6 +115,7 @@ libexec/git-core/git-read-tree
libexec/git-core/git-rebase libexec/git-core/git-rebase
libexec/git-core/git-receive-pack libexec/git-core/git-receive-pack
libexec/git-core/git-reflog libexec/git-core/git-reflog
libexec/git-core/git-refs
libexec/git-core/git-remote libexec/git-core/git-remote
libexec/git-core/git-remote-ext libexec/git-core/git-remote-ext
libexec/git-core/git-remote-fd libexec/git-core/git-remote-fd
@@ -145,6 +125,7 @@ libexec/git-core/git-remote-http
libexec/git-core/git-remote-https libexec/git-core/git-remote-https
libexec/git-core/git-repack libexec/git-core/git-repack
libexec/git-core/git-replace libexec/git-core/git-replace
libexec/git-core/git-replay
libexec/git-core/git-request-pull libexec/git-core/git-request-pull
libexec/git-core/git-rerere libexec/git-core/git-rerere
libexec/git-core/git-reset libexec/git-core/git-reset
@@ -187,7 +168,6 @@ libexec/git-core/git-verify-commit
libexec/git-core/git-verify-pack libexec/git-core/git-verify-pack
libexec/git-core/git-verify-tag libexec/git-core/git-verify-tag
libexec/git-core/git-version libexec/git-core/git-version
libexec/git-core/git-web--browse
libexec/git-core/git-whatchanged libexec/git-core/git-whatchanged
libexec/git-core/git-worktree libexec/git-core/git-worktree
libexec/git-core/git-write-tree libexec/git-core/git-write-tree
@@ -212,6 +192,7 @@ libexec/git-core/mergetools/smerge
libexec/git-core/mergetools/tkdiff libexec/git-core/mergetools/tkdiff
libexec/git-core/mergetools/tortoisemerge libexec/git-core/mergetools/tortoisemerge
libexec/git-core/mergetools/vimdiff libexec/git-core/mergetools/vimdiff
libexec/git-core/mergetools/vscode
libexec/git-core/mergetools/winmerge libexec/git-core/mergetools/winmerge
libexec/git-core/mergetools/xxdiff libexec/git-core/mergetools/xxdiff
libexec/git-core/scalar libexec/git-core/scalar
@@ -221,6 +202,7 @@ man/man1/git-annotate.1.gz
man/man1/git-apply.1.gz man/man1/git-apply.1.gz
man/man1/git-archimport.1.gz man/man1/git-archimport.1.gz
man/man1/git-archive.1.gz man/man1/git-archive.1.gz
man/man1/git-backfill.1.gz
man/man1/git-bisect.1.gz man/man1/git-bisect.1.gz
man/man1/git-blame.1.gz man/man1/git-blame.1.gz
man/man1/git-branch.1.gz man/man1/git-branch.1.gz
@@ -256,6 +238,7 @@ man/man1/git-describe.1.gz
man/man1/git-diagnose.1.gz man/man1/git-diagnose.1.gz
man/man1/git-diff-files.1.gz man/man1/git-diff-files.1.gz
man/man1/git-diff-index.1.gz man/man1/git-diff-index.1.gz
man/man1/git-diff-pairs.1.gz
man/man1/git-diff-tree.1.gz man/man1/git-diff-tree.1.gz
man/man1/git-diff.1.gz man/man1/git-diff.1.gz
man/man1/git-difftool.1.gz man/man1/git-difftool.1.gz
@@ -321,11 +304,13 @@ man/man1/git-read-tree.1.gz
man/man1/git-rebase.1.gz man/man1/git-rebase.1.gz
man/man1/git-receive-pack.1.gz man/man1/git-receive-pack.1.gz
man/man1/git-reflog.1.gz man/man1/git-reflog.1.gz
man/man1/git-refs.1.gz
man/man1/git-remote-ext.1.gz man/man1/git-remote-ext.1.gz
man/man1/git-remote-fd.1.gz man/man1/git-remote-fd.1.gz
man/man1/git-remote.1.gz man/man1/git-remote.1.gz
man/man1/git-repack.1.gz man/man1/git-repack.1.gz
man/man1/git-replace.1.gz man/man1/git-replace.1.gz
man/man1/git-replay.1.gz
man/man1/git-request-pull.1.gz man/man1/git-request-pull.1.gz
man/man1/git-rerere.1.gz man/man1/git-rerere.1.gz
man/man1/git-reset.1.gz man/man1/git-reset.1.gz
@@ -398,17 +383,14 @@ man/man7/giteveryday.7.gz
man/man7/gitfaq.7.gz man/man7/gitfaq.7.gz
man/man7/gitglossary.7.gz man/man7/gitglossary.7.gz
man/man7/gitnamespaces.7.gz man/man7/gitnamespaces.7.gz
man/man7/gitpacking.7.gz
man/man7/gitremote-helpers.7.gz man/man7/gitremote-helpers.7.gz
man/man7/gitrevisions.7.gz man/man7/gitrevisions.7.gz
man/man7/gitsubmodules.7.gz man/man7/gitsubmodules.7.gz
man/man7/gittutorial-2.7.gz man/man7/gittutorial-2.7.gz
man/man7/gittutorial.7.gz man/man7/gittutorial.7.gz
man/man7/gitworkflows.7.gz man/man7/gitworkflows.7.gz
share/examples/git/gitweb/gitweb.cgi share/bash-completion/completions/git
share/examples/git/gitweb/static/git-favicon.png
share/examples/git/gitweb/static/git-logo.png
share/examples/git/gitweb/static/gitweb.css
share/examples/git/gitweb/static/gitweb.js
share/git-core/templates/description share/git-core/templates/description
share/git-core/templates/hooks/applypatch-msg.sample share/git-core/templates/hooks/applypatch-msg.sample
share/git-core/templates/hooks/commit-msg.sample share/git-core/templates/hooks/commit-msg.sample
@@ -422,77 +404,15 @@ share/git-core/templates/hooks/pre-rebase.sample
share/git-core/templates/hooks/pre-receive.sample share/git-core/templates/hooks/pre-receive.sample
share/git-core/templates/hooks/prepare-commit-msg.sample share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/push-to-checkout.sample share/git-core/templates/hooks/push-to-checkout.sample
share/git-core/templates/hooks/sendemail-validate.sample
share/git-core/templates/hooks/update.sample share/git-core/templates/hooks/update.sample
share/git-core/templates/info/exclude share/git-core/templates/info/exclude
share/locale/bg/LC_MESSAGES/git.mo
share/locale/ca/LC_MESSAGES/git.mo
share/locale/de/LC_MESSAGES/git.mo
share/locale/el/LC_MESSAGES/git.mo
share/locale/es/LC_MESSAGES/git.mo
share/locale/fr/LC_MESSAGES/git.mo
share/locale/id/LC_MESSAGES/git.mo
share/locale/is/LC_MESSAGES/git.mo
share/locale/it/LC_MESSAGES/git.mo
share/locale/ko/LC_MESSAGES/git.mo
share/locale/pl/LC_MESSAGES/git.mo
share/locale/pt_PT/LC_MESSAGES/git.mo
share/locale/ru/LC_MESSAGES/git.mo
share/locale/sv/LC_MESSAGES/git.mo
share/locale/tr/LC_MESSAGES/git.mo
share/locale/vi/LC_MESSAGES/git.mo
share/locale/zh_CN/LC_MESSAGES/git.mo
share/locale/zh_TW/LC_MESSAGES/git.mo
@dir %%SITE_PERL%%/FromCPAN/Mail
@dir %%SITE_PERL%%/FromCPAN
@dir %%SITE_PERL%%/Git/LoadCPAN/Mail
@dir %%SITE_PERL%%/Git/LoadCPAN
@dir %%SITE_PERL%%/Git/SVN/Memoize
@dir %%SITE_PERL%%/Git/SVN
@dir %%SITE_PERL%%/Git
@dir %%SITE_PERL%%
@dir libexec/git-core/mergetools @dir libexec/git-core/mergetools
@dir libexec/git-core @dir libexec/git-core
@dir share/examples/git/gitweb/static @dir share/bash-completion/completions
@dir share/examples/git/gitweb @dir share/bash-completion
@dir share/examples/git @dir share/examples/git
@dir share/git-core/templates/hooks @dir share/git-core/templates/hooks
@dir share/git-core/templates/info @dir share/git-core/templates/info
@dir share/git-core/templates @dir share/git-core/templates
@dir share/git-core @dir share/git-core
@dir share/locale/bg/LC_MESSAGES
@dir share/locale/bg
@dir share/locale/ca/LC_MESSAGES
@dir share/locale/ca
@dir share/locale/de/LC_MESSAGES
@dir share/locale/de
@dir share/locale/el/LC_MESSAGES
@dir share/locale/el
@dir share/locale/es/LC_MESSAGES
@dir share/locale/es
@dir share/locale/fr/LC_MESSAGES
@dir share/locale/fr
@dir share/locale/id/LC_MESSAGES
@dir share/locale/id
@dir share/locale/is/LC_MESSAGES
@dir share/locale/is
@dir share/locale/it/LC_MESSAGES
@dir share/locale/it
@dir share/locale/ko/LC_MESSAGES
@dir share/locale/ko
@dir share/locale/pl/LC_MESSAGES
@dir share/locale/pl
@dir share/locale/pt_PT/LC_MESSAGES
@dir share/locale/pt_PT
@dir share/locale/ru/LC_MESSAGES
@dir share/locale/ru
@dir share/locale/sv/LC_MESSAGES
@dir share/locale/sv
@dir share/locale/tr/LC_MESSAGES
@dir share/locale/tr
@dir share/locale/vi/LC_MESSAGES
@dir share/locale/vi
@dir share/locale/zh_CN/LC_MESSAGES
@dir share/locale/zh_CN
@dir share/locale/zh_TW/LC_MESSAGES
@dir share/locale/zh_TW
@dir share/locale

2
devel/gmake/Makefile
View File

@@ -1,5 +1,5 @@
PORTNAME= gmake PORTNAME= gmake
PORTVERSION= 4.4 PORTVERSION= 4.4.1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= GNU/make MASTER_SITES= GNU/make
DISTNAME= make-${PORTVERSION} DISTNAME= make-${PORTVERSION}

6
devel/gmake/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1667226973 TIMESTAMP = 1755496281
SHA256 (make-4.4.tar.lz) = 48d0fc0b2a04bb50f2911c16da65723285f7f4804c74fc5a2124a3df6c5f78c4 SHA256 (make-4.4.1.tar.lz) = 8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
SIZE (make-4.4.tar.lz) = 1283355 SIZE (make-4.4.1.tar.lz) = 1305648

0
devel/gmake/files/patch-lib-glob.c → devel/gmake/files/_patch-lib-glob.c
View File

0
devel/gmake/files/patch-src-default.c → devel/gmake/files/_patch-src-default.c
View File

0
devel/gmake/files/patch-src-makeint.h → devel/gmake/files/_patch-src-makeint.h
View File

127
devel/gmake/files/patch-10-6e6abd0c
View File

@@ -1,127 +0,0 @@
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 23 May 2020 10:19:34 +0000 (+0200)
Subject: findprog-in: Ignore directories.
X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=6e6abd0cdfe4bb96f6412aebc511f10bf254a820
findprog-in: Ignore directories.
Reported by Frederick Eaton via Dmitry Goncharov in
<https://lists.gnu.org/archive/html/bug-gnulib/2020-03/msg00003.html>.
* lib/findprog-in.c (find_in_given_path): When the file found is a
directory, set errno to EACCES and, during a PATH search, continue
searching.
* modules/findprog-in (Depends-on): Add sys_stat, stat.
---
diff --git a/lib/findprog-in.c b/lib/findprog-in.c
index c254f2f..0f76e36 100644
--- lib/findprog-in.c
+++ lib/findprog-in.c
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
#include "filename.h"
#include "concat-filename.h"
@@ -58,8 +59,8 @@ static const char * const suffixes[] =
/* Note: The cmd.exe program does a different lookup: It searches according
to the PATHEXT environment variable.
See <https://stackoverflow.com/questions/7839150/>.
- Also, it executes files ending .bat and .cmd directly without letting the
- kernel interpret the program file. */
+ Also, it executes files ending in .bat and .cmd directly without letting
+ the kernel interpret the program file. */
#elif defined __CYGWIN__
"", ".exe", ".com"
#elif defined __EMX__
@@ -136,14 +137,26 @@ find_in_given_path (const char *progname, const char *path,
call access() despite its design flaw. */
if (eaccess (progpathname, X_OK) == 0)
{
- /* Found! */
- if (strcmp (progpathname, progname) == 0)
+ /* Check that the progpathname does not point to a
+ directory. */
+ struct stat statbuf;
+
+ if (stat (progpathname, &statbuf) >= 0)
{
- free (progpathname);
- return progname;
+ if (! S_ISDIR (statbuf.st_mode))
+ {
+ /* Found! */
+ if (strcmp (progpathname, progname) == 0)
+ {
+ free (progpathname);
+ return progname;
+ }
+ else
+ return progpathname;
+ }
+
+ errno = EACCES;
}
- else
- return progpathname;
}
if (errno != ENOENT)
@@ -210,25 +223,37 @@ find_in_given_path (const char *progname, const char *path,
call access() despite its design flaw. */
if (eaccess (progpathname, X_OK) == 0)
{
- /* Found! */
- if (strcmp (progpathname, progname) == 0)
+ /* Check that the progpathname does not point to a
+ directory. */
+ struct stat statbuf;
+
+ if (stat (progpathname, &statbuf) >= 0)
{
- free (progpathname);
-
- /* Add the "./" prefix for real, that
- xconcatenated_filename() optimized away. This
- avoids a second PATH search when the caller uses
- execl/execv/execlp/execvp. */
- progpathname =
- XNMALLOC (2 + strlen (progname) + 1, char);
- progpathname[0] = '.';
- progpathname[1] = NATIVE_SLASH;
- memcpy (progpathname + 2, progname,
- strlen (progname) + 1);
- }
+ if (! S_ISDIR (statbuf.st_mode))
+ {
+ /* Found! */
+ if (strcmp (progpathname, progname) == 0)
+ {
+ free (progpathname);
+
+ /* Add the "./" prefix for real, that
+ xconcatenated_filename() optimized away.
+ This avoids a second PATH search when the
+ caller uses execl/execv/execlp/execvp. */
+ progpathname =
+ XNMALLOC (2 + strlen (progname) + 1, char);
+ progpathname[0] = '.';
+ progpathname[1] = NATIVE_SLASH;
+ memcpy (progpathname + 2, progname,
+ strlen (progname) + 1);
+ }
+
+ free (path_copy);
+ return progpathname;
+ }
- free (path_copy);
- return progpathname;
+ errno = EACCES;
+ }
}
if (errno != ENOENT)

11
devel/gmake/files/patch-configure Normal file
View File

@@ -0,0 +1,11 @@
--- configure.orig 2023-02-26 18:46:38 UTC
+++ configure
@@ -6741,7 +6741,7 @@ fi
-printf "%s\n" "#define MAKE_CXX \"$CXX\"" >>confdefs.h
+printf "%s\n" "#define MAKE_CXX \"c++\"" >>confdefs.h
# Configure gnulib

2
system/gcoreutils/Makefile
View File

@@ -2,7 +2,7 @@
# $Id: Makefile 2715 2009-11-19 10:26:38Z root $ # $Id: Makefile 2715 2009-11-19 10:26:38Z root $
# #
PORTNAME= coreutils PORTNAME= coreutils
PORTVERSION= 9.1 PORTVERSION= 9.7
DIST_SUBDIR= gnu DIST_SUBDIR= gnu
MASTER_SITES+= ${MASTER_SITE_GNU} MASTER_SITES+= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

6
system/gcoreutils/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1650133880 TIMESTAMP = 1755494535
SHA256 (gnu/coreutils-9.1.tar.xz) = 61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 SHA256 (gnu/coreutils-9.7.tar.xz) = e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf
SIZE (gnu/coreutils-9.1.tar.xz) = 5712104 SIZE (gnu/coreutils-9.7.tar.xz) = 6158960

11
system/gcoreutils/files/patch-configure Normal file
View File

@@ -0,0 +1,11 @@
--- configure.orig 2022-04-15 21:11:02 UTC
+++ configure
@@ -5579,7 +5579,7 @@ do
*/) ;;
*) as_dir=$as_dir/ ;;
esac
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(

11
system/gcoreutils/pkg-plist
View File

@@ -256,6 +256,8 @@ share/locale/it/LC_MESSAGES/coreutils.mo
share/locale/it/LC_TIME/coreutils.mo share/locale/it/LC_TIME/coreutils.mo
share/locale/ja/LC_MESSAGES/coreutils.mo share/locale/ja/LC_MESSAGES/coreutils.mo
share/locale/ja/LC_TIME/coreutils.mo share/locale/ja/LC_TIME/coreutils.mo
share/locale/ka/LC_MESSAGES/coreutils.mo
share/locale/ka/LC_TIME/coreutils.mo
share/locale/kk/LC_MESSAGES/coreutils.mo share/locale/kk/LC_MESSAGES/coreutils.mo
share/locale/kk/LC_TIME/coreutils.mo share/locale/kk/LC_TIME/coreutils.mo
share/locale/ko/LC_MESSAGES/coreutils.mo share/locale/ko/LC_MESSAGES/coreutils.mo
@@ -288,6 +290,8 @@ share/locale/sr/LC_MESSAGES/coreutils.mo
share/locale/sr/LC_TIME/coreutils.mo share/locale/sr/LC_TIME/coreutils.mo
share/locale/sv/LC_MESSAGES/coreutils.mo share/locale/sv/LC_MESSAGES/coreutils.mo
share/locale/sv/LC_TIME/coreutils.mo share/locale/sv/LC_TIME/coreutils.mo
share/locale/ta/LC_MESSAGES/coreutils.mo
share/locale/ta/LC_TIME/coreutils.mo
share/locale/tr/LC_MESSAGES/coreutils.mo share/locale/tr/LC_MESSAGES/coreutils.mo
share/locale/tr/LC_TIME/coreutils.mo share/locale/tr/LC_TIME/coreutils.mo
share/locale/uk/LC_MESSAGES/coreutils.mo share/locale/uk/LC_MESSAGES/coreutils.mo
@@ -299,6 +303,7 @@ share/locale/zh_CN/LC_TIME/coreutils.mo
share/locale/zh_TW/LC_MESSAGES/coreutils.mo share/locale/zh_TW/LC_MESSAGES/coreutils.mo
share/locale/zh_TW/LC_TIME/coreutils.mo share/locale/zh_TW/LC_TIME/coreutils.mo
@dir libexec/coreutils @dir libexec/coreutils
@dir share/info
@dir share/locale/af/LC_MESSAGES @dir share/locale/af/LC_MESSAGES
@dir share/locale/af/LC_TIME @dir share/locale/af/LC_TIME
@dir share/locale/af @dir share/locale/af
@@ -365,6 +370,9 @@ share/locale/zh_TW/LC_TIME/coreutils.mo
@dir share/locale/ja/LC_MESSAGES @dir share/locale/ja/LC_MESSAGES
@dir share/locale/ja/LC_TIME @dir share/locale/ja/LC_TIME
@dir share/locale/ja @dir share/locale/ja
@dir share/locale/ka/LC_MESSAGES
@dir share/locale/ka/LC_TIME
@dir share/locale/ka
@dir share/locale/kk/LC_MESSAGES @dir share/locale/kk/LC_MESSAGES
@dir share/locale/kk/LC_TIME @dir share/locale/kk/LC_TIME
@dir share/locale/kk @dir share/locale/kk
@@ -413,6 +421,9 @@ share/locale/zh_TW/LC_TIME/coreutils.mo
@dir share/locale/sv/LC_MESSAGES @dir share/locale/sv/LC_MESSAGES
@dir share/locale/sv/LC_TIME @dir share/locale/sv/LC_TIME
@dir share/locale/sv @dir share/locale/sv
@dir share/locale/ta/LC_MESSAGES
@dir share/locale/ta/LC_TIME
@dir share/locale/ta
@dir share/locale/tr/LC_MESSAGES @dir share/locale/tr/LC_MESSAGES
@dir share/locale/tr/LC_TIME @dir share/locale/tr/LC_TIME
@dir share/locale/tr @dir share/locale/tr