reimport mail/dcc for 1.3.159 upgrade

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: reimport mail/dcc for 1.3.159 upgrade
From: Petar Bogdanovic <petar%smokva.net@localhost>
Date: Fri, 26 May 2017 13:33:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Petar Bogdanovic <petar%smokva.net@localhost>
Pushed By:	petar
Date:		Fri May 26 15:33:21 2017 +0200
Changeset:	142ed89dd8e49e1bb86ddac23a838cd2feaf161a

Modified Files:
	Makefile
Added Files:
	dcc/DESCR
	dcc/MESSAGE
	dcc/Makefile
	dcc/PLIST
	dcc/distinfo
	dcc/files/dccd.sh
	dcc/files/dccifd.sh
	dcc/patches/patch-Makefile.inc.in
	dcc/patches/patch-Makefile.inc2.in
	dcc/patches/patch-configure
	dcc/patches/patch-homedir_Makefile.in

Log Message:
reimport mail/dcc for 1.3.159 upgrade

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=142ed89dd8e49e1bb86ddac23a838cd2feaf161a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                              |   1 +
 dcc/DESCR                             |   9 +++
 dcc/MESSAGE                           |  44 +++++++++++++
 dcc/Makefile                          | 112 ++++++++++++++++++++++++++++++++++
 dcc/PLIST                             |  69 +++++++++++++++++++++
 dcc/distinfo                          |  10 +++
 dcc/files/dccd.sh                     |  32 ++++++++++
 dcc/files/dccifd.sh                   |  32 ++++++++++
 dcc/patches/patch-Makefile.inc.in     |  14 +++++
 dcc/patches/patch-Makefile.inc2.in    |  16 +++++
 dcc/patches/patch-configure           | 104 +++++++++++++++++++++++++++++++
 dcc/patches/patch-homedir_Makefile.in |  38 ++++++++++++
 12 files changed, 481 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 6af6d722d1..80afc89e44 100644
--- a/Makefile
+++ b/Makefile
@@ -483,6 +483,7 @@ SUBDIR+=	db1
 SUBDIR+=	dbf
 SUBDIR+=	dbus-dfbsd
 SUBDIR+=	dbus-explorer
+SUBDIR+=	dcc
 SUBDIR+=	ddate
 SUBDIR+=	ddocent
 SUBDIR+=	deadbeef
diff --git a/dcc/DESCR b/dcc/DESCR
new file mode 100644
index 0000000000..f8d3a7020d
--- /dev/null
+++ b/dcc/DESCR
@@ -0,0 +1,9 @@
+The Distributed Checksum Clearinghouses or DCC is an anti-spam content filter
+that runs on a variety of operating systems. As of the middle of 2007, it
+involves millions of users, more than six hundred thousand client computer
+systems, and more than 250 servers collecting and counting checksums related to
+more than 300 million mail messages on week days. The counts can be used by
+SMTP servers and mail user agents to detect and reject or filter spam or
+unsolicited bulk mail. DCC servers exchange or "flood" common checksums. The
+checksums include values that are constant across common variations in bulk
+messages, including "personalizations".
diff --git a/dcc/MESSAGE b/dcc/MESSAGE
new file mode 100644
index 0000000000..9fa65de3ed
--- /dev/null
+++ b/dcc/MESSAGE
@@ -0,0 +1,44 @@
+===========================================================================
+$NetBSD$
+
+Use of Public DCC Servers
+-------------------------
+
+This package will by default query public servers; before running it
+read the documentation and terms of use at:
+
+  http://www.rhyolite.com/dcc/#public-servers
+
+The essence is:
+
+  Public DCC servers for anonymous DCC clients handling fewer than
+  100,000 mail messages per day are provided by people and organizations
+  in the following list. The default contents of /var/dcc/map file point
+  to these servers.
+
+  Note well that it has been wrong to take and resell the bandwidth and,
+  most important, human system administration work of the public DCC
+  servers to third parties. Blunt words for that include theft and
+  stealing. Vendors of "spam appliances" or services including DCC such
+  as "managed email" must provide DCC servers of their own or contract
+  for DCC services from others. They must also buy a license for the
+  commercial version of the DCC software.
+
+(Note that these terms are similar but not identical to the license
+for the dcc software itself.)
+
+===========================================================================
+===========================================================================
+
+DCC Server (dccd)
+-----------------
+
+Running an own DCC server is strongly recommended if your site handles
+more than 100k messages per day. It will decrease the load on public DCC
+servers and increase the responsiveness of your DCC clients. When doing
+so, cron-dccd should run at least once per day in order to remove old
+checksums from the database:
+
+   ${PREFIX}/libexec/cron-dccd
+
+===========================================================================
diff --git a/dcc/Makefile b/dcc/Makefile
new file mode 100644
index 0000000000..d9dba4eca8
--- /dev/null
+++ b/dcc/Makefile
@@ -0,0 +1,112 @@
+# $NetBSD$
+
+DISTNAME=		dcc-1.3.158
+PKGREVISION=		2
+CATEGORIES=		mail
+MASTER_SITES=		http://www.rhyolite.com/dcc/source/old/
+EXTRACT_SUFX=		.tar.Z
+
+OWNER=			petar%smokva.net@localhost
+HOMEPAGE=		http://www.rhyolite.com/dcc/
+COMMENT=		Anti-spam content filter
+LICENSE=		dcc-free-license
+
+.include "../../mk/bsd.prefs.mk"
+
+DCC_USER?=		dcc
+DCC_GROUP?=		dcc
+DCC_HOME?=		${VARBASE}/dcc
+DCC_RUN?=		${VARBASE}/run/dcc
+
+# dcc already implements $DESTDIR as $installroot but also prepends
+# $installroot to $BINDIR, which bsd.prog.mk subsequently extends to
+# $DESTDIR/$BINDIR, effectively doubling the $DESTDIR prefix.  The
+# following bit of make dances around the issue and avoids adding
+# $DESTDIR when evaluated within a bsd.prog.mk target.
+DCC_DESTDIR=		$${"$${@:Mproginstall-*}"=="":?$${DESTDIR}:}
+
+# expanded in files/dcc*.sh
+FILES_SUBST+=		DCC_HOME=${DCC_HOME}
+FILES_SUBST+=		DCC_EGDIR=${DCC_EGDIR}
+FILES_SUBST+=		DCC_RC=${PREFIX}/libexec/rcDCC
+FILES_SUBST+=		DCC_FIXMAP=${PREFIX}/libexec/fix-map
+
+# enabling/disabling daemons is done in rc.conf
+SUBST_CLASSES+=		dae
+SUBST_STAGE.dae=	post-patch
+SUBST_FILES.dae=	homedir/dcc_conf.in
+SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(GREY_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCM_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCIFD_ENABLE=\).*$$/\1on/'
+SUBST_MESSAGE.dae=	Enabling all daemons in dcc_conf
+
+HAS_CONFIGURE=		yes
+
+USE_TOOLS+=		xargs:run
+USE_TOOLS+=		ftp:run
+
+CONFIGURE_ENV+=		DCC_XARGS=${TOOLS_PATH.xargs:Q}
+# See --with-fetch-cmd for ftp..
+
+# dcc provides certain auxiliary scripts used for its web-UI and stats
+# management.  Since these scripts are non-essential, the bulky tools
+# they rely on are not declared as dependencies.
+CONFIGURE_ENV+=		PERL=${DCC_HOME}/bin/perl
+CONFIGURE_ENV+=		NOTIFYMAILER=${DCC_HOME}/bin/sendmail
+CONFIGURE_ENV+=		HTPASSWD=${DCC_HOME}/bin/htpasswd
+CONFIGURE_ENV+=		RRDTOOL=${DCC_HOME}/bin/rrdtool
+
+CONFIGURE_ARGS+=	--homedir=${DCC_HOME}
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--with-cgi-bin=${DCC_EGDIR}/cgi-bin
+CONFIGURE_ARGS+=	--with-rundir=${DCC_RUN}
+CONFIGURE_ARGS+=	--with-uid=${DCC_USER}
+CONFIGURE_ARGS+=	--with-make-cmd=${MAKE_PROGRAM:Q}
+CONFIGURE_ARGS+=	--with-fetch-cmd=${TOOLS_PATH.ftp:Q}
+CONFIGURE_ARGS+=	--with-installroot=\$$\(DCC_DESTDIR\)
+CONFIGURE_ARGS+=	--disable-sys-inst
+CONFIGURE_ARGS+=	--disable-dccm
+
+USE_BSD_MAKEFILE=	yes
+MAKE_JOBS_SAFE=		no
+
+# PKGSRC_DCC_EGDIR is for homedir/Makefile
+MAKE_ENV+=		PKGSRC_DCC_EGDIR=${DCC_EGDIR}
+MAKE_ENV+=		DCC_DESTDIR=${DCC_DESTDIR:Q}
+MAKE_ENV+=		NO_SUID=yes
+
+BUILD_DEFS+=		VARBASE
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	libexec
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	${DCC_EGDIR_REL}
+INSTALLATION_DIRS+=	${DCC_EGDIR_REL}/cgi-bin
+
+PKG_GROUPS=		${DCC_GROUP}
+PKG_USERS=		${DCC_USER}:${DCC_GROUP}
+
+OWN_DIRS_PERMS+=	${DCC_HOME} ${DCC_USER} ${DCC_GROUP} 0755
+OWN_DIRS_PERMS+=	${DCC_HOME}/log ${DCC_USER} ${DCC_GROUP} 0710
+
+DCC_EGDIR_REL=		share/examples/dcc
+DCC_EGDIR=		${PREFIX}/${DCC_EGDIR_REL}
+DCC_PERMS_CONFIG=	${DCC_USER} ${DCC_GROUP} 0600
+CONF_FILES_PERMS+=	${DCC_EGDIR}/dcc_conf ${DCC_HOME}/dcc_conf ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/flod ${DCC_HOME}/flod ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/grey_flod ${DCC_HOME}/grey_flod ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/grey_whitelist ${DCC_HOME}/grey_whitelist ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whiteclnt ${DCC_HOME}/whiteclnt ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whitecommon ${DCC_HOME}/whitecommon ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whitelist ${DCC_HOME}/whitelist ${DCC_PERMS_CONFIG}
+RCD_SCRIPTS+=		dccd dccifd
+
+DCC_PERMS_SETUID=	${DCC_USER} ${REAL_ROOT_GROUP} 4555
+SPECIAL_PERMS+=		bin/cdcc ${DCC_PERMS_SETUID}
+SPECIAL_PERMS+=		bin/dccproc ${DCC_PERMS_SETUID}
+SPECIAL_PERMS+=		libexec/dccsight ${DCC_PERMS_SETUID}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/dcc/PLIST b/dcc/PLIST
new file mode 100644
index 0000000000..bb4af15a7d
--- /dev/null
+++ b/dcc/PLIST
@@ -0,0 +1,69 @@
+@comment $NetBSD$
+bin/cdcc
+bin/dccif-test
+bin/dccproc
+libexec/check_ip_range
+libexec/ck2ip
+libexec/cron-dccd
+libexec/dbclean
+libexec/dblist
+libexec/dcc-nagios
+libexec/dcc-stats-collect
+libexec/dcc-stats-graph
+libexec/dcc-stats-init
+libexec/dcc-stats-update
+libexec/dccd
+libexec/dccifd
+libexec/dccsight
+libexec/dns-helper
+libexec/dump-clients
+libexec/fetch-testmsg-whitelist
+libexec/fetchblack
+libexec/fetchids
+libexec/fix-map
+libexec/hackmc
+libexec/list-clients
+libexec/logger
+libexec/newwebuser
+libexec/rcDCC
+libexec/start-dccd
+libexec/start-dccifd
+libexec/start-dccm
+libexec/start-grey
+libexec/stats-get
+libexec/stop-dccd
+libexec/uninstalldcc
+libexec/updatedcc
+libexec/wlist
+man/man8/cdcc.8
+man/man8/dbclean.8
+man/man8/dblist.8
+man/man8/dcc.8
+man/man8/dccd.8
+man/man8/dccifd.8
+man/man8/dccm.8
+man/man8/dccproc.8
+man/man8/dccsight.8
+share/examples/dcc/cgi-bin/README
+share/examples/dcc/cgi-bin/chgpasswd
+share/examples/dcc/cgi-bin/common
+share/examples/dcc/cgi-bin/common.pm
+share/examples/dcc/cgi-bin/edit-whiteclnt
+share/examples/dcc/cgi-bin/footer
+share/examples/dcc/cgi-bin/footer-dist
+share/examples/dcc/cgi-bin/header
+share/examples/dcc/cgi-bin/header-dist
+share/examples/dcc/cgi-bin/http2https
+share/examples/dcc/cgi-bin/list-log
+share/examples/dcc/cgi-bin/list-msg
+share/examples/dcc/cgi-bin/webuser-notify
+share/examples/dcc/dcc_conf
+share/examples/dcc/flod
+share/examples/dcc/grey_flod
+share/examples/dcc/grey_whitelist
+share/examples/dcc/ids
+share/examples/dcc/map
+share/examples/dcc/map.txt
+share/examples/dcc/whiteclnt
+share/examples/dcc/whitecommon
+share/examples/dcc/whitelist
diff --git a/dcc/distinfo b/dcc/distinfo
new file mode 100644
index 0000000000..fd8e1d660e
--- /dev/null
+++ b/dcc/distinfo
@@ -0,0 +1,10 @@
+$NetBSD$
+
+SHA1 (dcc-1.3.158.tar.Z) = 016442e1cf87f50588787cd5632b345bb15e6335
+RMD160 (dcc-1.3.158.tar.Z) = 00676a5fbb52cd3971a764f1b4244296e90c2dba
+SHA512 (dcc-1.3.158.tar.Z) = 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
+Size (dcc-1.3.158.tar.Z) = 1714175 bytes
+SHA1 (patch-Makefile.inc.in) = 9cd0fb433697d1864dde3314bed08f5a78bf3e7e
+SHA1 (patch-Makefile.inc2.in) = 16e3fdd5933048ea31f90a6e1b2dad2949deb2a3
+SHA1 (patch-configure) = c1a1c536cd2643043f2eb2ede2acc4b9f000f4b4
+SHA1 (patch-homedir_Makefile.in) = f1097124734b848140cd7ea7827b67c7e3855680
diff --git a/dcc/files/dccd.sh b/dcc/files/dccd.sh
new file mode 100644
index 0000000000..abbb625fb5
--- /dev/null
+++ b/dcc/files/dccd.sh
@@ -0,0 +1,32 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD$
+#
+#
+# PROVIDE: dccd
+# REQUIRE: DAEMON
+# BEFORE:  mail spamd dccifd
+# KEYWORD: shutdown
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name=dccd
+rcvar=$name
+start_precmd=dcc_precmd
+start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
+stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
+
+dcc_precmd ()
+{
+	if [ ! -s @DCC_HOME@/ids ]; then
+		@DCC_FIXMAP@ \
+			-i @DCC_HOME@/ids \
+			-I @DCC_EGDIR@/ids \
+			-m @DCC_HOME@/map \
+			-t @DCC_HOME@/map.txt \
+			-T @DCC_EGDIR@/map.txt
+	fi
+}
+
+load_rc_config $name
+run_rc_command "${1}"
diff --git a/dcc/files/dccifd.sh b/dcc/files/dccifd.sh
new file mode 100644
index 0000000000..b6e4a68694
--- /dev/null
+++ b/dcc/files/dccifd.sh
@@ -0,0 +1,32 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD$
+#
+#
+# PROVIDE: dccifd
+# REQUIRE: DAEMON
+# BEFORE:  mail spamd
+# KEYWORD: shutdown
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name=dccifd
+rcvar=$name
+start_precmd=dcc_precmd
+start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
+stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
+
+dcc_precmd ()
+{
+	if [ ! -s @DCC_HOME@/ids ]; then
+		@DCC_FIXMAP@ \
+			-i @DCC_HOME@/ids \
+			-I @DCC_EGDIR@/ids \
+			-m @DCC_HOME@/map \
+			-t @DCC_HOME@/map.txt \
+			-T @DCC_EGDIR@/map.txt
+	fi
+}
+
+load_rc_config $name
+run_rc_command "${1}"
diff --git a/dcc/patches/patch-Makefile.inc.in b/dcc/patches/patch-Makefile.inc.in
new file mode 100644
index 0000000000..12a36dacf3
--- /dev/null
+++ b/dcc/patches/patch-Makefile.inc.in
@@ -0,0 +1,14 @@
+$NetBSD$
+
+NO_SYS_INSTALL shouldn't prevent man pages from being installed.
+
+--- Makefile.inc.in.orig	2014-08-06 14:43:42.000000000 +0000
++++ Makefile.inc.in
+@@ -124,7 +124,6 @@ MANOWN	    =$(DCC_OWN)
+ MANMODE	    =444
+ 
+ @MAKE_DOT@ifdef NO_SYS_INSTALL
+-NOMAN	=no
+ SET_BINOWN=
+ SET_MANOWN=
+ SET_DCCOWN=
diff --git a/dcc/patches/patch-Makefile.inc2.in b/dcc/patches/patch-Makefile.inc2.in
new file mode 100644
index 0000000000..b296015edd
--- /dev/null
+++ b/dcc/patches/patch-Makefile.inc2.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Prepending `depend' and `all' during the install stage will cause at
+least two ambiguous errors.  Remove the whole dependency because it
+doesn't seem to have much use anyway.
+
+--- Makefile.inc2.in.orig	2014-08-06 14:43:42.000000000 +0000
++++ Makefile.inc2.in
+@@ -47,7 +47,6 @@ INSTALL	=@DCCINSTALL@
+ BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
+ 
+ # create the DCC home directory before trying to install files
+-beforeinstall:$(BINDIR) $(MANDIR)8 depend all
+ $(BINDIR):
+ 	$(INSTALL) -d $(SET_BINOWN) -m 755 $(BINDIR)
+ 
diff --git a/dcc/patches/patch-configure b/dcc/patches/patch-configure
new file mode 100644
index 0000000000..c9a8f13fca
--- /dev/null
+++ b/dcc/patches/patch-configure
@@ -0,0 +1,104 @@
+$NetBSD$
+
+Always install man-pages.
+
+--- configure.orig	2014-08-06 14:43:42.000000000 +0000
++++ configure
+@@ -1920,93 +1920,10 @@ fi
+ #	decide whether to install .8 or .0 files.
+ MANXFILE=
+ MAN0AS8='/`expr $$NM : "\(.*\)".0`.8'
+-case "$TARGET_SYS" in
+-    Linux)
+-	# default to /usr/local/man/man8 and use roff files
+-	mancat=man
+-	MANX='$(MAN8)'
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    OpenBSD)
+-	# default to /usr/local/man/cat8 and .0 names
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    HP-UX)
+-	# default to /usr/local/man/cat8 and use cleartext files and
+-	#   .8 names
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	MANXFILE="$MAN8AS8"
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    IRIX*)
+-	# default to /usr/local/man/man8 and use cleartext files and .8 names
+-	mancat=man
+-	MANX='$(MAN0)'
+-	MANXFILE="$MAN8AS8"
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    SunOS)
+-	# default to /usr/local/man/cat8 and use cleartext files,
+-	#   use our installation rule, and .8 names
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	MANXFILE="$MAN8AS8"
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    FreeBSD|DragonFly)
+-	# default to /usr/local/man/man8 and use nroff files, possibly
+-	#   compressed via /usr/share/mk
+-	mancat=man
+-	MANX='$(MAN8)'
+-	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
+-	;;
+-    Darwin)
+-	# default to /usr/local/man/man8 and use nroff files
+-	mancat=man
+-	MANX='$(MAN8)'
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    NetBSD)
+-	# use text output to avoid running groff on every `man` command
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	# force NetBSD to install the man pages
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes\
+-install:maninstall'
+-	;;
+-    BSD/OS)
+-	# default to /usr/local/man/cat8 and use cleartext files, possibly
+-	#   compressed via /usr/share/mk, and named .0
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
+-	;;
+-    AIX)
+-	# default to /usr/local/man/cat8, use our installation rule,
+-	#   and use cleartext files named .8
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	MANXFILE="$MAN8AS8"
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    OpenUNIX)
+-	# default to /usr/local/man/cat8 and use cleartext files named
+-	#   .8
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	MANXFILE="$MAN8AS8"
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-    *)
+-	echo "warning: 	*** Cannot install man pages on unfamiliar systems ***" 1>&2
+-	mancat=fixme
+-	MANX=
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+-	;;
+-esac
++# default to /usr/local/man/man8 and use nroff files
++mancat=man
++MANX='$(MAN8)'
++USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+ if test "$mandir" = '${prefix}/man'; then
+     if test "$DCC_MANDIR"SET != SET; then
+ 	mandir="$DCC_MANDIR"
diff --git a/dcc/patches/patch-homedir_Makefile.in b/dcc/patches/patch-homedir_Makefile.in
new file mode 100644
index 0000000000..7f5743d488
--- /dev/null
+++ b/dcc/patches/patch-homedir_Makefile.in
@@ -0,0 +1,38 @@
+$NetBSD$
+
+Install configuration files into PKGSRC_DCC_EGDIR.
+
+The path in HD is only used during installation and should therefore not
+end up in any of the installed files.
+
+Also, skip make-dcc_conf (there is nothing to merge) and fix-map (moved
+into rc-files as start_precmd check).
+
+--- homedir/Makefile.in.orig	2014-08-06 14:43:42.000000000 +0000
++++ homedir/Makefile.in
+@@ -39,7 +39,7 @@
+ DEPTH	=..
+ 
+ HINST	=$(INSTALL) -c $(SET_DCCOWN)
+-HD	=@installroot@@prefix@
++HD	=@installroot@$(PKGSRC_DCC_EGDIR)
+ MAP	=$(HD)/map@configsuffix@
+ MAPTXT	=$(HD)/map.txt@configsuffix@
+ IDS	=$(HD)/ids@configsuffix@
+@@ -60,14 +60,12 @@ DCC_BINDIR=@installroot@@libexecdir@
+ all:
+ 	@:
+ 
+-install:$(HD) $(HD)/log
++install:$(HD)
+ 	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
+-	sh make-dcc_conf -F '@configsuffix@' -h $(HD)
+-	for NM in $(SIMPLE); do\
++	for NM in $(SIMPLE) $(GENFILES); do\
+ 	    if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\
+ 		$(HINST) -m 644 $$NM $(HD)/$${NM}@configsuffix@; fi; done
+ 	if test -s $(PFILE); then $(HINST) -m 600 $(PFILE) $(HD)/$(PFILE); fi
+-	sh fix-map -n '@configsuffix@' -c $(CDCC) -h $(HD) -i $(IDS) -m $(MAP) -t $(MAPTXT)
+ 	for NM in $(SIMPLE) $(GENFILES); do\
+ 	    if test -n '@configsuffix@' -a ! -s $(HD)/$$NM; then\
+ 		cp -p $(HD)/$${NM}@configsuffix@ $(HD)/$${NM}; fi; done
Prev by Date: dcc: update to 1.3.159
Next by Date: fusionpbx: Fix pkglint {-Wall} warnings
Previous by Thread: dcc: update to 1.3.159
Next by Thread: fusionpbx: Fix pkglint {-Wall} warnings
Indexes:
Home | Main Index | Thread Index | Old Index