From owner-svn-ports-all@FreeBSD.ORG Sat Apr 26 02:23:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EBB2827; Sat, 26 Apr 2014 02:23:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AE281569; Sat, 26 Apr 2014 02:23:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q2NBuq078102; Sat, 26 Apr 2014 02:23:11 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3Q2NATP078097; Sat, 26 Apr 2014 02:23:10 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201404260223.s3Q2NATP078097@svn.freebsd.org> From: Martin Wilke Date: Sat, 26 Apr 2014 02:23:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352207 - in head/irc/ngircd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 02:23:11 -0000 Author: miwi Date: Sat Apr 26 02:23:10 2014 New Revision: 352207 URL: http://svnweb.freebsd.org/changeset/ports/352207 QAT: https://qat.redports.org/buildarchive/r352207/ Log: - Update to 21.1 - Convert to USES - Convert to new OPTIONS helper PR: 187967 Submitted by: ports fury Deleted: head/irc/ngircd/files/patch-doc-Makefile.in head/irc/ngircd/files/patch-man::Makefile.in head/irc/ngircd/files/patch-src::ngircd_Makefile.in Modified: head/irc/ngircd/Makefile head/irc/ngircd/distinfo head/irc/ngircd/pkg-descr head/irc/ngircd/pkg-plist Modified: head/irc/ngircd/Makefile ============================================================================== --- head/irc/ngircd/Makefile Sat Apr 26 02:21:10 2014 (r352206) +++ head/irc/ngircd/Makefile Sat Apr 26 02:23:10 2014 (r352207) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= ngircd -PORTVERSION= 21 +PORTVERSION= 21.1 PORTEPOCH= 1 CATEGORIES= irc ipv6 -MASTER_SITES= ftp://ftp.berlios.de/pub/%SUBDIR%/ \ - http://arthur.barton.de/pub/%SUBDIR%/ +MASTER_SITES= http://arthur.barton.de/pub/%SUBDIR%/ \ + http://ngircd.mirror.3rz.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org @@ -14,69 +14,50 @@ COMMENT= Free open source daemon for Int LICENSE= GPLv2 -USE_RC_SUBR= ngircd +USES= tar:xz GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-silent-rules # --docdir=${WRKDIR}/tmproot +USE_RC_SUBR= ngircd + CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= DOCS TCP_WRAPPERS SYSLOG ZLIB IPV6 OPENSSL GNUTLS IRCPLUS IDENT SNIFFER DEBUG -OPTIONS_DEFAULT=TCP_WRAPPERS SYSLOG ZLIB IPV6 IRCPLUS -NO_OPTIONS_SORT=yes -TCP_WRAPPERS_DESC= Enable TCP wrappers support -SYSLOG_DESC= Enable syslog() support -ZLIB_DESC= Enable ZLIB compression -IRCPLUS_DESC= Enable IRC+ protocol -IDENT_DESC= Enable IDENT (AUTH) protocol support -SNIFFER_DESC= Enable IRC traffic sniffer -DEBUG_DESC= Show additional debug output - -.include - -.if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCP_WRAPPERS) -CONFIGURE_ARGS+= --with-tcp-wrappers -.endif - -.if empty(PORT_OPTIONS:MSYSLOG) -CONFIGURE_ARGS+= --without-syslog -.endif - -.if empty(PORT_OPTIONS:MZLIB) -CONFIGURE_ARGS+= --without-zlib -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+= --with-openssl -USE_OPENSSL=yes -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -CONFIGURE_ARGS+= --with-gnutls -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -.endif - -.if empty(PORT_OPTIONS:MIRCPLUS) -CONFIGURE_ARGS+= --disable-ircplus -.endif - -.if ${PORT_OPTIONS:MIDENT} -LIB_DEPENDS+= ident:${PORTSDIR}/security/libident -CONFIGURE_ARGS+= --with-ident -.endif - -.if ${PORT_OPTIONS:MSNIFFER} -CONFIGURE_ARGS+= --enable-sniffer -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif - -.if ! ${PORT_OPTIONS:MDOCS} -MAKE_ARGS+= NOPORTDOCS=yes -.endif +PORTDOCS= * +PLIST_FILES= etc/ngircd.conf.sample \ + man/man5/ngircd.conf.5.gz \ + man/man8/ngircd.8.gz \ + sbin/ngircd + +OPTIONS_DEFINE= DEBUG DOCS ICONV IDENT IPV6 IRCPLUS LIBWRAP \ + SNIFFER SYSLOG ZLIB +OPTIONS_RADIO= TLS +OPTIONS_RADIO_TLS= GNUTLS OPENSSL +OPTIONS_DEFAULT= ICONV IRCPLUS LIBWRAP OPENSSL SYSLOG ZLIB + +DEBUG_CONFIGURE_EBABLE= debug +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls +ICONV_USES= iconv +ICONV_CONFIGURE_WITH= iconv +IDENT_DESC= IDENT (AUTH) protocol support +IDENT_LIB_DEPENDS= libident.so:${PORTSDIR}/security/libident +INDENT_CONFIGURE_WITH= dent +IPV6_CONFIGURE_ENABLE= ipv6 +IRCPLUS_DESC= IRC+ protocol +IRCPLUS_CONFIGURE_ENABLE= ircplus +LIBWRAP_CONFIGURE_WITH= tcp-wrappers +OPENSSL_USE= openssl=yes +OPENSSL_CONFIGURE_WITH= openssl +SNIFFER_DESC= IRC traffic sniffer +SNIFFER_CONFIGURE_ENABLE= sniffer +SYSLOG_CONFIGURE_WITH= syslog +ZLIB_CONFIGURE_WITH= zlib + +post-patch: + @${REINPLACE_CMD} -e \ + '/LIBS/s|-liconv|${ICONV_LIB}|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/toplevel/s| \.\./COPYING|| ; \ + /INSTALL/s|.conf$$|.conf.sample|' ${WRKSRC}/doc/Makefile.in .include Modified: head/irc/ngircd/distinfo ============================================================================== --- head/irc/ngircd/distinfo Sat Apr 26 02:21:10 2014 (r352206) +++ head/irc/ngircd/distinfo Sat Apr 26 02:23:10 2014 (r352207) @@ -1,2 +1,2 @@ -SHA256 (ngircd-21.tar.gz) = 0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0 -SIZE (ngircd-21.tar.gz) = 500668 +SHA256 (ngircd-21.1.tar.xz) = b5b04f559bb533efc6821f2e62d83af8d196f7aa29a3710ff1e898d4e3c28a6f +SIZE (ngircd-21.1.tar.xz) = 339092 Modified: head/irc/ngircd/pkg-descr ============================================================================== --- head/irc/ngircd/pkg-descr Sat Apr 26 02:21:10 2014 (r352206) +++ head/irc/ngircd/pkg-descr Sat Apr 26 02:23:10 2014 (r352207) @@ -1,8 +1,7 @@ -ngIRCd is an Open-Source server for the Internet Relay Chat (IRC), which is -developed and published under the terms of the GNU General Public Licence. -ngIRCd means "next generation IRC daemon", it's written from scratch and not -deduced from the "grandfather of IRC daemons", the daemon of the IRCNet. - -LICENSE: GPL2 or later +ngIRCd is a free, portable and lightweight Internet Relay Chat server +for small or private networks, developed under the GNU General Public +License. It is simple to configure, can cope with dynamic IP addresses, +and supports IPv6 as well as SSL. It is written from scratch and not +based on the original IRCd. WWW: http://ngircd.barton.de/ Modified: head/irc/ngircd/pkg-plist ============================================================================== --- head/irc/ngircd/pkg-plist Sat Apr 26 02:21:10 2014 (r352206) +++ head/irc/ngircd/pkg-plist Sat Apr 26 02:23:10 2014 (r352207) @@ -1,29 +0,0 @@ -etc/ngircd.conf.sample -sbin/ngircd -man/man5/ngircd.conf.5.gz -man/man8/ngircd.8.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/Bopm.txt -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/Capabilities.txt -%%PORTDOCS%%%%DOCSDIR%%/Commands.txt -%%PORTDOCS%%%%DOCSDIR%%/Contributing.txt -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt -%%PORTDOCS%%%%DOCSDIR%%/GIT.txt -%%PORTDOCS%%%%DOCSDIR%%/HowToRelease.txt -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/Modes.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/PAM.txt -%%PORTDOCS%%%%DOCSDIR%%/Platforms.txt -%%PORTDOCS%%%%DOCSDIR%%/Protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README-AUX.txt -%%PORTDOCS%%%%DOCSDIR%%/README-BeOS.txt -%%PORTDOCS%%%%DOCSDIR%%/README-Interix.txt -%%PORTDOCS%%%%DOCSDIR%%/RFC.txt -%%PORTDOCS%%%%DOCSDIR%%/SSL.txt -%%PORTDOCS%%%%DOCSDIR%%/Services.txt -%%PORTDOCS%%%%DOCSDIR%%/sample-ngircd.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%%