Index: head/devel/got/Makefile =================================================================== --- head/devel/got/Makefile (revision 557990) +++ head/devel/got/Makefile (revision 557991) @@ -1,32 +1,31 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.44 -PORTREVISION= 1 +PORTVERSION= 0.45 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix n= ${.newline} post-extract: @${FIND} ${WRKSRC} -name '*.[cy]' -exec \ ${REINPLACE_CMD} '1,/^#include "/{ \ /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \ {} + ${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC} # The regression test suite requires: # installed got # installed git # ssh to 127.0.0.1 run-test: @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) .include Index: head/devel/got/distinfo =================================================================== --- head/devel/got/distinfo (revision 557990) +++ head/devel/got/distinfo (revision 557991) @@ -1,3 +1,3 @@ -TIMESTAMP = 1605047903 -SHA256 (got-0.44.tar.gz) = eff4956c07ee0eaa62652cf57db8145782703d8799e383f4bd5576a969cc7526 -SIZE (got-0.44.tar.gz) = 447925 +TIMESTAMP = 1607870946 +SHA256 (got-0.45.tar.gz) = 48f97532b8640dcfae37fee7da86e4bb8e56d149c8d1b9d3b54dddebbe894c56 +SIZE (got-0.45.tar.gz) = 479367 Index: head/devel/got/files/patch-tog_tog.c =================================================================== --- head/devel/got/files/patch-tog_tog.c (revision 557990) +++ head/devel/got/files/patch-tog_tog.c (nonexistent) @@ -1,48 +0,0 @@ ------------------------------------------------ -commit 276b94a1f9ff915aab767e558957527ccddf43e9 (main) -from: Christian Weisgerber -date: Fri Nov 13 21:09:10 2020 UTC - - Call pthread_cond_destroy(cond) exactly once when closing a view. - - This moves the pthread_cond_destroy(need_commits) from stop_log_thread(), - which can be called twice, to close_log_view(), which is called - once. It also destroys the commit_loaded condition variable, which - is created in open_log_view() but was never destroyed. - - ok stsp - -blob - 3895e44e1cc2bd3dcc96dbcbd7369ecad839c9b0 -blob + 200352838ae37181b0bce33796fd9bfa11c66d34 ---- tog/tog.c.orig 2020-11-13 21:13:34 UTC -+++ tog/tog.c -@@ -2035,10 +2035,6 @@ stop_log_thread(struct tog_log_view_state *s) - s->thread = NULL; - } - -- errcode = pthread_cond_destroy(&s->thread_args.need_commits); -- if (errcode && err == NULL) -- err = got_error_set_errno(errcode, "pthread_cond_destroy"); -- - if (s->thread_args.repo) { - got_repo_close(s->thread_args.repo); - s->thread_args.repo = NULL; -@@ -2057,8 +2053,18 @@ close_log_view(struct tog_view *view) - { - const struct got_error *err = NULL; - struct tog_log_view_state *s = &view->state.log; -+ int errcode; - - err = stop_log_thread(s); -+ -+ errcode = pthread_cond_destroy(&s->thread_args.need_commits); -+ if (errcode && err == NULL) -+ err = got_error_set_errno(errcode, "pthread_cond_destroy"); -+ -+ errcode = pthread_cond_destroy(&s->thread_args.commit_loaded); -+ if (errcode && err == NULL) -+ err = got_error_set_errno(errcode, "pthread_cond_destroy"); -+ - free_commits(&s->commits); - free(s->in_repo_path); - s->in_repo_path = NULL; Property changes on: head/devel/got/files/patch-tog_tog.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-Makefile.inc =================================================================== --- head/devel/got/files/patch-Makefile.inc (revision 557990) +++ head/devel/got/files/patch-Makefile.inc (revision 557991) @@ -1,16 +1,16 @@ ---- Makefile.inc.orig 2020-07-25 09:10:27 UTC +--- Makefile.inc.orig 2020-11-26 12:53:05 UTC +++ Makefile.inc -@@ -3,6 +3,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI - #CFLAGS += -DGOT_NO_OBJ_CACHE +@@ -4,6 +4,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI #CFLAGS += -DGOT_OBJ_CACHE_DEBUG + #CFLAGS += -DGOT_DIFF_NO_MMAP +OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat +CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT} +CFLAGS += -Wno-pointer-sign + +LDFLAGS += -L${OPENBSD_COMPAT} +LDADD += -lopenbsd-compat -lmd + .if "${GOT_RELEASE}" == "Yes" PREFIX ?= /usr/local BINDIR ?= ${PREFIX}/bin Index: head/devel/got/files/patch-got_Makefile =================================================================== --- head/devel/got/files/patch-got_Makefile (revision 557990) +++ head/devel/got/files/patch-got_Makefile (revision 557991) @@ -1,13 +1,13 @@ ---- got/Makefile.orig 2020-09-14 14:04:47 UTC +--- got/Makefile.orig 2020-11-10 22:54:37 UTC +++ got/Makefile -@@ -25,10 +25,6 @@ DPADD = ${LIBZ} ${LIBUTIL} +@@ -29,10 +29,6 @@ DPADD = ${LIBZ} ${LIBUTIL} NOMAN = Yes .endif -realinstall: - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \ - -m ${BINMODE} ${PROG} ${BINDIR}/${PROG} - dist: mkdir ../got-${GOT_VERSION}/got cp ${SRCS} ${MAN} ../got-${GOT_VERSION}/got Index: head/devel/got/files/patch-regress_cmdline_histedit.sh =================================================================== --- head/devel/got/files/patch-regress_cmdline_histedit.sh (nonexistent) +++ head/devel/got/files/patch-regress_cmdline_histedit.sh (revision 557991) @@ -0,0 +1,20 @@ +--- regress/cmdline/histedit.sh.orig 2020-12-13 15:08:45 UTC ++++ regress/cmdline/histedit.sh +@@ -1468,7 +1468,7 @@ test_histedit_fold_only() { + + cat > $testroot/editor.sh < $testroot/editor.sh <