diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
index d9ec3b4e969f..b9f58167cf9d 100644
--- a/devel/cunit/Makefile
+++ b/devel/cunit/Makefile
@@ -1,57 +1,40 @@
 PORTNAME=	cunit
 PORTVERSION=	2.1.3
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/cunit/CUnit/${PORTVERSION:R}-${PORTVERSION:E}
 DISTNAME=	CUnit-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automated unit testing framework for C
 WWW=		https://cunit.sourceforge.net/
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf gmake libtool pathfix tar:bzip2
+USES=		autoreconf gmake libtool ncurses pathfix tar:bzip2
 
+CONFIGURE_ARGS=	--enable-automated --enable-basic --enable-console --enable-curses --enable-debug --enable-memtrace --enable-test
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+LDFLAGS+=	-lncurses
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 DATADIR=	${PREFIX}/share/CUnit
 DOCSDIR=	${PREFIX}/share/doc/CUnit
 EXAMPLESDIR=	${PREFIX}/share/examples/CUnit
 
 CONFLICTS_INSTALL=	c-unit
 
-OPTIONS_DEFINE=	AUTOMATED BASIC CONSOLE CURSES DEBUG DOCS EXAMPLES MEMTRACE TEST
-OPTIONS_DEFAULT=AUTOMATED BASIC CONSOLE CURSES DEBUG MEMTRACE TEST
-OPTIONS_SUB=	yes
-AUTOMATED_DESC=	Automated (XML) interface
-BASIC_DESC=	Basic interface
-CONSOLE_DESC=	Console interface
-CURSES_DESC=	Curses interface
-DEBUG_DESC=	Debug interface
-EXAMPLES_DESC=	Example programs
-MEMTRACE_DESC=	Internal memory tracking
-TEST_DESC=	Internal test program
-
-AUTOMATED_CONFIGURE_ENABLE=	automated
-BASIC_CONFIGURE_ENABLE=	basic
-CONSOLE_CONFIGURE_ENABLE=	console
-CURSES_CONFIGURE_ENABLE=curses
-CURSES_LDFLAGS=		-lncurses
-CURSES_USES=		ncurses
-DEBUG_CONFIGURE_ENABLE=	debug
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 EXAMPLES_CONFIGURE_ENABLE=	examples
-MEMTRACE_CONFIGURE_ENABLE=	memtrace
-TEST_CONFIGURE_ENABLE=	test
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@|/share/doc/@PACKAGE@|g' ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/headers/Makefile.am
 	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/|/examples/@PACKAGE@/|g' ${WRKSRC}/Examples/*/Makefile.am
 	@${REINPLACE_CMD} -e 's|CUnit-[A-Z][a-z]*\.[a-z]*|${DATADIR}/&|' ${WRKSRC}/CUnit/Sources/Automated/Automated.c
 	@${REINPLACE_CMD} -e '/fprintf/ s|Memory-Dump\.[a-z]*|${DATADIR}/&|' ${WRKSRC}/CUnit/Sources/Framework/MyMem.c
 
 .include <bsd.port.mk>
diff --git a/devel/cunit/pkg-plist b/devel/cunit/pkg-plist
index 2d352ece866c..9455c2703d17 100644
--- a/devel/cunit/pkg-plist
+++ b/devel/cunit/pkg-plist
@@ -1,53 +1,53 @@
-%%AUTOMATED%%include/CUnit/Automated.h
-%%BASIC%%include/CUnit/Basic.h
-%%CURSES%%include/CUnit/CUCurses.h
+include/CUnit/Automated.h
+include/CUnit/Basic.h
+include/CUnit/CUCurses.h
 include/CUnit/CUError.h
 include/CUnit/CUnit.h
 include/CUnit/CUnit_intl.h
-%%CONSOLE%%include/CUnit/Console.h
+include/CUnit/Console.h
 include/CUnit/MyMem.h
 include/CUnit/TestDB.h
 include/CUnit/TestRun.h
 include/CUnit/Util.h
 lib/libcunit.a
 lib/libcunit.so
 lib/libcunit.so.1
 lib/libcunit.so.1.0.1
 libdata/pkgconfig/cunit.pc
 man/man3/CUnit.3.gz
 %%DATADIR%%/CUnit-List.dtd
 %%DATADIR%%/CUnit-List.xsl
 %%DATADIR%%/CUnit-Run.dtd
 %%DATADIR%%/CUnit-Run.xsl
 %%DATADIR%%/Memory-Dump.dtd
 %%DATADIR%%/Memory-Dump.xsl
 %%DATADIR%%/Test/test_cunit
 %%PORTDOCS%%%%DOCSDIR%%/CUnit_doc.css
 %%PORTDOCS%%%%DOCSDIR%%/error_handling.html
 %%PORTDOCS%%%%DOCSDIR%%/fdl.html
 %%PORTDOCS%%%%DOCSDIR%%/headers/Automated.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/Basic.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/CUCurses.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/CUError.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/CUnit.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/CUnit_intl.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/Console.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/MyMem.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/TestDB.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/TestRun.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/Util.h
 %%PORTDOCS%%%%DOCSDIR%%/headers/Win.h
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/managing_tests.html
 %%PORTDOCS%%%%DOCSDIR%%/running_tests.html
 %%PORTDOCS%%%%DOCSDIR%%/test_registry.html
 %%PORTDOCS%%%%DOCSDIR%%/writing_tests.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Automated/AutomatedTest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Automated/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/BasicTest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Console/ConsoleTest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Console/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Curses/CursesTest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Curses/README