Index: head/math/gnumeric/Makefile
===================================================================
--- head/math/gnumeric/Makefile	(revision 382376)
+++ head/math/gnumeric/Makefile	(revision 382377)
@@ -1,81 +1,69 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.12.18
+PORTVERSION=	1.12.21
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME spreadsheet program
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 LIB_DEPENDS=	libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 \
 		libpsiconv.so:${PORTSDIR}/converters/psiconv
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USES=		cpe desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		python:2 shebangfix tar:xz
 USE_GNOME=	intlhack libgsf pygobject3
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-warnings \
 		--without-paradox \
 		--enable-introspection
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
 		org.gnome.gnumeric.gschema.xml \
 		org.gnome.gnumeric.plugin.gschema.xml
 
 SHEBANG_FILES=	plugins/perl-func/perl_func.pl
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		GOFFICE=0.10 \
 		SHORT_VER=${PORTVERSION:R}
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	PERL GDA
 OPTIONS_DEFAULT=PERL
 GDA_DESC=	Gnome Database Access plugin
 PERL_DESC=	Support Perl as extension language
 
-.include <bsd.port.options.mk>
+PERL_USES=	perl5
+PERL_CONFIGURE_WITH=	perl
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-PLIST_SUB+=		PERL=""
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGDA}
-USE_GNOME+=		libgda5-ui
-CONFIGURE_ARGS+=	--with-gda
-PLIST_SUB+=		GDA=""
-.else
-CONFIGURE_ARGS+=	--without-gda
-PLIST_SUB+=		GDA="@comment "
-.endif
+GDA_CONFIGURE_WITH=	gda
+GDA_USE=	GNOME=libgda5-ui
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
 		${WRKSRC}/configure
 
 post-install:
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
 		${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
 		${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
 
 .include <bsd.port.mk>
Index: head/math/gnumeric/distinfo
===================================================================
--- head/math/gnumeric/distinfo	(revision 382376)
+++ head/math/gnumeric/distinfo	(revision 382377)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnumeric-1.12.18.tar.xz) = 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9
-SIZE (gnome3/gnumeric-1.12.18.tar.xz) = 18064824
+SHA256 (gnome3/gnumeric-1.12.21.tar.xz) = 6eed42120babb7b2a857115f2ad6320bf255c7bd71a939344e5a6df744a09ef4
+SIZE (gnome3/gnumeric-1.12.21.tar.xz) = 18460624