[Midnightbsd-cvs] src [11026] sync

[laffer1 at midnightbsd.org]

Revision: 11026
          http://svnweb.midnightbsd.org/src/?rev=11026
Author:   laffer1
Date:     2018-06-15 18:43:23 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/bsnmpd/modules/Makefile
    trunk/usr.sbin/bsnmpd/modules/Makefile.inc

Property Changed:
----------------
    trunk/usr.sbin/bsnmpd/modules/Makefile.inc

Modified: trunk/usr.sbin/bsnmpd/modules/Makefile
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/Makefile	2018-06-15 22:42:59 UTC (rev 11025)
+++ trunk/usr.sbin/bsnmpd/modules/Makefile	2018-06-15 22:43:23 UTC (rev 11026)
@@ -1,8 +1,9 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/Makefile 313223 2017-02-04 16:40:28Z ngie $
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd
+.PATH: ${SRCTOP}/contrib/bsnmp/snmpd
 
 .if ${MK_ATM} != "no"
 _snmp_atm= snmp_atm
@@ -10,20 +11,31 @@
 
 SUBDIR=	${_snmp_atm} \
 	snmp_bridge \
-	snmp_hast \
 	snmp_hostres \
 	snmp_mibII \
-	snmp_pf \
 	snmp_target \
 	snmp_usm \
 	snmp_vacm \
-	snmp_wlan
 
+.if ${MK_HAST} != "no"
+SUBDIR+=snmp_hast
+.endif
+
+.if ${MK_PF} != "no"
+SUBDIR+=snmp_pf
+.endif
+
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SUBDIR+=snmp_netgraph
 .endif
 
+.if ${MK_WIRELESS} != "no"
+SUBDIR+=snmp_wlan
+.endif
+
 INCS=	snmpmod.h
 INCSDIR= ${INCLUDEDIR}/bsnmp
 
+SUBDIR_TARGETS+=	smilint
+
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/bsnmpd/modules/Makefile.inc
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/Makefile.inc	2018-06-15 22:42:59 UTC (rev 11025)
+++ trunk/usr.sbin/bsnmpd/modules/Makefile.inc	2018-06-15 22:43:23 UTC (rev 11026)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/Makefile.inc 249657 2013-04-19 19:45:00Z ed $
 
 SHLIB_MAJOR=	6
 
@@ -6,4 +7,6 @@
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\
 		    -e 's%@MIBSPATH@%${BMIBSDIR}/%g'
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include "../Makefile.inc"


Property changes on: trunk/usr.sbin/bsnmpd/modules/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property