View | Details | Raw Unified | Return to bug 57160
Collapse All | Expand All

(-)inn/Makefile (-3 / +41 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	inn
8
PORTNAME=	inn
9
PORTVERSION=	2.4.0
9
PORTVERSION=	2.4.0
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	news ipv6
11
CATEGORIES=	news ipv6
12
MASTER_SITES=	${MASTER_SITE_ISC}
12
MASTER_SITES=	${MASTER_SITE_ISC}
13
MASTER_SITE_SUBDIR=	inn
13
MASTER_SITE_SUBDIR=	inn
Lines 20-25 Link Here
20
USE_PERL5=	yes
20
USE_PERL5=	yes
21
USE_OPENSSL=	yes
21
USE_OPENSSL=	yes
22
22
23
CONFLICTS=	inn-*
24
23
.if exists(/var/news) && !defined(PACKAGE_BUILDING)
25
.if exists(/var/news) && !defined(PACKAGE_BUILDING)
24
INN_NEWSSPOOL?=/var/news
26
INN_NEWSSPOOL?=/var/news
25
.elif exists(/var/spool/news) && !defined(PACKAGE_BUILDING)
27
.elif exists(/var/spool/news) && !defined(PACKAGE_BUILDING)
Lines 30-49 Link Here
30
INN_NEWSLOG?=/var/log/news
32
INN_NEWSLOG?=/var/log/news
31
33
32
HAS_CONFIGURE=		yes
34
HAS_CONFIGURE=		yes
35
CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
33
CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
36
CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
34
			--prefix=${PREFIX}/news \
37
			--prefix=${PREFIX}/news \
35
			--with-spool-dir=${INN_NEWSSPOOL} \
38
			--with-spool-dir=${INN_NEWSSPOOL} \
36
			--with-log-dir=${INN_NEWSLOG} \
39
			--with-log-dir=${INN_NEWSLOG} \
37
			--with-perl \
40
			--with-perl \
38
			--with-tmp-path=${INN_NEWSSPOOL}/tmp \
41
			--with-tmp-path=${INN_NEWSSPOOL}/tmp \
39
			--with-openssl \
42
			--with-openssl=${OPENSSLBASE} \
40
			--enable-ipv6
43
			--enable-ipv6
41
44
45
.if defined(WITH_BERKELEYDB)
46
# We don't support other versions for the moment.
47
CONFIGURE_ARGS+=	--with-berkeleydb
48
LIB_DEPENDS+=		db4:${PORTSDIR}/databases/db4
49
.endif
50
42
.if defined(WITH_PYTHON)
51
.if defined(WITH_PYTHON)
43
USE_PYTHON=		YES
52
USE_PYTHON=		YES
44
CONFIGURE_ARGS+=	--with-python
53
CONFIGURE_ARGS+=	--with-python
45
.endif
54
.endif
46
55
56
.if defined(WITH_TCL)
57
USE_REINPLACE=		yes
58
CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}
59
BUILD_DEPENDS+=		${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
60
.endif
61
62
.if defined (WITH_MAXSOCKET)
63
CONFIGURE_ARGS+=	--with-max-sockets=${WITH_MAXSOCKET}
64
.endif
65
66
.if defined(WITH_KEYWORDS)
67
CONFIGURE_ARGS+=	--enable-keywords
68
.endif
69
70
.if defined(WITH_SASL)
71
CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
72
LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
73
.endif
74
47
.if defined(WITH_TAGGED_HASH)
75
.if defined(WITH_TAGGED_HASH)
48
CONFIGURE_ARGS+=	--enable-tagged-hash
76
CONFIGURE_ARGS+=	--enable-tagged-hash
49
DBZ_FILES=		dir pag
77
DBZ_FILES=		dir pag
Lines 56-61 Link Here
56
PLIST_SUB+=		SUB_WITHOUT_TAGGED_HASH=""
84
PLIST_SUB+=		SUB_WITHOUT_TAGGED_HASH=""
57
.endif
85
.endif
58
86
87
59
EXTRA=		CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
88
EXTRA=		CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
60
HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
89
HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
61
90
Lines 81-86 Link Here
81
	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
110
	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
82
	tally.control.8 tdx-util.8 writelog.8
111
	tally.control.8 tdx-util.8 writelog.8
83
112
113
.include <bsd.port.pre.mk>
114
115
post-patch:
116
.if defined(WITH_TCL)
117
	@${REINPLACE_CMD} -e 's!<tcl.h>!<tcl8.3/tcl.h>!' ${WRKSRC}/innd/innd.h
118
	@${REINPLACE_CMD} -e 's!-ltcl!-ltcl83!' ${WRKSRC}/configure
119
.endif
120
84
post-install:
121
post-install:
85
	${MKDIR} ${INN_NEWSSPOOL}
122
	${MKDIR} ${INN_NEWSSPOOL}
86
.if !defined(NOPORTDOCS)
123
.if !defined(NOPORTDOCS)
Lines 97-102 Link Here
97
	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
134
	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
98
	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
135
	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
99
	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
136
	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
137
	@PKG_PREFIX=${PKG_PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF
100
	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
138
	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
101
	    ${ECHO} 'Creating empty history database...' ; \
139
	    ${ECHO} 'Creating empty history database...' ; \
102
	    cd ${PREFIX}/news/db ; \
140
	    cd ${PREFIX}/news/db ; \
Lines 110-113 Link Here
110
	fi)
148
	fi)
111
	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
149
	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
112
150
113
.include <bsd.port.mk>
151
.include <bsd.port.post.mk>
(-)inn/pkg-install (+18 lines)
Lines 2-10 Link Here
2
2
3
PKGNAME=$1
3
PKGNAME=$1
4
[ ! -n PKG_PREFIX ] && exit 1
4
[ ! -n PKG_PREFIX ] && exit 1
5
PKG_PREFIX=${PKG_PREFIX:-/usr/local}
5
6
6
case $2 in
7
case $2 in
7
    PRE-INSTALL)
8
    PRE-INSTALL)
9
	;;
10
    CHECK-CONF)
11
	NEWSBASE=${PKG_PREFIX}/news
12
	echo "Checking for configuration files"
13
	for f in $(find ${NEWSBASE}/etc/ -name "*.dist" -type f)
14
		do
15
			REALFILE=${f%%.dist}
16
			echo -n "Checking if ${REALFILE} exists:   "
17
			if [ -e ${REALFILE} ] 
18
				then
19
					echo "[YES]"
20
				else
21
					echo "[NO]"
22
					echo "     Installing ${f} to ${REALFILE}"
23
					cp ${f} ${REALFILE}
24
			fi
25
		done
8
	;;
26
	;;
9
    POST-INSTALL)
27
    POST-INSTALL)
10
	NEWSBASE=${PKG_PREFIX}/news
28
	NEWSBASE=${PKG_PREFIX}/news
(-)inn/pkg-plist (-29 / +57 lines)
Lines 115-120 Link Here
115
news/doc/LICENSE
115
news/doc/LICENSE
116
news/doc/NEWS
116
news/doc/NEWS
117
news/doc/README
117
news/doc/README
118
news/doc/README.snapshot
118
news/doc/TODO
119
news/doc/TODO
119
news/doc/compliance-nntp
120
news/doc/compliance-nntp
120
news/doc/config-design
121
news/doc/config-design
Lines 126-157 Link Here
126
news/doc/hook-python
127
news/doc/hook-python
127
news/doc/hook-tcl
128
news/doc/hook-tcl
128
news/doc/sample-control
129
news/doc/sample-control
129
news/etc/actsync.cfg
130
@unexec if cmp -s %D/news/etc/actsync.cfg %D/news/etc/actsync.cfg.dist; then rm -f %D/news/etc/actsync.cfg ; fi
130
news/etc/actsync.ign
131
news/etc/actsync.cfg.dist
131
news/etc/buffindexed.conf
132
@unexec if cmp -s %D/news/etc/actsync.ign %D/news/etc/actsync.ign.dist; then rm -f %D/news/etc/actsync.ign ; fi
132
news/etc/control.ctl
133
news/etc/actsync.ign.dist
133
news/etc/cycbuff.conf
134
@unexec if cmp -s %D/news/etc/buffindexed.conf %D/news/etc/buffindexed.conf.dist; then rm -f %D/news/etc/buffindexed.conf ; fi
134
news/etc/distrib.pats
135
news/etc/buffindexed.conf.dist
135
news/etc/expire.ctl
136
@unexec if cmp -s %D/news/etc/control.ctl %D/news/etc/control.ctl.dist; then rm -f %D/news/etc/control.ctl ; fi
136
news/etc/incoming.conf
137
news/etc/control.ctl.dist
137
news/etc/inn.conf
138
@unexec if cmp -s %D/news/etc/cycbuff.conf %D/news/etc/cycbuff.conf.dist; then rm -f %D/news/etc/cycbuff.conf ; fi
138
news/etc/innfeed.conf
139
news/etc/cycbuff.conf.dist
139
news/etc/innreport.conf
140
@unexec if cmp -s %D/news/etc/distrib.pats %D/news/etc/distrib.pats.dist; then rm -f %D/news/etc/distrib.pats ; fi
140
news/etc/innwatch.ctl
141
news/etc/distrib.pats.dist
141
news/etc/moderators
142
@unexec if cmp -s %D/news/etc/expire.ctl %D/news/etc/expire.ctl.dist; then rm -f %D/news/etc/expire.ctl ; fi
142
news/etc/motd.news
143
news/etc/expire.ctl.dist
143
news/etc/news2mail.cf
144
@unexec if cmp -s %D/news/etc/incoming.conf %D/news/etc/incoming.conf.dist; then rm -f %D/news/etc/incoming.conf ; fi
144
news/etc/newsfeeds
145
news/etc/incoming.conf.dist
145
news/etc/nnrpd.track
146
@unexec if cmp -s %D/news/etc/inn.conf %D/news/etc/inn.conf.dist; then rm -f %D/news/etc/inn.conf ; fi
146
news/etc/nntpsend.ctl
147
news/etc/inn.conf.dist
147
news/etc/ovdb.conf
148
@unexec if cmp -s %D/news/etc/innfeed.conf %D/news/etc/innfeed.conf.dist; then rm -f %D/news/etc/innfeed.conf ; fi
148
news/etc/overview.fmt
149
news/etc/innfeed.conf.dist
149
news/etc/passwd.nntp
150
@unexec if cmp -s %D/news/etc/innreport.conf %D/news/etc/innreport.conf.dist; then rm -f %D/news/etc/innreport.conf ; fi
150
news/etc/radius.conf
151
news/etc/innreport.conf.dist
151
news/etc/readers.conf
152
@unexec if cmp -s %D/news/etc/innwatch.ctl %D/news/etc/innwatch.ctl.dist; then rm -f %D/news/etc/innwatch.ctl ; fi
152
news/etc/sasl.conf
153
news/etc/innwatch.ctl.dist
153
news/etc/storage.conf
154
@unexec if cmp -s %D/news/etc/moderators %D/news/etc/moderators.dist; then rm -f %D/news/etc/moderators ; fi
154
news/etc/subscriptions
155
news/etc/moderators.dist
156
@unexec if cmp -s %D/news/etc/motd.news %D/news/etc/motd.news.dist; then rm -f %D/news/etc/motd.news ; fi
157
news/etc/motd.news.dist
158
@unexec if cmp -s %D/news/etc/news2mail.cf %D/news/etc/news2mail.cf.dist; then rm -f %D/news/etc/news2mail.cf ; fi
159
news/etc/news2mail.cf.dist
160
@unexec if cmp -s %D/news/etc/newsfeeds %D/news/etc/newsfeeds.dist; then rm -f %D/news/etc/newsfeeds ; fi
161
news/etc/newsfeeds.dist
162
@unexec if cmp -s %D/news/etc/nnrpd.track %D/news/etc/nnrpd.track.dist; then rm -f %D/news/etc/nnrpd.track ; fi
163
news/etc/nnrpd.track.dist
164
@unexec if cmp -s %D/news/etc/nntpsend.ctl %D/news/etc/nntpsend.ctl.dist; then rm -f %D/news/etc/nntpsend.ctl ; fi
165
news/etc/nntpsend.ctl.dist
166
@unexec if cmp -s %D/news/etc/ovdb.conf %D/news/etc/ovdb.conf.dist; then rm -f %D/news/etc/ovdb.conf ; fi
167
news/etc/ovdb.conf.dist
168
@unexec if cmp -s %D/news/etc/overview.fmt %D/news/etc/overview.fmt.dist; then rm -f %D/news/etc/overview.fmt ; fi
169
news/etc/overview.fmt.dist
170
@unexec if cmp -s %D/news/etc/passwd.nntp %D/news/etc/passwd.nntp.dist; then rm -f %D/news/etc/passwd.nntp ; fi
171
news/etc/passwd.nntp.dist
172
@unexec if cmp -s %D/news/etc/radius.conf %D/news/etc/radius.conf.dist; then rm -f %D/news/etc/radius.conf ; fi 
173
news/etc/radius.conf.dist
174
@unexec if cmp -s %D/news/etc/readers.conf %D/news/etc/readers.conf.dist; then rm -f %D/news/etc/readers.conf; fi
175
news/etc/readers.conf.dist
176
@unexec if cmp -s %D/news/etc/sasl.conf %D/news/etc/sasl.conf.dist; then rm -f %D/news/etc/sasl.conf ; fi
177
news/etc/sasl.conf.dist
178
@unexec if cmp -s %D/news/etc/storage.conf %D/news/etc/storage.conf.dist; then rm -f %D/news/etc/storage.conf ; fi
179
news/etc/storage.conf.dist
180
@unexec if cmp -s %D/news/etc/subscriptions %D/news/etc/subscriptions.dist; then rm -f %D/news/etc/subscriptions ; fi
181
news/etc/subscriptions.dist
155
news/include/clibrary.h
182
news/include/clibrary.h
156
news/include/conffile.h
183
news/include/conffile.h
157
news/include/config.h
184
news/include/config.h
Lines 196-202 Link Here
196
%%PORTDOCS%%%%DOCSDIR%%/README
223
%%PORTDOCS%%%%DOCSDIR%%/README
197
%%PORTDOCS%%%%DOCSDIR%%/TODO
224
%%PORTDOCS%%%%DOCSDIR%%/TODO
198
%%PORTDOCS%%@dirrm %%DOCSDIR%%
225
%%PORTDOCS%%@dirrm %%DOCSDIR%%
199
@dirrm news/tmp
226
@unexec rmdir %D/news/tmp 2>/dev/null || true
200
@dirrm news/spool/overview
227
@dirrm news/spool/overview
201
@dirrm news/spool/outgoing
228
@dirrm news/spool/outgoing
202
@dirrm news/spool/innfeed
229
@dirrm news/spool/innfeed
Lines 204-215 Link Here
204
@dirrm news/spool/incoming
231
@dirrm news/spool/incoming
205
@dirrm news/spool/articles
232
@dirrm news/spool/articles
206
@dirrm news/spool/archive
233
@dirrm news/spool/archive
234
@dirrm news/spool/tmp
207
@dirrm news/spool
235
@dirrm news/spool
208
@dirrm news/run
236
@dirrm news/run
209
@dirrm news/lib
237
@dirrm news/lib
210
@dirrm news/include/inn
238
@dirrm news/include/inn
211
@dirrm news/include
239
@dirrm news/include
212
@dirrm news/etc
240
@unexec rmdir %D/news/etc 2>/dev/null || true
213
@dirrm news/doc
241
@dirrm news/doc
214
@dirrm news/db
242
@dirrm news/db
215
@dirrm news/bin/rnews.libexec
243
@dirrm news/bin/rnews.libexec
Lines 219-222 Link Here
219
@dirrm news/bin/auth/passwd
247
@dirrm news/bin/auth/passwd
220
@dirrm news/bin/auth
248
@dirrm news/bin/auth
221
@dirrm news/bin
249
@dirrm news/bin
222
@dirrm news
250
@unexec rmdir %D/news 2>/dev/null ||( echo "===>  If you don't plan to use inn later, you can safely remove %D/news. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo "    - $i"; done)
(-)inn/files/patch-configure (+15 lines)
Added Link Here
1
--- configure.orig	Mon Sep 22 11:31:16 2003
2
+++ configure	Mon Sep 22 11:32:15 2003
3
@@ -5828,9 +5828,9 @@
4
     fi
5
     if test x"$BERKELEY_DB_DIR" = xyes ; then
6
         for v in db4 db3 db2 ; do
7
-            if test -d "/usr/local/include/$v" ; then
8
-                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
9
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
10
+            if test -d "${LOCALBASE}/include/$v" ; then
11
+                BERKELEY_DB_LDFLAGS="-L${LOCALBASE}/lib"
12
+                BERKELEY_DB_CFLAGS="-I${LOCALBASE}/include/$v"
13
                 BERKELEY_DB_LIB="-l$v"
14
                 echo "$ac_t""FreeBSD locations" 1>&6
15
                 break
(-)inn/files/patch-site::Makefile (+88 lines)
Added Link Here
1
--- site/Makefile.orig	Sat Jul 12 21:11:02 2003
2
+++ site/Makefile	Sun Sep 21 12:53:00 2003
3
@@ -23,29 +23,29 @@
4
 PATH_NNRPAUTH           = ${PATHFILTER}/nnrpd_auth.pl
5
 PATH_NNRPYAUTH          = ${PATHFILTER}/nnrpd_auth.py
6
 
7
-PATH_CONFIG		= ${PATHETC}/inn.conf
8
-PATH_CONTROLCTL		= ${PATHETC}/control.ctl
9
-PATH_EXPIRECTL		= ${PATHETC}/expire.ctl
10
-PATH_INNDHOSTS		= ${PATHETC}/incoming.conf
11
-PATH_MODERATORS		= ${PATHETC}/moderators
12
-PATH_DISTPATS		= ${PATHETC}/distrib.pats
13
-PATH_NEWSFEEDS		= ${PATHETC}/newsfeeds
14
-PATH_READERSCONF	= ${PATHETC}/readers.conf
15
-PATH_NNRPDTRACK		= ${PATHETC}/nnrpd.track
16
-PATH_SCHEMA		= ${PATHETC}/overview.fmt
17
-PATH_NNTPPASS		= ${PATHETC}/passwd.nntp
18
-PATH_CTLWATCH		= ${PATHETC}/innwatch.ctl
19
-PATH_ACTSYNC_IGN	= ${PATHETC}/actsync.ign
20
-PATH_ACTSYNC_CFG	= ${PATHETC}/actsync.cfg
21
-PATH_MOTD		= ${PATHETC}/motd.news
22
-PATH_STORAGECONF	= ${PATHETC}/storage.conf
23
-PATH_CYCBUFFCONFIG	= ${PATHETC}/cycbuff.conf
24
-PATH_INNFEEDCTL		= ${PATHETC}/innfeed.conf
25
-PATH_BUFFINDEXED	= ${PATHETC}/buffindexed.conf
26
-PATH_RADIUS_CONF	= ${PATHETC}/radius.conf
27
-PATH_OVDB_CONF		= ${PATHETC}/ovdb.conf
28
-PATH_SASL_CONF		= ${PATHETC}/sasl.conf
29
-PATH_SUBSCRIPTIONS	= ${PATHETC}/subscriptions
30
+PATH_CONFIG		= ${PATHETC}/inn.conf.dist
31
+PATH_CONTROLCTL		= ${PATHETC}/control.ctl.dist
32
+PATH_EXPIRECTL		= ${PATHETC}/expire.ctl.dist
33
+PATH_INNDHOSTS		= ${PATHETC}/incoming.conf.dist
34
+PATH_MODERATORS		= ${PATHETC}/moderators.dist
35
+PATH_DISTPATS		= ${PATHETC}/distrib.pats.dist
36
+PATH_NEWSFEEDS		= ${PATHETC}/newsfeeds.dist
37
+PATH_READERSCONF	= ${PATHETC}/readers.conf.dist
38
+PATH_NNRPDTRACK		= ${PATHETC}/nnrpd.track.dist
39
+PATH_SCHEMA		= ${PATHETC}/overview.fmt.dist
40
+PATH_NNTPPASS		= ${PATHETC}/passwd.nntp.dist
41
+PATH_CTLWATCH		= ${PATHETC}/innwatch.ctl.dist
42
+PATH_ACTSYNC_IGN	= ${PATHETC}/actsync.ign.dist
43
+PATH_ACTSYNC_CFG	= ${PATHETC}/actsync.cfg.dist
44
+PATH_MOTD		= ${PATHETC}/motd.news.dist
45
+PATH_STORAGECONF	= ${PATHETC}/storage.conf.dist
46
+PATH_CYCBUFFCONFIG	= ${PATHETC}/cycbuff.conf.dist
47
+PATH_INNFEEDCTL		= ${PATHETC}/innfeed.conf.dist
48
+PATH_BUFFINDEXED	= ${PATHETC}/buffindexed.conf.dist
49
+PATH_RADIUS_CONF	= ${PATHETC}/radius.conf.dist
50
+PATH_OVDB_CONF		= ${PATHETC}/ovdb.conf.dist
51
+PATH_SASL_CONF		= ${PATHETC}/sasl.conf.dist
52
+PATH_SUBSCRIPTIONS	= ${PATHETC}/subscriptions.dist
53
 
54
 PATH_ACTIVE		= ${PATHDB}/active
55
 PATH_ACTIVE_TIMES	= ${PATHDB}/active.times
56
@@ -71,8 +71,8 @@
57
 	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
58
 	$D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
59
 	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
60
-	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \
61
-	$D$(PATHETC)/innreport.conf \
62
+	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl.dist \
63
+	$D$(PATHETC)/innreport.conf.dist \
64
 	$D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \
65
 	$D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
66
 	$D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
67
@@ -81,7 +81,7 @@
68
 	$D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
69
 	$D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \
70
 	$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
71
-	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
72
+	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf.dist $D$(PATH_READERSCONF) \
73
 	$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
74
 	$D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS)
75
 
76
@@ -170,9 +170,9 @@
77
 $D$(PATH_MODERATORS):	moderators	; $(COPY_RPUB) $? $@
78
 $D$(PATH_DISTPATS):	distrib.pats	; $(COPY_RPUB) $? $@
79
 $D$(PATH_NNTPPASS):	passwd.nntp	; $(COPY_RPRI) $? $@
80
-$D$(PATHETC)/nntpsend.ctl: nntpsend.ctl	; $(COPY_RPUB) $? $@
81
-$D$(PATHETC)/news2mail.cf: news2mail.cf	; $(COPY_RPUB) $? $@
82
-$D$(PATHETC)/innreport.conf: innreport.conf	; $(COPY_RPUB) $? $@
83
+$D$(PATHETC)/nntpsend.ctl.dist: nntpsend.ctl	; $(COPY_RPUB) $? $@
84
+$D$(PATHETC)/news2mail.cf.dist: news2mail.cf	; $(COPY_RPUB) $? $@
85
+$D$(PATHETC)/innreport.conf.dist: innreport.conf	; $(COPY_RPUB) $? $@
86
 $D$(PATH_STORAGECONF): storage.conf	; $(COPY_RPUB) $? $@
87
 $D$(PATH_CYCBUFFCONFIG): cycbuff.conf	; $(COPY_RPUB) $? $@
88
 $D$(PATH_BUFFINDEXED): buffindexed.conf	; $(COPY_RPUB) $? $@

Return to bug 57160