On Sat, May 15, 2021 at 10:44:50AM -0600, Todd C. Miller wrote:
> >From https://github.com/OLSR/olsrd/pull/87
>
> I bumped both revisions just to be on the safe side. OK?
>
Sure, OK. Thank you for taking care of it.
> - todd
>
> Index: net/olsrd/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/olsrd/Makefile,v
> retrieving revision 1.34
> diff -u -p -u -r1.34 Makefile
> --- net/olsrd/Makefile 12 Jul 2019 20:48:35 -0000 1.34
> +++ net/olsrd/Makefile 10 May 2021 21:47:48 -0000
> @@ -8,8 +8,8 @@ DISTNAME= olsrd-${VERSION}
> PKGNAME-main= olsrd-${VERSION}
> PKGNAME-gui= olsrd-gui-${VERSION}
>
> -REVISION-main= 2
> -REVISION-gui= 1
> +REVISION-main= 3
> +REVISION-gui= 2
>
> CATEGORIES= net
>
> Index: net/olsrd/patches/patch-src_cfgparser_local_mk
> ===================================================================
> RCS file: /cvs/ports/net/olsrd/patches/patch-src_cfgparser_local_mk,v
> retrieving revision 1.3
> diff -u -p -u -r1.3 patch-src_cfgparser_local_mk
> --- net/olsrd/patches/patch-src_cfgparser_local_mk 4 Jun 2017 11:45:04
> -0000 1.3
> +++ net/olsrd/patches/patch-src_cfgparser_local_mk 10 May 2021 21:39:24
> -0000
> @@ -2,11 +2,22 @@ $OpenBSD: patch-src_cfgparser_local_mk,v
> Index: src/cfgparser/local.mk
> --- src/cfgparser/local.mk.orig
> +++ src/cfgparser/local.mk
> -@@ -83,5 +83,7 @@ endif
> +@@ -74,14 +74,12 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefi
> + ifeq ($(VERBOSE),0)
> + @echo "[BISON] $@"
> + endif
> +- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
> +- $(MAKECMDPREFIX)sed -e 's/register //' \
> +- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
> +- < "$@-tmp" >"$@"
> +- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
> +- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
> ++ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<"
> ++ $(MAKECMDPREFIX)sed 's/register //' "$@" > "$@.o" && mv "$@.o" "$@"
>
> $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS))
> -
> -+$(C)cfgfile_gen.o: CFLAGS += -fPIC
> +
> ++$(C)cfgfile_gen.o: CFLAGS += -fPIC
> +
> # and a few files to be cleaned
> TMPFILES += $(foreach pat,oscan.c oparse.c oparse.h,$(C)$(pat)
> $(C)$(pat)-tmp)
>
>
