From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 24 10:30:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4549516A4E1 for ; Mon, 24 Jul 2006 10:30:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6196D43D53 for ; Mon, 24 Jul 2006 10:30:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6OAUJYO009041 for ; Mon, 24 Jul 2006 10:30:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6OAUJPw009040; Mon, 24 Jul 2006 10:30:19 GMT (envelope-from gnats) Resent-Date: Mon, 24 Jul 2006 10:30:19 GMT Resent-Message-Id: <200607241030.k6OAUJPw009040@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Morozovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADF1216A4DE; Mon, 24 Jul 2006 10:28:13 +0000 (UTC) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E81D43D55; Mon, 24 Jul 2006 10:28:12 +0000 (GMT) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (localhost [127.0.0.1]) by woozle.rinet.ru (8.13.6/8.13.6) with ESMTP id k6OASB7a035246; Mon, 24 Jul 2006 14:28:11 +0400 (MSD) (envelope-from marck@woozle.rinet.ru) Received: (from marck@localhost) by woozle.rinet.ru (8.13.6/8.13.6/Submit) id k6OASBp6035245; Mon, 24 Jul 2006 14:28:11 +0400 (MSD) (envelope-from marck) Message-Id: <200607241028.k6OASBp6035245@woozle.rinet.ru> Date: Mon, 24 Jul 2006 14:28:11 +0400 (MSD) From: Dmitry Morozovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/100773: mail/popa3d conversion to rc_subr and OPTIONS style X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Morozovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 10:30:20 -0000 >Number: 100773 >Category: ports >Synopsis: mail/popa3d conversion to rc_subr and OPTIONS style >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 24 10:30:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Morozovsky >Release: FreeBSD 6-STABLE i386 >Organization: Cronyx Plus LLC (RiNet ISP) >Environment: System: FreeBSD 6-STABLE >Description: synopsis sais it almost all >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/popa3d/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- Makefile 25 May 2006 15:27:55 -0000 1.33 +++ Makefile 24 Jul 2006 10:25:47 -0000 @@ -7,6 +7,7 @@ PORTNAME= popa3d PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.openwall.com/popa3d/ \ ftp://ftp.openwall.com/pub/projects/popa3d/ @@ -15,11 +16,17 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Secure, performance, tiny POP3 daemon +OPTIONS= STANDALONE_POP3 "Unattended server mode" off \ + SMTP_AFTER_POP3 "Enable SMTP-after-POP mode" off + ALL_TARGET= popa3d MAN8= popa3d.8 PLIST= ${WRKDIR}/.PLIST.more CFLAGS+= -DPREFIX=${PREFIX} -.if defined(STANDALONE_POP3) + +.include + +.if defined(WITH_STANDALONE_POP3) STANDALONE_SUFFIX= -standalone PLIST_SUB+= STANDALONE_POP3="" CONFLICTS?= popa3d-0.* popa3d-before-sendmail-0.* @@ -28,7 +35,7 @@ .else PLIST_SUB+= STANDALONE_POP3="@comment " .endif -.if defined(SMTP_AFTER_POP3) +.if defined(WITH_SMTP_AFTER_POP3) SMTP_AFTER_POP3_SUFFIX= -before-sendmail EXTRA_PATCHES+= ${FILESDIR}/pop-before-sendmail.patch PLIST_SUB+= SMTP_AFTER_POP3="" @@ -38,7 +45,7 @@ CONFLICTS?= popa3d-standalone-0.* popa3d-before-sendmail-0.* .endif -.if defined(STANDALONE_POP3) +.if defined(WITH_STANDALONE_POP3) post-extract: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/popa3d.sh \ > ${WRKSRC}/popa3d.sh @@ -52,11 +59,11 @@ @${ECHO_CMD} "@exec ${MKDIR} %D/empty" >>${PLIST} @${ECHO_CMD} "@dirrm empty" >>${PLIST} .endif -.if defined(SMTP_AFTER_POP3) +.if defined(WITH_SMTP_AFTER_POP3) @${ECHO_CMD} "@cwd ${CFDIR}" >>${PLIST} @${ECHO_CMD} "hack/popauth.m4" >>${PLIST} .endif -.if defined(STANDALONE_POP3) +.if defined(WITH_STANDALONE_POP3) @${REINPLACE_CMD} -e 's|^\(#define POP_STANDALONE\).*|\1 1|' \ ${WRKSRC}/params.h .endif @@ -75,28 +82,26 @@ ${INSTALL} ${COPY} -o root -g wheel -m 500 \ ${WRKSRC}/popa3d ${PREFIX}/libexec/popa3d ${INSTALL_MAN} ${WRKSRC}/popa3d.8 ${MANPREFIX}/man/man8/ -.if defined(SMTP_AFTER_POP3) +.if defined(WITH_SMTP_AFTER_POP3) ${INSTALL_DATA} ${FILESDIR}/popauth.m4 ${CFDIR}/hack/ .endif -.if defined(STANDALONE_POP3) - ${INSTALL_DATA} ${WRKSRC}/popa3d.sh ${PREFIX}/etc/rc.d/popa3d.sh-dist +.if defined(WITH_STANDALONE_POP3) + ${INSTALL_SCRIPT} ${WRKSRC}/popa3d.sh ${PREFIX}/etc/rc.d/ .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/DESIGN ${DOCSDIR}/ ${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}/ -.if defined(SMTP_AFTER_POP3) +.if defined(WITH_SMTP_AFTER_POP3) ${INSTALL_DATA} ${FILESDIR}/POPAUTH ${DOCSDIR}/ .endif .endif -.if !defined(STANDALONE_POP3) +.if !defined(WITH_STANDALONE_POP3) post-install: @ ${CAT} ${PKGMESSAGE} .endif -.include - .if exists(${LOCALBASE}/share/sendmail/cf/mailer/uucp.m4) CFDIR= ${LOCALBASE}/share/sendmail/cf .else Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/popa3d/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 19 May 2006 04:32:01 -0000 1.10 +++ pkg-plist 24 Jul 2006 10:25:47 -0000 @@ -1,4 +1,4 @@ -%%STANDALONE_POP3%%etc/rc.d/popa3d.sh-dist +%%STANDALONE_POP3%%etc/rc.d/popa3d.sh libexec/popa3d %%PORTDOCS%%%%DOCSDIR%%/DESIGN %%PORTDOCS%%%%DOCSDIR%%/LICENSE Index: files/popa3d.sh =================================================================== RCS file: /home/ncvs/ports/mail/popa3d/files/popa3d.sh,v retrieving revision 1.1 diff -u -r1.1 popa3d.sh --- files/popa3d.sh 4 Dec 2003 03:28:54 -0000 1.1 +++ files/popa3d.sh 24 Jul 2006 10:25:47 -0000 @@ -1,16 +1,16 @@ #!/bin/sh -case "$1" in -start) - [ -x %%PREFIX%%/libexec/popa3d ] && %%PREFIX%%/libexec/popa3d -D && echo -n ' popa3d' - ;; -stop) - killall popa3d - ;; -*) - echo "Usage: ${0##*/}: { start | stop }" >&2 - exit 64 - ;; -esac +# PROVIDE: popa3d +# REQUIRE: LOGIN cleanvar + +. /etc/rc.subr + +name="popa3d" +rcvar=`set_rcvar` + +command="%%PREFIX%%/libexec/${name}" +flags="-D" + +load_rc_config $name +run_rc_command "$1" -exit 0 >Release-Note: >Audit-Trail: >Unformatted: