Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1,6 +1,8 @@
 #-*- tab-width: 4; -*-
 # ex:ts=4
 #
+# --------------------- begin comment section ---------------------
+
 # $FreeBSD$
 #	$NetBSD: $
 #
@@ -1010,6 +1012,10 @@
 # Most port authors should not need to understand anything after this point.
 #
 
+# --------------------- end comment section ---------------------
+
+# --------------------- begin unconditional section ---------------------
+
 LANG=		C
 LC_ALL=		C
 .export		LANG LC_ALL
@@ -1092,6 +1098,10 @@
 .export.env STRIPBIN
 .endif
 
+# --------------------- end unconditional section ---------------------
+
+# --------------------- begin DESTDIR conditional ---------------------
+
 #
 # DESTDIR section to start a chrooted process if invoked with DESTDIR set
 #
@@ -1111,10 +1121,10 @@
 		${SH} ${SCRIPTSDIR}/smart_makepatch.sh
 .endif
 
-
 # Start of options section
 .if defined(INOPTIONSMK) || ( !defined(USEOPTIONSMK) && !defined(AFTERPORTMK) )
 
+# --------------------- begin bsd.port.options.mk ---------------------
 
 # Get the default maintainer
 MAINTAINER?=	ports@FreeBSD.org
@@ -1306,9 +1316,13 @@
 .endif
 # End of options section.
 
+# --------------------- end bsd.port.options.mk ---------------------
+
 # Start of pre-makefile section.
 .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
 
+# --------------------- begin bsd.port.pre.mk ---------------------
+
 .if defined(_PREMKINCLUDED)
 DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
 .endif
@@ -1570,11 +1584,16 @@
 WITH_PKG?=	${WITH_PKGNG}
 
 .endif
+
+# --------------------- end bsd.port.pre.mk ---------------------
+
 # End of pre-makefile section.
 
 # Start of post-makefile section.
 .if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
 
+# --------------------- begin bsd.port.post.mk ---------------------
+
 .if defined(_POSTMKINCLUDED)
 DEV_ERROR+=	"${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
 	@${FALSE}
@@ -5395,7 +5420,12 @@
 .endif
 
 .endif
+
 # End of post-makefile section.
 
+# --------------------- end bsd.port.post.mk ---------------------
+
 .endif
 # End of the DESTDIR if statement
+
+# --------------------- end DESTDIR conditional ---------------------