Index: head/sysutils/hexpeek/Makefile =================================================================== --- head/sysutils/hexpeek/Makefile (revision 549986) +++ head/sysutils/hexpeek/Makefile (revision 549987) @@ -1,33 +1,36 @@ # Created by: se@freebsd.org # $FreeBSD$ PORTNAME= hexpeek DISTVERSIONPREFIX= v DISTVERSION= 1.0.20200804 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://www.hexpeek.com/releases/${DISTNAME}/ MAINTAINER= se@freebsd.org COMMENT= Hex file editor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= libedit ncurses tar:bzip2 USE_CSTD= c99 CFLAGS+= -D_WITH_GETLINE -Isrc -L${LOCALBASE}/lib PLIST_FILES= bin/hexdiff \ bin/hexDump \ bin/hexpack \ bin/hexpeek \ bin/hexview \ share/man/man1/hexpeek.1.gz 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 Index: head/sysutils/hexpeek/files/patch-Makefile =================================================================== --- head/sysutils/hexpeek/files/patch-Makefile (revision 549986) +++ head/sysutils/hexpeek/files/patch-Makefile (revision 549987) @@ -1,20 +1,31 @@ --- 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. -SRCDIR := src -BINDIR := bin -EXEC := $(BINDIR)/hexpeek -CC ?= clang -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 Index: head/sysutils/hexpeek/files/patch-test_Makefile =================================================================== --- head/sysutils/hexpeek/files/patch-test_Makefile (revision 549986) +++ head/sysutils/hexpeek/files/patch-test_Makefile (revision 549987) @@ -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) Index: head/sysutils/hexpeek/files/patch-test_base_Makefile =================================================================== --- head/sysutils/hexpeek/files/patch-test_base_Makefile (nonexistent) +++ head/sysutils/hexpeek/files/patch-test_base_Makefile (revision 549987) @@ -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) + Property changes on: head/sysutils/hexpeek/files/patch-test_base_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property