[Midnightbsd-cvs] mports: Makefile: This isn't going to work, merge the saslauthd changes

[laffer1 at midnightbsd.org]

Log Message:
-----------
This isn't going to work, merge the saslauthd changes together.

Modified Files:
--------------
    mports/security/cyrus-sasl:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/cyrus-sasl/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L security/cyrus-sasl/Makefile -L security/cyrus-sasl/Makefile -u -r1.5 -r1.6
--- security/cyrus-sasl/Makefile
+++ security/cyrus-sasl/Makefile
@@ -228,9 +228,7 @@
 	${SED} -e "s;%%PREFIX%%;${TRUE_PREFIX};g" ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/pwcheck.sh > ${PREFIX}/etc/rc.d/cyrus_pwcheck.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/cyrus_pwcheck.sh
-	@${SED} -e 's;%%PREFIX%%;${TRUE_PREFIX};g' \
-		${FILESDIR}/saslauthd.sh > ${PREFIX}/etc/rc.d/saslauthd1.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+	@${SED} -e 's;%%PREFIX%%;${TRUE_PREFIX};g' ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/saslauthd.sh > ${PREFIX}/etc/rc.d/saslauthd1.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/saslauthd1.sh
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \