ports/78659: [NON MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE CHANGES]

Thu Mar 10 06:40:09 UTC 2005

The following reply was made to PR ports/78659; it has been noted by GNATS.

From: Boris Kovalenko <boris at tagnet.ru>
To: freebsd-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: ports/78659: [NON MAINTAINER UPDATE] mail/tpop3d: [SUMMARIZE
 CHANGES]
Date: Thu, 10 Mar 2005 11:33:40 +0500

 This is a multi-part message in MIME format.
 --------------050605010500050207090902
 Content-Type: text/plain; charset=KOI8-R; format=flowed
 Content-Transfer-Encoding: 7bit

 Hello!

     Some minor options duplication. Fixed.

 With respect,
     Boris

 --------------050605010500050207090902
 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	Wed Dec 22 08:07:58 2004
 +++ /usr/ports/mail/tpop3d.new/Makefile	Thu Mar 10 11:29:31 2005
 @@ -12,7 +12,7 @@
  MASTER_SITES=	http://www.ex-parrot.com/~chris/tpop3d/

  MAINTAINER=	chris at shagged.org
 -COMMENT=	Virtual-domain capable POP3 server supporting MySQL auth
 +COMMENT=	Virtual-domain capable POP3 server supporting MySQL,PgSQL etc auth

  USE_OPENSSL=	yes
  USE_REINPLACE=	yes
 @@ -23,37 +23,58 @@
  		--with-mailspool-directory=/var/mail
  CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

 +OPTIONS=	MYSQL		"Use MySQL authentication"			off \
 +		PGSQL		"Use PgSQL authentication"			off \
 +		LDAP		"Use LDAP authentication"			off \
 +		PERLAUTH	"Use Perl authentication"			off \
 +		FLATAUTH	"Enable /etc/passwd-style authentication"	off \
 +		MAILDIR		"Compile Maildir support"			on
 +
  # MySQL authentication
 -.if !defined(WITHOUT_MYSQL)
 +.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
  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
  .endif

 -.if defined(WITH_LDAP)
 +.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
 +USE_PGSQL=		yes
 +DEFAULT_PGSQL_VER=	80
 +CONFIGURE_ARGS+=	--enable-auth-pgsql \
 +			--with-pgsql-lib-dir=${LOCALBASE}/lib \
 +			--with-pgsql-include-dir=${LOCALBASE}/include
 +.endif
 +
 +.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
  LIB_DEPENDS+=		ldap-2.2:${PORTSDIR}/net/openldap22-client
  CONFIGURE_ARGS+=	--enable-auth-ldap --with-openldap-root=${LOCALBASE}
  .endif

  # Perl authentication
 -.if defined(WITH_PERLAUTH)
 +.if defined(WITH_PERLAUTH) && !defined(WITHOUT_PERLAUTH)
  USE_PERL5=		yes
  CONFIGURE_ARGS+=	--enable-auth-perl
  .endif

 +.if defined(WITH_FLATAUTH) && !defined(WITHOUT_FLATAUTH)
 +CONFIGURE_ARGS+=	--enable-auth-flatfile
 +.endif
 +
  .if !defined(WITHOUT_MAILDIR)
  CONFIGURE_ARGS+=	--enable-mbox-maildir
  .endif

 -SAMPLE_RCD=	tpop3d.sh.sample
 -STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${SAMPLE_RCD}
 +USE_RC_SUBR=	tpop3d.sh
  DEFAULT_CONFIG=	${PREFIX}/etc/tpop3d.conf.dist

  MAN5=		tpop3d.conf.5
  MAN8=		tpop3d.8
 -DOCS=		CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \
 +.if !defined(NOPORTDOCS)
 +PORTDOCS=	CHANGES CREDITS FAQ HACKING INSTALL PORTABILITY \
         		README README.POP-before-SMTP README.auth_mysql TODO
 +.endif

  post-patch:
  	@${REINPLACE_CMD} 's,^CFLAGS =, CFLAGS = \@CFLAGS\@,' \
 @@ -63,17 +84,13 @@

  post-install:
  	${INSTALL_SCRIPT} ${FILESDIR}/tpop3d.conf.dist ${DEFAULT_CONFIG}
 -	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 -		${INSTALL_SCRIPT} ${FILESDIR}/${SAMPLE_RCD}		\
 -			${STARTUP_SCRIPT} ;				\
 -	fi
  	@if [ ! -f ${PREFIX}/etc/tpop3d.conf ]; then			\
  		${INSTALL_SCRIPT} ${FILESDIR}/tpop3d.conf.dist 		\
  			${PREFIX}/etc/tpop3d.conf ;			\
  	fi
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
  .endif

  .include <bsd.port.mk>
 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	Thu Jan  1 05:00:00 1970
 +++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.in	Thu Mar 10 11:26:00 2005
 @@ -0,0 +1,41 @@
 +#!/bin/sh
 +#
 +
 +# PROVIDE: tpop3d
 +# BEFORE:  LOGIN
 +# KEYWORD: FreeBSD
 +
 +#
 +# Add the following line to /etc/rc.conf to enable tpop3d:
 +#tpop3d_enable="YES"
 +#
 +# You may also wish to use the following variables to fine-tune startup:
 +#tpop3d_flags="..."
 +#
 +
 +. %%RC_SUBR%%
 +
 +name="tpop3d"
 +rcvar=`set_rcvar`
 +
 +
 +stop_postcmd=stop_postcmd
 +
 +stop_postcmd()
 +{
 +  rm -f $pidfile
 +}
 +
 +# set defaults
 +
 +tpop3d_enable=${tpop3d_enable:-"NO"}
 +tpop3d_flags=${tpop3d_flags:-""}
 +load_rc_config $name
 +
 +command=%%PREFIX%%/sbin/tpop3d
 +required_files=%%PREFIX%%/tpop3d.conf
 +pidfile=/var/run/tpop3d.pid
 +
 +tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}"
 +
 +run_rc_command "$1"
 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/files/tpop3d.sh.sample /usr/ports/mail/tpop3d.new/files/tpop3d.sh.sample
 --- /usr/ports/mail/tpop3d/files/tpop3d.sh.sample	Fri Aug 31 11:43:57 2001
 +++ /usr/ports/mail/tpop3d.new/files/tpop3d.sh.sample	Thu Jan  1 05:00:00 1970
 @@ -1,45 +0,0 @@
 -#!/bin/sh
 -#
 -# tpop3d:
 -# Init script for starting/stopping tpop3d.
 -#
 -# Copyright (c) 2001 Chris Lightfoot. All rights reserved.
 -#  Portability enhanced by Chris Elsworth, July 2001
 -#
 -# $FreeBSD: ports/mail/tpop3d/files/tpop3d.sh.sample,v 1.1 2001/08/31 05:43:57 petef Exp $
 -#
 -
 -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
 -    echo "$0: Cannot determine the PREFIX" >&2
 -    exit 1
 -fi
 -
 -DAEMON=$PREFIX/sbin/tpop3d
 -
 -[ -f $DAEMON ] || exit 0
 -
 -# See how we were called.
 -case "$1" in
 -  start)
 -        # Start daemons.
 -        $DAEMON -f $PREFIX/etc/tpop3d.conf -p /var/run/tpop3d.pid \
 -		&& echo -n " tpop3d"
 -        ;;
 -  stop)
 -        # Stop daemons.
 -	[ -r /var/run/tpop3d.pid ] && kill `cat /var/run/tpop3d.pid` \
 -		&& echo -n " tpop3d"
 -        ;;
 -  restart)
 -	$0 stop
 -	$0 start
 -	;;
 -  reload)
 -  	[ -r /var/run/tpop3d.pid ] && kill -HUP `cat /var/run/tpop3d.pid`
 -        ;;
 -  *)
 -        echo "Usage: `basename $0` {start|stop|restart|reload}"
 -        exit 1
 -esac
 -
 -exit 0
 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/pkg-plist /usr/ports/mail/tpop3d.new/pkg-plist
 --- /usr/ports/mail/tpop3d/pkg-plist	Mon Sep 13 03:33:03 2004
 +++ /usr/ports/mail/tpop3d.new/pkg-plist	Thu Mar 10 09:53:39 2005
 @@ -1,17 +1,5 @@
  @comment $FreeBSD: ports/mail/tpop3d/pkg-plist,v 1.2 2003/12/04 13:16:47 sergei Exp $
  sbin/tpop3d
 -etc/rc.d/tpop3d.sh.sample
  @unexec if cmp -s %D/etc/tpop3d.conf.dist %D/etc/tpop3d.conf; then rm -f %D/etc/tpop3d.conf; fi
  etc/tpop3d.conf.dist
  @exec if [ ! -f %D/etc/tpop3d.conf ]; then cp %D/etc/%f %D/etc/tpop3d.conf; fi
 -%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 -%%PORTDOCS%%%%DOCSDIR%%/CREDITS
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/HACKING
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/PORTABILITY
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/README.POP-before-SMTP
 -%%PORTDOCS%%%%DOCSDIR%%/README.auth_mysql
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 diff -ruN --exclude=CVS /usr/ports/mail/tpop3d/tpop3d.diff /usr/ports/mail/tpop3d.new/tpop3d.diff
 --- /usr/ports/mail/tpop3d/tpop3d.diff	Thu Jan  1 05:00:00 1970
 +++ /usr/ports/mail/tpop3d.new/tpop3d.diff	Thu Mar 10 11:30:22 2005
 @@ -0,0 +1 @@
 +===> Generating patch
 ===> Done

 --------------050605010500050207090902--