Date: Mon, 15 Feb 2016 19:19:24 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408952 - in head/irc/ircd-ratbox: . files Message-ID: <201602151919.u1FJJOaW085894@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Feb 15 19:19:24 2016 New Revision: 408952 URL: https://svnweb.freebsd.org/changeset/ports/408952 Log: irc/ircd-ratbox: Fix OpenSSL linking and simplify - Fix linking with ports' ssl libs - Fix `contrib` build (used base openssl headers) - Re-work EGD detection - Use options helpers - Simplify REINPLACE with :U defaults PR: 195796 Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: D5286 Deleted: head/irc/ircd-ratbox/files/patch-configure head/irc/ircd-ratbox/files/patch-configure.ac Modified: head/irc/ircd-ratbox/Makefile head/irc/ircd-ratbox/files/patch-contrib_Makefile.in head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c Modified: head/irc/ircd-ratbox/Makefile ============================================================================== --- head/irc/ircd-ratbox/Makefile Mon Feb 15 19:01:11 2016 (r408951) +++ head/irc/ircd-ratbox/Makefile Mon Feb 15 19:19:24 2016 (r408952) @@ -3,7 +3,7 @@ PORTNAME= ircd-ratbox PORTVERSION= 3.0.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= irc ipv6 MASTER_SITES= http://www.ratbox.org/download/ \ http://www.ratbox.org/download/old/ @@ -61,59 +61,20 @@ SHORTCUTS_DESC= Build with ircd-shortcu OPTIONS_DEFAULT= OPENSSL IPV6 ZIPLINKS SHARED_MODS OPTIONS_EXCLUDE= NLS EXAMPLES -#---------------------------------------------------------------------- +OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+= --enable-openssl -.else -CONFIGURE_ARGS+= --disable-openssl -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MZIPLINKS} -CONFIGURE_ARGS+= --enable-zlib -.else -CONFIGURE_ARGS+= --disable-zlib -.endif - -.if ${PORT_OPTIONS:MSHARED_MODS} -CONFIGURE_ARGS+= --disable-static -.else -CONFIGURE_ARGS+= --enable-static -.endif - -.if ${PORT_OPTIONS:MASSERT} -CONFIGURE_ARGS+= --enable-assert -.else -CONFIGURE_ARGS+= --disable-assert -.endif - -.if ${PORT_OPTIONS:MSMALL_NET} -CONFIGURE_ARGS+= --enable-small-net -.endif - -.if ${PORT_OPTIONS:MSERVICES} -CONFIGURE_ARGS+= --enable-services -PLIST_SUB+= SERVICES="" -.else -PLIST_SUB+= SERVICES="@comment " -.endif - -.if ${PORT_OPTIONS:MSHORTCUTS} -USES+= perl5 -USE_PERL5= build -PLIST_SUB+= SHORTCUTS="" -.else -PLIST_SUB+= SHORTCUTS="@comment " -.endif +ASSERT_CONFIGURE_ENABLE= assert +IPV6_CONFIGURE_ENABLE= ipv6 +OPENSSL_USE= openssl=yes +OPENSSL_CONFIGURE_ON= --enable-openssl=${OPENSSLBASE} +OPENSSL_CONFIGURE_OFF= --disable-openssl +SERVICES_CONFIGURE_ENABLE= services +SHARED_MODS_CONFIGURE_ON= --disable-static +SHARED_MODS_CONFIGURE_OFF= --enable-static +SHORTCUTS_USES= perl5 +SHORTCUTS_USE= perl5=build +SMALL_NET_CONFIGURE_ENABLE= small-net +ZIPLINKS_CONFIGURE_ENABLE= zlib #-- User Configuration ------------------------------------------------- @@ -159,48 +120,17 @@ pre-build: ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h - @${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl - #-- ircd-shortcut.pl ratbox-services commands -------------------------------------- - -.if !empty(SERVER_NAME) - @${REINPLACE_CMD} -e "s#services.ircd-ratbox.org#${SERVER_NAME}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(USER_SERV) - @${REINPLACE_CMD} -e "s#USERSERV#${USER_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(CHAN_SERV) - @${REINPLACE_CMD} -e "s#CHANSERV#${CHAN_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(NICK_SERV) - @${REINPLACE_CMD} -e "s#NICKSERV#${NICK_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(ALIS_SERV) - @${REINPLACE_CMD} -e "s#ALIS#${ALIS_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(OPER_BOT) - @${REINPLACE_CMD} -e "s#OPERBOT#${OPER_BOT}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(OPER_SERV) - @${REINPLACE_CMD} -e "s#OPERSERV#${OPER_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(JUPE_SERV) - @${REINPLACE_CMD} -e "s#JUPESERV#${JUPE_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif -.if !empty(GLOBAL_SERV) - @${REINPLACE_CMD} -e "s#GLOBAL#${GLOBAL_SERV}#" \ - ${WRKSRC}/contrib/ircd-shortcut.pl -.endif + @${REINPLACE_CMD} -e "s#ALIS#${ALIS_SERV:UALIS}#" \ + -e "s#CHANSERV#${CHAN_SERV:UCHANSERV}#" -e "s#GLOBAL#${GLOBAL_SERV:UGLOBAL}#" \ + -e "s#JUPESERV#${JUPE_SERV:UJUPESERV}#" -e "s#NICKSERV#${NICK_SERV:UNICKSERV}#" \ + -e "s#OPERBOT#${OPER_BOT:UOPERBOT}#" -e "s#USERSERV#${USER_SERV:UUSERSERV}#" \ + -e "s#services.ircd-ratbox.org#${SERVER_NAME:Uservices.ircd-ratbox.org}#" \ + -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl # ----- Execute ircd-shortcut perl script to generate the .c file. ----- +.include <bsd.port.options.mk> + .if ${PORT_OPTIONS:MSHORTCUTS} @${ECHO_MSG} "Executing ircd-shortcut.pl for ircd-shortcuts generation." ${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl Modified: head/irc/ircd-ratbox/files/patch-contrib_Makefile.in ============================================================================== --- head/irc/ircd-ratbox/files/patch-contrib_Makefile.in Mon Feb 15 19:01:11 2016 (r408951) +++ head/irc/ircd-ratbox/files/patch-contrib_Makefile.in Mon Feb 15 19:19:24 2016 (r408952) @@ -1,6 +1,18 @@ ---- contrib/Makefile.in.orig 2012-03-11 01:12:06.000000000 +0100 -+++ contrib/Makefile.in 2014-07-02 01:22:20.963771475 +0200 -@@ -429,8 +429,8 @@ +Fix linking ssl, used /usr/include/openssl even when --enable-openssl=%LOCALBASE% +was used + +--- contrib/Makefile.in.orig 2012-03-11 00:12:06 UTC ++++ contrib/Makefile.in +@@ -202,7 +202,7 @@ coredir = @moduledir@ + servicesdir = @moduledir@/autoload + libmodulesdir = @moduledir@ + contribdir = @moduledir@/contrib +-INCLUDES = -I../include -I../libratbox/include $(INCLTDL) ++INCLUDES = -I../include -I../libratbox/include $(INCLTDL) $(SSL_INCLUDES) + AM_CFLAGS = $(WARNFLAGS) + SRCS = \ + example_module.c \ +@@ -429,8 +429,8 @@ clean-generic: $(LIBTOOL) --mode=clean $(RB_RM) -f $(S_OBJS) $(S_CORE_OBJS) $(ST_OBJS) install_modules: $(S_OBJS) Modified: head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c ============================================================================== --- head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c Mon Feb 15 19:01:11 2016 (r408951) +++ head/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c Mon Feb 15 19:19:24 2016 (r408952) @@ -4,7 +4,7 @@ switch (seed_type) { -+#ifdef HAVE_RAND_EGD ++#ifndef OPENSSL_NO_EGD case RB_PRNG_EGD: if(RAND_egd(path) == -1) return -1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602151919.u1FJJOaW085894>