4 files changed, 16 insertions, 14 deletions

diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index 674bac6e77ff..36f9829ea80a 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	policyd-weight
-PORTVERSION=	0.1.14.3
+PORTVERSION=	0.1.14.5
 
 CATEGORIES=	mail
 MASTER_SITES=	http://www.policyd-weight.org/releases/
@@ -15,11 +15,10 @@ PKGNAMEPREFIX=	postfix-
 MAINTAINER=	robtone@ek-muc.de
 COMMENT=	Weighted policy daemon for postfix
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
-		postfix:${PORTSDIR}/mail/postfix
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 SUB_FILES=	pkg-message
-PLIST_FILES=	libexec/postfix/${PORTNAME} etc/${PORTNAME}.conf.sample
+PLIST_FILES=	bin/${PORTNAME} etc/${PORTNAME}.conf.sample
 
 USE_RC_SUBR+=	policyd-weight
 
@@ -29,7 +28,7 @@ MAN5+=	policyd-weight.conf.5
 .include <bsd.port.pre.mk>
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec/postfix/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${PREFIX}/etc/
 .for i in 5 8
 	@${MKDIR} ${PREFIX}/man/man$i
diff --git a/mail/postfix-policyd-weight/distinfo b/mail/postfix-policyd-weight/distinfo
index 03700b6c4480..f3449402401f 100644
--- a/mail/postfix-policyd-weight/distinfo
+++ b/mail/postfix-policyd-weight/distinfo
@@ -1,3 +1,3 @@
-MD5 (policyd-weight-0.1.14.3.tar.gz) = afa9286a5adc393b63641994bbb78a16
-SHA256 (policyd-weight-0.1.14.3.tar.gz) = 642d5ca134fe6deeb6e7d7e0147dedcf615c8e4d3b4d7d848f1a0ff023a67b50
-SIZE (policyd-weight-0.1.14.3.tar.gz) = 49105
+MD5 (policyd-weight-0.1.14.5.tar.gz) = ff3b8e68c7955f1f2b4ac50d48afc11e
+SHA256 (policyd-weight-0.1.14.5.tar.gz) = 6d48598530202a379a9f8f855cd44da8c9a1443ff57faf52eccc039be913dd8f
+SIZE (policyd-weight-0.1.14.5.tar.gz) = 50043
diff --git a/mail/postfix-policyd-weight/files/pkg-message.in b/mail/postfix-policyd-weight/files/pkg-message.in
index d0af1084c9e1..c162ae44528b 100644
--- a/mail/postfix-policyd-weight/files/pkg-message.in
+++ b/mail/postfix-policyd-weight/files/pkg-message.in
@@ -1,7 +1,7 @@
 **********
 * Start with:
 
-# %%PREFIX%%/libexec/postfix/policyd-weight start
+# %%PREFIX%%/bin/policyd-weight start
 
 * To use this from Postfix SMTPD, use in %%PREFIX%%/etc/postfix/main.cf
 
@@ -23,10 +23,13 @@ smtpd_recipient_restrictions =
 * An example is provided in %%PREFIX%%/etc/policyd-weight.conf.sample
 *
 *
-* ATTENTION !!! ATTENTION
+* Notes:
 *
 * Since version 0.1.14 beta the master.cf mode is deprecated. Use the daemon
 * mode instead. More info in man 8 policyd-weight.
+*
+* Since version 0.1.14.5 beta the policyd-weight executable is located in
+* %%PREFIX%%/bin. Please remove older versions in %%PREFIX%%/libexec/postfix/
+* manually.
 * 
-* ATTENTION !!! ATTENTION
 *************
diff --git a/mail/postfix-policyd-weight/files/policyd-weight.in b/mail/postfix-policyd-weight/files/policyd-weight.in
index e592a7263b0c..47cca5ab38b8 100644
--- a/mail/postfix-policyd-weight/files/policyd-weight.in
+++ b/mail/postfix-policyd-weight/files/policyd-weight.in
@@ -29,16 +29,16 @@ case "$policyd_weight_enable" in
     *) echo "To make use of $name set $rcvar=\"YES\" in /etc/rc.conf" ;;
 esac
 
-command="/usr/local/libexec/postfix/policyd-weight"
+command="/usr/local/bin/policyd-weight"
 pidfile=/var/run/policyd-weight.pid
 
 policyd_weight_start() {
-    /usr/local/libexec/postfix/policyd-weight start
+    /usr/local/bin/policyd-weight start
 }
 
 policyd_weight_stop() {
     echo "Stopping $name"
-    /usr/local/libexec/postfix/policyd-weight stop
+    /usr/local/bin/policyd-weight stop
 }
 
 run_rc_command "$1"