Date: Mon, 1 Feb 2016 09:48:34 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407691 - in head/security/xinetd: . files Message-ID: <201602010948.u119mYsw022425@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Feb 1 09:48:34 2016 New Revision: 407691 URL: https://svnweb.freebsd.org/changeset/ports/407691 Log: Add a new option to conditionalize xconv installation 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) Modified: head/security/xinetd/Makefile head/security/xinetd/files/patch-Makefile.in head/security/xinetd/files/patch-xinetd__builtins.c head/security/xinetd/files/patch-xinetd__xconfig.h head/security/xinetd/pkg-plist Modified: head/security/xinetd/Makefile ============================================================================== --- head/security/xinetd/Makefile Mon Feb 1 08:44:12 2016 (r407690) +++ head/security/xinetd/Makefile Mon Feb 1 09:48:34 2016 (r407691) @@ -14,16 +14,20 @@ GNU_CONFIGURE= yes USE_RC_SUBR= xinetd ALL_TARGET= build CONFIGURE_ARGS+= --with-loadavg +OPTIONS_SUB= yes -USES= cpe shebangfix perl5 -USE_PERL5= run +USES= cpe shebangfix SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl -OPTIONS_DEFINE= IPV6 LIBWRAP -OPTIONS_DEFAULT= LIBWRAP +OPTIONS_DEFINE= IPV6 LIBWRAP XCONV +OPTIONS_DEFAULT= LIBWRAP XCONV + +XCONV_DESC= Install xconv utility (requires perl) IPV6_CONFIGURE_WITH= ipv6 LIBWRAP_CONFIGURE_WITH= libwrap +XCONV_USES= perl5 +XCONV_USE= PERL5=run post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h Modified: head/security/xinetd/files/patch-Makefile.in ============================================================================== --- head/security/xinetd/files/patch-Makefile.in Mon Feb 1 08:44:12 2016 (r407690) +++ head/security/xinetd/files/patch-Makefile.in Mon Feb 1 09:48:34 2016 (r407691) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed Jul 31 19:03:43 2002 -+++ Makefile.in Mon Aug 19 11:49:58 2002 -@@ -76,16 +76,14 @@ +--- Makefile.in.orig 2007-09-20 17:01:52 UTC ++++ Makefile.in +@@ -77,16 +77,14 @@ install: build for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ test -d $$i || mkdir -p $$i ; done $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR) Modified: head/security/xinetd/files/patch-xinetd__builtins.c ============================================================================== --- head/security/xinetd/files/patch-xinetd__builtins.c Mon Feb 1 08:44:12 2016 (r407690) +++ head/security/xinetd/files/patch-xinetd__builtins.c Mon Feb 1 09:48:34 2016 (r407691) @@ -1,6 +1,6 @@ ---- xinetd/builtins.c.orig 2013-10-03 16:04:32.562080623 +0400 -+++ xinetd/builtins.c 2013-10-03 16:04:57.297350342 +0400 -@@ -617,7 +617,7 @@ +--- xinetd/builtins.c.orig 2012-05-09 15:40:29 UTC ++++ xinetd/builtins.c +@@ -617,7 +617,7 @@ static void tcpmux_handler( const struct if( SC_IS_INTERNAL( scp ) ) { SC_INTERNAL(scp, nserp); } else { Modified: head/security/xinetd/files/patch-xinetd__xconfig.h ============================================================================== --- head/security/xinetd/files/patch-xinetd__xconfig.h Mon Feb 1 08:44:12 2016 (r407690) +++ head/security/xinetd/files/patch-xinetd__xconfig.h Mon Feb 1 09:48:34 2016 (r407691) @@ -1,5 +1,5 @@ ---- xinetd/xconfig.h.orig Sun Sep 15 19:23:41 2002 -+++ xinetd/xconfig.h Sun Sep 15 19:23:55 2002 +--- xinetd/xconfig.h.orig 2003-02-19 17:29:28 UTC ++++ xinetd/xconfig.h @@ -29,7 +29,7 @@ #endif Modified: head/security/xinetd/pkg-plist ============================================================================== --- head/security/xinetd/pkg-plist Mon Feb 1 08:44:12 2016 (r407690) +++ head/security/xinetd/pkg-plist Mon Feb 1 09:48:34 2016 (r407691) @@ -1,4 +1,4 @@ -bin/xconv +%%XCONV%%bin/xconv sbin/xinetd man/man5/xinetd.conf.5.gz man/man8/xconv.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602010948.u119mYsw022425>