8 files changed, 15 insertions, 17 deletions

diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 11c8596450a6..5521a53beb79 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -2,14 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.3.155
+PORTVERSION=	1.3.156
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
-		http://www.rhyolite.com/anti-spam/dcc/source/old/ \
 		ftp://ftp.dcc-servers.net/src/dcc/old/ \
-		ftp://ftp.rhyolite.com/src/dcc/old/
+		LOCAL/mat/${PORTNAME}
 DISTNAME=	dcc-${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Distributed Checksum Clearinghouse bulk email detector
@@ -23,7 +21,7 @@ LICENSE_PERMS=	no-pkg-sell no-dist-mirror no-pkg-mirror no-dist-sell
 
 HAS_CONFIGURE=	yes
 
-USES=	gmake
+USES=	gmake tar:Z
 
 OPTIONS_DEFINE=	DCCIFD DCCD DCCGREY IPV6 ALT_HOME
 OPTIONS_DEFAULT=	DCCIFD DCCM DCCD DCCGREY
diff --git a/mail/dcc-dccd/distinfo b/mail/dcc-dccd/distinfo
index 49cd8f88c64b..11b34e0bd528 100644
--- a/mail/dcc-dccd/distinfo
+++ b/mail/dcc-dccd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dcc-1.3.155.tar.Z) = ea922f75607cf0f571c7ec3745bb80903ff1739d749655bf731b8f7e15efd76d
-SIZE (dcc-1.3.155.tar.Z) = 1711020
+SHA256 (dcc-1.3.156.tar.Z) = 1fc25d1a3428fb675a93788cb1896f9ac21a5819cbb1143b9c4f110c673037c9
+SIZE (dcc-1.3.156.tar.Z) = 1714093
diff --git a/mail/dcc-dccd/files/patch-Makefile.inc.in b/mail/dcc-dccd/files/patch-Makefile.inc.in
index 94d741e888aa..a573a2611887 100644
--- a/mail/dcc-dccd/files/patch-Makefile.inc.in
+++ b/mail/dcc-dccd/files/patch-Makefile.inc.in
@@ -1,6 +1,6 @@
 --- Makefile.inc.in.orig	2014-08-06 14:43:42 UTC
 +++ Makefile.inc.in
-@@ -102,7 +102,6 @@
+@@ -102,7 +102,6 @@ DCC_OWN	    =@DCC_OWN@
  DCC_OWN	    =@DCCSUID@
  @MAKE_DOT@endif
  @MAKE_DOT@endif
@@ -8,7 +8,7 @@
  
  @MAKE_DOT@ifndef DCC_GRP
  DCC_GRP	    =@DCC_GRP@
-@@ -129,9 +128,9 @@
+@@ -129,9 +128,9 @@ SET_BINOWN=
  SET_MANOWN=
  SET_DCCOWN=
  @MAKE_DOT@else
diff --git a/mail/dcc-dccd/files/patch-cdcc__Makefile.in b/mail/dcc-dccd/files/patch-cdcc__Makefile.in
index fc35c89ddcd4..1bc52ca29e08 100644
--- a/mail/dcc-dccd/files/patch-cdcc__Makefile.in
+++ b/mail/dcc-dccd/files/patch-cdcc__Makefile.in
@@ -1,6 +1,6 @@
 --- cdcc/Makefile.in.orig	2014-08-06 14:43:42 UTC
 +++ cdcc/Makefile.in
-@@ -45,7 +45,5 @@
+@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
  
  @MAKE_DOT@ifndef NO_SUID
  # cdcc needs to be SUID to read the server passwords
diff --git a/mail/dcc-dccd/files/patch-configure b/mail/dcc-dccd/files/patch-configure
index bba7147abc24..5f2a9cde0a41 100644
--- a/mail/dcc-dccd/files/patch-configure
+++ b/mail/dcc-dccd/files/patch-configure
@@ -1,11 +1,11 @@
 --- configure.orig	2014-08-06 14:43:42 UTC
 +++ configure
-@@ -1950,7 +1950,7 @@
+@@ -1955,7 +1955,7 @@ case "$TARGET_SYS" in
  	#   compressed via /usr/share/mk
  	mancat=man
- 	MANX='$(MAN8)'
+ 	MAN='$(MAN8)'
 -	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
 +	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
  	;;
-     DragonFly)
- 	# default to /usr/local/man/man8 and use nroff files, possibly
+     Darwin)
+ 	# default to /usr/local/man/man8 and use nroff files
diff --git a/mail/dcc-dccd/files/patch-dccproc__Makefile.in b/mail/dcc-dccd/files/patch-dccproc__Makefile.in
index 6ed8caf080b3..8a584fea8f46 100644
--- a/mail/dcc-dccd/files/patch-dccproc__Makefile.in
+++ b/mail/dcc-dccd/files/patch-dccproc__Makefile.in
@@ -1,6 +1,6 @@
 --- dccproc/Makefile.in.orig	2014-08-06 14:43:42 UTC
 +++ dccproc/Makefile.in
-@@ -45,7 +45,5 @@
+@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
  
  @MAKE_DOT@ifndef NO_SUID
  # dccproc needs to be SUID to read the server passwords
diff --git a/mail/dcc-dccd/files/patch-dccsight__Makefile.in b/mail/dcc-dccd/files/patch-dccsight__Makefile.in
index ea5ea9d3969c..628abf8b053f 100644
--- a/mail/dcc-dccd/files/patch-dccsight__Makefile.in
+++ b/mail/dcc-dccd/files/patch-dccsight__Makefile.in
@@ -1,6 +1,6 @@
 --- dccsight/Makefile.in.orig	2014-08-06 14:43:42 UTC
 +++ dccsight/Makefile.in
-@@ -46,7 +46,5 @@
+@@ -46,7 +46,5 @@ DCC_BINDIR=@installroot@@libexecdir@
  
  @MAKE_DOT@ifndef NO_SUID
  # dccsight needs to be SUID to read the server passwords
diff --git a/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in b/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
index c9c7b3191278..9d28579554e1 100644
--- a/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
+++ b/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
@@ -1,6 +1,6 @@
 --- homedir/make-dcc_conf.in.orig	2014-08-06 14:43:42 UTC
 +++ homedir/make-dcc_conf.in
-@@ -83,10 +83,6 @@
+@@ -83,10 +83,6 @@ fi
  if test -n "$FORCE" -o ! -f "$CUR"; then
      cp $PROTOTYPE $CUR$FORCE
      chmod 0644 $CUR$FORCE