From owner-dev-commits-ports-all@freebsd.org Sat May 15 09:20:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ABA7863FD3D; Sat, 15 May 2021 09:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fj0HX4YRxz3P6B; Sat, 15 May 2021 09:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 852EF22EB0; Sat, 15 May 2021 09:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14F9KeTj070979; Sat, 15 May 2021 09:20:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14F9KeUf070978; Sat, 15 May 2021 09:20:40 GMT (envelope-from git) Date: Sat, 15 May 2021 09:20:40 GMT Message-Id: <202105150920.14F9KeUf070978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: c0cb001a887d - main - sysutils/bacula*-server: Clean up some USES=readline:port cruft MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0cb001a887d6d9bc82e45ec89ede03fc8b26872 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2021 09:20:40 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0cb001a887d6d9bc82e45ec89ede03fc8b26872 commit c0cb001a887d6d9bc82e45ec89ede03fc8b26872 Author: Tobias Kortkamp AuthorDate: 2021-05-15 08:22:39 +0000 Commit: Tobias Kortkamp CommitDate: 2021-05-15 09:20:04 +0000 sysutils/bacula*-server: Clean up some USES=readline:port cruft --- sysutils/bacula11-server/Makefile | 10 ++-------- sysutils/bacula9-server/Makefile | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 72a6d4f9c5e7..78fe542d8c12 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -29,7 +29,7 @@ PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= MTX NLS IPV6 @@ -127,18 +127,12 @@ MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include -.if ${readline_ARGS} == "port" -readline_CONFIGURE= ${LOCALBASE} -.else -readline_CONFIGURE= yes -.endif - # if IPv6 is not in the kernel, it generates many errors .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif -CONFIGURE_ARGS+= --with-readline=${readline_CONFIGURE} +CONFIGURE_ARGS+= --with-readline=${LOCALBASE} .if defined(WITH_CLIENT_ONLY) MP8+= bacula.8 bacula-fd.8 bconsole.8 diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index 320e138dd540..638c31ad864d 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -29,7 +29,7 @@ PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= MTX NLS IPV6 @@ -127,18 +127,12 @@ MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include -.if ${readline_ARGS} == "port" -readline_CONFIGURE= ${LOCALBASE} -.else -readline_CONFIGURE= yes -.endif - # if IPv6 is not in the kernel, it generates many errors .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif -CONFIGURE_ARGS+= --with-readline=${readline_CONFIGURE} +CONFIGURE_ARGS+= --with-readline=${LOCALBASE} .if defined(WITH_CLIENT_ONLY) MP8+= bacula.8 bacula-fd.8 bconsole.8