Date: Sat, 5 Jul 2014 21:23:51 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360820 - in head/irc/nefarious: . files Message-ID: <201407052123.s65LNpbt080709@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Jul 5 21:23:51 2014 New Revision: 360820 URL: http://svnweb.freebsd.org/changeset/ports/360820 QAT: https://qat.redports.org/buildarchive/r360820/ Log: irc/nefarious: stage, unbreak on F10+ and more * Add stage support * Fix build for clang * convert USE_BZIP2 * Bring in DragonFly support patch * convert USE_OPENSSL and USE_CHROOT knobs to options * rename DOMAIN knob to NEFARIOUS_DOMAIN knob * rename INSTALL_PREFIX knob to NEFARIOUS_INSTALL_PREFIX knob * Make bash dependency work in non-standard location * Tweak pre-configure message accordingly, remove sleep command Added: head/irc/nefarious/files/patch-ircd_m__help.c (contents, props changed) Modified: head/irc/nefarious/Makefile head/irc/nefarious/files/patch-configure head/irc/nefarious/pkg-plist Modified: head/irc/nefarious/Makefile ============================================================================== --- head/irc/nefarious/Makefile Sat Jul 5 21:17:07 2014 (r360819) +++ head/irc/nefarious/Makefile Sat Jul 5 21:23:51 2014 (r360820) @@ -12,41 +12,46 @@ COMMENT= IRC server used by evilnet base BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_BZIP2= yes +USES= tar:bzip2 HAS_CONFIGURE= yes PLIST_SUB+= INSTALL_PREFIX=${INSTALL_PREFIX:S/${PREFIX}\///} -MAN8= ircd.8 -.if defined(WITH_OPENSSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+= --enable-ssl -.endif +OPTIONS_DEFINE= SSL CHROOT +CHROOT_DESC= Chroot the irc daemon within INSTALL_PREFIX -NO_STAGE= yes -.include <bsd.port.pre.mk> +SSL_CONFIGURE_ENABLE= ssl -.if !defined(INSTALL_PREFIX) +.include <bsd.port.options.mk> + +.if defined(NEFARIUS_INSTALL_PREFIX) +INSTALL_PREFIX=${NEFARIUS_INSTALL_PREFIX} +.else INSTALL_PREFIX=${PREFIX}/${PORTNAME} .endif -.if defined(WITH_CHROOT) +.if ${PORT_OPTIONS:MSSL} +USE_OPENSSL= yes +.endif + +.if ${PORT_OPTIONS:MCHROOT} CONFIGURE_ARGS+= --with-chroot=${INSTALL_PREFIX} .endif -.if defined(DOMAIN) -CONFIGURE_ARGS+= --with-domain=${DOMAIN} +.if defined(NEFARIOUS_DOMAIN) +CONFIGURE_ARGS+= --with-domain=${NEFARIOUS_DOMAIN} .endif -CONFIGURE_ARGS+= --prefix=${INSTALL_PREFIX} --mandir=${MANPREFIX}/man --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS+= --prefix=${STAGEDIR}${INSTALL_PREFIX} \ + --mandir=${STAGEDIR}${MANPREFIX}/man + +post-patch: + @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/configure pre-configure: - @${ECHO_CMD} "" + @${ECHO_CMD} @${ECHO_CMD} "User configurable options for ${PORTNAME}:" - @${ECHO_CMD} "INSTALL_PREFIX - Where to install all Nefarious files (default: PREFIX/Nefarious)" - @${ECHO_CMD} "WITH_OPENSSL - Compile with SSL support" - @${ECHO_CMD} "WITH_CHROOT - chroot the ircd within INSTALL_PREFIX" - @${ECHO_CMD} "DOMAIN - Domain to use for IRCd" - @${ECHO_CMD} "" - @sleep 5 + @${ECHO_CMD} "NEFARIOUS_INSTALL_PREFIX - Install location for Nefarious (default: ${PREFIX}/Nefarious)" + @${ECHO_CMD} "NEFARIOUS_DOMAIN - Domain to use for IRCd" + @${ECHO_CMD} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/irc/nefarious/files/patch-configure ============================================================================== --- head/irc/nefarious/files/patch-configure Sat Jul 5 21:17:07 2014 (r360819) +++ head/irc/nefarious/files/patch-configure Sat Jul 5 21:23:51 2014 (r360820) @@ -1,11 +1,20 @@ ---- configure.orig 2009-07-31 23:06:12.000000000 -0300 -+++ configure 2009-07-31 23:06:29.000000000 -0300 -@@ -10364,7 +10364,7 @@ +--- configure.orig 2008-08-04 02:56:02.000000000 +0000 ++++ configure +@@ -10364,7 +10364,7 @@ fi test -n "$BASH" && break done -test -n "$BASH" || BASH="/bin/bash" -+test -n "$BASH" || BASH="/usr/local/bin/bash" ++test -n "$BASH" || BASH="@PREFIX@/bin/bash" { echo "$as_me:$LINENO: checking for posix non-blocking" >&5 +@@ -10783,7 +10783,7 @@ echo "${ECHO_T}OpenBSD ($host) found." > + OSDEP_C=os_openbsd.c + ;; + +- *-*bsd*) ++ *-*bsd*|*-dragonfly*) + { echo "$as_me:$LINENO: result: Generic BSD ($host) found." >&5 + echo "${ECHO_T}Generic BSD ($host) found." >&6; } + CFLAGS="-Wno-long-long $CFLAGS" Added: head/irc/nefarious/files/patch-ircd_m__help.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/nefarious/files/patch-ircd_m__help.c Sat Jul 5 21:23:51 2014 (r360820) @@ -0,0 +1,19 @@ +--- ircd/m_help.c.orig 2008-08-04 02:55:42.000000000 +0000 ++++ ircd/m_help.c +@@ -243,6 +243,7 @@ sendhelpfile(struct Client *sptr, const + send_reply(sptr, RPL_ENDOFHELP, topic); + } + ++void + dohelp(struct Client *sptr, const char *hpath, char *topic) + { + char path[PATH_MAX + 1]; +@@ -291,7 +292,7 @@ dohelp(struct Client *sptr, const char * + sendhelpfile(sptr, path, topic); + } + +-int m_help(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) ++void m_help(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) + { + static time_t last_used = 0; + Modified: head/irc/nefarious/pkg-plist ============================================================================== --- head/irc/nefarious/pkg-plist Sat Jul 5 21:17:07 2014 (r360819) +++ head/irc/nefarious/pkg-plist Sat Jul 5 21:23:51 2014 (r360820) @@ -1,3 +1,4 @@ +man/man8/ircd.8.gz %%INSTALL_PREFIX%%/bin/ircd %%INSTALL_PREFIX%%/bin/chkconf %%INSTALL_PREFIX%%/lib/example.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407052123.s65LNpbt080709>