From owner-svn-ports-all@FreeBSD.ORG Sun Aug 17 09:36:48 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 834F938B; Sun, 17 Aug 2014 09:36:48 +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 621652E83; Sun, 17 Aug 2014 09:36:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7H9amfP003955; Sun, 17 Aug 2014 09:36:48 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7H9alOD003951; Sun, 17 Aug 2014 09:36:47 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408170936.s7H9alOD003951@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 17 Aug 2014 09:36:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365163 - in head/irc/undernet-ircu: . 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.18-1 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: Sun, 17 Aug 2014 09:36:48 -0000 Author: marino Date: Sun Aug 17 09:36:47 2014 New Revision: 365163 URL: http://svnweb.freebsd.org/changeset/ports/365163 QAT: https://qat.redports.org/buildarchive/r365163/ Log: Stage irc/undernet-ircu and assign maintainership to submitter Big changes include moving ircd from bin to sbin and installing lots of documentation. Also "disable" options were swapped to "enable" options and turned on by default. PR: 192720 Submitted by: Daniel Austin Add'l work by: marino Added: head/irc/undernet-ircu/files/pkg-message.in (contents, props changed) Modified: head/irc/undernet-ircu/Makefile head/irc/undernet-ircu/files/undernet.in head/irc/undernet-ircu/pkg-descr Modified: head/irc/undernet-ircu/Makefile ============================================================================== --- head/irc/undernet-ircu/Makefile Sun Aug 17 09:16:39 2014 (r365162) +++ head/irc/undernet-ircu/Makefile Sun Aug 17 09:36:47 2014 (r365163) @@ -3,11 +3,13 @@ PORTNAME= undernet-ircu PORTVERSION= 2.10.12.14 +PORTREVISION= 1 CATEGORIES= irc net -MASTER_SITES= SF/${PORTNAME}/ircu/ircu${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/ircu/ircu${PORTVERSION} \ + ftp://ftpmirror.uk/freebsd-ports/undernet-ircu/ DISTNAME= ircu${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd-ports@dan.me.uk COMMENT= Undernet IRCU irc daemon CONFLICTS= ircd-hybrid-7.[0-9]* @@ -15,86 +17,76 @@ CONFLICTS= ircd-hybrid-7.[0-9]* USERS= undernet GROUPS= ${USERS} -GNU_CONFIGURE= yes -USE_RC_SUBR= undernet -CONFIGURE_ARGS= --with-dpath=${PREFIX}/etc/ --with-symlink=no - -PLIST_FILES= bin/ircd bin/umkpasswd bin/convert-conf etc/ircd.conf.example - -OPTIONS_DEFINE= IPV6 POLL DEBUG ASSERTS PROFILE PEDANTIC WARNINGS INLINES DEVPOLL KQUEUE \ - EPOLL LEAKDETECT +GNU_CONFIGURE= yes +USE_RC_SUBR= undernet +SUB_FILES= pkg-message +PORTDOCS= * +PLIST_FILES= bin/undernet-convert-conf \ + bin/undernet-umkpasswd \ + etc/ircd.conf.sample \ + sbin/ircd + +CONFIGURE_ARGS+= --with-dpath=${PREFIX}/etc/ --with-symlink=no + +OPTIONS_DEFINE= DOCS EXAMPLES IPV6 POLL DEBUG ASSERTS PEDANTIC WARNINGS \ + INLINES DEVPOLL KQUEUE EPOLL LEAKDETECT +OPTIONS_DEFAULT=ASSERTS INLINES DEVPOLL KQUEUE EPOLL POLL_DESC= Force poll to be used even if not a sys call -ASSERTS_DESC= Disable assertion checking +ASSERTS_DESC= Enable assertion checking PEDANTIC_DESC= Enable pedantic warnings WARNINGS_DESC= Enable warnings (add -Wall to CFLAGS) -INLINES_DESC= Disable inlining for a few critical functions -DEVPOLL_DESC= Disable the /dev/poll-based engine -KQUEUE_DESC= Disable the kqueue-based engine -EPOLL_DESC= Disable the epoll-based engine +INLINES_DESC= Enable inlining for a few critical functions +DEVPOLL_DESC= Enable the /dev/poll-based engine +KQUEUE_DESC= Enable the kqueue-based engine +EPOLL_DESC= Enable the epoll-based engine LEAKDETECT_DESC= Turn on the leak detector (reqs patched boehm) -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --with-ipv6 -.else -CONFIGURE_ARGS+= --without-ipv6 -.endif - -.if ${PORT_OPTIONS:MPOLL} -CONFIGURE_ARGS+= --enable-poll -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif +IPV6_CONFIGURE_WITH= ipv6 +POLL_CONFIGURE_ENABLE= poll +DEBUG_CONFIGURE_ENABLE= debug +EPOLL_CONFIGURE_ENABLE= epoll +KQUEUE_CONFIGURE_ENABLE= kqueue +ASSERTS_CONFIGURE_ENABLE= asserts +INLINES_CONFIGURE_ENABLE= inlines +DEVPOLL_CONFIGURE_ENABLE= devpoll +PEDANTIC_CONFIGURE_ENABLE= pedantic +WARNINGS_CONFIGURE_ENABLE= warnings +LEAKDETECT_CONFIGURE_WITH= leak-detect -.if ${PORT_OPTIONS:MASSERTS} -CONFIGURE_ARGS+= --disable-asserts -.endif - -.if ${PORT_OPTIONS:MPROFILE} +.if !defined(NO_PROFILE) CONFIGURE_ARGS+= --enable-profile .endif -.if ${PORT_OPTIONS:MPEDANTIC} -CONFIGURE_ARGS+= --enable-pedantic -.endif - -.if ${PORT_OPTIONS:MWARNINGS} -CONFIGURE_ARGS+= --enable-warnings -.endif - -.if ${PORT_OPTIONS:MINLINES} -CONFIGURE_ARGS+= --disable-inlines -.endif - -.if ${PORT_OPTIONS:MDEVPOLL} -CONFIGURE_ARGS+= --disable-devpoll -.endif - -.if ${PORT_OPTIONS:MKQUEUE} -CONFIGURE_ARGS+= --disable-kqueue -.endif - -.if ${PORT_OPTIONS:MEPOLL} -CONFIGURE_ARGS+= --disable-epoll -.endif +.include -.if ${PORT_OPTIONS:MLEAKDETECT} -CONFIGURE_ARGS+= --with-leak-detect +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/ircd/convert-conf \ + ${STAGEDIR}${PREFIX}/bin/undernet-convert-conf + ${INSTALL_PROGRAM} ${WRKSRC}/ircd/umkpasswd \ + ${STAGEDIR}${PREFIX}/bin/undernet-umkpasswd +.if ${PORT_OPTIONS:MEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/doc/example.conf \ + ${STAGEDIR}${PREFIX}/etc/ircd.conf.sample +.endif +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/api ${STAGEDIR}${DOCSDIR}/history + (cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog ChangeLog.11 INSTALL \ + INSTALL_FR README RELEASE.NOTES ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${INSTALL_DATA} Authors debug_memleak_gc.patch \ + example.conf fda.txt features.txt freebsd.txt iso-time.html \ + linux-poll.patch p10.html readme.asll readme.chroot \ + readme.crules readme.cvs readme.features readme.gline \ + readme.iauth readme.indent readme.jupe readme.log readme.who \ + readme.www readme.xquery rfc1413.txt rfc1459.unet \ + snomask.html strings.txt ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc/api && ${INSTALL_DATA} api.txt events.txt \ + features.txt gline.txt ircd_snprintf.txt joinbuf.txt \ + jupe.txt log.txt modebuf.txt motd.txt msgq.txt \ + privileges.txt send.txt ${STAGEDIR}${DOCSDIR}/api) + (cd ${WRKSRC}/doc/history && ${INSTALL_DATA} 2.4.notes README-2.6 \ + 2.7-New ChangeLog.07 ChangeLog.10 Manual README.patches \ + history.pre24 overview.u2.9 ${STAGEDIR}${DOCSDIR}/history) .endif -post-install: - @${ECHO_MSG} "" - @${ECHO_MSG} " To run undernet ircu you must add 'undernet_enable=\"YES\" to" - @${ECHO_MSG} " \"/etc/rc.conf\" . It can then be started with" - @${ECHO_MSG} " \"${PREFIX}/etc/rc.d/undernet start\"" - @${ECHO_MSG} "" - @${ECHO_MSG} " You must also copy \"${PREFIX}/etc/ircd.conf.example\" to" - @${ECHO_MSG} " \"${PREFIX}/etc/ircd.conf\" and modify its settings according to" - @${ECHO_MSG} " your needs. See documentation at http://coder-com.undernet.org." - @${ECHO_MSG} "" - .include Added: head/irc/undernet-ircu/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/undernet-ircu/files/pkg-message.in Sun Aug 17 09:36:47 2014 (r365163) @@ -0,0 +1,7 @@ + To run undernet ircu you must add 'undernet_enable="YES"' to + "/etc/rc.conf" . It can then be started with + "%%PREFIX%%/etc/rc.d/undernet start" + + You must also copy "%%PREFIX%%/etc/ircd.conf.example" to + "%%PREFIX%%/etc/ircd.conf\" and modify its settings according to + your needs. See documentation at http://coder-com.undernet.org. Modified: head/irc/undernet-ircu/files/undernet.in ============================================================================== --- head/irc/undernet-ircu/files/undernet.in Sun Aug 17 09:16:39 2014 (r365162) +++ head/irc/undernet-ircu/files/undernet.in Sun Aug 17 09:36:47 2014 (r365163) @@ -25,7 +25,7 @@ load_rc_config ${name} undernet_user="undernet" undernet_group="undernet" -command="%%PREFIX%%/bin/ircd" +command="%%PREFIX%%/sbin/ircd" pidfile="undernet.pid" piddir="/var/log/" required_files="${undernet_config}" Modified: head/irc/undernet-ircu/pkg-descr ============================================================================== --- head/irc/undernet-ircu/pkg-descr Sun Aug 17 09:16:39 2014 (r365162) +++ head/irc/undernet-ircu/pkg-descr Sun Aug 17 09:36:47 2014 (r365163) @@ -1,9 +1,8 @@ -Undernet's popular and reliable irc daemon. See website (URL below) for -details. +Undernet's popular and reliable irc daemon. -Note that this port is titled "undernet-ircu" to differentiate it from another -ircd known as ircu (which was created and is maintained by a former undernet -coder who forked project paths without changing project names). +Note that this port is titled "undernet-ircu" to differentiate it from +another ircd known as ircu (which was created and is maintained by a +former undernet coder who forked project paths without changing project +names). -Author: "Coder-Com" -WWW: http://coder-com.undernet.org +WWW: http://coder-com.undernet.org