Index: stable/11/secure/caroot/Makefile
===================================================================
--- stable/11/secure/caroot/Makefile	(revision 357191)
+++ stable/11/secure/caroot/Makefile	(revision 357192)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PACKAGE=	caroot
 
 CLEANFILES+=	certdata.txt
 
 SUBDIR+=	trusted
 SUBDIR+=	blacklisted
 
-.include <bsd.prog.mk>
+.include <bsd.obj.mk>
 
 # To be used by secteam@ to update the trusted certificates
-
 fetchcerts: .PHONY
 	fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt'
 
 cleancerts: .PHONY
 	@${MAKE} -C ${.CURDIR}/trusted ${.TARGET}
 
 updatecerts: .PHONY cleancerts fetchcerts
 	perl ${.CURDIR}/MAca-bundle.pl -i certdata.txt -o ${.CURDIR}/trusted
Index: stable/11
===================================================================
--- stable/11	(revision 357191)
+++ stable/11	(revision 357192)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r357084
Index: stable/12/secure/caroot/Makefile
===================================================================
--- stable/12/secure/caroot/Makefile	(revision 357191)
+++ stable/12/secure/caroot/Makefile	(revision 357192)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PACKAGE=	caroot
 
 CLEANFILES+=	certdata.txt
 
 SUBDIR+=	trusted
 SUBDIR+=	blacklisted
 
-.include <bsd.prog.mk>
+.include <bsd.obj.mk>
 
 # To be used by secteam@ to update the trusted certificates
-
 fetchcerts: .PHONY
 	fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt'
 
 cleancerts: .PHONY
 	@${MAKE} -C ${.CURDIR}/trusted ${.TARGET}
 
 updatecerts: .PHONY cleancerts fetchcerts
 	perl ${.CURDIR}/MAca-bundle.pl -i certdata.txt -o ${.CURDIR}/trusted
Index: stable/12
===================================================================
--- stable/12	(revision 357191)
+++ stable/12	(revision 357192)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r357084