diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-11 10:08:38 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-11 10:08:38 +0000 |
| commit | 8244fe99bcdbad7a2d0b22d66183394f5ffacd03 (patch) | |
| tree | c9a458d29164af55be5bf3330f3f659428ac04ac /net-mgmt | |
| parent | graphics/opencv2: reset maintainership (diff) | |
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=431169
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/collectd5/Makefile | 12 | ||||
| -rw-r--r-- | net-mgmt/collectd5/pkg-plist | 2 | ||||
| -rw-r--r-- | net-mgmt/icinga2/Makefile | 9 |
3 files changed, 3 insertions, 20 deletions
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 985f91705bc8..8b0e0c11fb93 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -108,7 +108,8 @@ CONFIGURE_ARGS= --localstatedir=/var \ --without-lvm \ --without-mic \ --without-oracle \ - --disable-turbostat + --disable-turbostat \ + --enable-disk CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \ p5-CGI>=0:www/p5-CGI \ @@ -323,15 +324,6 @@ CONFIGURE_ARGS+=--enable-aggregation \ --enable-write_log \ --enable-zfs_arc \ -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -PLIST_SUB+= DISK="@comment " -.else -CONFIGURE_ARGS+=--enable-disk -PLIST_SUB+= DISK="" -.endif - INSTALL_TARGET= install-strip SHEBANG_FILES= contrib/collection.cgi diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist index fdf22215ebb7..65283d622a16 100644 --- a/net-mgmt/collectd5/pkg-plist +++ b/net-mgmt/collectd5/pkg-plist @@ -27,7 +27,7 @@ lib/collectd/csv.so %%CURL_XML%%lib/collectd/curl_xml.so %%DBI%%lib/collectd/dbi.so lib/collectd/df.so -%%DISK%%lib/collectd/disk.so +lib/collectd/disk.so lib/collectd/dns.so lib/collectd/email.so lib/collectd/exec.so diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index 705685cac07d..0d88f8001d7b 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -89,19 +89,10 @@ PLIST_SUB+= DBBACKEND="@comment " PLIST_SUB+= DBBACKEND="" .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= flex>=2.5.31:textproc/flex -CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex -CXXFLAGS+= -I${LOCALBASE}/include/flex -.endif - post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor -.if ${OSVERSION} < 1000000 - ${REINPLACE_CMD} 's|,--no-export-dynamic||' ${WRKSRC}/CMakeLists.txt -.endif pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; |