svn commit: r400559 - in head/mail: qmail qmail-mysql qmail-spamcontrol qmail-tls qmail/files

[Bryan Drewery]

Author: bdrewery
Date: Fri Oct 30 23:07:16 2015
New Revision: 400559
URL: https://svnweb.freebsd.org/changeset/ports/400559

Log:
  - Fix creation of rc symlink in package
  - Fix procname in rc script so it can 'stop' correctly. [1]
  
  Submitted by:	Dirk Engling <erdgeist at erdgeist.org> [1]

Modified:
  head/mail/qmail-mysql/Makefile
  head/mail/qmail-spamcontrol/Makefile
  head/mail/qmail-tls/Makefile
  head/mail/qmail/Makefile
  head/mail/qmail/files/qmailsmtpd.in
  head/mail/qmail/pkg-plist

Modified: head/mail/qmail-mysql/Makefile
==============================================================================
--- head/mail/qmail-mysql/Makefile	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail-mysql/Makefile	Fri Oct 30 23:07:16 2015	(r400559)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 

Modified: head/mail/qmail-spamcontrol/Makefile
==============================================================================
--- head/mail/qmail-spamcontrol/Makefile	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail-spamcontrol/Makefile	Fri Oct 30 23:07:16 2015	(r400559)
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
 		LOCAL/bdrewery/qmail/:spamcontrol

Modified: head/mail/qmail-tls/Makefile
==============================================================================
--- head/mail/qmail-tls/Makefile	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail-tls/Makefile	Fri Oct 30 23:07:16 2015	(r400559)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail/Makefile	Fri Oct 30 23:07:16 2015	(r400559)
@@ -3,7 +3,7 @@
 
 PORTNAME=	${QMAIL_PORTNAME}
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	mail
 MASTER_SITES+=	QMAIL
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -892,6 +892,8 @@ post-install:
 	    ${STAGEDIR}${PREFIX}/control/signatures.sample
 	@${FIND} ${WRKDIR} -type f -name run -exec ${SED} -i "" \
 	    -e 's|${STAGEDIR}|${PREFIX}|' {} +
+.else
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
 .endif
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/man.d
 	${INSTALL_DATA} ${WRKDIR}/qmail.conf ${STAGEDIR}${LOCALBASE}/etc/man.d/qmail.conf

Modified: head/mail/qmail/files/qmailsmtpd.in
==============================================================================
--- head/mail/qmail/files/qmailsmtpd.in	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail/files/qmailsmtpd.in	Fri Oct 30 23:07:16 2015	(r400559)
@@ -36,7 +36,7 @@ load_rc_config $name
 start_cmd=qmailsmtpd_start
 start_precmd=qmailsmtpd_precmd
 pidfile=${qmailsmtpd_pidfile}
-procname=${qmailsmtpd_tcprules}
+procname=${qmailsmtpd_tcpserver}
 
 qmailsmtpd_start()
 {

Modified: head/mail/qmail/pkg-plist
==============================================================================
--- head/mail/qmail/pkg-plist	Fri Oct 30 22:52:51 2015	(r400558)
+++ head/mail/qmail/pkg-plist	Fri Oct 30 23:07:16 2015	(r400559)
@@ -238,4 +238,5 @@ scripts/mkaliasdir
 @cwd %%LOCALBASE%%
 @dir etc/man.d
 etc/man.d/qmail.conf
+%%RCDLINK%%@dir etc/rc.d
 @cwd %%QMAIL_PREFIX%%