Date: Thu, 14 Jan 2010 00:28:32 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/142799: [PATCH] mail/popa3d-standalone: use $SUB_FILES to dynamically adjust pkg-message + other changes Message-ID: <201001140028.o0E0SWpn061209@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001140040.o0E0e19V020738@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142799
>Category: ports
>Synopsis: [PATCH] mail/popa3d-standalone: use $SUB_FILES to dynamically adjust pkg-message + other changes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 14 00:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
use SUBFILES to adjust pkg-message
drop the .sh extension from the rc script
USE_RC_SUBR
Added file(s):
- files/pkg-message.in
- files/popa3d.in
Removed file(s):
- pkg-message
- files/popa3d.sh
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- popa3d-standalone-1.0.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/popa3d/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 24 Jun 2008 08:05:41 -0000 1.38
+++ Makefile 14 Jan 2010 00:25:02 -0000
@@ -22,11 +22,13 @@
CFLAGS+= -DPREFIX=${PREFIX}
UNIQUENAME= ${.CURDIR:T}
+SUB_FILES= pkg-message
+
OPTIONS?= SMTP_AFTER_POP3 "Enable SMTP-after-POP mode" off \
STANDALONE_POP3 "Enable standalone server mode" off \
SETPROCTITLE "Enable setproctitle mode" off
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
# honor old flags
.if defined(STANDALONE_POP3)
@@ -61,15 +63,11 @@
.endif
.if defined(WITH_STANDALONE_POP3)
-RC_SUBR= /etc/rc.subr
-
-post-extract:
- @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
- -e "s=%%RC_SUBR%%=${RC_SUBR}=g" \
- ${FILESDIR}/popa3d.sh \
- > ${WRKSRC}/popa3d.sh
+USE_RC_SUBR= popa3d
.endif
+.include <bsd.port.pre.mk>
+
pre-configure:
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
.if !exists(/var/empty)
@@ -104,9 +102,7 @@
.if defined(WITH_SMTP_AFTER_POP3) && !defined(WITHOUT_POPAUTH_M4)
${INSTALL_DATA} ${FILESDIR}/popauth.m4 ${CFDIR}/hack/
.endif
-.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}/
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message 1 Apr 2000 03:39:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-===========================================================================
-1. Edit your /etc/inetd.conf to use popa3d. The line should look like this:
-
-pop3 stream tcp nowait root /usr/local/libexec/popa3d popa3d
-
-Note: when started via an inetd clone, the logging of connections is left
-up to that inetd clone or TCP wrappers.
-
-2. Restart inetd by sending it a SIGHUP:
-
-# killall -HUP inetd
-===========================================================================
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/popa3d/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist 25 Jul 2006 11:27:44 -0000 1.11
+++ pkg-plist 14 Jan 2010 00:25:02 -0000
@@ -1,4 +1,3 @@
-%%STANDALONE_POP3%%etc/rc.d/popa3d.sh
libexec/popa3d
%%PORTDOCS%%%%DOCSDIR%%/DESIGN
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 14 Jan 2010 00:25:02 -0000
@@ -0,0 +1,12 @@
+===========================================================================
+1. Edit your /etc/inetd.conf to use popa3d. The line should look like this:
+
+pop3 stream tcp nowait root %%PREFIX%%/libexec/popa3d popa3d
+
+Note: when started via an inetd clone, the logging of connections is left
+up to that inetd clone or TCP wrappers.
+
+2. Restart inetd by sending it a SIGHUP:
+
+# killall -HUP inetd
+===========================================================================
Index: files/popa3d.in
===================================================================
RCS file: files/popa3d.in
diff -N files/popa3d.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/popa3d.in 14 Jan 2010 00:25:02 -0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# PROVIDE: popa3d
+# REQUIRE: LOGIN cleanvar
+
+. %%RC_SUBR%%
+
+name="popa3d"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/libexec/${name}"
+flags="-D"
+
+load_rc_config $name
+run_rc_command "$1"
+
Index: files/popa3d.sh
===================================================================
RCS file: files/popa3d.sh
diff -N files/popa3d.sh
--- files/popa3d.sh 3 Aug 2006 22:46:52 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: popa3d
-# REQUIRE: LOGIN cleanvar
-
-. %%RC_SUBR%%
-
-name="popa3d"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/libexec/${name}"
-flags="-D"
-
-load_rc_config $name
-run_rc_command "$1"
-
--- popa3d-standalone-1.0.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001140028.o0E0SWpn061209>