5 files changed, 9 insertions, 69 deletions

diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile
index ccfa2642f4ac..ce880c615cb3 100644
--- a/mail/dkimproxy/Makefile
+++ b/mail/dkimproxy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dkimproxy
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -22,20 +22,9 @@ GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	dkimproxy_in dkimproxy_out
 
-DKIMPY_USERNAME?=	dkimproxy
-DKIMPY_USERID?=		525
-DKIMPY_GROUPNAME?=	${DKIMPY_USERNAME}
-DKIMPY_GROUPID?=	${DKIMPY_USERID}
+USERS=		dkimproxy
+GROUPS=		dkimproxy
 
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	USER=${DKIMPY_USERNAME} \
-		UID=${DKIMPY_USERID} \
-		GROUP=${DKIMPY_GROUPNAME} \
-		GID=${DKIMPY_GROUPID}
+MAN8=		dkimproxy_in.8 dkimproxy_out.8
 
-.include <bsd.port.pre.mk>
-
-pre-install:
-	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/dkimproxy/distinfo b/mail/dkimproxy/distinfo
index d830839bbb40..54ad295a024b 100644
--- a/mail/dkimproxy/distinfo
+++ b/mail/dkimproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkimproxy-1.1.tar.gz) = e462bf16d081442d484ef51072f80be9
-SHA256 (dkimproxy-1.1.tar.gz) = f08bfcb2e166de4c52c96ccf5c3e6b54b589beaf0d442868bd04fbd23158aba5
-SIZE (dkimproxy-1.1.tar.gz) = 78775
+MD5 (dkimproxy-1.2.tar.gz) = db32f81c33636a9cf0b1e22d4eb6d959
+SHA256 (dkimproxy-1.2.tar.gz) = 4ae76367e2cecc85c3bce15513bf110b96251acd3d5e4278fbf6c9c5f9d3b7be
+SIZE (dkimproxy-1.2.tar.gz) = 96971
diff --git a/mail/dkimproxy/files/pkg-deinstall.in b/mail/dkimproxy/files/pkg-deinstall.in
deleted file mode 100644
index 65b9aec55e4c..000000000000
--- a/mail/dkimproxy/files/pkg-deinstall.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-USERNAME=%%USER%%
-
-if pw usershow "${USERNAME}" 2>/dev/null 1>&2; then
-	echo "To delete ${USERNAME} user permanently, use 'pw userdel \"${USERNAME}\"'"
-fi
-exit 0
diff --git a/mail/dkimproxy/files/pkg-install.in b/mail/dkimproxy/files/pkg-install.in
deleted file mode 100644
index 999ccc8fff42..000000000000
--- a/mail/dkimproxy/files/pkg-install.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-
-PRE-INSTALL)
-  echo "---> Starting install script:"
-
-  if [ -z "%%USER%%" -o -z "%%GROUP%%" -o \
-       -z "%%UID%%" -o -z "%%GID%%" ]; then
-    echo "ERROR: A required pragma was empty"
-    exit 1
-  fi
-
-  # Create group if required
-  if pw group show "%%GROUP%%" >/dev/null 2>&1; then
-    echo "---> Using existing group \"%%GROUP%%\""
-  else
-    echo "---> Adding group \"%%GROUP%%\" (%%GID%%)"
-    /usr/sbin/pw groupadd %%GROUP%% -g %%GID%% || exit 1
-  fi
-
-  # Create user if required
-  if pw user show "%%USER%%" >/dev/null 2>&1; then
-    echo "---> Using existing user \"%%USER%%\""
-  else
-    echo "---> Adding user \"%%USER%%\" (%%UID%%)"
-    pw useradd "%%USER%%" -u "%%UID%%" -g "%%GROUP%%" -h - \
-      -d "/nonexistent" -s "/sbin/nologin" -c "DKIM Proxy Owner" || exit 1
-  fi
-  ;;
-
-esac
diff --git a/mail/dkimproxy/pkg-descr b/mail/dkimproxy/pkg-descr
index ad9009ac536b..b5753f2ae356 100644
--- a/mail/dkimproxy/pkg-descr
+++ b/mail/dkimproxy/pkg-descr
@@ -5,4 +5,4 @@ e-mail messages on a per-domain basis.
 Details regarding the protocol and other issues related to the draft standard
 can be found at http://mipassoc.org/dkim/.
 
-WWW: http://jason.long.name/dkimproxy/
+WWW: http://dkimproxy.sourceforge.net/