diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index c3004928fc7c..86f66df3fb95 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 		vcdimager:${PORTSDIR}/multimedia/vcdimager \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-USE_BZIP2=	yes
 USE_GNOME=	pygtk2
-USES=		iconv
+USES=		iconv tar:bzip2
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
@@ -29,19 +28,9 @@ IBUS_DESC=	iBus support
 DEJAVU_FONTSDIR=	${LOCALBASE}/lib/X11/fonts/dejavu
 DEJAVU_FONTFILE=	${DEJAVU_FONTSDIR}/DejaVuSans.ttf
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIBUS}
-RUN_DEPENDS+=	ibus-daemon:${PORTSDIR}/textproc/ibus
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+IBUS_RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
+NLS_USES=	gettext
+OPTIONS_SUB=	yes
 
 PORTDOCS=	*
 
@@ -61,59 +50,53 @@ post-patch:
 
 do-install:
 # File locations in devede are a mess...
-	@${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${PREFIX}/bin/devede
-	@${INSTALL_SCRIPT} ${WRKSRC}/devede-debug ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${STAGEDIR}${PREFIX}/bin/devede
+	${INSTALL_SCRIPT} ${WRKSRC}/devede-debug ${STAGEDIR}${PREFIX}/bin/
 
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/devede.svg ${STAGEDIR}${DATADIR}
 
-	@${MKDIR} ${DATADIR}/interface
-	@(cd ${WRKSRC}/interface && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" ${DATADIR} \;)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/interface
+	(cd ${WRKSRC}/interface && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" ${STAGEDIR}${DATADIR} \;)
 
-	@(cd ${WRKSRC}/pixmaps/ && ${FIND} . -depth 1 -type f \
-		-exec ${INSTALL_DATA} "{}" ${DATADIR} \;)
+	(cd ${WRKSRC}/pixmaps/ && ${FIND} . -depth 1 -type f \
+		-exec ${INSTALL_DATA} "{}" ${STAGEDIR}${DATADIR} \;)
 
-	@${MKDIR} ${DATADIR}/backgrounds
-	@(cd ${WRKSRC}/pixmaps/backgrounds && ${FIND} . -type f \
-		-exec ${INSTALL_DATA} "{}" "${DATADIR}/backgrounds/{}" \;)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/backgrounds
+	(cd ${WRKSRC}/pixmaps/backgrounds && ${FIND} . -type f \
+		-exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/backgrounds/{}" \;)
 
-	@${MKDIR} ${DESKTOPDIR}
-	@${INSTALL_DATA} ${WRKSRC}/devede.desktop ${DESKTOPDIR}
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/devede.desktop ${STAGEDIR}${DESKTOPDIR}
 
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	@(cd ${WRKSRC} && ${FIND} . -depth 1 -type f -name "devede_*.py" \
-			-exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/lib/${PORTNAME}/{}" \;)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	(cd ${WRKSRC} && ${FIND} . -depth 1 -type f -name "devede_*.py" \
+			-exec ${INSTALL_SCRIPT} "{}" "${STAGEDIR}${PREFIX}/lib/${PORTNAME}/{}" \;)
 
-	@${INSTALL_DATA} ${WRKSRC}/devede.svg ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/devede.svg ${STAGEDIR}${PREFIX}/share/pixmaps
 
-.if ${PORT_OPTIONS:MNLS}
-	@${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/cs_CZ.mo ${PREFIX}/share/locale/cs/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/da.mo ${PREFIX}/share/locale/da/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/de_DE.mo ${PREFIX}/share/locale/de/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/el.mo ${PREFIX}/share/locale/el/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/fr.mo ${PREFIX}/share/locale/fr/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/gl.mo ${PREFIX}/share/locale/gl/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/hu_HU.mo ${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/it_IT.mo ${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/nb_NO.mo ${PREFIX}/share/locale/nb/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/nl.mo ${PREFIX}/share/locale/nl/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/pl.mo ${PREFIX}/share/locale/pl/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/pt_BR.mo ${PREFIX}/share/locale/pt_BR/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/pt_PT.mo ${PREFIX}/share/locale/pt_PT/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${PREFIX}/share/locale/ru/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/sk.mo ${PREFIX}/share/locale/sk/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/sv.mo ${PREFIX}/share/locale/sv/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/zh_CN.mo ${PREFIX}/share/locale/zh_CN/LC_MESSAGES/devede.mo
-	@${INSTALL_DATA} ${WRKSRC}/po/zh_TW.mo ${PREFIX}/share/locale/zh_TW/LC_MESSAGES/devede.mo
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
-.endif
+	${INSTALL_DATA} ${WRKSRC}/po/ca.mo ${STAGEDIR}${PREFIX}/share/locale/ca/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/cs_CZ.mo ${STAGEDIR}${PREFIX}/share/locale/cs/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/da.mo ${STAGEDIR}${PREFIX}/share/locale/da/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/de_DE.mo ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/el.mo ${STAGEDIR}${PREFIX}/share/locale/el/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/es.mo ${STAGEDIR}${PREFIX}/share/locale/es/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/fr.mo ${STAGEDIR}${PREFIX}/share/locale/fr/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/gl.mo ${STAGEDIR}${PREFIX}/share/locale/gl/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/hu_HU.mo ${STAGEDIR}${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/it_IT.mo ${STAGEDIR}${PREFIX}/share/locale/it/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/nb_NO.mo ${STAGEDIR}${PREFIX}/share/locale/nb/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/nl.mo ${STAGEDIR}${PREFIX}/share/locale/nl/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/pl.mo ${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/pt_BR.mo ${STAGEDIR}${PREFIX}/share/locale/pt_BR/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/pt_PT.mo ${STAGEDIR}${PREFIX}/share/locale/pt_PT/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${STAGEDIR}${PREFIX}/share/locale/ru/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/sk.mo ${STAGEDIR}${PREFIX}/share/locale/sk/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/sv.mo ${STAGEDIR}${PREFIX}/share/locale/sv/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/zh_CN.mo ${STAGEDIR}${PREFIX}/share/locale/zh_CN/LC_MESSAGES/devede.mo
+	${INSTALL_DATA} ${WRKSRC}/po/zh_TW.mo ${STAGEDIR}${PREFIX}/share/locale/zh_TW/LC_MESSAGES/devede.mo
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
 
 .include <bsd.port.mk>