freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysutils/bacula*-server: Clean up some USES=readline:port cruft

Browse Source
This commit is contained in:
Tobias Kortkamp
2021-05-15 10:22:39 +02:00
parent ab83f2b4bb
commit c0cb001a88
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysutils/bacula11-server/Makefile
View File

@@ -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

10
sysutils/bacula9-server/Makefile
View File

@@ -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