diff --git a/devel/dwz/Makefile b/devel/dwz/Makefile index f4ed7cbd9fdb..769edb5229e1 100644 --- a/devel/dwz/Makefile +++ b/devel/dwz/Makefile @@ -1,17 +1,18 @@ PORTNAME= dwz DISTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://sourceware.org/ftp/dwz/releases/ MAINTAINER= bcallah@openbsd.org COMMENT= DWARF optimization and duplicate removal tool WWW= https://sourceware.org/dwz/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING3 ALL_TARGET= dwz WRKSRC= ${WRKDIR}/${PORTNAME} .include diff --git a/devel/dwz/files/patch-Makefile b/devel/dwz/files/patch-Makefile index acc0314ce073..35cc3a75f3ef 100644 --- a/devel/dwz/files/patch-Makefile +++ b/devel/dwz/files/patch-Makefile @@ -1,38 +1,38 @@ --- Makefile.orig 2021-03-08 07:56:18 UTC +++ Makefile @@ -1,23 +1,20 @@ -ifneq ($(srcdir),) -VPATH = $(srcdir) -else -srcdir=$(shell pwd) -endif -CFLAGS = -O2 -g -DWZ_VERSION := $(shell cat $(srcdir)/VERSION) -override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \ - -DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS) -prefix = /usr +srcdir = . +CFLAGS ?= -O2 -g +DWZ_VERSION != cat $(srcdir)/VERSION +CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"' +CYEARS != cat $(srcdir)/COPYRIGHT_YEARS +CFLAGS += $(CYEARS) +prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin datarootdir = $(prefix)/share -mandir = $(datarootdir)/man -OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o -+mandir = $(prefix)/man ++mandir = $(prefix)/share/man +OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o dwz: $(OBJECTS) - $(CC) $(LDFLAGS) -o $@ $^ -lelf + $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf install: dwz - install -D dwz $(DESTDIR)$(bindir)/dwz - install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1 + install dwz $(DESTDIR)$(bindir)/dwz + install -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1 clean: rm -f $(OBJECTS) *~ core* dwz $(TEST_EXECS) $(DWZ_TEST_SOURCES) \ dwz.log dwz.sum diff --git a/devel/dwz/pkg-plist b/devel/dwz/pkg-plist index e44c825df684..1568aa52b65f 100644 --- a/devel/dwz/pkg-plist +++ b/devel/dwz/pkg-plist @@ -1,2 +1,2 @@ bin/dwz -man/man1/dwz.1.gz +share/man/man1/dwz.1.gz