Attachment 145890 Details for Bug 192720 – add staging support

[patch] add staging support

20140816-irc-undernet-ircu.diff (text/plain), 6.98 KB, created by Daniel Austin on 2014-08-16 22:29:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2014-08-16 22:29:23 UTC

Size: 6.98 KB

patch

obsolete

>diff -ruN irc/undernet-ircu.orig/Makefile irc/undernet-ircu/Makefile
>--- irc/undernet-ircu.orig/Makefile	2014-07-23 18:07:12.000000000 +0100
>+++ irc/undernet-ircu/Makefile	2014-08-16 23:21:22.373302413 +0100
>@@ -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,12 +19,11 @@
> 
> 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 PROFILE PEDANTIC WARNINGS \
>+		INLINES DEVPOLL KQUEUE EPOLL LEAKDETECT
> POLL_DESC=	Force poll to be used even if not a sys call
> ASSERTS_DESC=	Disable assertion checking
> PEDANTIC_DESC=	Enable pedantic warnings
>@@ -33,7 +34,6 @@
> EPOLL_DESC=	Disable the epoll-based engine
> LEAKDETECT_DESC=	Turn on the leak detector (reqs patched boehm)
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MIPV6}
>@@ -86,6 +86,41 @@
> CONFIGURE_ARGS+=	--with-leak-detect
> .endif
> 
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/ircd/ircd ${STAGEDIR}${PREFIX}/sbin/ircd
>+	${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}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/api
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/history
>+	for file in \
>+		ChangeLog ChangeLog.11 INSTALL INSTALL_FR README RELEASE.NOTES; do \
>+			${INSTALL_DATA} ${WRKSRC}/$$file ${STAGEDIR}${DOCSDIR}/ ; \
>+	done
>+	for file in \
>+		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; do \
>+			${INSTALL_DATA} ${WRKSRC}/doc/$$file ${STAGEDIR}${DOCSDIR}/ ; \
>+	done
>+	for file in \
>+		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; do \
>+			${INSTALL_DATA} ${WRKSRC}/doc/api/$$file ${STAGEDIR}${DOCSDIR}/api/ ; \
>+	done
>+	for file in \
>+		2.4.notes 2.7-New ChangeLog.07 ChangeLog.10 Manual README-2.6 README.patches \
>+		history.pre24 overview.u2.9; do \
>+			${INSTALL_DATA} ${WRKSRC}/doc/history/$$file ${STAGEDIR}${DOCSDIR}/history/ ; \
>+	done
>+.endif
>+
> post-install:
> 	@${ECHO_MSG}    ""
> 	@${ECHO_MSG}    "	To run undernet ircu you must add 'undernet_enable=\"YES\" to"
>@@ -97,4 +132,5 @@
> 	@${ECHO_MSG}    "	your needs.  See documentation at http://coder-com.undernet.org."
> 	@${ECHO_MSG}    ""
> 
>+
> .include <bsd.port.mk>
>diff -ruN irc/undernet-ircu.orig/files/pkg-message.in irc/undernet-ircu/files/pkg-message.in
>--- irc/undernet-ircu.orig/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>+++ irc/undernet-ircu/files/pkg-message.in	2014-08-16 23:20:30.374295134 +0100
>@@ -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.
>diff -ruN irc/undernet-ircu.orig/files/undernet.in irc/undernet-ircu/files/undernet.in
>--- irc/undernet-ircu.orig/files/undernet.in	2014-01-24 00:14:07.000000000 +0000
>+++ irc/undernet-ircu/files/undernet.in	2014-08-16 22:51:11.771444181 +0100
>@@ -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}"
>diff -ruN irc/undernet-ircu.orig/pkg-plist irc/undernet-ircu/pkg-plist
>--- irc/undernet-ircu.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ irc/undernet-ircu/pkg-plist	2014-08-16 23:16:55.361375629 +0100
>@@ -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