From john.marshall@riverwillow.com.au  Fri Aug 23 06:39:20 2013
Return-Path: <john.marshall@riverwillow.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id F1216277
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Aug 2013 06:39:20 +0000 (UTC)
	(envelope-from john.marshall@riverwillow.com.au)
Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 5BF072064
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Aug 2013 06:39:19 +0000 (UTC)
Received: from rwsrv08.mby.riverwillow.net.au (localhost [127.0.0.1])
	by mail1.riverwillow.net.au (8.14.7/8.14.7) with ESMTP id r7N6O6Fb056230
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Aug 2013 16:24:06 +1000 (AEST)
Received: (from john@localhost)
	by rwsrv08.mby.riverwillow.net.au (8.14.7/8.14.7/Submit) id r7N6O5IE056229;
	Fri, 23 Aug 2013 16:24:05 +1000 (AEST)
Message-Id: <201308230624.r7N6O5IE056229@rwsrv08.mby.riverwillow.net.au>
Date: Fri, 23 Aug 2013 16:24:05 +1000 (AEST)
From: John Marshall <john.marshall@riverwillow.com.au>
Reply-To: John Marshall <john.marshall@riverwillow.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] irc/ircd-ratbox fix default options broken by optionsNG commit
X-Send-Pr-Version: 3.114
X-GNATS-Notify: moggie@elasticmind.net

>Number:         181481
>Category:       ports
>Synopsis:       [PATCH] irc/ircd-ratbox fix default options broken by optionsNG commit
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    rodrigo
>State:          feedback
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 23 06:40:00 UTC 2013
>Closed-Date:    
>Last-Modified:  Tue Feb 18 10:00:01 UTC 2014
>Originator:     John Marshall
>Release:        FreeBSD 9.2-RC2 amd64
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwsrv08.mby.riverwillow.net.au 9.2-RC2 FreeBSD 9.2-RC2 #0 r254388: Fri Aug 16 11:31:09 AEST 2013 root@rwsrv08.mby.riverwillow.net.au:/usr/obj/usr/src/sys/RWSRV08 amd64


	
>Description:

r309810 included optionsNG conversion work which broke 3 of the 4
default options.  This meant that, instead of IPv6 and Ziplinks being
enabled by default, it wasn't possible to build the port with either.
Fortunately, an incorrect (old) configure argument was used to disable
building with shared modules, so they still built anyway.

>How-To-Repeat:

 make config (and twiddle the IPV6, ZIPLINKS and SHARED_MODS options)
 make clean configure (and notice absolutely no difference in the report)

>Fix:

Added appropriate --enable-foo arguments.

The --disable-shared-modules configure argument is old, invalid, and
does nothing.  The --enable-static option now provides that
functionality.

Also added MAKE_JOBS_UNSAFE to avoid intermittent build failures.

--- ircd-ratbox_324939.diff begins here ---
Index: irc/ircd-ratbox/Makefile
===================================================================
--- irc/ircd-ratbox/Makefile	(revision 324939)
+++ irc/ircd-ratbox/Makefile	(working copy)
@@ -20,6 +20,8 @@
 USE_SQLITE=	3
 USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
 
+MAKE_JOBS_UNSAFE=	yes
+
 USERS=		ircd
 GROUPS=		${USERS}
 
@@ -70,15 +72,21 @@
 .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-shared-modules
+CONFIGURE_ARGS+=	--disable-static
+.else
+CONFIGURE_ARGS+=	--enable-static
 .endif
 
 .if ${PORT_OPTIONS:MASSERT}
--- ircd-ratbox_324939.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 23 06:40:10 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: moggie@elasticmind.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/181481: [PATCH] irc/ircd-ratbox fix default options broken by optionsNG commit
Date: Fri, 23 Aug 2013 06:40:09 UT

 Maintainer of irc/ircd-ratbox,
 
 Please note that PR ports/181481 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181481
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: moggie <moggie@elasticmind.net>
To: bug-followup@FreeBSD.org, john.marshall@riverwillow.com.au
Cc:  
Subject: Re: ports/181481: [PATCH] irc/ircd-ratbox fix default options broken
 by optionsNG commit
Date: Tue, 04 Feb 2014 20:59:56 +0000

 This seems fine, thank you very much.
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed Feb 5 10:55:15 UTC 2014 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181481 
Responsible-Changed-From-To: freebsd-ports-bugs->rodrigo 
Responsible-Changed-By: rodrigo 
Responsible-Changed-When: Thu Feb 13 11:10:41 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181481 
State-Changed-From-To: open->feedback 
State-Changed-By: rodrigo 
State-Changed-When: Tue Feb 18 09:53:22 UTC 2014 
State-Changed-Why:  
Ask for maintainer approval. 

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

From: Rodrigo Osorio <rodrigo@FreeBSD.org>
To: moggie@elasticmind.net, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181481: [PATCH] irc/ircd-ratbox fix default options broken
 by optionsNG commit
Date: Tue, 18 Feb 2014 09:46:01 +0000

 --4bRzO86E/ozDv8r1
 Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc"
 Content-Disposition: inline
 
 
 --C7zPtVaVf+AK4Oqc
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi John,
 
 I suggest an extended version of the patch, to stagify
 ircd-ratbox in a proper way. If this patch is ok to you,
 the same work has to be done with the ircd-ratbox-legacy.
 
 Regards,
 - rodrigo
 
 --C7zPtVaVf+AK4Oqc
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="2014-02-18-ircd-ratbox.diff"
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 341830)
 +++ Makefile	(working copy)
 @@ -20,15 +20,15 @@
  USE_SQLITE=3D	3
  USE_LDCONFIG=3D	${PREFIX}/lib/ircd-ratbox
 =20
 +#MAKE_JOBS_UNSAFE=3D	yes
 +
  USERS=3D		ircd
  GROUPS=3D		${USERS}
 =20
 -LOGDIR?=3D	/var/log/${PORTNAME}
 -RUNDIR?=3D	/var/run/${PORTNAME}
 -DBDIR?=3D		/var/db/${PORTNAME}
  SUB_FILES=3D	pkg-message pkg-install
 -PLIST_SUB=3D	LOGDIR=3D${LOGDIR} RUNDIR=3D${RUNDIR} DBDIR=3D${DBDIR}
 -SUB_LIST=3D	LOGDIR=3D${LOGDIR} RUNDIR=3D${RUNDIR} DBDIR=3D${DBDIR}
 +SUB_LIST=3D	LOGDIR=3D/var/log/${PORTNAME} \
 +		RUNDIR=3D/var/run/${PORTNAME} \
 +		DBDIR=3D/var/db/${PORTNAME}
 =20
  GNU_CONFIGURE=3D	yes
  CONFIGURE_ARGS=3D	--with-confdir=3D${PREFIX}/etc/${PORTNAME}		\
 @@ -39,6 +39,7 @@
  		--libdir=3D${PREFIX}/lib/${PORTNAME}			\
  		--with-sqlite3=3D${LOCALBASE}				\
  		--disable-backups
 +STRIP=3D
 =20
  PORTDOCS=3D	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 =20
 @@ -60,7 +61,6 @@
 =20
  #----------------------------------------------------------------------
 =20
 -NO_STAGE=3D	yes
  .include <bsd.port.options.mk>
 =20
  .if ${PORT_OPTIONS:MOPENSSL}
 @@ -71,15 +71,21 @@
  .endif
 =20
  .if ${PORT_OPTIONS:MIPV6}
 +CONFIGURE_ARGS+=3D	--enable-ipv6
 +.else
  CONFIGURE_ARGS+=3D	--disable-ipv6
  .endif
 =20
  .if ${PORT_OPTIONS:MZIPLINKS}
 +CONFIGURE_ARGS+=3D	--enable-zlib
 +.else
  CONFIGURE_ARGS+=3D	--disable-zlib
  .endif
 =20
  .if ${PORT_OPTIONS:MSHARED_MODS}
 -CONFIGURE_ARGS+=3D	--disable-shared-modules
 +CONFIGURE_ARGS+=3D	--disable-static
 +.else
 +CONFIGURE_ARGS+=3D	--enable-static
  .endif
 =20
  .if ${PORT_OPTIONS:MASSERT}
 @@ -194,7 +200,7 @@
  .endif
 =20
  post-build:
 -	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
 +	cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
  		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 =20
  # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
 @@ -205,21 +211,24 @@
  .endif
 =20
  pre-su-install:
 -	${MKDIR} ${PREFIX}/etc/${PORTNAME}
 -	${MKDIR} ${DATADIR}/help
 -	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
 +	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 +	${MKDIR} ${STAGEDIR}${DATADIR}/help
 +	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules
 +	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 +	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 +	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 =20
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 +	${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
  .endif
  	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
  		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
 -	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.mo=
 td.sample
 -	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd=
 =2Econf.sample
 -	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME=
 }/ircd-efnet.conf.sample
 -	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.=
 sh
 +	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNA=
 ME}/ircd.motd.sample
 +	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${POR=
 TNAME}/ircd.conf.sample
 +	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc=
 /${PORTNAME}/ircd-efnet.conf.sample
 +	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${STAGEDIR}${PREFIX}/etc/${PORTNA=
 ME}/genssl.sh
 =20
  # ----- We need to install the shortcut.pl module ----
  .if ${PORT_OPTIONS:MSHORTCUTS}
 @@ -228,19 +237,20 @@
  		${PREFIX}/lib/${PORTNAME}/modules/contrib
  .endif
 =20
 -	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
 +	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
  		${ECHO} "Installing default configuration file."; \
 -		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${PREFIX}/etc/${PORT=
 NAME}/ircd.conf ; \
 +		${CP} -p ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${STAGEDI=
 R}${PREFIX}/etc/${PORTNAME}/ircd.conf ; \
  	fi
 =20
 -	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.motd ]; then \
 +	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd ]; then \
  		${ECHO} "Installing default motd file."; \
 -		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${PREFIX}/etc/${PORT=
 NAME}/ircd.motd ; \
 +		${CP} -p ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${STAGEDI=
 R}${PREFIX}/etc/${PORTNAME}/ircd.motd ; \
  	fi
 =20
 +.if empty(STAGEDIR)
  	@${SETENV} "PKG_PREFIX=3D${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-I=
 NSTALL
  	@${CAT} ${PKGMESSAGE}
 -
 +.endif
  #-----------------------------------------------------------------------
 =20
  .include <bsd.port.mk>
 Index: files/patch-Makefile.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-Makefile.in	(revision 0)
 +++ files/patch-Makefile.in	(working copy)
 @@ -0,0 +1,43 @@
 +--- Makefile.in	2012-03-11 01:12:06.000000000 +0100
 ++++ Makefile.in	2014-02-17 16:06:51.000000000 +0100
 +@@ -597,7 +597,7 @@
 + 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 + 	case $$dist_files in \
 + 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 +-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 ++			   sed '/\//!d;s|^|$(DESTDIR)$(distdir)/|;s,/[^/]*$$,,' | \
 + 			   sort -u` ;; \
 + 	esac; \
 + 	for file in $$dist_files; do \
 +@@ -609,8 +609,8 @@
 + 	    fi; \
 + 	    if test -d $(srcdir)/$$file && test $$d !=3D $(srcdir); then \
 + 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {}=
  \;; \
 +-	    fi; \
 ++	      find "$(distdir)/$$file" -type d !=20
 ++	   =20
 + 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 + 	  else \
 + 	    test -f "$(distdir)/$$file" \
 +@@ -620,8 +620,8 @@
 + 	done
 + 	@list=3D'$(DIST_SUBDIRS)'; for subdir in $$list; do \
 + 	  if test "$$subdir" =3D .; then :; else \
 +-	    test -d "$(distdir)/$$subdir" \
 +-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 ++	    test -d "$(DESTDIR)$(distdir)/$$subdir" \
 ++	    || $(MKDIR_P) "$(DESTDIR)$(distdir)/$$subdir" \
 + 	    || exit 1; \
 + 	  fi; \
 + 	done
 +@@ -917,7 +917,8 @@
 + 	cd contrib && $(MAKE) install
 +=20
 + install_data-local:
 +-	-@if test ! -d @logdir@; then mkdir @logdir@;fi
 ++	echo "ROS=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>"
 ++	if test ! -d $(DESTDIR)@logdir@; then mkdir -p $(DESTDIR)@logdir@;fi
 +=20
 + contrib: build_contrib
 +=20
 
 Property changes on: files/patch-Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: files/patch-contrib_Makefile.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/patch-contrib_Makefile.in	(revision 0)
 +++ files/patch-contrib_Makefile.in	(working copy)
 @@ -0,0 +1,13 @@
 +--- contrib/Makefile.in.orig	2012-03-11 01:12:06.000000000 +0100
 ++++ contrib/Makefile.in	2014-02-17 11:27:01.000000000 +0100
 +@@ -429,8 +429,8 @@
 + 	$(LIBTOOL) --mode=3Dclean $(RB_RM) -f $(S_OBJS) $(S_CORE_OBJS)  $(ST_OBJ=
 S)
 +=20
 + install_modules: $(S_OBJS)
 +-	-@@$(MKDIR_P) $(contribdir); \
 +-	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(contribdir);done
 ++	-@@$(MKDIR_P) $(DESTDIR)$(contribdir); \
 ++	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(DESTDIR)$(contri=
 bdir);done
 +=20
 + #install-mkdirs:
 + #	@echo "ircd: setting up modular directory structure"
 
 Property changes on: files/patch-contrib_Makefile.in
 ___________________________________________________________________
 Added: fbsd:nokeywords
 ## -0,0 +1 ##
 +yes
 \ No newline at end of property
 Added: svn:eol-style
 ## -0,0 +1 ##
 +native
 \ No newline at end of property
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: files/pkg-install.in
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- files/pkg-install.in	(revision 341830)
 +++ files/pkg-install.in	(working copy)
 @@ -13,16 +13,13 @@
  elif [ "x$2" =3D "xPOST-INSTALL" ]; then
  #-----------------------------------------------------------------------
 =20
 -mkdir -p %%LOGDIR%%           \
 -&& chown ircd:ircd %%LOGDIR%% \
 +chown ircd:ircd %%LOGDIR%% \
  && chmod 750 %%LOGDIR%%=20
 =20
 -mkdir -p %%RUNDIR%%           \
 -&& chown ircd:ircd %%RUNDIR%% \
 +chown ircd:ircd %%RUNDIR%% \
  && chmod 750 %%RUNDIR%%
 =20
 -mkdir -p %%DBDIR%%		\
 -&& chown ircd:ircd %%DBDIR%%	\
 +chown ircd:ircd %%DBDIR%%	\
  && chmod 750 %%DBDIR%%
 =20
  # Secure permissions if we think this is a fresh install
 Index: pkg-plist
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- pkg-plist	(revision 341830)
 +++ pkg-plist	(working copy)
 @@ -242,12 +242,10 @@
  etc/ircd-ratbox/ircd-efnet.conf.sample
  @unexec if cmp -s "%D/etc/ircd-ratbox/ircd.conf.sample" "%D/etc/ircd-ratbo=
 x/ircd.conf"; then rm -f "%D/etc/ircd-ratbox/ircd.conf"; fi
  etc/ircd-ratbox/ircd.conf.sample
 -@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.conf" ] ; then cp -p "%D/%F" "%B/=
 ircd.conf"; fi
  @unexec if cmp -s "%D/etc/ircd-ratbox/ircd.motd.sample" "%D/etc/ircd-ratbo=
 x/ircd.motd"; then rm -f "%D/etc/ircd-ratbox/ircd.motd"; fi
  etc/ircd-ratbox/ircd.motd.sample
  @exec if [ ! -f "%D/etc/ircd-ratbox/ircd.motd" ] ; then cp -p "%D/%F" "%B/=
 ircd.motd"; fi
  @dirrmtry etc/ircd-ratbox
 -@cwd /
 -@dirrmtry %%LOGDIR%%
 -@dirrmtry %%RUNDIR%%
 -@dirrmtry %%DBDIR%%
 +@dirrmtry /var/log/ircd-ratbox
 +@dirrmtry /var/db/ircd-ratbox
 +@dirrmtry /var/run/ircd-ratbox
 
 --C7zPtVaVf+AK4Oqc--
 
 --4bRzO86E/ozDv8r1
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQF8BAEBCgBmBQJTAyvYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDN0ZDQTJCQkM1MEEzQkMzMUI1MDQ4Mzc4
 NjM1MEJEQTg3MjQ4NjlDAAoJEIY1C9qHJIaccBQH+gOnn22H2fw3sfmv7Zk9cVBC
 x1iPJV+o9LEhG6CHY74rFsWX7WCj9d37RyQbaDpTjULZ1chPF8DA4rBIpVDsZuY6
 aIcEovh+u16jmRA/GOWxBttJqG0HhKUNi/3YdAMozfWytMoBgD2qyk7J3sI1gO2f
 wcru9TfdSry+PedIItHsbGetlCEyoGICRqnNayR2J5gKB3eQKZ1OBbbTdQkKLd+a
 Z/bUQsYGsi0rIGIM+aoiNZDc6kas2SK11UNFHFYvlVwn9qdsnYg68iKgtv1Uc28g
 sLFKAtpVamPH+4aUUXGUA/N6vugv38F5Cy6kTzroUFKKYUzEVnRTgahDIKyYV7Q=
 =xHR5
 -----END PGP SIGNATURE-----
 
 --4bRzO86E/ozDv8r1--
>Unformatted:
