5 files changed, 32 insertions, 35 deletions

diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index 3b7d58b40d0b..679ebe2a1217 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -6,45 +6,42 @@ PORTVERSION=	1.82
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/1.x%20%28Old%20Stable%29/v${PORTVERSION} \
-		ftp://ftp.oav.net/pkg_freebsd/distfiles/
-
+MASTER_SITES=	SF/${PORTNAME}/1.x%20%28Old%20Stable%29/v${PORTVERSION}
 PKGNAMEPREFIX=	postfix-
 PKGNAMESUFFIX=	-sf
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Anti-spam plugin for Postfix (written in C)
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		gmake mysql
 USE_RC_SUBR=	policyd
 
-REALNAME=	${PKGNAME:C/-${PORTVERSION}.*//}
-
-SUB_LIST+=	REALNAME=${REALNAME}
-
 ALL_TARGET=	linux
 
-DOCS=		ChangeLog ChangeLog.1 README LICENSE TODO DATABASE.mysql \
-		doc/whitelist.sql doc/support.txt doc/blacklist_helo.sql
-PORTDOCS=	${DOCS:C/.*\///}
+SUB_LIST+=	PKGBASE=${PKGBASE}
 
-PLIST_FILES=	sbin/${REALNAME}-cleanup \
-		sbin/${REALNAME}-stats \
-		sbin/${REALNAME} \
-		etc/${REALNAME}.conf.sample
+PLIST_FILES=	etc/${PKGBASE}.conf.sample \
+		sbin/${PKGBASE} \
+		sbin/${PKGBASE}-cleanup \
+		sbin/${PKGBASE}-stats
+PORTDOCS=	${_DOCS:C/.*\///}
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,policyd.pid,postfix-policyd-sf.pid,' \
-		${WRKSRC}/policyd.conf
+_DOCS=		ChangeLog ChangeLog.1 README TODO DATABASE.mysql \
+		doc/whitelist.sql doc/support.txt doc/blacklist_helo.sql
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cleanup ${STAGEDIR}${PREFIX}/sbin/${REALNAME}-cleanup
-	${INSTALL_PROGRAM} ${WRKSRC}/stats ${STAGEDIR}${PREFIX}/sbin/${REALNAME}-stats
-	${INSTALL_PROGRAM} ${WRKSRC}/policyd ${STAGEDIR}${PREFIX}/sbin/${REALNAME}
-	${INSTALL_DATA} ${WRKSRC}/policyd.conf ${STAGEDIR}${PREFIX}/etc/${REALNAME}.conf.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/cleanup ${STAGEDIR}${PREFIX}/sbin/${PKGBASE}-cleanup
+	${INSTALL_PROGRAM} ${WRKSRC}/stats ${STAGEDIR}${PREFIX}/sbin/${PKGBASE}-stats
+	${INSTALL_PROGRAM} ${WRKSRC}/policyd ${STAGEDIR}${PREFIX}/sbin/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/policyd.conf ${STAGEDIR}${PREFIX}/etc/${PKGBASE}.conf.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${_DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-policyd-sf/files/patch-Makefile b/mail/postfix-policyd-sf/files/patch-Makefile
index b90c613ed85c..c6f6d17e7d40 100644
--- a/mail/postfix-policyd-sf/files/patch-Makefile
+++ b/mail/postfix-policyd-sf/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	Sun Jun 11 22:52:34 2006
-+++ Makefile	Sun Jun 11 22:53:50 2006
-@@ -12,9 +12,9 @@
- inc += -I/usr/pkg/include/mysql
- lib += -L/usr/pkg/lib/mysql
+--- Makefile.orig	2007-08-20 06:42:05 UTC
++++ Makefile
+@@ -15,9 +15,9 @@ lib += -L/usr/pkg/lib/mysql
+ lib += -L/usr/local/mysql
+ 
  
 -CC       := gcc
 -CPPFLAGS := -O $(inc)
@@ -13,7 +13,7 @@
  OS_NAME  := $(shell uname | tr [A-Z] [a-z])
  LDLIBS    = $(lib) -lmysqlclient -lz
  
-@@ -26,16 +26,7 @@
+@@ -29,16 +29,7 @@ endif
  	@echo "  compiling ${CFLAGS} $<"
  	@${CC} ${CPPFLAGS} ${CFLAGS} -o $@ -c $<
  
diff --git a/mail/postfix-policyd-sf/files/patch-policyd.conf b/mail/postfix-policyd-sf/files/patch-policyd.conf
index 1348eb903e25..13fd61baed43 100644
--- a/mail/postfix-policyd-sf/files/patch-policyd.conf
+++ b/mail/postfix-policyd-sf/files/patch-policyd.conf
@@ -1,6 +1,6 @@
---- policyd.conf.orig	Thu Sep  8 13:59:51 2005
-+++ policyd.conf	Thu Sep  8 14:00:05 2005
-@@ -100,7 +100,7 @@
+--- policyd.conf.orig	2007-08-20 06:42:05 UTC
++++ policyd.conf
+@@ -111,7 +111,7 @@ BINDPORT=10031
  #
  #   where policyd will write its current pid to
  #
diff --git a/mail/postfix-policyd-sf/files/policyd.in b/mail/postfix-policyd-sf/files/policyd.in
index 2a2648ef2335..b593cb302839 100644
--- a/mail/postfix-policyd-sf/files/policyd.in
+++ b/mail/postfix-policyd-sf/files/policyd.in
@@ -19,7 +19,7 @@
 name=postfix_policyd_sf
 rcvar=postfix_policyd_sf_enable
 
-command=%%PREFIX%%/sbin/%%REALNAME%%
+command=%%PREFIX%%/sbin/%%PKGBASE%%
 
 stop_postcmd=stop_postcmd
 
@@ -31,8 +31,8 @@ stop_postcmd()
 # set defaults
 
 postfix_policyd_sf_enable=${postfix_policyd_sf_enable:-"NO"}
-postfix_policyd_sf_pidfile=${postfix_policyd_sf_pidfile:-"/var/run/%%REALNAME%%.pid"}
-postfix_policyd_sf_flags=${postfix_policyd_sf_flags:-"-c %%PREFIX%%/etc/%%REALNAME%%.conf"}
+postfix_policyd_sf_pidfile=${postfix_policyd_sf_pidfile:-"/var/run/%%PKGBASE%%.pid"}
+postfix_policyd_sf_flags=${postfix_policyd_sf_flags:-"-c %%PREFIX%%/etc/%%PKGBASE%%.conf"}
 
 pidfile="${postfix_policyd_sf_pidfile}"
 
diff --git a/mail/postfix-policyd-sf/pkg-descr b/mail/postfix-policyd-sf/pkg-descr
index 40b83a6e1158..762cbecb83b2 100644
--- a/mail/postfix-policyd-sf/pkg-descr
+++ b/mail/postfix-policyd-sf/pkg-descr
@@ -9,4 +9,4 @@ Policyd is an anti-spam plugin for Postfix (written in C) that does :
  o HELO randomization preventation,
  o Sender mail addresses or domain Sender blacklisting
 
-WWW: http://www.policyd.org/
+WWW: https://wiki.policyd.org/