Fri Nov 17 00:52:53 2023 UTC ()
Make perl dependencies conditional on "perl" package option.

No functional change in the default configuration case.


(sekiya)
diff -r1.144 -r1.145 pkgsrc/news/inn/Makefile
diff -r1.10 -r1.11 pkgsrc/news/inn/options.mk
cvs diff -r1.144 -r1.145 pkgsrc/news/inn/Makefile (expand / switch to unified diff)

--- pkgsrc/news/inn/Makefile 2023/11/08 13:20:38 1.144
+++ pkgsrc/news/inn/Makefile 2023/11/17 00:52:53 1.145
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.144 2023/11/08 13:20:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.145 2023/11/17 00:52:53 sekiya Exp $
2 2
3DISTNAME= inn-2.7.1 3DISTNAME= inn-2.7.1
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= news 5CATEGORIES= news
6MASTER_SITES= ftp://ftp.isc.org/isc/inn/ 6MASTER_SITES= ftp://ftp.isc.org/isc/inn/
7MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/news/inn/ 7MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/news/inn/
8 8
9MAINTAINER= spz@NetBSD.org 9MAINTAINER= spz@NetBSD.org
10HOMEPAGE= https://www.eyrie.org/~eagle/software/inn/ 10HOMEPAGE= https://www.eyrie.org/~eagle/software/inn/
11COMMENT= The public release of InterNet News (INN) 11COMMENT= The public release of InterNet News (INN)
12LICENSE= modified-bsd AND gnu-gpl-v2 12LICENSE= modified-bsd AND gnu-gpl-v2
13 13
14CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* 14CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]*
@@ -52,30 +52,26 @@ CONFIGURE_ARGS+= --enable-setgid-inews  @@ -52,30 +52,26 @@ CONFIGURE_ARGS+= --enable-setgid-inews
52 --with-news-group=${INN_GROUP} 52 --with-news-group=${INN_GROUP}
53CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK} 53CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK}
54CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP} 54CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP}
55CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED} 55CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED}
56CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH} 56CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH}
57CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT} 57CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT}
58CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD} 58CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD}
59USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc 59USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
60 60
61USE_LIBTOOL= yes 61USE_LIBTOOL= yes
62 62
63LDFLAGS.SunOS+= -lsocket -lnsl 63LDFLAGS.SunOS+= -lsocket -lnsl
64 64
65DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools 
66DEPENDS+= p5-GD-[0-9]*:../../graphics/p5-GD 
67DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite 
68 
69USERGROUP_PHASE= pre-install 65USERGROUP_PHASE= pre-install
70PKG_USERS_VARS+= INN_USER 66PKG_USERS_VARS+= INN_USER
71PKG_GROUPS_VARS+= INN_GROUP 67PKG_GROUPS_VARS+= INN_GROUP
72 68
73PKG_GROUPS+= ${INN_GROUP} 69PKG_GROUPS+= ${INN_GROUP}
74PKG_USERS+= ${INN_USER}:${INN_GROUP} 70PKG_USERS+= ${INN_USER}:${INN_GROUP}
75PKG_GECOS.${INN_USER}= Internet\ News 71PKG_GECOS.${INN_USER}= Internet\ News
76PKG_HOME.${INN_USER}= ${INN_DATA_DIR} 72PKG_HOME.${INN_USER}= ${INN_DATA_DIR}
77PKG_SHELL.${INN_USER}= ${SH} 73PKG_SHELL.${INN_USER}= ${SH}
78 74
79EXAMPLEDIR= ${PREFIX}/share/examples/inn 75EXAMPLEDIR= ${PREFIX}/share/examples/inn
80INN_DATADIRS= log log/OLD tmp db spool http 76INN_DATADIRS= log log/OLD tmp db spool http
81INN_SPOOLDIRS= archive articles overview incoming incoming/bad \ 77INN_SPOOLDIRS= archive articles overview incoming incoming/bad \
cvs diff -r1.10 -r1.11 pkgsrc/news/inn/options.mk (expand / switch to unified diff)

--- pkgsrc/news/inn/options.mk 2023/04/30 14:58:58 1.10
+++ pkgsrc/news/inn/options.mk 2023/11/17 00:52:53 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.10 2023/04/30 14:58:58 spz Exp $ 1# $NetBSD: options.mk,v 1.11 2023/11/17 00:52:53 sekiya Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.inn 3PKG_OPTIONS_VAR= PKG_OPTIONS.inn
4PKG_SUPPORTED_OPTIONS= perl python uucp kerberos gnupg2 canlock 4PKG_SUPPORTED_OPTIONS= perl python uucp kerberos gnupg2 canlock
5PKG_SUGGESTED_OPTIONS= perl gnupg2 canlock 5PKG_SUGGESTED_OPTIONS= perl gnupg2 canlock
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= kerberos 9PLIST_VARS+= kerberos
10 10
11### 11###
12### uucp support (requires a group uucp to exist) 12### uucp support (requires a group uucp to exist)
13### 13###
14.if !empty(PKG_OPTIONS:Muucp) 14.if !empty(PKG_OPTIONS:Muucp)
@@ -17,26 +17,29 @@ PKG_GROUPS+= ${UUCP_GROUP} @@ -17,26 +17,29 @@ PKG_GROUPS+= ${UUCP_GROUP}
17SPECIAL_PERMS+= ${PREFIX}/${INN_PATHBIN}/rnews ${INN_USER} ${UUCP_GROUP} 2555 17SPECIAL_PERMS+= ${PREFIX}/${INN_PATHBIN}/rnews ${INN_USER} ${UUCP_GROUP} 2555
18 18
19CONFIGURE_ARGS+= --enable-uucp-rnews 19CONFIGURE_ARGS+= --enable-uucp-rnews
20.else 20.else
21CONFIGURE_ARGS+= --disable-uucp-rnews 21CONFIGURE_ARGS+= --disable-uucp-rnews
22.endif 22.endif
23 23
24### 24###
25### perl hooks support for INN 25### perl hooks support for INN
26### 26###
27.if !empty(PKG_OPTIONS:Mperl) 27.if !empty(PKG_OPTIONS:Mperl)
28CONFIGURE_ARGS+= --with-perl 28CONFIGURE_ARGS+= --with-perl
29CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q} 29CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q}
 30DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 31DEPENDS+= p5-GD-[0-9]*:../../graphics/p5-GD
 32DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
30 33
31.include "../../lang/perl5/buildlink3.mk" 34.include "../../lang/perl5/buildlink3.mk"
32.else 35.else
33CONFIGURE_ARGS+= --without-perl 36CONFIGURE_ARGS+= --without-perl
34.endif 37.endif
35 38
36### 39###
37### Python hooks support for INN 40### Python hooks support for INN
38### 41###
39.if !empty(PKG_OPTIONS:Mpython) 42.if !empty(PKG_OPTIONS:Mpython)
40CONFIGURE_ARGS+= --with-python 43CONFIGURE_ARGS+= --with-python
41CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q} 44CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q}
42 45