diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-05-15 08:22:39 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2021-05-15 09:20:04 +0000 |
| commit | c0cb001a887d6d9bc82e45ec89ede03fc8b26872 (patch) | |
| tree | ea64b81681dcc6df5c8b8210e1928a36c21fc720 | |
| parent | ab83f2b4bb78a718efa5c43247ba1e1d207f99b6 (diff) | |
| download | ports-c0cb001a887d6d9bc82e45ec89ede03fc8b26872.tar.gz ports-c0cb001a887d6d9bc82e45ec89ede03fc8b26872.zip | |
sysutils/bacula*-server: Clean up some USES=readline:port cruft
| -rw-r--r-- | sysutils/bacula11-server/Makefile | 10 | ||||
| -rw-r--r-- | 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 <bsd.port.pre.mk> -.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 <bsd.port.pre.mk> -.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 |