Index: head/mail/dcc-dccd/Makefile
===================================================================
--- head/mail/dcc-dccd/Makefile
+++ head/mail/dcc-dccd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.3.158
-PORTREVISION=	2
+PORTVERSION=	1.3.159
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
 		ftp://ftp.dcc-servers.net/src/dcc/old/ \
@@ -22,7 +21,7 @@
 
 HAS_CONFIGURE=	yes
 
-USES=		gmake tar:Z
+USES=		tar:Z
 
 OPTIONS_DEFINE=	DCCIFD DCCD DCCGREY IPV6 ALT_HOME
 OPTIONS_DEFAULT=	DCCIFD DCCM DCCD DCCGREY
@@ -52,12 +51,15 @@
 ## Use the configure script to explicitly set the locations of all files,
 ## in case the standard locations have been locally overridden
 ## Also, use a similar hack to USES=desthack.
-CONFIGURE_ARGS=	--with-uid=${DCCUSER} \
+CONFIGURE_ARGS=	-q \
+		--with-uid=${DCCUSER} \
 		--bindir=${PREFIX}/bin \
 		--mandir=${MANPREFIX}/man \
 		--with-installroot=\$${${DESTDIRNAME}} \
 		--with-configsuffix=.sample \
-		--with-make-cmd=${MAKE_CMD}
+		--with-make-cmd=${MAKE_CMD} \
+		--with-install-cmd=${BSD_INSTALL_PROGRAM} \
+		--enable-pkg-make
 
 CONFIGURE_ENV=	ac_cv_header_histedit_h=no	# disable libedit detection
 
@@ -122,5 +124,26 @@
 		${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
 	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
 		${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
+.for sf in bin/dccproc bin/cdcc dcc/libexec/dccsight dcc/libexec/check_ip_range \
+	dcc/libexec/wlist dcc/libexec/ck2ip
+		${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf}
+.endfor
+.if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM}
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dns-helper
+.endif
+
+post-install-DCCIFD-on:
+.for sf in bin/dccif-test dcc/libexec/dccifd
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf}
+.endfor
+
+post-install-DCCD-on:
+.for sf in dcc/libexec/dump-clients dcc/libexec/dbclean \
+	dcc/libexec/dblist dcc/libexec/dccd
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf}
+.endfor
+
+post-install-DCCM-on:
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dccm
 
 .include <bsd.port.mk>
Index: head/mail/dcc-dccd/distinfo
===================================================================
--- head/mail/dcc-dccd/distinfo
+++ head/mail/dcc-dccd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dcc-1.3.158.tar.Z) = 596bb4a02800a87501818215e61ac877e4d5a31ec0c8c227f23438f6b6b831c6
-SIZE (dcc-1.3.158.tar.Z) = 1714175
+TIMESTAMP = 1497491773
+SHA256 (dcc-1.3.159.tar.Z) = 064144a1f01bda7cdc3e8b8f721b2b73df53bf7b293c1c672244eada9776ac89
+SIZE (dcc-1.3.159.tar.Z) = 1606625
Index: head/mail/dcc-dccd/files/patch-Makefile.inc.in
===================================================================
--- head/mail/dcc-dccd/files/patch-Makefile.inc.in
+++ head/mail/dcc-dccd/files/patch-Makefile.inc.in
@@ -1,23 +0,0 @@
---- Makefile.inc.in.orig	2014-08-06 14:43:42 UTC
-+++ Makefile.inc.in
-@@ -102,7 +102,6 @@ DCC_OWN	    =@DCC_OWN@
- DCC_OWN	    =@DCCSUID@
- @MAKE_DOT@endif
- @MAKE_DOT@endif
--BINOWN	    =$(DCC_OWN)
- 
- @MAKE_DOT@ifndef DCC_GRP
- DCC_GRP	    =@DCC_GRP@
-@@ -129,9 +128,9 @@ SET_BINOWN=
- SET_MANOWN=
- SET_DCCOWN=
- @MAKE_DOT@else
--SET_BINOWN=-o $(BINOWN) -g $(BINGRP)
--SET_MANOWN=-o $(MANOWN) -g $(MANGRP)
--SET_DCCOWN=-o @DCCSUID@ -g $(BINGRP)
-+SET_BINOWN=
-+SET_MANOWN=
-+SET_DCCOWN=
- @MAKE_DOT@endif
- 
- @MAKE_DOT@ifdef PROG
Index: head/mail/dcc-dccd/files/patch-Makefile.inc2.in
===================================================================
--- head/mail/dcc-dccd/files/patch-Makefile.inc2.in
+++ head/mail/dcc-dccd/files/patch-Makefile.inc2.in
@@ -1,11 +0,0 @@
---- Makefile.inc2.in.orig	2015-04-03 01:32:45 UTC
-+++ Makefile.inc2.in
-@@ -44,7 +44,7 @@
- INSTALL	=@DCCINSTALL@
- @MAKE_DOT@endif
- 
--BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
-+BININSTALL=$(BSD_INSTALL_PROGRAM)
- 
- # create the DCC home directory before trying to install files
- beforeinstall:$(BINDIR) $(MANDIR)8 depend all
Index: head/mail/dcc-dccd/files/patch-cdcc__Makefile.in
===================================================================
--- head/mail/dcc-dccd/files/patch-cdcc__Makefile.in
+++ head/mail/dcc-dccd/files/patch-cdcc__Makefile.in
@@ -1,10 +0,0 @@
---- cdcc/Makefile.in.orig	2014-08-06 14:43:42 UTC
-+++ cdcc/Makefile.in
-@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
- 
- @MAKE_DOT@ifndef NO_SUID
- # cdcc needs to be SUID to read the server passwords
--BINMODE	=4$(DCC_MODE)
--BINOWN	=@DCCSUID@
- @MAKE_DOT@endif
- @MAKE_INC2@
Index: head/mail/dcc-dccd/files/patch-configure
===================================================================
--- head/mail/dcc-dccd/files/patch-configure
+++ head/mail/dcc-dccd/files/patch-configure
@@ -1,11 +0,0 @@
---- configure.orig	2014-08-06 14:43:42 UTC
-+++ configure
-@@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in
- 	#   compressed via /usr/share/mk
- 	mancat=man
- 	MANX='$(MAN8)'
--	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
-+	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- 	;;
-     Darwin)
- 	# default to /usr/local/man/man8 and use nroff files
Index: head/mail/dcc-dccd/files/patch-dccproc__Makefile.in
===================================================================
--- head/mail/dcc-dccd/files/patch-dccproc__Makefile.in
+++ head/mail/dcc-dccd/files/patch-dccproc__Makefile.in
@@ -1,10 +0,0 @@
---- dccproc/Makefile.in.orig	2014-08-06 14:43:42 UTC
-+++ dccproc/Makefile.in
-@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
- 
- @MAKE_DOT@ifndef NO_SUID
- # dccproc needs to be SUID to read the server passwords
--BINMODE	=4$(DCC_MODE)
--BINOWN	=@DCCSUID@
- @MAKE_DOT@endif
- @MAKE_INC2@
Index: head/mail/dcc-dccd/files/patch-dccsight__Makefile.in
===================================================================
--- head/mail/dcc-dccd/files/patch-dccsight__Makefile.in
+++ head/mail/dcc-dccd/files/patch-dccsight__Makefile.in
@@ -1,10 +0,0 @@
---- dccsight/Makefile.in.orig	2014-08-06 14:43:42 UTC
-+++ dccsight/Makefile.in
-@@ -46,7 +46,5 @@ DCC_BINDIR=@installroot@@libexecdir@
- 
- @MAKE_DOT@ifndef NO_SUID
- # dccsight needs to be SUID to read the server passwords
--BINMODE	=4$(DCC_MODE)
--BINOWN	=@DCCSUID@
- @MAKE_DOT@endif
- @MAKE_INC2@
Index: head/mail/dcc-dccd/files/patch-homedir_Makefile.in
===================================================================
--- head/mail/dcc-dccd/files/patch-homedir_Makefile.in
+++ head/mail/dcc-dccd/files/patch-homedir_Makefile.in
@@ -1,11 +0,0 @@
---- homedir/Makefile.in.orig	2014-08-06 14:43:42 UTC
-+++ homedir/Makefile.in
-@@ -61,7 +61,7 @@ all:
- 	@:
- 
- install:$(HD) $(HD)/log
--	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
-+	for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done
- 	sh make-dcc_conf -F '@configsuffix@' -h $(HD)
- 	for NM in $(SIMPLE); do\
- 	    if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\
Index: head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
===================================================================
--- head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
+++ head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
@@ -1,13 +0,0 @@
---- homedir/make-dcc_conf.in.orig	2014-08-06 14:43:42 UTC
-+++ homedir/make-dcc_conf.in
-@@ -83,10 +83,6 @@ fi
- if test -n "$FORCE" -o ! -f "$CUR"; then
-     cp $PROTOTYPE $CUR$FORCE
-     chmod 0644 $CUR$FORCE
--    if test -n "@DCCSUID@" -a -z "$NO_SUID"; then
--	set +e		# do not die if the user name is not in the passwd file
--	chown @DCCSUID@ $CUR$FORCE
--    fi
-     exit
- fi
- 
Index: head/mail/dcc-dccd/files/patch-misc_Makefile.in
===================================================================
--- head/mail/dcc-dccd/files/patch-misc_Makefile.in
+++ head/mail/dcc-dccd/files/patch-misc_Makefile.in
@@ -1,11 +0,0 @@
---- misc/Makefile.in.orig	2014-08-06 14:43:42 UTC
-+++ misc/Makefile.in
-@@ -51,7 +51,7 @@ DCC_BINDIR=@installroot@@libexecdir@
- @MAKE_INC2@
- 
- install:
--	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
-+	for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done
- 
- deinstall:
- 	-if test -d $(DCC_BINDIR); then cd $(DCC_BINDIR); rm -f $(SSCRIPTS); fi
Index: head/mail/dcc-dccd/pkg-plist
===================================================================
--- head/mail/dcc-dccd/pkg-plist
+++ head/mail/dcc-dccd/pkg-plist
@@ -29,7 +29,6 @@
 @(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
 %%IFD_MILT%%dcc/libexec/dns-helper
 dcc/libexec/fetchblack
-dcc/libexec/fetchids
 dcc/libexec/fetch-testmsg-whitelist
 dcc/libexec/fix-map
 dcc/libexec/hackmc