From moggie@ewok.elasticmind.net  Fri Apr 13 23:40:33 2012
Return-Path: <moggie@ewok.elasticmind.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 995FA106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Apr 2012 23:40:33 +0000 (UTC)
	(envelope-from moggie@ewok.elasticmind.net)
Received: from ewok.elasticmind.net (ewok.elasticmind.net [IPv6:2001:67c:26e8:4::20])
	by mx1.freebsd.org (Postfix) with ESMTP id DEF728FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Apr 2012 23:40:31 +0000 (UTC)
Received: from ewok.elasticmind.net (moggie@localhost [127.0.0.1])
	by ewok.elasticmind.net (8.14.4/8.14.4) with ESMTP id q3DNeTKV001780
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Apr 2012 00:40:29 +0100 (BST)
	(envelope-from moggie@ewok.elasticmind.net)
Received: (from moggie@localhost)
	by ewok.elasticmind.net (8.14.4/8.14.4/Submit) id q3DNeTQ3001779;
	Sat, 14 Apr 2012 00:40:29 +0100 (BST)
	(envelope-from moggie)
Message-Id: <201204132340.q3DNeTQ3001779@ewok.elasticmind.net>
Date: Sat, 14 Apr 2012 00:40:29 +0100 (BST)
From: moggie <moggie@elasticmind.net>
Reply-To: moggie <moggie@elasticmind.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [repocopy] irc/ircd-ratbox-devel -> irc/ircd-ratbox
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166931
>Category:       ports
>Synopsis:       [PATCH] Update irc/ircd-ratbox to 3.0.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    scheidell
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 13 23:50:11 UTC 2012
>Closed-Date:    Sun Apr 15 12:01:16 UTC 2012
>Last-Modified:  Sun Apr 15 12:01:16 UTC 2012
>Originator:     moggie
>Release:        FreeBSD 7.4-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD 7.4-RELEASE-p6 FreeBSD 7.4-RELEASE-p6 #0: Sat Feb 4 11:35:35 GMT 2012 amd64

	
>Description:
Please repocopy irc/ircd-ratbox-devel (3.0.7) over to irc/ircd-ratbox
to replace the deprecated version.

The supplied patch should:
- Make the necessary changes to convert the "devel" port into the "stable" one.
- Avoid listing Perl as a dependency when it is not required.
- Remove some @unexec usage in pkg-plist.


--- Note for /usr/src/UPDATING ---

ircd-ratbox has been updated to follow the current stable release branch (3.0.x).
All previous branches are no longer supported by the ratbox team.

Users of ircd-ratbox are advised to create new ircd configuration files based on
the examples provided.

--- End of note ---

	
>How-To-Repeat:
	
>Fix:

	

--- ircd-ratbox-repocopy.diff begins here ---
diff -ruN ircd-ratbox.orig/Makefile ircd-ratbox/Makefile
--- ircd-ratbox.orig/Makefile	2012-04-13 18:09:37.000000000 +0100
+++ ircd-ratbox/Makefile	2012-04-13 23:47:14.000000000 +0100
@@ -12,20 +12,18 @@
 MASTER_SITES=	http://www.ratbox.org/download/				\
 		ftp://ftp.parodius.com/pub/ircd-ratbox/			\
 		http://www.ratbox.org/download/old/
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	moggie@elasticmind.net
-COMMENT=	Advanced, stable IRC daemon, used widely on EFnet ('testing' release)
+COMMENT=	Advanced, stable IRC daemon, used widely on EFnet
 
 LICENSE=	GPLv2
 
-CONFLICTS=	ircd-ratbox-[0-9]*
+CONFLICTS=	ircd-ratbox-devel-[0-9]*
 
 USE_BZIP2=	yes
 #MAN8=		ircd.8
 USE_RC_SUBR=	ircd-ratbox.sh
 USE_SQLITE=	3
-USE_PERL5_BUILD=	yes
 USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
 
 USERS=		ircd
@@ -58,7 +56,8 @@
 		SHARED_MODULES	"Enable shared modules support"			on  \
 		ASSERT		"Enable debugging code"				off \
 		SMALL_NET	"Tune server for small networks"		off \
-		SERVICES	"Enable ratbox-services compatibility code"	off
+		SERVICES	"Enable ratbox-services compatibility code"	off \
+		SHORTCUTS	"Build with ircd-shortcut commands"		off
 
 #----------------------------------------------------------------------
 
@@ -95,6 +94,16 @@
 
 .if defined(WITH_SERVICES)
 CONFIGURE_ARGS+=	--enable-services
+PLIST_SUB+=		SERVICES=""
+.else
+PLIST_SUB+=		SERVICES="@comment "
+.endif
+
+.if defined(WITH_SHORTCUTS)
+USE_PERL5_BUILD=	yes
+PLIST_SUB+=		SHORTCUTS=""
+.else
+PLIST_SUB+=		SHORTCUTS="@comment "
 .endif
 
 #-- User Configuration -------------------------------------------------
@@ -126,14 +135,14 @@
 pre-build:
 	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g"		\
-			  ${WRKSRC}/doc/example.conf		\
-			  ${WRKSRC}/doc/example.efnet.conf
+			${WRKSRC}/doc/example.conf		\
+			${WRKSRC}/doc/example.efnet.conf
 	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g"		\
-				${WRKSRC}/doc/example.conf	\
-				${WRKSRC}/doc/example.efnet.conf
+			${WRKSRC}/doc/example.conf		\
+			${WRKSRC}/doc/example.efnet.conf
 	@${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g"		\
-				${WRKSRC}/doc/example.conf	\
-				${WRKSRC}/doc/example.efnet.conf
+			${WRKSRC}/doc/example.conf		\
+			${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
@@ -177,18 +186,22 @@
 	${WRKSRC}/contrib/ircd-shortcut.pl
 .endif
 
-#------ Execute ircd-shortcut perl script to generate the .c file. -----
+# ----- Execute ircd-shortcut perl script to generate the .c file. -----
+.if defined(WITH_SHORTCUTS)
 	@${ECHO_MSG} "Executing ircd-shortcut.pl for ircd-shortcuts generation."
 	${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl
+.endif
 
 post-build:
 	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
+.if defined(WITH_SHORTCUTS)
 	@${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts."
 	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
+.endif
 
 pre-su-install:
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}
@@ -208,9 +221,11 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh
 
 # ----- We need to install the shortcut.pl module ----
+.if defined(WITH_SHORTCUTS)
 	@${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation."
 	${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \
 		${PREFIX}/lib/${PORTNAME}/modules/contrib
+.endif
 
 	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
diff -ruN ircd-ratbox.orig/files/pkg-install.in ircd-ratbox/files/pkg-install.in
--- ircd-ratbox.orig/files/pkg-install.in	2012-04-13 18:09:37.000000000 +0100
+++ ircd-ratbox/files/pkg-install.in	2012-04-14 00:05:39.000000000 +0100
@@ -29,12 +29,12 @@
 conffile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf"
 samplefile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample"
 if cmp -s $conffile $samplefile; then
-	echo "Setting permissions for config dir and files."
+	echo "Setting default permissions for config dir and files."
 	chown -R root:ircd %%PREFIX%%/etc/ircd-ratbox/
 	chmod 750 %%PREFIX%%/etc/ircd-ratbox/
 	chmod 640 %%PREFIX%%/etc/ircd-ratbox/*
 else
-	echo "Modified ircd.conf file found, skipping perms setting."
+	echo "Modified ircd.conf file found, permissions unchanged."
 fi
 
 #-----------------------------------------------------------------------
diff -ruN ircd-ratbox.orig/files/pkg-message.in ircd-ratbox/files/pkg-message.in
--- ircd-ratbox.orig/files/pkg-message.in	2012-04-13 18:09:37.000000000 +0100
+++ ircd-ratbox/files/pkg-message.in	2012-04-14 00:10:37.000000000 +0100
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------
-ircd-ratbox-devel has been successfully installed.
+ircd-ratbox has been successfully installed.
 
 Sample 'ircd.conf' and 'ircd.motd' files have been created in the
 ircd-ratbox configuration directory. A sample configuration file is
@@ -17,15 +17,20 @@
 
 	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
 
-The ban.db database can be checked and updated using 'bantool -u'.
-For safety, updates should be done while no ircd is running and before
-starting the new version.
+The ban.db database should be checked and updated using 'bantool -u'.
+For safety, bantool updates must be done while no ircd is running and
+before starting the new version.
 
 	%%PREFIX%%/bin/bantool -u
 
-Note that the ssl_only_channel compile option has been removed, and
-should be added as a configuration setting (use_sslonly) in the
-ircd.conf file in order to activate the +S channel mode. 
+Notice: ircd-ratbox has been updated to follow the current stable
+release branch (3.0.x). All previous branches are no longer supported
+by the ratbox team. Users of ircd-ratbox are advised to create new ircd
+configuration files based on the examples provided.
+
+For more information on upgrading, see:
+
+	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
 
 Be sure to check out 'ratbox-services' if you need a services package.
 ------------------------------------------------------------------------
diff -ruN ircd-ratbox.orig/pkg-descr ircd-ratbox/pkg-descr
--- ircd-ratbox.orig/pkg-descr	2012-04-13 20:05:31.000000000 +0100
+++ ircd-ratbox/pkg-descr	2012-04-13 18:16:50.000000000 +0100
@@ -1,10 +1,5 @@
 This is a port of the ircd-ratbox IRC daemon.
 
-This version is the 'testing' branch; it usually contains more features,
-but may contain as of yet unidentified bugs. Admins wishing to try out new
-features or test the development release may prefer to use it over the
-standard production release.
-
 ircd-ratbox is the primary ircd used on EFnet; it combines the stability
 of an ircd required for a large production network together with a rich
 set of features, making it also suitable for use on smaller networks.
diff -ruN ircd-ratbox.orig/pkg-plist ircd-ratbox/pkg-plist
--- ircd-ratbox.orig/pkg-plist	2012-04-13 18:09:37.000000000 +0100
+++ ircd-ratbox/pkg-plist	2012-04-13 23:51:44.000000000 +0100
@@ -142,8 +142,8 @@
 lib/ircd-ratbox/libcore.so
 lib/ircd-ratbox/libratbox.la
 lib/ircd-ratbox/libratbox.so
-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.so"; if [ -f "$f" ]; then rm -f "$f"; fi
-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.la"; if [ -f "$f" ]; then rm -f "$f"; fi
+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.so
+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.la
 lib/ircd-ratbox/modules/autoload/m_accept.so
 lib/ircd-ratbox/modules/autoload/m_admin.so
 lib/ircd-ratbox/modules/autoload/m_adminwall.so
@@ -198,6 +198,7 @@
 lib/ircd-ratbox/modules/autoload/m_whois.so
 lib/ircd-ratbox/modules/autoload/m_whowas.so
 lib/ircd-ratbox/modules/autoload/m_xline.so
+%%SHORTCUTS%%lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
 lib/ircd-ratbox/modules/contrib/example_module.so
 lib/ircd-ratbox/modules/contrib/m_42.so
 lib/ircd-ratbox/modules/contrib/m_clearchan.so
@@ -216,7 +217,6 @@
 lib/ircd-ratbox/modules/contrib/spy_stats_p_notice.so
 lib/ircd-ratbox/modules/contrib/spy_whois_notice.so
 lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so
-lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
 lib/ircd-ratbox/modules/m_die.so
 lib/ircd-ratbox/modules/m_error.so
 lib/ircd-ratbox/modules/m_join.so
--- ircd-ratbox-repocopy.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sat Apr 14 11:59:47 UTC 2012 
Responsible-Changed-Why:  
I'll take it.  I got 166914 also. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 
State-Changed-From-To: open->suspended 
State-Changed-By: scheidell 
State-Changed-When: Sat Apr 14 12:00:21 UTC 2012 
State-Changed-Why:  
Waiting on pr 166914 to close 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 
State-Changed-From-To: suspended->open 
State-Changed-By: scheidell 
State-Changed-When: Sat Apr 14 13:44:04 UTC 2012 
State-Changed-Why:  
pr 166914 comitted. Please repocopy 


Responsible-Changed-From-To: scheidell->portmgr 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sat Apr 14 13:44:04 UTC 2012 
Responsible-Changed-Why:  
pr 166914 comitted. Please repocopy 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 

From: Michael Scheidell <scheidell@FreeBSD.org>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/166931: [repocopy] irc/ircd-ratbox-devel -&gt; irc/ircd-ratbox
Date: Sat, 14 Apr 2012 09:54:30 -0400

 moggie:
 
 do you want -devel deleted from ports tree with repocopy? or leave it?
 You want to write a MOVED entry? or should I ?
 
 
 -- 
 Michael Scheidell, CTO
  >*| * SECNAP Network Security Corporation
 d: +1.561.948.2259
 w: http://people.freebsd.org/~scheidell
Responsible-Changed-From-To: portmgr->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Sat Apr 14 14:54:25 UTC 2012 
Responsible-Changed-Why:  
Not yet.. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 

From: Moggie <moggie@elasticmind.net>
To: bug-followup@FreeBSD.org, moggie@elasticmind.net
Cc:  
Subject: Re: ports/166931: [repocopy] irc/ircd-ratbox-devel -&gt; irc/ircd-ratbox
Date: Sat, 14 Apr 2012 17:04:28 +0100

 Sorry, I used bad terminology... At the time I thought repocopy was a 
 euphemism for "updating or syncing one port's current files with 
 another", but have come to understand that it is certainly not. I 
 definitely don't wish for the ports to be repocopied, sorry for the 
 confusion!
 
 To clarify; the "-devel" release of ircd-ratbox is now considered 
 stable, meaning there is currently no development version available.
 
 I've updated irc/ircd-ratbox-devel to the most recent release and meant 
 to ask if the two ports could please be synchronised, such that the 
 deprecated (old "stable") version of the port is updated to the current 
 release branch (by copying irc/ircd-ratbox-devel files over 
 irc/ircd-ratbox and then applying the supplied patch).
 
 Thanks.
State-Changed-From-To: open->feedback 
State-Changed-By: scheidell 
State-Changed-When: Sun Apr 15 10:54:31 UTC 2012 
State-Changed-Why:  
note: next time, supply a patch to ircd-ratware that updates it to tne next version. 
(cd ../ircd-ratware.  manually everything but CVS files. 
cd ./irc  rsync -avC ./ircd-ratware-devel ./ircd-ratware 
edit ./irc/Makefile and remove ircd-ratware-devel entry if you want it removed. 

Q: Did you want ../irc/ircd-ratware-devel removed? and entry made in /usr/ports/MOVED  or will you be continuting to use it  
for new devel versions? ie: do you want to maintain two versions? 


http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166931: commit references a PR
Date: Sun, 15 Apr 2012 10:52:27 +0000 (UTC)

 scheidell    2012-04-15 10:52:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    UPDATING 
     irc/ircd-ratbox      Makefile distinfo pkg-descr pkg-plist 
     irc/ircd-ratbox/files patch-contrib_ircd-shortcut.pl 
                           patch-doc_Makefile.in 
                           patch-doc_example.conf 
                           patch-doc_example.efnet.conf 
                           patch-include_config.h pkg-install.in 
                           pkg-message.in 
   Removed files:
     irc/ircd-ratbox/files patch-Makefile.in 
                           patch-contrib_Makefile.in 
                           patch-help_Makefile.in 
                           patch-modules_Makefile.in 
                           patch-servlink_Makefile.in 
                           patch-src_Makefile.in 
                           patch-tools_Makefile.in 
   Log:
   - Major release update to 3.0.7. Read /usr/ports/UPDATING
   
   PR:             ports/166931
   Submitted by:   moggie <moggie@elasticmind.net> (maintainer)
   Reviewed by:    scheidell (me)
   
   Revision  Changes    Path
   1.1219    +11 -1     ports/UPDATING
   1.20      +65 -32    ports/irc/ircd-ratbox/Makefile
   1.11      +2 -2      ports/irc/ircd-ratbox/distinfo
   1.2       +0 -11     ports/irc/ircd-ratbox/files/patch-Makefile.in (dead)
   1.3       +0 -11     ports/irc/ircd-ratbox/files/patch-contrib_Makefile.in (dead)
   1.2       +2 -2      ports/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
   1.2       +10 -15    ports/irc/ircd-ratbox/files/patch-doc_Makefile.in
   1.4       +33 -16    ports/irc/ircd-ratbox/files/patch-doc_example.conf
   1.4       +36 -19    ports/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
   1.2       +0 -17     ports/irc/ircd-ratbox/files/patch-help_Makefile.in (dead)
   1.2       +13 -10    ports/irc/ircd-ratbox/files/patch-include_config.h
   1.2       +0 -16     ports/irc/ircd-ratbox/files/patch-modules_Makefile.in (dead)
   1.2       +0 -12     ports/irc/ircd-ratbox/files/patch-servlink_Makefile.in (dead)
   1.2       +0 -12     ports/irc/ircd-ratbox/files/patch-src_Makefile.in (dead)
   1.2       +0 -12     ports/irc/ircd-ratbox/files/patch-tools_Makefile.in (dead)
   1.3       +15 -7     ports/irc/ircd-ratbox/files/pkg-install.in
   1.5       +19 -4     ports/irc/ircd-ratbox/files/pkg-message.in
   1.2       +12 -0     ports/irc/ircd-ratbox/pkg-descr
   1.6       +112 -102  ports/irc/ircd-ratbox/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Moggie <moggie@elasticmind.net>
To: bug-followup@FreeBSD.org, moggie@elasticmind.net
Cc:  
Subject: Re: ports/166931: [PATCH] Update irc/ircd-ratbox to 3.0.7
Date: Sun, 15 Apr 2012 12:14:57 +0100

 Thanks for sorting this out.
 
 Making a patch to update irc/ircd-ratbox did cross my mind, but I 
 recalled someone telling me once that patches aren't always the best way 
 of achieving things like this - as it tends to produce large / 
 complicated patch files. However, if that is what committers prefer, 
 I'll be sure to just use a patch next time.
 
 Please leave irc/ircd-ratbox-devel unchanged. I know people actively use 
 it and at some point in the future I'm sure there will be new testing 
 releases.
State-Changed-From-To: feedback->closed 
State-Changed-By: scheidell 
State-Changed-When: Sun Apr 15 12:01:12 UTC 2012 
State-Changed-Why:  
Yes, sometimes its complicated. but without it, we could mis-undserstand 
exactly what you want.  Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166931 
>Unformatted:
