From owner-svn-ports-all@FreeBSD.ORG Sun Dec 29 15:19:30 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E303BCA3; Sun, 29 Dec 2013 15:19:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C364A1ADF; Sun, 29 Dec 2013 15:19:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBTFJUMD085658; Sun, 29 Dec 2013 15:19:30 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBTFJTIa085651; Sun, 29 Dec 2013 15:19:29 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201312291519.rBTFJTIa085651@svn.freebsd.org> From: Johan van Selst Date: Sun, 29 Dec 2013 15:19:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338008 - in head/irc/irc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2013 15:19:31 -0000 Author: johans Date: Sun Dec 29 15:19:29 2013 New Revision: 338008 URL: http://svnweb.freebsd.org/changeset/ports/338008 Log: Enable stage support Added: head/irc/irc/files/patch-support_Makefile.in (contents, props changed) head/irc/irc/files/patch-support_config.h.dist - copied, changed from r338007, head/irc/irc/files/patch-ab Deleted: head/irc/irc/files/patch-ab Modified: head/irc/irc/Makefile head/irc/irc/pkg-plist Modified: head/irc/irc/Makefile ============================================================================== --- head/irc/irc/Makefile Sun Dec 29 15:13:37 2013 (r338007) +++ head/irc/irc/Makefile Sun Dec 29 15:19:29 2013 (r338008) @@ -17,22 +17,13 @@ CONFLICTS_INSTALL= charybdis-[0-9]* ircd ru-ircd-hybrid-[0-9]* ircd-ru-[0-9]* USE_RC_SUBR= ircd -MAN5= iauth.conf.5 -MAN8= ircd.8 iauth.8 ircdwatch.8 - -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/ircd BUILD_WRKSRC= ${WRKSRC}/${MACHINE_ARCH}-unknown-${OPSYS:L}${OSREL} INSTALL_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif +IPV6_CONFIGURE_ENABLE= ipv6 .include Added: head/irc/irc/files/patch-support_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/irc/files/patch-support_Makefile.in Sun Dec 29 15:19:29 2013 (r338008) @@ -0,0 +1,94 @@ +--- support/Makefile.in.orig 2008-06-07 01:51:26.000000000 +0200 ++++ support/Makefile.in 2013-12-29 16:16:43.000000000 +0100 +@@ -219,55 +219,55 @@ $(TKSERV): tkserv.o + install: install-server + + install-ircd: $(IRCD_BIN) +- -@if [ ! -d $(server_bin_dir) ]; then \ +- $(MKDIRHIER) $(server_bin_dir); \ ++ -@if [ ! -d $(DESTDIR)$(server_bin_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(server_bin_dir); \ + fi +- $(INSTALL_PROGRAM) -m $(ircd_mode) $(IRCD_BIN) $(server_bin_dir) ++ $(INSTALL_PROGRAM) -m $(ircd_mode) $(IRCD_BIN) $(DESTDIR)$(server_bin_dir) + + install-server: install-ircd server +- -@if [ ! -d $(server_man_dir) ]; then \ +- $(MKDIRHIER) $(server_man_dir); \ ++ -@if [ ! -d $(DESTDIR)$(server_man_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(server_man_dir); \ + fi +- -@if [ ! -d $(conf_man_dir) ]; then \ +- $(MKDIRHIER) $(conf_man_dir); \ ++ -@if [ ! -d $(DESTDIR)$(conf_man_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(conf_man_dir); \ + fi +- -@if [ ! -d $(ircd_conf_dir) ]; then \ +- $(MKDIRHIER) $(ircd_conf_dir); \ ++ -@if [ ! -d $(DESTDIR)$(ircd_conf_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(ircd_conf_dir); \ + fi +- -@if [ ! -d $(ircd_var_dir) ]; then \ +- $(MKDIRHIER) $(ircd_var_dir); \ +- fi +- -@if [ ! -d $(ircd_log_dir) ]; then \ +- $(MKDIRHIER) $(ircd_log_dir); \ +- fi +- $(INSTALL_PROGRAM) -m $(ircd_mode) $(IAUTH) $(server_bin_dir) +- $(INSTALL_PROGRAM) -m $(ircd_mode) $(CHKCONF) $(server_bin_dir) +- $(INSTALL_PROGRAM) -m $(ircd_mode) ircd-mkpasswd $(server_bin_dir) +- $(INSTALL_PROGRAM) -m $(ircd_mode) $(IRCDWATCH) $(server_bin_dir) +- $(RM) $(IRCDM4_PATH) +- ../ircd/buildm4 $(IRCDM4_PATH) +- $(INSTALL_DATA) ../doc/ircd.8 $(server_man_dir) +- $(INSTALL_DATA) ../doc/iauth.8 $(server_man_dir) +- $(INSTALL_DATA) ../doc/iauth.conf.5 $(conf_man_dir) +- $(INSTALL_DATA) ../contrib/ircdwatch/ircdwatch.8 $(server_man_dir) +- $(INSTALL_DATA) ../doc/ircd.conf.example $(ircd_conf_dir) +- $(INSTALL_DATA) ../doc/iauth.conf.example $(ircd_conf_dir) +- -@if [ ! -f $(IAUTHCONF_PATH) ]; then \ +- $(INSTALL_DATA) ../doc/iauth.conf.example $(IAUTHCONF_PATH); \ ++ -@if [ ! -d $(DESTDIR)$(ircd_var_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(ircd_var_dir); \ ++ fi ++ -@if [ ! -d $(DESTDIR)$(ircd_log_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(ircd_log_dir); \ ++ fi ++ $(INSTALL_PROGRAM) -m $(ircd_mode) $(IAUTH) $(DESTDIR)$(server_bin_dir) ++ $(INSTALL_PROGRAM) -m $(ircd_mode) $(CHKCONF) $(DESTDIR)$(server_bin_dir) ++ $(INSTALL_PROGRAM) -m $(ircd_mode) ircd-mkpasswd $(DESTDIR)$(server_bin_dir) ++ $(INSTALL_PROGRAM) -m $(ircd_mode) $(IRCDWATCH) $(DESTDIR)$(server_bin_dir) ++ $(RM) $(DESTDIR)$(IRCDM4_PATH) ++ ../ircd/buildm4 $(DESTDIR)$(IRCDM4_PATH) ++ $(INSTALL_DATA) ../doc/ircd.8 $(DESTDIR)$(server_man_dir) ++ $(INSTALL_DATA) ../doc/iauth.8 $(DESTDIR)$(server_man_dir) ++ $(INSTALL_DATA) ../doc/iauth.conf.5 $(DESTDIR)$(conf_man_dir) ++ $(INSTALL_DATA) ../contrib/ircdwatch/ircdwatch.8 $(DESTDIR)$(server_man_dir) ++ $(INSTALL_DATA) ../doc/ircd.conf.example $(DESTDIR)$(ircd_conf_dir) ++ $(INSTALL_DATA) ../doc/iauth.conf.example $(DESTDIR)$(ircd_conf_dir) ++ -@if [ ! -f $(DESTDIR)$(IAUTHCONF_PATH) ]; then \ ++ $(INSTALL_DATA) ../doc/iauth.conf.example $(DESTDIR)$(IAUTHCONF_PATH); \ + fi +- -@if [ ! -f $(IRCDMOTD_PATH) ]; then \ +- $(INSTALL_DATA) ../support/ircd.motd $(IRCDMOTD_PATH); \ ++ -@if [ ! -f $(DESTDIR)$(IRCDMOTD_PATH) ]; then \ ++ $(INSTALL_DATA) ../support/ircd.motd $(DESTDIR)$(IRCDMOTD_PATH); \ + fi + @echo "installation of server done." + + install-tkserv: $(TKSERV) +- -@if [ ! -d $(server_bin_dir) ]; then \ +- $(MKDIRHIER) $(server_bin_dir); \ ++ -@if [ ! -d $(DESTDIR)$(server_bin_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(server_bin_dir); \ + fi +- -@if [ ! -d $(ircd_conf_dir) ]; then \ +- $(MKDIRHIER) $(ircd_conf_dir); \ ++ -@if [ ! -d $(DESTDIR)$(ircd_conf_dir) ]; then \ ++ $(MKDIRHIER) $(DESTDIR)$(ircd_conf_dir); \ + fi +- $(INSTALL_PROGRAM) -m $(ircd_mode) $(TKSERV) $(server_bin_dir) ++ $(INSTALL_PROGRAM) -m $(ircd_mode) $(TKSERV) $(DESTDIR)$(server_bin_dir) + @echo "installation of tkserv done." + + clbsd.o: ../common/bsd.c setup.h config.h ../common/struct_def.h Copied and modified: head/irc/irc/files/patch-support_config.h.dist (from r338007, head/irc/irc/files/patch-ab) ============================================================================== --- head/irc/irc/files/patch-ab Sun Dec 29 15:13:37 2013 (r338007, copy source) +++ head/irc/irc/files/patch-support_config.h.dist Sun Dec 29 15:19:29 2013 (r338008) @@ -1,6 +1,6 @@ ---- support/config.h.dist.orig Sat Dec 11 01:56:41 2004 -+++ support/config.h.dist Sat Feb 26 01:13:29 2005 -@@ -118,13 +118,13 @@ +--- support/config.h.dist.orig 2010-08-13 21:53:03.000000000 +0200 ++++ support/config.h.dist 2013-12-29 16:09:38.000000000 +0100 +@@ -123,13 +123,13 @@ /* * Operator rights can be precisely defined in O:line flags. However * if you undefine any of the following, it will make given function @@ -17,9 +17,9 @@ +#define LOCOP_REHASH +#define LOCOP_RESTART #define OPER_SQUIT - #define OPER_TKLINE - /* In a perfect world these two (or at least second) would be undefined. */ -@@ -232,25 +232,25 @@ + #define OPER_SQUIT_REMOTE + #define OPER_KLINE +@@ -241,25 +241,25 @@ * this option is used unless you tell the system administrator beforehand * and obtain their permission to send messages to the system log files. */ @@ -53,7 +53,7 @@ #endif /* USE_SYSLOG */ /* -@@ -275,7 +275,7 @@ +@@ -308,7 +308,7 @@ * Define this if you want to use crypted passwords for operators in your * ircd.conf file. See contrib/mkpasswd/README for more details on this. */ @@ -62,7 +62,7 @@ /* * If you want to store encrypted passwords in N-lines for server links, -@@ -324,7 +324,7 @@ +@@ -357,7 +357,7 @@ * send to the server without processing before disconnecting the client for * flooding it. Values greater than 8000 make no difference to the server. */ @@ -71,7 +71,7 @@ /* Remote query flood protection. */ #define CHREPLLEN 8192 -@@ -359,7 +359,7 @@ +@@ -392,7 +392,7 @@ * The library and the include files must have been found by configure, * if you have installed the zlib after running configure, run it again. */ Modified: head/irc/irc/pkg-plist ============================================================================== --- head/irc/irc/pkg-plist Sun Dec 29 15:13:37 2013 (r338007) +++ head/irc/irc/pkg-plist Sun Dec 29 15:19:29 2013 (r338008) @@ -3,6 +3,10 @@ etc/ircd/iauth.conf.example etc/ircd/iauth.conf etc/ircd/ircd.motd etc/ircd/ircd.m4 +man/man5/iauth.conf.5.gz +man/man8/iauth.8.gz +man/man8/ircd.8.gz +man/man8/ircdwatch.8.gz sbin/chkconf sbin/ircd sbin/iauth