ports/94804: repairs to port makefile

[Eric W.Bates]

>Number:         94804
>Category:       ports
>Synopsis:       repairs to port makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 21 18:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Eric W. Bates
>Release:        FreeBSD i386
>Organization:
Vineyard.NET, Inc.
>Environment:
System: FreeBSD ace2.vineyard.net 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Mar 4 12:44:54 EST 2004 ericx at ace2.vineyard.net:/usr/obj/usr/src/sys/ACE2 i386
>Description:
	pop-before-smtp now has fewer dependencies.
	Repairs to substitution variables in rc script
>How-To-Repeat:
	
>Fix:
diff -ruN pop-before-smtp/Makefile pop-before-smtp.new/Makefile
--- pop-before-smtp/Makefile	Sun Mar 19 03:10:35 2006
+++ pop-before-smtp.new/Makefile	Tue Mar 21 13:00:34 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	pop-before-smtp
 PORTVERSION=	1.41
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	popbsmtp
@@ -14,25 +15,23 @@
 MAINTAINER=	ericx at vineyard.net
 COMMENT=	A log parser to identify valid POP/IMAP logins for later smtp
 
-RUN_DEPENDS=	${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
+RUN_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate
 
 NO_BUILD=	yes
-USE_PERL5=	yes
+USE_PERL5_RUN=	yes
 USE_RC_SUBR=	pop-before-smtp.sh
 SUB_FILES=	pkg-message
 POD2MAN?=	pod2man
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 MAN8=		${PORTNAME}.8
+SUB_LIST+=	PERL=${PERL}
 
 post-patch:
 	@${REINPLACE_CMD} 's|^#!/usr/bin/perl|#!${PERL}|; \
 		s|/etc/postfix/pop-before-smtp|${PREFIX}/etc/postfix/pop-before-smtp|g;' \
 		${WRKSRC}/pop-before-smtp
-
 pre-install:
 	@${POD2MAN} ${WRKSRC}/${PORTNAME} > ${PREFIX}/man/man8/${PORTNAME}.8
 
diff -ruN pop-before-smtp/files/pop-before-smtp.sh.in pop-before-smtp.new/files/pop-before-smtp.sh.in
--- pop-before-smtp/files/pop-before-smtp.sh.in	Sat Jan 28 15:44:40 2006
+++ pop-before-smtp.new/files/pop-before-smtp.sh.in	Fri Mar 17 15:29:06 2006
@@ -1,7 +1,7 @@
 #!/bin/sh
 # File:		pop-before-smtp.sh
 # Date:		Fri Mar  7 11:20:43 2003
-# Time-stamp:	<2006-01-26 11:54:41 ericx>
+# Time-stamp:	<2006-03-17 15:29:06 ericx>
 # Description:	start/stop script for pop-before-smtp daemon
 #
 # $FreeBSD: ports/mail/pop-before-smtp/files/pop-before-smtp.sh.in,v 1.1 2006/01/28 20:44:40 pav Exp $
@@ -35,8 +35,6 @@
 
 . %%RC_SUBR%%
 
-PREFIX=%PREFIX%
-
 # sh interprets dash chars as the numeric minus operator...
 name="pop_before_smtp"
 filename="pop-before-smtp"
@@ -44,15 +42,15 @@
 
 load_rc_config $name
 
-command=${pop_before_smtp_program:-"${PREFIX}/sbin/${filename}"}
+command=${pop_before_smtp_program:-"%%PREFIX%%/sbin/${filename}"}
 pidfile=${pop_before_smtp_pid:-"/var/run/${filename}.pid"}
-config=${pop_before_smtp_config:-"${PREFIX}/etc/${filename}-conf.pl"}
+config=${pop_before_smtp_config:-"%%PREFIX%%/etc/${filename}-conf.pl"}
 
 command_args="--config=${config}"
 command_args="${command_args} ${pop_before_smtp_flags:-''}"
 command_args="${command_args} --daemon=${pidfile}"
 
-command_interpreter=%PERL%
+command_interpreter=%%PERL%%
 required_files=${config}
 
 run_rc_command "$1"



>Release-Note:
>Audit-Trail:
>Unformatted: