From boris@ntmk.ru  Tue Jun 27 10:57:54 2006
Return-Path: <boris@ntmk.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 83DC716A401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Jun 2006 10:57:54 +0000 (UTC)
	(envelope-from boris@ntmk.ru)
Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37EE343D5E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Jun 2006 10:57:51 +0000 (GMT)
	(envelope-from boris@ntmk.ru)
Received: from boris.nikom.ru ([10.1.16.195])
	by mail.ntmk.ru with esmtp (Exim 4.51)
	id 1FvBGQ-00041w-6K
	for FreeBSD-gnats-submit@freebsd.org; Tue, 27 Jun 2006 16:57:50 +0600
Received: from root by boris.nikom.ru with local (Exim 4.62 (FreeBSD))
	(envelope-from <boris@ntmk.ru>)
	id 1FvBGQ-000Fdd-3C
	for FreeBSD-gnats-submit@freebsd.org; Tue, 27 Jun 2006 16:57:50 +0600
Message-Id: <E1FvBGQ-000Fdd-3C@boris.nikom.ru>
Date: Tue, 27 Jun 2006 16:57:50 +0600
From: Boris Kovalenko <boris@tagnet.ru>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         99537
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 27 11:00:32 GMT 2006
>Closed-Date:    Wed Jun 28 02:54:46 GMT 2006
>Last-Modified:  Wed Jun 28 02:54:46 GMT 2006
>Originator:     Boris Kovalenko
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
JSC "TAGNet"
>Environment:
System: FreeBSD boris.nikom.ru 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Wed May 10 10:43:32 YEKST 2006
>Description:
[DESCRIBE CHANGES]


    - Update rcNG script to allow startup on 6.1-RELEASE. Reported by Alexander Titaev
    - Cosmetic fixes

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- tpop3d-1.5.3_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/Makefile /usr/ports/mail/tpop3d.new/Makefile
--- /usr/ports/mail/tpop3d/Makefile	Thu May 11 08:57:20 2006
+++ /usr/ports/mail/tpop3d.new/Makefile	Tue Jun 27 16:55:03 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	tpop3d
 PORTVERSION=	1.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ex-parrot.com/~chris/tpop3d/
 
@@ -35,7 +35,7 @@
 # MySQL authentication
 .if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
 .if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
-IGNORE=	MySQL and PgSQL authentication can not be build together
+BROKEN=	MySQL and PgSQL authentication can not be build together
 .endif
 USE_MYSQL=		yes
 DEFAULT_MYSQL_VER=	41
diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/files/tpop3d.sh.in /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in
--- /usr/ports/mail/tpop3d/files/tpop3d.sh.in	Tue Feb 21 01:47:16 2006
+++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in	Tue Jun 27 16:43:01 2006
@@ -2,7 +2,7 @@
 #
 
 # PROVIDE: tpop3d
-# BEFORE:  LOGIN
+# REQUIRE:  LOGIN
 
 #
 # Add the following line to /etc/rc.conf to enable tpop3d:
@@ -27,14 +27,14 @@
 
 # set defaults
 
-tpop3d_enable=${tpop3d_enable:-"NO"}
-tpop3d_flags=${tpop3d_flags:-""}
-load_rc_config $name
 
 command=%%PREFIX%%/sbin/tpop3d
 required_files=%%PREFIX%%/etc/tpop3d.conf
 pidfile=/var/run/tpop3d.pid
 
-tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}"
+load_rc_config $name
+
+: ${tpop3d_enable="NO"}
+: ${tpop3d_flags="-f ${required_files} -p ${pidfile}"}
 
 run_rc_command "$1"
--- tpop3d-1.5.3_3.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Boris Kovalenko <boris@tagnet.ru>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/99537: [MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES]
Date: Tue, 27 Jun 2006 17:08:12 +0600

 This is a multi-part message in MIME format.
 --------------040609060905030506040903
 Content-Type: text/plain; charset=KOI8-R; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hello!
 
     Some more cosmetic fixes.
 
 With respect,
     Boris
 
 
 --------------040609060905030506040903
 Content-Type: text/plain;
  name="tpop3d.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="tpop3d.diff"
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/Makefile /usr/ports/mail/tpop3d.new/Makefile
 --- /usr/ports/mail/tpop3d/Makefile	Thu May 11 08:57:20 2006
 +++ /usr/ports/mail/tpop3d.new/Makefile	Tue Jun 27 17:03:01 2006
 @@ -7,7 +7,7 @@
  
  PORTNAME=	tpop3d
  PORTVERSION=	1.5.3
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	mail
  MASTER_SITES=	http://www.ex-parrot.com/~chris/tpop3d/
  
 @@ -35,10 +35,9 @@
  # MySQL authentication
  .if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
  .if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
 -IGNORE=	MySQL and PgSQL authentication can not be build together
 +BROKEN=	MySQL and PgSQL authentication can not be build together
  .endif
  USE_MYSQL=		yes
 -DEFAULT_MYSQL_VER=	41
  CONFIGURE_ARGS+=	--enable-auth-mysql \
  			--with-mysql-lib-dir=${LOCALBASE}/lib/mysql \
  			--with-mysql-include-dir=${LOCALBASE}/include/mysql
 @@ -53,7 +52,7 @@
  .endif
  
  .if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
 -LIB_DEPENDS+=		ldap-2.2:${PORTSDIR}/net/openldap22-client
 +USE_OPENLDAP=		yes
  CONFIGURE_ARGS+=	--enable-auth-ldap --with-openldap-root=${LOCALBASE}
  .endif
  
 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/files/tpop3d.sh.in /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in
 --- /usr/ports/mail/tpop3d/files/tpop3d.sh.in	Tue Feb 21 01:47:16 2006
 +++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in	Tue Jun 27 16:43:01 2006
 @@ -2,7 +2,7 @@
  #
  
  # PROVIDE: tpop3d
 -# BEFORE:  LOGIN
 +# REQUIRE:  LOGIN
  
  #
  # Add the following line to /etc/rc.conf to enable tpop3d:
 @@ -27,14 +27,14 @@
  
  # set defaults
  
 -tpop3d_enable=${tpop3d_enable:-"NO"}
 -tpop3d_flags=${tpop3d_flags:-""}
 -load_rc_config $name
  
  command=%%PREFIX%%/sbin/tpop3d
  required_files=%%PREFIX%%/etc/tpop3d.conf
  pidfile=/var/run/tpop3d.pid
  
 -tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}"
 +load_rc_config $name
 +
 +: ${tpop3d_enable="NO"}
 +: ${tpop3d_flags="-f ${required_files} -p ${pidfile}"}
  
  run_rc_command "$1"
 ===> Done
 
 --------------040609060905030506040903--
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Tue Jun 27 11:53:12 UTC 2006 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99537 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Wed Jun 28 02:54:23 UTC 2006 
State-Changed-Why:  
Committed. Thank you! 

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