From owner-svn-ports-head@freebsd.org Fri Sep 25 06:39:24 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6BB23EC95C; Fri, 25 Sep 2020 06:39:24 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ByMhX5lSyz4jDj; Fri, 25 Sep 2020 06:39:24 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4793F189; Fri, 25 Sep 2020 06:39:24 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08P6dOV8059291; Fri, 25 Sep 2020 06:39:24 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08P6dNuh059287; Fri, 25 Sep 2020 06:39:23 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009250639.08P6dNuh059287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Fri, 25 Sep 2020 06:39:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549987 - in head/sysutils/hexpeek: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/sysutils/hexpeek: . files X-SVN-Commit-Revision: 549987 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 06:39:25 -0000 Author: se Date: Fri Sep 25 06:39:23 2020 New Revision: 549987 URL: https://svnweb.freebsd.org/changeset/ports/549987 Log: Fix build on powerpc64 While her let "make test" execute the port's test Reported by: linimon Added: head/sysutils/hexpeek/files/patch-test_base_Makefile (contents, props changed) Modified: head/sysutils/hexpeek/Makefile head/sysutils/hexpeek/files/patch-Makefile head/sysutils/hexpeek/files/patch-test_Makefile Modified: head/sysutils/hexpeek/Makefile ============================================================================== --- head/sysutils/hexpeek/Makefile Fri Sep 25 06:35:27 2020 (r549986) +++ head/sysutils/hexpeek/Makefile Fri Sep 25 06:39:23 2020 (r549987) @@ -4,7 +4,7 @@ PORTNAME= hexpeek DISTVERSIONPREFIX= v DISTVERSION= 1.0.20200804 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://www.hexpeek.com/releases/${DISTNAME}/ @@ -29,5 +29,8 @@ PLIST_FILES= bin/hexdiff \ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/etc/hexpeek.1 ${STAGEDIR}${MANPREFIX}/share/man/man1 + +do-test: + ${MAKE} -C ${WRKSRC}/test test .include Modified: head/sysutils/hexpeek/files/patch-Makefile ============================================================================== --- head/sysutils/hexpeek/files/patch-Makefile Fri Sep 25 06:35:27 2020 (r549986) +++ head/sysutils/hexpeek/files/patch-Makefile Fri Sep 25 06:39:23 2020 (r549987) @@ -1,6 +1,6 @@ --- Makefile.orig 2020-08-04 05:58:52 UTC +++ Makefile -@@ -26,13 +26,10 @@ +@@ -26,15 +26,15 @@ # Note that libedit is optional. To build hexpeek without it, remove # -DHEXPEEK_EDITABLE_CONSOLE and -ledit. @@ -11,10 +11,21 @@ -CFLAGS := -I$(SRCDIR) -O3 -Wall -fPIC -DFLAGS := -DHEXPEEK_EDITABLE_CONSOLE -LIBS := -ledit #-ltermcap -+SRCDIR = src -+BINDIR = bin -+EXEC = $(BINDIR)/hexpeek -+LIBS = -ledit ++SRCDIR = src ++BINDIR = bin ++EXEC = $(BINDIR)/hexpeek ++LIBS = -ledit ++DFLAGS = -DHEXPEEK_EDITABLE_CONSOLE all: $(EXEC) ++ ++test: test/simplediff make -C test + + clear: +@@ -44,4 +44,4 @@ clear: + $(EXEC): $(SRCDIR)/*.c $(SRCDIR)/*.h + mkdir -p $(BINDIR) + $(CC) $(CFLAGS) $(DFLAGS) -o $(EXEC) $(SRCDIR)/*.c $(LIBS) +- cd $(BINDIR) ; ln -f -s hexpeek hexview ; ln -f -s hexpeek hexDump ; ln -f -s hexpeek hexpack ; ln -f -s hexpeek hexdiff ; cd .. ++ cd $(BINDIR) ; ln -f -s hexpeek hexview ; ln -f -s hexpeek hexDump ; ln -f -s hexpeek hexpack ; ln -f -s hexpeek hexdiff Modified: head/sysutils/hexpeek/files/patch-test_Makefile ============================================================================== --- head/sysutils/hexpeek/files/patch-test_Makefile Fri Sep 25 06:35:27 2020 (r549986) +++ head/sysutils/hexpeek/files/patch-test_Makefile Fri Sep 25 06:39:23 2020 (r549987) @@ -1,22 +1,17 @@ --- test/Makefile.orig 2020-08-04 05:58:52 UTC +++ test/Makefile -@@ -24,11 +24,7 @@ - # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --SRCDIR := . --BINDIR := . --EXEC := $(BINDIR)/simplediff --CC ?= clang +@@ -28,10 +28,13 @@ SRCDIR := . + BINDIR := . + EXEC := $(BINDIR)/simplediff + CC ?= clang -CFLAGS := -O3 -Wall #-fPIC -+EXEC = simplediff ++CFLAGS ?= -O3 -Wall #-fPIC all: $(EXEC) make -C base -@@ -37,5 +33,4 @@ clear: - rm -f $(EXEC) - make -C base clear ++ ++test: all ++ sh run --$(BINDIR)/simplediff: $(SRCDIR)/simplediff.c -- $(CC) $(CFLAGS) -o $@ $(SRCDIR)/simplediff.c -+$(EXEC): simplediff.c + clear: + rm -f $(EXEC) Added: head/sysutils/hexpeek/files/patch-test_base_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/hexpeek/files/patch-test_base_Makefile Fri Sep 25 06:39:23 2020 (r549987) @@ -0,0 +1,11 @@ +--- test/base/Makefile.orig 2020-08-04 05:58:52 UTC ++++ test/base/Makefile +@@ -28,7 +28,7 @@ SRCDIR := src + BINDIR := bin + EXEC := $(BINDIR)/server $(BINDIR)/client + CC ?= clang +-CFLAGS := -O3 -Wall #-fPIC ++CFLAGS ?= -O3 -Wall #-fPIC + + all: $(EXEC) +