diff --git a/dns/void-zones-tools/Makefile b/dns/void-zones-tools/Makefile index aa43a50a11b3..eec68d79df7e 100644 --- a/dns/void-zones-tools/Makefile +++ b/dns/void-zones-tools/Makefile @@ -1,33 +1,34 @@ PORTNAME= void-zones-tools DISTVERSIONPREFIX= v DISTVERSION= 1.0.2-18 DISTVERSIONSUFFIX= -g204634a +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= vidar@karlsen.tech COMMENT= Prepare a list of void zones that can be readily fed into Unbound WWW= https://github.com/cyclaero/void-zones-tools LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss USES= compiler:c11 USE_GITHUB= yes GH_ACCOUNT= cyclaero SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hosts2zones ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/etc/void-zones ${INSTALL_SCRIPT} ${WRKSRC}/void-zones-update.sh ${STAGEDIR}${PREFIX}/bin post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include diff --git a/dns/void-zones-tools/files/patch-Makefile b/dns/void-zones-tools/files/patch-Makefile index eff508c7c245..7d0d77e5c7ca 100644 --- a/dns/void-zones-tools/files/patch-Makefile +++ b/dns/void-zones-tools/files/patch-Makefile @@ -1,13 +1,22 @@ --- Makefile.orig 2023-08-28 22:28:23 UTC +++ Makefile -@@ -26,9 +26,7 @@ +@@ -26,15 +26,13 @@ CC ?= clang DV != $(CC) -dumpversion -.if $(MACHINE) == "i386" || $(MACHINE) == "amd64" || $(MACHINE) == "x86_64" -CFLAGS = $(CDEFS) -march=native -mssse3 -.elif $(MACHINE) == "arm" +-CFLAGS = $(CDEFS) -fsigned-char +.if $(MACHINE) == "arm" - CFLAGS = $(CDEFS) -fsigned-char ++CFLAGS += $(CDEFS) -fsigned-char .else - CFLAGS = $(CDEFS) +-CFLAGS = $(CDEFS) ++CFLAGS += $(CDEFS) + .endif + +-CFLAGS += -std=gnu11 -g0 -O3 -fno-pic -fvisibility=hidden -fstrict-aliasing -fno-common -fstack-protector -Wno-parentheses ++CFLAGS += -std=gnu11 -g0 -O3 -fvisibility=hidden -fstrict-aliasing -fno-common -fstack-protector -Wno-parentheses + + # Clang only flags come here + .if $(DV) == "4.2.1"