Date: Sat, 10 May 2014 16:32:10 GMT From: Ryan Frederick <ryanrfrederick@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189615: [PATCH] Add Stage Support to irc/unreal Message-ID: <201405101632.s4AGWAFm011375@cgiserv.freebsd.org> Resent-Message-ID: <201405101640.s4AGe0XY013534@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189615 >Category: ports >Synopsis: [PATCH] Add Stage Support to irc/unreal >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 10 16:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Ryan Frederick >Release: 9.1-RELEASE-p12 >Organization: >Environment: FreeBSD system.name 9.1-RELEASE-p12 FreeBSD 9.1-RELEASE-p12 #0: Tue Apr 29 21:30:52 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Attached is a patch that should properly add stage support to irc/unreal. Patch has been tested on redports. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: irc/unreal/Makefile =================================================================== --- irc/unreal/Makefile (revision 353577) +++ irc/unreal/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= Unreal PORTVERSION= 3.2.10.2 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -56,7 +57,6 @@ PREFIXAQ_DESC= Enable prefixes for chanadmin and chanowner REMOTE_DESC= Enable remote includes -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} @@ -134,52 +134,34 @@ .endif @${REINPLACE_CMD} -e "/Your system does not support IPv6/ s|as_fn_error|echo|" ${WRKSRC}/configure do-install: - ${INSTALL} -m 0700 ${WRKSRC}/src/ircd ${PREFIX}/libexec/ircd - ${MKDIR} ${MODULESDIR} - ${MKDIR} ${CONFIGDIR} || true - ${MKDIR} ${CONFIGDIR}/aliases || true - ${MKDIR} ${EXAMPLESDIR}/aliases - ${MKDIR} ${RUNDIR}/tmp - ${MKDIR} ${LOGDIR} - ${TOUCH} ${CONFIGDIR}/ircd.motd - ${TOUCH} ${CONFIGDIR}/ircd.rules - ${INSTALL_DATA} ${WRKSRC}/badwords.*.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/help.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${EXAMPLESDIR}/unrealircd.conf - ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${EXAMPLESDIR}/aliases - ${INSTALL} ${WRKSRC}/src/modules/*.so ${MODULESDIR} + ${INSTALL} -m 0700 ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/ircd + ${MKDIR} ${STAGEDIR}${MODULESDIR} + ${MKDIR} ${STAGEDIR}${CONFIGDIR} || true + ${MKDIR} ${STAGEDIR}${CONFIGDIR}/aliases || true + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/aliases + ${MKDIR} ${STAGEDIR}${RUNDIR}/tmp + ${MKDIR} ${STAGEDIR}${LOGDIR} + ${TOUCH} ${STAGEDIR}${CONFIGDIR}/ircd.motd + ${TOUCH} ${STAGEDIR}${CONFIGDIR}/ircd.rules + ${INSTALL_DATA} ${WRKSRC}/badwords.*.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/help.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${EXAMPLESDIR}/unrealircd.conf + ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${STAGEDIR}${EXAMPLESDIR}/aliases + ${INSTALL} ${WRKSRC}/src/modules/*.so ${STAGEDIR}${MODULESDIR} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .endif post-install: - @[ -f ${CONFIGDIR}/aliases/aliases.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/aliases.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/anope.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/anope.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/auspice.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/auspice.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/cygnus.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/cygnus.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/epona.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/epona.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/generic.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/generic.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/genericstats.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/genericstats.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/ircservices.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/ircservices.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/aliases/operstats.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/operstats.conf ${CONFIGDIR}/aliases - @[ -f ${CONFIGDIR}/badwords.channel.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.channel.conf ${CONFIGDIR} - @[ -f ${CONFIGDIR}/badworks.message.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.message.conf ${CONFIGDIR} - @[ -f ${CONFIGDIR}/badwords.quit.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.quit.conf ${CONFIGDIR} - @[ -f ${CONFIGDIR}/help.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/help.conf ${CONFIGDIR} - @[ -f ${CONFIGDIR}/spamfilter.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/spamfilter.conf ${CONFIGDIR} - @[ -f ${CONFIGDIR}/unrealircd.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/unrealircd.conf ${CONFIGDIR} - @${CHOWN} -R ${USERS}:${GROUPS} ${CONFIGDIR} - @${CHOWN} ${USERS}:${GROUPS} ${RUNDIR} - @${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} .if defined(WITH_SQLMOD) - @${CP} ${WRKSRC}/SQLMod/sample.conf ${CONFIGDIR}/m_sqlmod.conf - @${CP} ${WRKSRC}/SQLMod/Changes ${DOCSDIR}/Changes.sqlmod - @${CP} ${WRKSRC}/SQLMod/README ${DOCSDIR}/README.sqlmod - @${CP} ${WRKSRC}/SQLMod/LICENSE ${DOCSDIR}/LICENSE.sqlmod + @${CP} ${WRKSRC}/SQLMod/sample.conf ${STAGEDIR}${CONFIGDIR}/m_sqlmod.conf + @${CP} ${WRKSRC}/SQLMod/Changes ${STAGEDIR}${DOCSDIR}/Changes.sqlmod + @${CP} ${WRKSRC}/SQLMod/README ${STAGEDIR}${DOCSDIR}/README.sqlmod + @${CP} ${WRKSRC}/SQLMod/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE.sqlmod .endif .include <bsd.port.mk> Index: irc/unreal/pkg-plist =================================================================== --- irc/unreal/pkg-plist (revision 353577) +++ irc/unreal/pkg-plist (working copy) @@ -147,8 +147,12 @@ @dirrm %%EXAMPLESDIR%% @dirrm %%EXAMPLESDIR%%/aliases @dirrm lib/Unreal +@owner ircd +@group ircd @dirrmtry %%ETCDIR%% @dirrmtry %%ETCDIR%%/aliases +@dirrmtry /var/run/ircd +@dirrmtry /var/log/ircd @unexec if cmp -s %D/etc/Unreal/aliases/aliases.conf %D/%%EXAMPLESDIR%%/aliases/aliases.conf; then rm -f %D/etc/Unreal/aliases/aliases.conf; fi @exec [ -f %D/etc/Unreal/aliases/aliases.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/aliases.conf %D/etc/Unreal/aliases/aliases.conf @unexec if cmp -s %D/etc/Unreal/aliases/atheme.conf %D/%%EXAMPLESDIR%%/aliases/atheme.conf; then rm -f %D/etc/Unreal/aliases/atheme.conf; fi @@ -181,3 +185,5 @@ @exec [ -f %D/etc/Unreal/spamfilter.conf ] || cp %D/%%EXAMPLESDIR%%/spamfilter.conf %D/etc/Unreal/spamfilter.conf @unexec if cmp -s %D/etc/Unreal/unrealircd.conf %D/%%EXAMPLESDIR%%/unrealircd.conf; then rm -f %D/etc/Unreal/unrealircd.conf; fi @exec [ -f %D/etc/Unreal/unrealircd.conf ] || cp %D/%%EXAMPLESDIR%%/unrealircd.conf %D/etc/Unreal/unrealircd.conf +@owner root +@group wheel >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405101632.s4AGWAFm011375>