Attachment 145906 Details for Bug 192720 – Reworks (intermediate?) version

[patch] Reworks (intermediate?) version

ircu.diff (text/plain), 9.62 KB, created by John Marino on 2014-08-17 09:18:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2014-08-17 09:18:12 UTC

Size: 9.62 KB

patch

obsolete

>Index: irc/undernet-ircu/Makefile
>===================================================================
>--- irc/undernet-ircu/Makefile	(revision 365038)
>+++ irc/undernet-ircu/Makefile	(working copy)
>@@ -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]*
>@@ -17,84 +19,68 @@
> 
> GNU_CONFIGURE=		yes
> USE_RC_SUBR=		undernet
>-CONFIGURE_ARGS=		--with-dpath=${PREFIX}/etc/ --with-symlink=no
>+SUB_FILES=		pkg-message
>+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
>+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 <bsd.port.options.mk>
>+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: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
>-
>-.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
>+.include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MWARNINGS}
>-CONFIGURE_ARGS+=	--enable-warnings
>+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:MINLINES}
>-CONFIGURE_ARGS+=	--disable-inlines
>+.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
> 
>-.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
>-
>-.if ${PORT_OPTIONS:MLEAKDETECT}
>-CONFIGURE_ARGS+=	--with-leak-detect
>-.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 <bsd.port.mk>
>Index: irc/undernet-ircu/files/pkg-message.in
>===================================================================
>--- irc/undernet-ircu/files/pkg-message.in	(revision 0)
>+++ irc/undernet-ircu/files/pkg-message.in	(working copy)
>@@ -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.
>Index: irc/undernet-ircu/files/undernet.in
>===================================================================
>--- irc/undernet-ircu/files/undernet.in	(revision 365038)
>+++ irc/undernet-ircu/files/undernet.in	(working copy)
>@@ -25,7 +25,7 @@
> undernet_user="undernet"
> undernet_group="undernet"
> 
>-command="%%PREFIX%%/bin/ircd"
>+command="%%PREFIX%%/sbin/ircd"
> pidfile="undernet.pid"
> piddir="/var/log/"
> required_files="${undernet_config}"
>Index: irc/undernet-ircu/pkg-descr
>===================================================================
>--- irc/undernet-ircu/pkg-descr	(revision 365038)
>+++ irc/undernet-ircu/pkg-descr	(working copy)
>@@ -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" <coder-com@undernet.org>
>-WWW:	http://coder-com.undernet.org
>+WWW: http://coder-com.undernet.org
>Index: irc/undernet-ircu/pkg-plist
>===================================================================
>--- irc/undernet-ircu/pkg-plist	(revision 0)
>+++ irc/undernet-ircu/pkg-plist	(working copy)
>@@ -0,0 +1,61 @@
>+bin/undernet-convert-conf
>+bin/undernet-umkpasswd
>+%%PORTEXAMPLES%%etc/ircd.conf.sample
>+sbin/ircd
>+%%PORTDOCS%%%%DOCSDIR%%/Authors
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.11
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL_FR
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
>+%%PORTDOCS%%%%DOCSDIR%%/api/api.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/events.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/features.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/gline.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/ircd_snprintf.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/joinbuf.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/jupe.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/log.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/modebuf.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/motd.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/msgq.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/privileges.txt
>+%%PORTDOCS%%%%DOCSDIR%%/api/send.txt
>+%%PORTDOCS%%%%DOCSDIR%%/debug_memleak_gc.patch
>+%%PORTDOCS%%%%DOCSDIR%%/example.conf
>+%%PORTDOCS%%%%DOCSDIR%%/fda.txt
>+%%PORTDOCS%%%%DOCSDIR%%/features.txt
>+%%PORTDOCS%%%%DOCSDIR%%/freebsd.txt
>+%%PORTDOCS%%%%DOCSDIR%%/history/2.4.notes
>+%%PORTDOCS%%%%DOCSDIR%%/history/2.7-New
>+%%PORTDOCS%%%%DOCSDIR%%/history/ChangeLog.07
>+%%PORTDOCS%%%%DOCSDIR%%/history/ChangeLog.10
>+%%PORTDOCS%%%%DOCSDIR%%/history/Manual
>+%%PORTDOCS%%%%DOCSDIR%%/history/README-2.6
>+%%PORTDOCS%%%%DOCSDIR%%/history/README.patches
>+%%PORTDOCS%%%%DOCSDIR%%/history/history.pre24
>+%%PORTDOCS%%%%DOCSDIR%%/history/overview.u2.9
>+%%PORTDOCS%%%%DOCSDIR%%/iso-time.html
>+%%PORTDOCS%%%%DOCSDIR%%/linux-poll.patch
>+%%PORTDOCS%%%%DOCSDIR%%/p10.html
>+%%PORTDOCS%%%%DOCSDIR%%/readme.asll
>+%%PORTDOCS%%%%DOCSDIR%%/readme.chroot
>+%%PORTDOCS%%%%DOCSDIR%%/readme.crules
>+%%PORTDOCS%%%%DOCSDIR%%/readme.cvs
>+%%PORTDOCS%%%%DOCSDIR%%/readme.features
>+%%PORTDOCS%%%%DOCSDIR%%/readme.gline
>+%%PORTDOCS%%%%DOCSDIR%%/readme.iauth
>+%%PORTDOCS%%%%DOCSDIR%%/readme.indent
>+%%PORTDOCS%%%%DOCSDIR%%/readme.jupe
>+%%PORTDOCS%%%%DOCSDIR%%/readme.log
>+%%PORTDOCS%%%%DOCSDIR%%/readme.who
>+%%PORTDOCS%%%%DOCSDIR%%/readme.www
>+%%PORTDOCS%%%%DOCSDIR%%/readme.xquery
>+%%PORTDOCS%%%%DOCSDIR%%/rfc1413.txt
>+%%PORTDOCS%%%%DOCSDIR%%/rfc1459.unet
>+%%PORTDOCS%%%%DOCSDIR%%/snomask.html
>+%%PORTDOCS%%%%DOCSDIR%%/strings.txt
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/api
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/history
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 192720: 145890 | 145906 | 145909