svn commit: r428605 - in head/irc/charybdis: . files

Mikhail Pchelin misha at FreeBSD.org
Thu Dec 15 08:59:22 UTC 2016 

Author: misha
Date: Thu Dec 15 08:59:20 2016
New Revision: 428605
URL: https://svnweb.freebsd.org/changeset/ports/428605

Log:
  - update from 3.4.2 to 3.5.3
  - use of official master site
  - remove 'expect' from CONFLICTS
  - remove DOCS option
  - binaries are stripped by default
  - help files are linked relatively
  
  Approved by:	crees (maintainer), jpaetzel (mentor)

Added:
  head/irc/charybdis/files/patch-extensions_Makefile.in   (contents, props changed)
  head/irc/charybdis/files/patch-help_Makefile.in   (contents, props changed)
  head/irc/charybdis/files/patch-modules_Makefile.in   (contents, props changed)
  head/irc/charybdis/files/patch-tools_Makefile.in   (contents, props changed)
Deleted:
  head/irc/charybdis/files/patch-remove-RB_PRNG_EGD
  head/irc/charybdis/files/patch-tools-Makefile-in
Modified:
  head/irc/charybdis/Makefile
  head/irc/charybdis/distinfo
  head/irc/charybdis/files/patch-configure
  head/irc/charybdis/pkg-plist

Modified: head/irc/charybdis/Makefile
==============================================================================
--- head/irc/charybdis/Makefile	Thu Dec 15 08:19:03 2016	(r428604)
+++ head/irc/charybdis/Makefile	Thu Dec 15 08:59:20 2016	(r428605)
@@ -1,13 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	charybdis
-PORTVERSION=	3.4.2
-PORTREVISION=	6
-CATEGORIES=	irc net
-MASTER_SITES=	http://www.stack.nl/~jilles/irc/ \
-		http://www.bayofrum.net/dist/${PORTNAME}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTFILES:M*tbz2}
+PORTVERSION=	3.5.3
+CATEGORIES=	irc ipv6 net
+MASTER_SITES=	http://distfiles.charybdis.io/
 
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Powerful IRC daemon, based on ircd-ratbox
@@ -20,17 +16,12 @@ BROKEN_powerpc64=	Does not build
 CONFLICTS=	ircd-ratbox-[0-9]* ircd-ratbox-devel-[0-9]* \
 		nefarious-[0-9]* ircd-hybrid-[0-9]* \
 		ptlink-ircd-[0-9]* bnc-[0-9]* \
-		expect-[0-9]* whois-[0-9]* undernet-ircu-[0-9]* \
+		whois-[0-9]* undernet-ircu-[0-9]* \
 		ru-ircd-hybrid-[0-9]* \
 
-MASTER_SITES:=	${MASTER_SITES} \
-		${MASTER_SITES:S,$,charybdis-stable-oper-guide/:pdf,}
-
-PORTDOCS=	charybdis-oper-guide.pdf
-
-USES=		libtool pathfix tar:tbz2
-USE_OPENSSL=	yes
+USES=		libtool pathfix ssl tar:bz2
 USE_RC_SUBR=	${PORTNAME}
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USERS=		ircd
 GROUPS=		ircd
@@ -39,19 +30,13 @@ CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
 		--enable-fhs-paths \
 		--enable-kqueue
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS_DISTFILES=	${PORTDOCS}:pdf
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd \
 		${STAGEDIR}${ETCDIR}/ircd.motd.sample
 
-pre-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf \
-		${STAGEDIR}${DOCSDIR}
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libratbox.so
 
 .include <bsd.port.mk>

Modified: head/irc/charybdis/distinfo
==============================================================================
--- head/irc/charybdis/distinfo	Thu Dec 15 08:19:03 2016	(r428604)
+++ head/irc/charybdis/distinfo	Thu Dec 15 08:59:20 2016	(r428605)
@@ -1,4 +1,3 @@
-SHA256 (charybdis-3.4.2.tbz2) = 8a38e67072d90147c40202918c82237765e339cbc849456da54994ce6e31b754
-SIZE (charybdis-3.4.2.tbz2) = 1526229
-SHA256 (charybdis-oper-guide.pdf) = 13a0fe5642ed62810e76aed4c95dcd2fcd63f3565af9035fdd7b3874b5951e07
-SIZE (charybdis-oper-guide.pdf) = 553379
+TIMESTAMP = 1481632793
+SHA256 (charybdis-3.5.3.tar.bz2) = 9fb928524acbadeabedef56b0b6446c2d6de365382e256f5c21170c75390e16b
+SIZE (charybdis-3.5.3.tar.bz2) = 1555846

Modified: head/irc/charybdis/files/patch-configure
==============================================================================
--- head/irc/charybdis/files/patch-configure	Thu Dec 15 08:19:03 2016	(r428604)
+++ head/irc/charybdis/files/patch-configure	Thu Dec 15 08:59:20 2016	(r428605)
@@ -1,6 +1,23 @@
---- configure.orig	2012-12-31 21:47:31 UTC
+--- configure.orig	2016-09-05 22:33:24 UTC
 +++ configure
-@@ -5411,7 +5411,7 @@ if test "x$enable_fhs_paths" = "xyes"; t
+@@ -677,6 +677,7 @@ MV
+ CP
+ RM
+ INSTALL_DATA
++INSTALL_LIB
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ SET_MAKE
+@@ -4833,6 +4834,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
++test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL} -s -m 644'
++
+ # Extract the first word of "rm", so it can be a program name with args.
+ set dummy rm; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -5424,7 +5427,7 @@ if test "x$enable_fhs_paths" = "xyes"; t
    	pkglibexecdir='${libexecdir}/${PACKAGE_TARNAME}'
  	rundir=${rundir-'${prefix}/run'}
  	pkgrundir='${rundir}/${PACKAGE_TARNAME}'

Added: head/irc/charybdis/files/patch-extensions_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/charybdis/files/patch-extensions_Makefile.in	Thu Dec 15 08:59:20 2016	(r428605)
@@ -0,0 +1,19 @@
+--- extensions/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ extensions/Makefile.in
+@@ -14,6 +14,7 @@ MKDEP		= @MKDEP@
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL_LIB@
+ INSTALL_SUID    = @INSTALL_PROGRAM@ -o root -m 4755
+ SHELL		= /bin/sh
+ 
+@@ -104,7 +105,7 @@ install: all
+         fi
+ 	@echo "Installing modules into $(DESTDIR)$(AUTOMODULEDIR) .."
+ 	@for file in $(OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(AUTOMODULEDIR); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(AUTOMODULEDIR); \
+ 	done
+ 
+ .SUFFIXES: .so

Added: head/irc/charybdis/files/patch-help_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/charybdis/files/patch-help_Makefile.in	Thu Dec 15 08:59:20 2016	(r428605)
@@ -0,0 +1,15 @@
+--- help/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ help/Makefile.in
+@@ -88,9 +88,10 @@ install:
+ 		$(INSTALL_DATA) $$help $(DESTDIR)$(uhelpdir); \
+ 	fi \
+ 	done
+-	@for link in $(SYMLINKS); do \
++	@cd $(DESTDIR)$(uhelpdir); \
++	for link in $(SYMLINKS); do \
+ 		rm -f $(DESTDIR)$(uhelpdir)/$$link; \
+-		ln -s $(ohelpdir)/$$link $(DESTDIR)$(uhelpdir); \
++		ln -s ../opers/$$link $$link; \
+ 	done
+ 
+ 

Added: head/irc/charybdis/files/patch-modules_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/charybdis/files/patch-modules_Makefile.in	Thu Dec 15 08:59:20 2016	(r428605)
@@ -0,0 +1,23 @@
+--- modules/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ modules/Makefile.in
+@@ -16,6 +16,7 @@ MKDEP		= @MKDEP@ -DIRCD_PREFIX=\"@prefix
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL_LIB@
+ INSTALL_SUID    = @INSTALL_PROGRAM@ -o root -m 4755
+ SEDOBJ		= @SEDOBJ@
+ SHELL		= /bin/sh
+@@ -179,10 +180,10 @@ install_libmodules.a: libmodules.a
+ install_shared_modules: install-mkdirs
+ 	@echo "ircd: installing modules"
+ 	@for file in $(SH_CORE_OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(moduledir); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(moduledir); \
+ 	done
+ 	@for file in $(SH_OBJS); do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(automoduledir); \
++		$(INSTALL_LIB) $$file $(DESTDIR)$(automoduledir); \
+ 	done
+ 
+ install_hpux_shared: install-mkdirs

Added: head/irc/charybdis/files/patch-tools_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/charybdis/files/patch-tools_Makefile.in	Thu Dec 15 08:59:20 2016	(r428605)
@@ -0,0 +1,30 @@
+--- tools/Makefile.in.orig	2016-12-13 14:45:17 UTC
++++ tools/Makefile.in
+@@ -4,6 +4,7 @@ CC		= @CC@
+ INSTALL		= @INSTALL@
+ INSTALL_BIN	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+ INSTALL_SUID	= @INSTALL_PROGRAM@ -o root -m 4755
+ RM		= @RM@
+ LEX		= @LEX@
+@@ -29,9 +30,9 @@ libexecdir	= @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ 
+-PROGS		= viconf mkpasswd genssl
++PROGS		= viconf mkpasswd
+ 
+-all: $(PROGS)
++all: $(PROGS) genssl
+ 
+ build: all
+ 
+@@ -93,6 +94,7 @@ install: install-mkdirs build
+ 		fi; \
+ 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \
+ 	done; \
++	$(INSTALL_SCRIPT) genssl $(DESTDIR)$(bindir); \
+ 	$(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+ 	$(LN) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)viconf $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+ 

Modified: head/irc/charybdis/pkg-plist
==============================================================================
--- head/irc/charybdis/pkg-plist	Thu Dec 15 08:19:03 2016	(r428604)
+++ head/irc/charybdis/pkg-plist	Thu Dec 15 08:59:20 2016	(r428605)
@@ -1,14 +1,14 @@
 bin/bantool
-bin/convertilines
-bin/convertklines
-bin/genssl.sh
+bin/genssl
 bin/ircd
 bin/mkpasswd
 bin/viconf
 bin/vimotd
-%%ETCDIR%%/example.conf
+ at sample %%ETCDIR%%/ircd.conf.example %%ETCDIR%%/ircd.conf
 @sample %%ETCDIR%%/ircd.motd.sample
 %%ETCDIR%%/reference.conf
+lib/charybdis/modules/autoload/chm_nocolour.so
+lib/charybdis/modules/autoload/chm_noctcp.so
 lib/charybdis/modules/autoload/m_accept.so
 lib/charybdis/modules/autoload/m_admin.so
 lib/charybdis/modules/autoload/m_away.so
@@ -53,6 +53,7 @@ lib/charybdis/modules/autoload/m_service
 lib/charybdis/modules/autoload/m_set.so
 lib/charybdis/modules/autoload/m_signon.so
 lib/charybdis/modules/autoload/m_snote.so
+lib/charybdis/modules/autoload/m_starttls.so
 lib/charybdis/modules/autoload/m_stats.so
 lib/charybdis/modules/autoload/m_svinfo.so
 lib/charybdis/modules/autoload/m_tb.so
@@ -74,29 +75,33 @@ lib/charybdis/modules/autoload/m_whowas.
 lib/charybdis/modules/autoload/m_xline.so
 lib/charybdis/modules/autoload/sno_routing.so
 lib/charybdis/modules/extensions/chm_adminonly.so
-lib/charybdis/modules/extensions/chm_operonly.so
+lib/charybdis/modules/extensions/chm_nonotice.so
 lib/charybdis/modules/extensions/chm_operonly_compat.so
+lib/charybdis/modules/extensions/chm_operonly.so
 lib/charybdis/modules/extensions/chm_quietunreg_compat.so
-lib/charybdis/modules/extensions/chm_sslonly.so
 lib/charybdis/modules/extensions/chm_sslonly_compat.so
+lib/charybdis/modules/extensions/chm_sslonly.so
 lib/charybdis/modules/extensions/createauthonly.so
 lib/charybdis/modules/extensions/createoperonly.so
 lib/charybdis/modules/extensions/example_module.so
 lib/charybdis/modules/extensions/extb_account.so
 lib/charybdis/modules/extensions/extb_canjoin.so
 lib/charybdis/modules/extensions/extb_channel.so
+lib/charybdis/modules/extensions/extb_combi.so
 lib/charybdis/modules/extensions/extb_extgecos.so
+lib/charybdis/modules/extensions/extb_hostmask.so
 lib/charybdis/modules/extensions/extb_oper.so
 lib/charybdis/modules/extensions/extb_realname.so
 lib/charybdis/modules/extensions/extb_server.so
 lib/charybdis/modules/extensions/extb_ssl.so
 lib/charybdis/modules/extensions/extb_usermode.so
 lib/charybdis/modules/extensions/force_user_invis.so
+lib/charybdis/modules/extensions/hide_uncommon_channels.so
 lib/charybdis/modules/extensions/hurt.so
-lib/charybdis/modules/extensions/ip_cloaking.so
 lib/charybdis/modules/extensions/ip_cloaking_3.0.so
 lib/charybdis/modules/extensions/ip_cloaking_4.0.so
 lib/charybdis/modules/extensions/ip_cloaking_old.so
+lib/charybdis/modules/extensions/ip_cloaking.so
 lib/charybdis/modules/extensions/m_42.so
 lib/charybdis/modules/extensions/m_adminwall.so
 lib/charybdis/modules/extensions/m_findforwards.so
@@ -104,16 +109,17 @@ lib/charybdis/modules/extensions/m_ident
 lib/charybdis/modules/extensions/m_mkpasswd.so
 lib/charybdis/modules/extensions/m_ojoin.so
 lib/charybdis/modules/extensions/m_okick.so
-lib/charybdis/modules/extensions/m_olist.so
 lib/charybdis/modules/extensions/m_omode.so
 lib/charybdis/modules/extensions/m_opme.so
 lib/charybdis/modules/extensions/m_remove.so
 lib/charybdis/modules/extensions/m_roleplay.so
 lib/charybdis/modules/extensions/m_sendbans.so
 lib/charybdis/modules/extensions/m_webirc.so
+lib/charybdis/modules/extensions/no_kill_services.so
 lib/charybdis/modules/extensions/no_locops.so
 lib/charybdis/modules/extensions/no_oper_invis.so
 lib/charybdis/modules/extensions/override.so
+lib/charybdis/modules/extensions/restrict-unauthenticated.so
 lib/charybdis/modules/extensions/sno_farconnect.so
 lib/charybdis/modules/extensions/sno_globalkline.so
 lib/charybdis/modules/extensions/sno_globaloper.so
@@ -181,6 +187,7 @@ man/man8/ircd.8.gz
 %%DATADIR%%/help/opers/modreload
 %%DATADIR%%/help/opers/modrestart
 %%DATADIR%%/help/opers/modunload
+%%DATADIR%%/help/opers/monitor
 %%DATADIR%%/help/opers/motd
 %%DATADIR%%/help/opers/names
 %%DATADIR%%/help/opers/nick
@@ -252,6 +259,7 @@ man/man8/ircd.8.gz
 %%DATADIR%%/help/users/list
 %%DATADIR%%/help/users/lusers
 %%DATADIR%%/help/users/map
+%%DATADIR%%/help/users/monitor
 %%DATADIR%%/help/users/motd
 %%DATADIR%%/help/users/names
 %%DATADIR%%/help/users/nick

More information about the svn-ports-all mailing list