Date: Fri, 22 Oct 2021 03:40:20 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f4a00bca97d0 - main - mail/gnarwl: unbreak the build on 13/14, do not depend on GNU sed. Message-ID: <202110220340.19M3eKUe026867@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4a00bca97d0cc3007ebdb4b8e5fda886c239a25 commit f4a00bca97d0cc3007ebdb4b8e5fda886c239a25 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-10-22 03:39:22 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-10-22 03:39:23 +0000 mail/gnarwl: unbreak the build on 13/14, do not depend on GNU sed. --- mail/gnarwl/Makefile | 4 +--- mail/gnarwl/files/patch-Makefile.in | 4 ++-- mail/gnarwl/files/patch-data-Makefile | 4 ++-- mail/gnarwl/files/patch-doc-Makefile | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index a9904cbe5bf0..9c92c8b2a379 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -9,11 +9,9 @@ MASTER_SITES= http://www.onyxbits.de/sites/default/files/download/15/ MAINTAINER= ports@FreeBSD.org COMMENT= Email autoresponder that gets data from LDAP -BROKEN_FreeBSD_13= ld: error: duplicate symbol: mail_status -BROKEN_FreeBSD_14= ld: error: duplicate symbol: mail_status +LICENSE= GPLv2 LIB_DEPENDS= libgdbm.so:databases/gdbm -BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:textproc/gsed USES= iconv gmake groff tar:tgz USE_OPENLDAP= yes diff --git a/mail/gnarwl/files/patch-Makefile.in b/mail/gnarwl/files/patch-Makefile.in index 4e0f27d88cb8..4d8d90255446 100644 --- a/mail/gnarwl/files/patch-Makefile.in +++ b/mail/gnarwl/files/patch-Makefile.in @@ -5,7 +5,7 @@ SBIN=damnit MAN_SEC=8 -VER=$(shell basename `pwd` | sed s\\$(BIN)-\\\\) -+VER=$(shell basename `pwd` | gsed s\\$(BIN)-\\\\) ++VER=$(shell basename `pwd` | sed s,$(BIN)-,,) ## # Path settings (no trailing slashes!) @@ -15,7 +15,7 @@ CC=@CC@ -CFLAGS=-DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I.. -LFLAGS=-lldap -lgdbm -ldl -lresolv -+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -Wall -I.. @CPPFLAGS@ ++CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -fcommon -Wall -I.. @CPPFLAGS@ +LFLAGS=@LDFLAGS@ @LIBS@ ## diff --git a/mail/gnarwl/files/patch-data-Makefile b/mail/gnarwl/files/patch-data-Makefile index f6fa5497cadb..3ed8fa16d00a 100644 --- a/mail/gnarwl/files/patch-data-Makefile +++ b/mail/gnarwl/files/patch-data-Makefile @@ -13,11 +13,11 @@ config: - @sed "s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_VER_\\$(VER)\\g ; s\\_MAN_SEC_\\$(MAN_SEC)\\g" < config.tmpl > gnarwl.cfg -+ @gsed "s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_VER_\\$(VER)\\g ; s\\_MAN_SEC_\\$(MAN_SEC)\\g" < config.tmpl > gnarwl.cfg.sample ++ @sed "s,_HOMEDIR_,$(HOMEDIR),g ; s,_VER_,$(VER),g ; s,_MAN_SEC_,$(MAN_SEC),g" < config.tmpl > gnarwl.cfg.sample spec: - @sed "s\\_BIN_\\$(BIN)\\g ; s\\_VER_\\$(VER)\\g; s\\_SBIN_\\$(SBIN)\\g; s\\_SEC_\\$(MAN_SEC)\\g" < spec.tmpl > $(BIN)-$(VER).spec -+ @gsed "s\\_BIN_\\$(BIN)\\g ; s\\_VER_\\$(VER)\\g; s\\_SBIN_\\$(SBIN)\\g; s\\_SEC_\\$(MAN_SEC)\\g" < spec.tmpl > $(BIN)-$(VER).spec ++ @sed "s,_BIN_,$(BIN),g ; s,_VER_,$(VER),g; s,_SBIN_,$(SBIN),g; s,_SEC_,$(MAN_SEC),g" < spec.tmpl > $(BIN)-$(VER).spec install: - mkdir -m 755 -p $(HOMEDIR)/block $(HOMEDIR)/bin $(CONFDIR) diff --git a/mail/gnarwl/files/patch-doc-Makefile b/mail/gnarwl/files/patch-doc-Makefile index 55c14989315e..7f272e8a1a79 100644 --- a/mail/gnarwl/files/patch-doc-Makefile +++ b/mail/gnarwl/files/patch-doc-Makefile @@ -14,8 +14,8 @@ @echo Generating manpage... - @sed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC) - @sed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC) -+ @gsed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC) -+ @gsed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC) ++ @sed "s,_CONFDIR_,$(CONFDIR),g ; s,_HOMEDIR_,$(HOMEDIR),g ; s,_MANSEC_,$(MAN_SEC),g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC) ++ @sed "s,_CONFDIR_,$(CONFDIR),g ; s,_HOMEDIR_,$(HOMEDIR),g ; s,_MANSEC_,$(MAN_SEC),g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC) install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110220340.19M3eKUe026867>