Thu May 10 21:58:38 2012 UTC ()
fix PLIST for an optionally installed file when picking option snmp


(spz)
diff -r1.4 -r1.5 pkgsrc/net/xymon/PLIST
diff -r1.1 -r1.2 pkgsrc/net/xymon/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/net/xymon/PLIST (expand / switch to unified diff)

--- pkgsrc/net/xymon/PLIST 2012/04/28 18:26:19 1.4
+++ pkgsrc/net/xymon/PLIST 2012/05/10 21:58:38 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2012/04/28 18:26:19 gendalia Exp $ 1@comment $NetBSD: PLIST,v 1.5 2012/05/10 21:58:38 spz Exp $
2libexec/xymon/ackinfo.cgi 2libexec/xymon/ackinfo.cgi
3libexec/xymon/acknowledge.cgi 3libexec/xymon/acknowledge.cgi
4libexec/xymon/appfeed.cgi 4libexec/xymon/appfeed.cgi
5libexec/xymon/bb 5libexec/xymon/bb
6libexec/xymon/bbcmd 6libexec/xymon/bbcmd
7libexec/xymon/bbdigest 7libexec/xymon/bbdigest
8libexec/xymon/bbhostgrep 8libexec/xymon/bbhostgrep
9libexec/xymon/bbhostshow 9libexec/xymon/bbhostshow
10libexec/xymon/beastat 10libexec/xymon/beastat
11libexec/xymon/boilerplate.cgi 11libexec/xymon/boilerplate.cgi
12libexec/xymon/cgi-bin/appfeed-critical.sh 12libexec/xymon/cgi-bin/appfeed-critical.sh
13libexec/xymon/cgi-bin/appfeed.sh 13libexec/xymon/cgi-bin/appfeed.sh
14libexec/xymon/cgi-bin/certreport.sh 14libexec/xymon/cgi-bin/certreport.sh
@@ -58,27 +58,27 @@ libexec/xymon/moverrd.sh @@ -58,27 +58,27 @@ libexec/xymon/moverrd.sh
58libexec/xymon/notifications.cgi 58libexec/xymon/notifications.cgi
59libexec/xymon/perfdata.cgi 59libexec/xymon/perfdata.cgi
60libexec/xymon/report.cgi 60libexec/xymon/report.cgi
61libexec/xymon/reportlog.cgi 61libexec/xymon/reportlog.cgi
62libexec/xymon/rrdcachectl 62libexec/xymon/rrdcachectl
63libexec/xymon/showgraph.cgi 63libexec/xymon/showgraph.cgi
64libexec/xymon/snapshot.cgi 64libexec/xymon/snapshot.cgi
65libexec/xymon/statusreport.cgi 65libexec/xymon/statusreport.cgi
66libexec/xymon/svcstatus.cgi 66libexec/xymon/svcstatus.cgi
67libexec/xymon/trimhistory 67libexec/xymon/trimhistory
68libexec/xymon/useradm.cgi 68libexec/xymon/useradm.cgi
69libexec/xymon/xymon 69libexec/xymon/xymon
70libexec/xymon/xymon-mailack 70libexec/xymon/xymon-mailack
71libexec/xymon/xymon-snmpcollect 71${PLIST.snmp}libexec/xymon/xymon-snmpcollect
72libexec/xymon/xymon.sh 72libexec/xymon/xymon.sh
73libexec/xymon/xymoncfg 73libexec/xymon/xymoncfg
74libexec/xymon/xymoncgimsg.cgi 74libexec/xymon/xymoncgimsg.cgi
75libexec/xymon/xymoncmd 75libexec/xymon/xymoncmd
76libexec/xymon/xymond 76libexec/xymon/xymond
77libexec/xymon/xymond_alert 77libexec/xymon/xymond_alert
78libexec/xymon/xymond_capture 78libexec/xymon/xymond_capture
79libexec/xymon/xymond_channel 79libexec/xymon/xymond_channel
80libexec/xymon/xymond_client 80libexec/xymon/xymond_client
81libexec/xymon/xymond_distribute 81libexec/xymon/xymond_distribute
82libexec/xymon/xymond_filestore 82libexec/xymon/xymond_filestore
83libexec/xymon/xymond_history 83libexec/xymon/xymond_history
84libexec/xymon/xymond_hostdata 84libexec/xymon/xymond_hostdata
cvs diff -r1.1 -r1.2 pkgsrc/net/xymon/options.mk (expand / switch to unified diff)

--- pkgsrc/net/xymon/options.mk 2011/10/16 15:19:08 1.1
+++ pkgsrc/net/xymon/options.mk 2012/05/10 21:58:38 1.2
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: options.mk,v 1.1 2011/10/16 15:19:08 spz Exp $ 1# $NetBSD: options.mk,v 1.2 2012/05/10 21:58:38 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.xymon 3PKG_OPTIONS_VAR= PKG_OPTIONS.xymon
4PKG_SUPPORTED_OPTIONS= ldap snmp ssl 4PKG_SUPPORTED_OPTIONS= ldap snmp ssl
5PKG_SUGGESTED_OPTIONS= ldap ssl 5PKG_SUGGESTED_OPTIONS= ldap ssl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
 9PLIST_VARS+= snmp
 10
9# include support for ldap 11# include support for ldap
10.if !empty(PKG_OPTIONS:Mldap) 12.if !empty(PKG_OPTIONS:Mldap)
11CONFIGURE_ARGS+= "--ldapinclude" "${BUILDLINK_PREFIX.openldap-client}/include" 13CONFIGURE_ARGS+= "--ldapinclude" "${BUILDLINK_PREFIX.openldap-client}/include"
12CONFIGURE_ARGS+= "--ldaplib" "${BUILDLINK_PREFIX.openldap-client}/lib" 14CONFIGURE_ARGS+= "--ldaplib" "${BUILDLINK_PREFIX.openldap-client}/lib"
13CONFIGURE_ENV+= ENABLELDAP=y 15CONFIGURE_ENV+= ENABLELDAP=y
14.if !empty(PKG_OPTIONS:Mssl) 16.if !empty(PKG_OPTIONS:Mssl)
15CONFIGURE_ENV+= ENABLELDAPSSL=y 17CONFIGURE_ENV+= ENABLELDAPSSL=y
16.endif 18.endif
17.include "../../databases/openldap-client/buildlink3.mk" 19.include "../../databases/openldap-client/buildlink3.mk"
18.else 20.else
19CONFIGURE_ENV+= ENABLELDAP=n 21CONFIGURE_ENV+= ENABLELDAP=n
20.endif 22.endif
21 23
22# include support for snmp 24# include support for snmp
23.if !empty(PKG_OPTIONS:Msnmp) 25.if !empty(PKG_OPTIONS:Msnmp)
24CONFIGURE_ENV+= SNMP=1 26CONFIGURE_ENV+= SNMP=1
25CONFIGURE_ARGS+= "--snmpconfig" "${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config" 27CONFIGURE_ARGS+= "--snmpconfig" "${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config"
26.include "../../net/net-snmp/buildlink3.mk" 28.include "../../net/net-snmp/buildlink3.mk"
 29PLIST.snmp= yes
27.else 30.else
28CONFIGURE_ENV+= SNMP=n 31CONFIGURE_ENV+= SNMP=n
29.endif 32.endif
30 33
31# include support for ssl 34# include support for ssl
32.if !empty(PKG_OPTIONS:Mssl) 35.if !empty(PKG_OPTIONS:Mssl)
33CONFIGURE_ARGS+= "--sslinclude" "${BUILDLINK_PREFIX.openssl}/include" 36CONFIGURE_ARGS+= "--sslinclude" "${BUILDLINK_PREFIX.openssl}/include"
34CONFIGURE_ARGS+= "--ssllib" "${BUILDLINK_PREFIX.openssl}/lib" 37CONFIGURE_ARGS+= "--ssllib" "${BUILDLINK_PREFIX.openssl}/lib"
35CONFIGURE_ENV+= ENABLESSL=y 38CONFIGURE_ENV+= ENABLESSL=y
36.include "../../security/openssl/buildlink3.mk" 39.include "../../security/openssl/buildlink3.mk"
37.else 40.else
38CONFIGURE_ENV+= ENABLESSL=n 41CONFIGURE_ENV+= ENABLESSL=n
39.endif 42.endif