--- Makefile.orig	2009-02-02 03:37:25.000000000 -0800
+++ Makefile	2009-02-05 14:02:51.000000000 -0800
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +21,6 @@
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier \
 		libgsf_gnome pygtk2 desktopfileutils libgnomeui
@@ -30,7 +29,7 @@
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-guile --with-bonobo
+CONFIGURE_ARGS=	--with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
@@ -42,10 +41,25 @@
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-OPTIONS=	GNOMEDB "Enable libgnomedb support" off
+OPTIONS=	GNOMEDB "Enable libgnomedb support" off \
+			PERL "Enable Perl as extension language" on \
+			GUILE "Enable Guile as extension language" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_GUILE)
+LIB_DEPENDS+=	guile.19:${PORTSDIR}/lang/guile
+CONFIGURE_ARGS+=	--with-guile
+.else
+CONFIGURE_ARGS+=	--without-guile
+.endif
+
+.if defined(WITH_PERL)
+USE_PERL5=	yes
+.else
+CONFIGURE_ARGS+=	--without-perl
+.endif
+
 .if defined(WITH_GNOMEDB)
 USE_GNOME+=		libgnomedb
 CONFIGURE_ARGS+=	--with-gda