--- bsd.port.mk.bapt.basic	2011-08-21 14:33:26.000000000 -0500
+++ bsd.port.mk	2011-08-28 12:43:08.000000000 -0500
@@ -5920,7 +5920,7 @@
 .undef group
 .undef opt
 
-.endif #pre-check-options
+.endif # pre-check-config
 
 .if !target(check-config)
 check-config: pre-check-config
@@ -5934,7 +5934,7 @@
 .endfor
 .undef group
 .undef select
-.endif # check-options
+.endif # check-config
 
 .if !target(pre-config)
 pre-config:
@@ -5967,7 +5967,7 @@
 .	endfor
 .endfor
 _COMPLETE_OPTIONS_LIST:=	${_COMPLETE_OPTIONS_LIST:u}
-.endif
+.endif # pre-config
 
 .if !target(config)
 config: pre-config
@@ -5976,20 +5976,20 @@
 .else
 .if ${UID} != 0 && !defined(INSTALL_AS_USER)
 	@optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
-	${ECHO_MSG} "===>  Switching to root credentials to create $${optionsdir}"; \
-	(${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \
+		${ECHO_MSG} "===>  Switching to root credentials to create $${optionsdir}"; \
+		(${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \
 		(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \
-	${ECHO_MSG} "===>  Returning to user credentials"
+		${ECHO_MSG} "===>  Returning to user credentials"
 .else
 	@(optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
-	${MKDIR} $${optionsdir} 2> /dev/null) || \
+		${MKDIR} $${optionsdir} 2> /dev/null) || \
 		(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1)
 .endif
-	TMPOPTIONSFILE=$$(mktemp -t portoptions); \
+	@TMPOPTIONSFILE=$$(mktemp -t portoptions); \
 	trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
 	${SH} -c "${DIALOG} --checklist \"Options for ${PKGNAME:C/-([^-]+)$/ \1/}\" 21 70 15 ${DEFOPTIONS} 2> $${TMPOPTIONSFILE}"; \
 	status=$$?; \
-	if [ $${status} -ne 0 ] ; then \
+	if [ $${status} -ne 0 ]; then \
 		${RM} -f $${TMPOPTIONSFILE}; \
 		${ECHO_MSG} "===> Options unchanged"; \
 		exit 0; \
@@ -6022,7 +6022,7 @@
 	fi; \
 	${RM} -f $${TMPOPTIONSFILE}
 .endif
-.endif
+.endif # config
 
 .if !target(config-recursive)
 config-recursive:
@@ -6030,7 +6030,7 @@
 	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
 		(cd $$dir; ${MAKE} config-conditional); \
 	done
-.endif
+.endif # config-recursive
 
 .if !target(config-conditional)
 config-conditional: pre-config
@@ -6039,7 +6039,7 @@
 	cd ${.CURDIR} && ${MAKE} config;
 .endif
 .endif
-.endif
+.endif # config-conditional
 
 .if !target(showconfig)
 .	include "${PORTSDIR}/Mk/bsd.options.desc.mk"
@@ -6093,7 +6093,7 @@
 .undef group
 .undef opt
 	@${ECHO_MSG} "===> Use 'make config' to modify these settings"
-.endif # show-options
+.endif # showconfig
 
 .if !target(showconfig-recursive)
 showconfig-recursive:
@@ -6101,7 +6101,7 @@
 	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
 		(cd $$dir; ${MAKE} showconfig); \
 	done
-.endif
+.endif # showconfig-recursive
 
 .if !target(rmconfig)
 rmconfig:
@@ -6120,7 +6120,7 @@
 .else
 	@${ECHO_MSG} "===> No user-specified options configured for ${PKGNAME}"
 .endif
-.endif
+.endif # rmconfig
 
 .if !target(rmconfig-recursive)
 rmconfig-recursive:
@@ -6128,7 +6128,7 @@
 	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
 		(cd $$dir; ${MAKE} rmconfig); \
 	done
-.endif
+.endif # rmconfig-recursive
 
 .if !target(pretty-print-config)
 pretty-print-config:
@@ -6165,7 +6165,7 @@
 .undef select
 .undef opt
 .undef select
-.endif #pretty-print-options
+.endif # pretty-print-config
 
 desktop-categories:
 	@categories=""; \