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

(-)./Makefile (-53 / +47 lines)
Lines 8-52 Link Here
8
PORTNAME?=	inn
8
PORTNAME?=	inn
9
PORTVERSION?=	2.5.2
9
PORTVERSION?=	2.5.2
10
CATEGORIES=	news ipv6
10
CATEGORIES=	news ipv6
11
# Master distribution broken
11
MASTER_SITES?=	${MASTER_SITE_ISC}
12
#MASTER_SITES?=	${MASTER_SITE_ISC}
12
MASTER_SITE_SUBDIR?=	${PORTNAME}
13
#MASTER_SITE_SUBDIR?=	${PORTNAME}
14
MASTER_SITES=	${MASTER_SITE_LOCAL}
15
MASTER_SITE_SUBDIR=	fluffy
16
13
17
MAINTAINER=	fluffy@FreeBSD.org
14
MAINTAINER=	fluffy@FreeBSD.org
18
COMMENT=	InterNetNews -- the Internet meets Netnews
15
COMMENT=	InterNetNews -- the Internet meets Netnews
19
16
17
BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
18
		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
19
20
RUN_DEPENDS:=	${BUILD_DEPENDS}
21
20
USE_RC_SUBR=	innd.sh
22
USE_RC_SUBR=	innd.sh
21
SUB_FILES=	pkg-install
23
SUB_FILES=	pkg-install
22
24
23
LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
25
LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
24
26
25
USE_GMAKE=	yes
27
#USE_GMAKE=	yes
26
USE_OPENSSL=	yes
27
USE_PERL5=	yes
28
USE_PERL5=	yes
28
29
29
CONFLICTS?=	inn-stable-[0-9]* inn-current-[0-9]*
30
CONFLICTS?=	inn-stable-[0-9]* inn-current-[0-9]*
30
31
31
OPTIONS=	PYTHON		"Embedded Python module support"		Off	\
32
OPTIONS_DEFINE=		PYTHON KERBEROS SASL KEYWORDS BERKELEYDB OPENSSL \
32
		TCL		"Embedded TCL support"				Off	\
33
			TAGGED_HASH LARGE_FILES GNUPG
33
		KERBEROS	"Enable Kerberos auth support"			Off	\
34
OPTIONS_DEFAULT=	KEYWORDS
34
		SASL		"Enable SASL support (for imapfeed auth)"	Off	\
35
35
		TAGGED_HASH	"Use tagged hash table for history"		Off	\
36
PYTHON_DESC=		Embedded Python module support
36
		LARGE_FILES	"Support for files larger than 2GB"		Off	\
37
KERBEROS_DESC=		Enable Kerberos v5 (for auth_krb5)
37
		KEYWORDS	"Automatic keyword generation support"		On	\
38
SASL_DESC=		Enable SASL (for imapfeed authentication)
38
		BERKELEYDB	"Enable BerkeleyDB (for ovdb overview method)"	Off
39
TAGGED_HASH_DESC=	Use tagged hash table for history
40
LARGE_FILES_DESC=	Support for files larger than 2GB
41
KEYWORDS_DESC=		Automatic keyword generation support
42
BERKELEYDB_DESC=	Enable BerkeleyDB (for ovdb overview method)
43
OPENSSL_DESC=		Enable OpenSSL (for NNTP over TLS/SSL support)
44
GNUPG_DESC=		GnuPG support (for pgpverify control message)
39
45
40
VARBASE?=	/var
46
VARBASE?=	/var
41
47
42
.include "Makefile.layout"
48
.include "Makefile.layout"
43
49
44
BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
45
		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
46
#		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
47
48
RUN_DEPENDS:=	${BUILD_DEPENDS}
49
50
HAS_CONFIGURE=		yes
50
HAS_CONFIGURE=		yes
51
CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
51
CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
52
CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
52
CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
Lines 54-77 Link Here
54
			--with-spool-dir=${INN_NEWSSPOOL}	\
54
			--with-spool-dir=${INN_NEWSSPOOL}	\
55
			--with-log-dir=${INN_LOGDIR}		\
55
			--with-log-dir=${INN_LOGDIR}		\
56
			--with-tmp-dir=${INN_TMPDIR}		\
56
			--with-tmp-dir=${INN_TMPDIR}		\
57
			--with-openssl=${OPENSSLBASE}		\
57
			--sysconfdir=${INN_ETCDIR}		\
58
			--with-etc-dir=${INN_ETCDIR}		\
59
			--with-run-dir=${INN_RUNDIR}		\
58
			--with-run-dir=${INN_RUNDIR}		\
60
			--with-db-dir=${INN_DBDIR}		\
59
			--with-db-dir=${INN_DBDIR}		\
61
			--with-datarootdirdir=${INN_SHAREDIR}	\
60
			--datarootdir=${INN_SHAREDIR}		\
62
			--with-ssl=${OPENSSLBASE}		\
63
			--enable-ipv6 --with-perl
61
			--enable-ipv6 --with-perl
64
62
65
.include <bsd.port.options.mk>
63
.include <bsd.port.options.mk>
66
64
67
.if defined(WITH_BERKELEYDB)
65
.if ${PORT_OPTIONS:MBERKELEYDB}
68
USE_BDB=		44+
66
USE_BDB=		44+
69
CONFIGURE_ENV+=		DB_VER=db${BDB_VER}
67
CONFIGURE_ENV+=		DB_VER=db${BDB_VER}
70
CONFIGURE_ENV+=		DB_LIB=${BDB_LIB_NAME}
68
CONFIGURE_ENV+=		DB_LIB=${BDB_LIB_NAME}
71
CONFIGURE_ARGS+=	--with-berkeleydb=${LOCALBASE}
69
CONFIGURE_ARGS+=	--with-berkeleydb=${LOCALBASE}
72
.endif
70
.endif
73
71
74
.if defined(WITH_KERBEROS)
72
.if ${PORT_OPTIONS:MKERBEROS}
75
.    if exists(${LOCALBASE}/bin/krb5-config)
73
.    if exists(${LOCALBASE}/bin/krb5-config)
76
LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
74
LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
77
CONFIGURE_ARGS+=	--with-kerberos=${LOCALBASE}
75
CONFIGURE_ARGS+=	--with-kerberos=${LOCALBASE}
Lines 84-132 Link Here
84
CONFIGURE_ARGS+=	--without-kerberos
82
CONFIGURE_ARGS+=	--without-kerberos
85
.endif
83
.endif
86
84
87
.if defined(WITH_PYTHON)
85
.if ${PORT_OPTIONS:MPYTHON}
88
USE_PYTHON=		yes
86
USE_PYTHON=		yes
89
CONFIGURE_ARGS+=	--with-python
87
CONFIGURE_ARGS+=	--with-python
90
.    include "${PORTSDIR}/Mk/bsd.python.mk"
91
.endif
88
.endif
92
89
93
.if defined(WITH_TCL)
90
.if ${PORT_OPTIONS:MLARGE_FILES}
94
USE_TCL=		84+
95
CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}
96
.endif
97
98
.if defined(WITH_MAXSOCKET)
99
CONFIGURE_ARGS+=	--with-max-sockets=${WITH_MAXSOCKET}
100
.endif
101
102
.if defined(WITH_LARGE_FILES)
103
CONFIGURE_ARGS+=	--enable-largefiles
91
CONFIGURE_ARGS+=	--enable-largefiles
104
.    if defined(WITH_TAGGED_HASH)
92
.    if ${PORT_OPTIONS:MTAGGED_HASH}
105
IGNORE=			cannot be compiled with both LARGE_FILES and TAGGED_HASH: please re-run make config
93
IGNORE=			cannot be compiled with both LARGE_FILES and TAGGED_HASH: please re-run make config
106
.    endif
94
.    endif
107
.endif
95
.endif
108
96
109
.if !defined(WITHOUT_KEYWORDS)
97
.if ${PORT_OPTIONS:MKEYWORDS}
110
CONFIGURE_ARGS+=	--enable-keywords
98
CONFIGURE_ARGS+=	--enable-keywords
111
.endif
99
.endif
112
100
113
.if defined(WITH_SASL)
101
.if ${PORT_OPTIONS:MSASL}
114
CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
102
CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
115
LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
103
LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
116
.endif
104
.endif
117
105
118
.if defined(WITH_TAGGED_HASH)
106
.if ${PORT_OPTIONS:MTAGGED_HASH}
119
CONFIGURE_ARGS+=	--enable-tagged-hash
107
CONFIGURE_ARGS+=	--enable-tagged-hash
120
DBZ_FILES=		dir pag
108
DBZ_FILES=		dir pag
121
PLIST_SUB+=		WITH_TAGGED_HASH=""
109
PLIST_SUB+=		WITH_TAGGED_HASH=""
122
PLIST_SUB+=		WITHOUT_TAGGED_HASH="@comment "
110
PLIST_SUB+=		WITHOUT_TAGGED_HASH="@comment "
123
.else
111
.else
124
CONFIGURE_ARGS+=	--enable-largefiles
125
DBZ_FILES=		dir hash index
112
DBZ_FILES=		dir hash index
126
PLIST_SUB+=		WITH_TAGGED_HASH="@comment "
113
PLIST_SUB+=		WITH_TAGGED_HASH="@comment "
127
PLIST_SUB+=		WITHOUT_TAGGED_HASH=""
114
PLIST_SUB+=		WITHOUT_TAGGED_HASH=""
128
.endif
115
.endif
129
116
117
.if ${PORT_OPTIONS:MOPENSSL}
118
USE_OPENSSL=		yes
119
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
120
.endif
121
122
.if ${PORT_OPTIONS:MGNUPG}
123
# Although pgpverify needs gpgv/gpgv2,
124
# checking 'gpg' is the shortest way to check any version of GnuPG installed.
125
BUILD_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
126
RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
127
.endif
128
130
PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
129
PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
131
HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
130
HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
132
131
Lines 155-161 Link Here
155
		tally.control.8 tdx-util.8 tinyleaf.8 writelog.8
154
		tally.control.8 tdx-util.8 tinyleaf.8 writelog.8
156
MLINKS=		actsync.8 actsyncd.8	docheckgroups.8 localgroups.5	perl-nocem.8 nocem.ctl.5
155
MLINKS=		actsync.8 actsyncd.8	docheckgroups.8 localgroups.5	perl-nocem.8 nocem.ctl.5
157
156
158
.if defined(WITH_KERBEROS)
157
.if ${PORT_OPTIONS:MKERBEROS}
159
MAN8+=		auth_krb5.8
158
MAN8+=		auth_krb5.8
160
.endif
159
.endif
161
160
Lines 176-183 Link Here
176
		expire.ctl localgroups incoming.conf inn.conf innfeed.conf \
175
		expire.ctl localgroups incoming.conf inn.conf innfeed.conf \
177
		innreport.conf innwatch.ctl moderators motd.news news2mail.cf \
176
		innreport.conf innwatch.ctl moderators motd.news news2mail.cf \
178
		newsfeeds nocem.ctl \
177
		newsfeeds nocem.ctl \
179
		nnrpd.track nntpsend.ctl ovdb.conf overview.fmt \
178
		nnrpd.track nntpsend.ctl ovdb.conf \
180
		passwd.nntp radius.conf readers.conf sasl.conf send-uucp.cf \
179
		passwd.nntp radius.conf readers.conf send-uucp.cf \
181
		storage.conf subscriptions
180
		storage.conf subscriptions
182
181
183
SUB_LIST+=	EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}"
182
SUB_LIST+=	EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}"
Lines 187-204 Link Here
187
186
188
# Perl 5.12 deprecated $[
187
# Perl 5.12 deprecated $[
189
.if ${PERL_LEVEL} >= 501200
188
.if ${PERL_LEVEL} >= 501200
190
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_innreport.in \
189
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-scripts_innreport.in \
191
		${PATCHDIR}/extra-patch-scripts_innreport_inn.pm
190
		${PATCHDIR}/extra-patch-scripts_innreport_inn.pm
192
.endif
191
.endif
193
192
194
post-patch:
193
post-patch:
195
	@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
194
	@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
196
	                  ${WRKSRC}/site/Makefile
195
	                  ${WRKSRC}/site/Makefile
197
.if defined(WITH_TCL)
198
	@${REINPLACE_CMD} -e 's!<tcl.h>!<tcl${TCL_VER}/tcl.h>!' ${WRKSRC}/innd/innd.h
199
	@${REINPLACE_CMD} -e 's!-ltcl!-ltcl${USE_TCL}!'			\
200
	                  ${WRKSRC}/configure
201
.endif
202
	@${REINPLACE_CMD} -e 's!et/com_err\.h!com_err.h!g'	\
196
	@${REINPLACE_CMD} -e 's!et/com_err\.h!com_err.h!g'	\
203
	                  -e 's!-lk5crypto!!g'			\
197
	                  -e 's!-lk5crypto!!g'			\
204
	                  ${WRKSRC}/configure
198
	                  ${WRKSRC}/configure
(-)./pkg-plist (-11 / +11 lines)
Lines 202-225 Link Here
202
@dirrm %%EXAMPLESDIR%%/db
202
@dirrm %%EXAMPLESDIR%%/db
203
@dirrm %%EXAMPLESDIR%%
203
@dirrm %%EXAMPLESDIR%%
204
@unexec rm -Rf %%TMPDIR%%                 2>/dev/null || true
204
@unexec rm -Rf %%TMPDIR%%                 2>/dev/null || true
205
@unexec rmdir  %%SHAREDIR%%               2>/dev/null || true
205
@dirrmtry  %%SHAREDIR%%
206
@unexec rmdir  %%NEWSSPOOL%%/overview     2>/dev/null || true
206
@dirrmtry  %%NEWSSPOOL%%/overview
207
@unexec rmdir  %%NEWSSPOOL%%/outgoing     2>/dev/null || true
207
@dirrmtry  %%NEWSSPOOL%%/outgoing
208
@unexec rmdir  %%NEWSSPOOL%%/innfeed      2>/dev/null || true
208
@dirrmtry  %%NEWSSPOOL%%/innfeed
209
@unexec rmdir  %%NEWSSPOOL%%/incoming/bad 2>/dev/null || true
209
@dirrmtry  %%NEWSSPOOL%%/incoming/bad
210
@unexec rmdir  %%NEWSSPOOL%%/incoming     2>/dev/null || true
210
@dirrmtry  %%NEWSSPOOL%%/incoming
211
@unexec rmdir  %%NEWSSPOOL%%/articles     2>/dev/null || true
211
@dirrmtry  %%NEWSSPOOL%%/articles
212
@unexec rmdir  %%NEWSSPOOL%%/archive      2>/dev/null || true
212
@dirrmtry  %%NEWSSPOOL%%/archive
213
@unexec rm -Rf %%NEWSSPOOL%%/tmp          2>/dev/null || true
213
@unexec rm -Rf %%NEWSSPOOL%%/tmp          2>/dev/null || true
214
@unexec rmdir  %%NEWSSPOOL%%              2>/dev/null || true
214
@dirrmtry  %%NEWSSPOOL%%
215
@unexec rm -Rf %%RUNDIR%%                 2>/dev/null || true
215
@unexec rm -Rf %%RUNDIR%%                 2>/dev/null || true
216
@unexec rm -R  %%NEWSBASE%%/http
216
@unexec rm -R  %%NEWSBASE%%/http
217
@unexec rm -R  %%NEWSBASE%%/lib
217
@unexec rm -R  %%NEWSBASE%%/lib
218
@unexec rm -R  %%NEWSBASE%%/include/inn
218
@unexec rm -R  %%NEWSBASE%%/include/inn
219
@unexec rm -R  %%NEWSBASE%%/include
219
@unexec rm -R  %%NEWSBASE%%/include
220
@unexec rmdir  %%ETCDIR%%                 2>/dev/null || true
220
@dirrmtry  %%ETCDIR%%
221
@unexec rm -Rf %%NEWSBASE%%/doc
221
@unexec rm -Rf %%NEWSBASE%%/doc
222
@unexec rmdir  %%DBDIR%%                  2>/dev/null || true
222
@dirrmtry  %%DBDIR%%
223
@unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec
223
@unexec rm -Rf %%NEWSBASE%%/bin/rnews.libexec
224
@unexec rm -Rf %%NEWSBASE%%/bin/filter
224
@unexec rm -Rf %%NEWSBASE%%/bin/filter
225
@unexec rm -Rf %%NEWSBASE%%/bin/control
225
@unexec rm -Rf %%NEWSBASE%%/bin/control

Return to bug 169666