sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a new option to conditionalize xconv installation

Browse source 
xconv is the only piece of xinetd written in perl, removing it from package
also removes perl dependency.

Add a new option, on by default to don't change current behavior, to select
to install or not xconv.

While here, re-generate patches using `make makepatch` to silence portlint

PR:		205661
Approved by:	maintainer timeout (> 30 days)
Obtained from:	pfSense
Sponsored by:	Rubicon Communications (Netgate)
This commit is contained in:
Renato Botelho 2016-02-01 09:48:34 +00:00
parent 26b6d315da
commit 9d2e434521
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=407691
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
security/xinetd/Makefile
View file

@ -14,16 +14,20 @@ GNU_CONFIGURE= yes
USE_RC_SUBR= xinetd USE_RC_SUBR= xinetd
ALL_TARGET= build ALL_TARGET= build
CONFIGURE_ARGS+= --with-loadavg CONFIGURE_ARGS+= --with-loadavg
OPTIONS_SUB= yes
USES= cpe shebangfix perl5 USES= cpe shebangfix
USE_PERL5= run
SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl
OPTIONS_DEFINE= IPV6 LIBWRAP OPTIONS_DEFINE= IPV6 LIBWRAP XCONV
OPTIONS_DEFAULT= LIBWRAP OPTIONS_DEFAULT= LIBWRAP XCONV
XCONV_DESC= Install xconv utility (requires perl)
IPV6_CONFIGURE_WITH= ipv6 IPV6_CONFIGURE_WITH= ipv6
LIBWRAP_CONFIGURE_WITH= libwrap LIBWRAP_CONFIGURE_WITH= libwrap
XCONV_USES= perl5
XCONV_USE= PERL5=run
post-patch: post-patch:
@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h

6
security/xinetd/files/patch-Makefile.in
View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Wed Jul 31 19:03:43 2002 --- Makefile.in.orig 2007-09-20 17:01:52 UTC
+++ Makefile.in Mon Aug 19 11:49:58 2002 +++ Makefile.in
@@ -76,16 +76,14 @@ @@ -77,16 +77,14 @@ install: build
for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
test -d $$i || mkdir -p $$i ; done test -d $$i || mkdir -p $$i ; done
$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR) $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)

6
security/xinetd/files/patch-xinetd__builtins.c
View file

@ -1,6 +1,6 @@
--- xinetd/builtins.c.orig 2013-10-03 16:04:32.562080623 +0400 --- xinetd/builtins.c.orig 2012-05-09 15:40:29 UTC
+++ xinetd/builtins.c 2013-10-03 16:04:57.297350342 +0400 +++ xinetd/builtins.c
@@ -617,7 +617,7 @@ @@ -617,7 +617,7 @@ static void tcpmux_handler( const struct
if( SC_IS_INTERNAL( scp ) ) { if( SC_IS_INTERNAL( scp ) ) {
SC_INTERNAL(scp, nserp); SC_INTERNAL(scp, nserp);
} else { } else {

4
security/xinetd/files/patch-xinetd__xconfig.h
View file

@ -1,5 +1,5 @@
--- xinetd/xconfig.h.orig Sun Sep 15 19:23:41 2002 --- xinetd/xconfig.h.orig 2003-02-19 17:29:28 UTC
+++ xinetd/xconfig.h Sun Sep 15 19:23:55 2002 +++ xinetd/xconfig.h
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
#endif #endif

2
security/xinetd/pkg-plist
View file

@ -1,4 +1,4 @@
bin/xconv %%XCONV%%bin/xconv
sbin/xinetd sbin/xinetd
man/man5/xinetd.conf.5.gz man/man5/xinetd.conf.5.gz
man/man8/xconv.8.gz man/man8/xconv.8.gz