diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 13:03:25 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 13:03:25 +0000 |
| commit | d96aa38d95dc8d9885acec0a826cf0fd17199648 (patch) | |
| tree | b8124e1b26d3492a2efdf76a075756366da04991 /net-mgmt | |
| parent | 1: Stagify. (diff) | |
Remove support for pkg_install
Merge back bsd.pkgng.mk into bsd.port.mk
Add a note about @stopdaemon not being supported anymore
With hat: portmgr
Differential Revision: https://reviews.freebsd.org/D693
Notes
Notes:
svn path=/head/; revision=366875
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/nagios-check_ports/Makefile | 8 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/Makefile | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/net-mgmt/nagios-check_ports/Makefile b/net-mgmt/nagios-check_ports/Makefile index f61fc374ac5e..4fa472ad900e 100644 --- a/net-mgmt/nagios-check_ports/Makefile +++ b/net-mgmt/nagios-check_ports/Makefile @@ -17,14 +17,8 @@ GH_COMMIT= 4e039d7 NO_BUILD= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000000 && ! defined(WITH_PKGNG) -RUN_DEPENDS= portaudit:${PORTSDIR}/ports-mgmt/portaudit -.endif - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_SCRIPT} ${WRKSRC}/check_ports ${STAGEDIR}${PREFIX}/libexec/nagios/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 4f6cb86f5ca5..dfc0532fa2fa 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -15,11 +15,6 @@ COMMENT= Extendable SNMP implementation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -# pkg-1.2 cannot handle this dependency well. -.if !defined(WITH_PKGNG) -LIB_DEPENDS= libpkg.so:${PORTSDIR}/ports-mgmt/pkg -.endif - OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX |