Index: comms/opencbm/Makefile
===================================================================
--- comms/opencbm/Makefile	(revision 538095)
+++ comms/opencbm/Makefile	(working copy)
@@ -21,7 +21,7 @@
 OPTIONS_DEFINE=		DOCS INFO
 OPTIONS_DEFAULT=	DOCS INFO
 
-MAKE_ARGS=	CC=cc INFODIR=${PREFIX}/share/info
+MAKE_ARGS=	CC="${CC}" INFODIR=${PREFIX}/${INFO_PATH}
 MAKEFILE=	LINUX/Makefile
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	opencbm plugin-xu1541 plugin-xum1541
Index: comms/opencbm/Makefile.inc
===================================================================
--- comms/opencbm/Makefile.inc	(revision 538095)
+++ comms/opencbm/Makefile.inc	(working copy)
@@ -16,5 +16,7 @@
 PATCHDIR=	${.CURDIR}/../opencbm/files
 PATCH_WRKSRC=	${WRKDIR}/OpenCBM-${OCBM_VERSION}
 
+MAKE_ENV=	USER_CFLAGS="${CFLAGS}"
+
 OCBM_LIBVERSION=	0.4.99.99
 PLUGINBASENAME=	${PREFIX}/lib/opencbm/plugin/libopencbm-
Index: comms/opencbm-plugin-xa1541/Makefile
===================================================================
--- comms/opencbm-plugin-xa1541/Makefile	(revision 538095)
+++ comms/opencbm-plugin-xa1541/Makefile	(working copy)
@@ -20,7 +20,7 @@
 USES=		gmake
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	CC=cc SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
+MAKE_ARGS=	CC="${CC}" SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
 MAKEFILE=	LINUX/Makefile
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	plugin-xa1541