diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile
index c1469b553b6a..d88f3d99b9ec 100644
--- a/graphics/goocanvas2/Makefile
+++ b/graphics/goocanvas2/Makefile
@@ -1,45 +1,41 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
 PORTNAME=	goocanvas
 PORTVERSION=	2.0.4
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Canvas widget for GTK+ 3
 
 LICENSE=	LGPL20
 
-USES=		gmake gnome libtool localbase pathfix pkgconfig python:build tar:xz
+USES=		gmake gnome libtool pathfix pkgconfig python:build tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python=no
 INSTALL_TARGET=	install-strip
 
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	*
-DOCSDIR=	${PREFIX}/share/gtk-doc/html/goocanvas2
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
 
 post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR:H}|' \
+		${WRKSRC}/configure
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in
-.endif
-.if ! ${PORT_OPTIONS:MNLS}
+
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>