Index: devel/boost-all/compiled.mk
===================================================================
--- devel/boost-all/compiled.mk
+++ devel/boost-all/compiled.mk
@@ -8,15 +8,9 @@
 PKG_MESSAGE_FILE_THREADS=	${PORTSDIR}/devel/boost-all/pkg-message.threads
 PKG_MESSAGE_FILE_PYTHON=	${PORTSDIR}/devel/boost-all/pkg-message.python
 
-.include <bsd.port.pre.mk>
-
 BJAM_ARGS=	--layout=system \
 		--prefix=${PREFIX} \
 
-.if ${ARCH} == amd64
-BJAM_ARGS+=	cxxflags=-fPIC
-.endif
-
 # Our compiler-flags will be added AFTER those set by bjam. We remove
 # the optimization level, because Boost sets it itself (to -O3 in case
 # of gcc/g++):
@@ -27,23 +21,16 @@
 BJAM_ARGS+=	--toolset=${BOOST_TOOLSET} \
 		${_MAKE_JOBS}
 
-.if ${PORT_OPTIONS:MVERBOSE_BUILD}
-BJAM_ARGS+=	-d2
-.endif
+VERBOSE_BUILD_VARS=	BJAM_ARGS+=-d2
 
-.if ${PORT_OPTIONS:MDEBUG}
-BJAM_ARGS+=	debug
-.else
-BJAM_ARGS+=	release
-.endif
+DEBUG_VARS=	BJAM_ARGS+=debug
+DEBUG_VARS_OFF=	BJAM_ARGS+=release
 
 BJAM_ARGS+=	threading=multi \
 		link=shared,static
 
 BJAM_ARGS+=	optimization=speed
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-BJAM_ARGS+=	inlining=full
-.endif
+OPTIMIZED_CFLAGS_VARS=	BJAM_ARGS+=inlining=full
 
 # ccache build fails when using precompiled headers, on a cached build.
 .if defined(WITH_CCACHE_BUILD)
Index: devel/boost-libs/Makefile
===================================================================
--- devel/boost-libs/Makefile
+++ devel/boost-libs/Makefile
@@ -14,7 +14,9 @@
 ICU_DESC=		Boost.Regex with ICU unicode support
 
 ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_VARS=		BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
 ICU_USES_OFF=		iconv
+ICU_VARS_OFF=		BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX}
 
 .include "${.CURDIR}/../boost-all/common.mk"
 
@@ -30,12 +32,6 @@
 PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCALE="" LOG=""
 .endif
 
-.if ${PORT_OPTIONS:MICU}
-BJAM_ARGS+=	-sICU_PATH=${LOCALBASE}
-.else
-BJAM_ARGS+=	-sICONV_PATH=${ICONV_PREFIX}
-.endif
-
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage
@@ -64,4 +60,4 @@
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/boost-python-libs/Makefile
===================================================================
--- devel/boost-python-libs/Makefile
+++ devel/boost-python-libs/Makefile
@@ -13,10 +13,6 @@
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
 
-.if ${ARCH} == "sparc64"
-CXXFLAGS=	-O0
-.endif
-
 MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_VERSION="${PYTHON_VERSION}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
@@ -53,4 +49,4 @@
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>