Index: Makefile
===================================================================
--- Makefile	(revision 342366)
+++ Makefile	(working copy)
@@ -1,64 +1,49 @@
-# Created by: Hakisho Nukama <Nukama@gmail.com>
+# Created by: Hakisho Nukama <nukama@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	gummi
-PORTVERSION=	0.6.5
-PORTREVISION=	1
-CATEGORIES=	editors
-MASTER_SITES=	http://dev.midnightcoding.org/attachments/download/301/
+PORTNAME=		gummi
+PORTVERSION=		0.6.5
+PORTREVISION=		1
+CATEGORIES=		editors
+MASTER_SITES=		http://dev.midnightcoding.org/attachments/download/301/
 
-MAINTAINER=	nukama+maintainer@gmail.com
-COMMENT=	Simple LaTex editor for GTK users
+MAINTAINER=		nukama+maintainer@gmail.com
+COMMENT=		Simple LaTex editor for GTK users
 
-LICENSE=	MIT
+LICENSE=		MIT
 
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		gtkspell:${PORTSDIR}/textproc/gtkspell
+BUILD_DEPENDS+=		msgfmt:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+=		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
+			libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 
-USES=		iconv gmake pkgconfig
-GNU_CONFIGURE=	yes
-USE_XORG=	xdamage xft xcursor xcomposite
-USE_GNOME=	desktopfileutils gtksourceview2 glib20 intlhack
-INSTALLS_ICONS=	yes
-INSTALLS_OMF=	yes
+USES=			iconv gmake pkgconfig desktop-file-utils
+GNU_CONFIGURE=		yes
+USE_XORG=		xdamage xft xcursor xcomposite
+USE_GNOME=		gtksourceview2 glib20 intlhack
+INSTALLS_ICONS=		yes
+INSTALLS_OMF=		yes
 
-MAN1=		gummi.1
-
-OPTIONS_DEFINE=	TETEX LATEXMK RUBBER TEXCOUNT
+OPTIONS_DEFINE=		TETEX LATEXMK RUBBER TEXCOUNT
 OPTIONS_DEFAULT=	TETEX
 
-TETEX_DESC=	Use pdfetex typesetter
-LATEXMK_DESC=	Use latexmk typesetter
-RUBBER_DESC=	Use rubber typesetter
-TEXCOUNT_DESC=	With texcount statistics
+TETEX_DESC=		Use pdfetex typesetter
+LATEXMK_DESC=		Use latexmk typesetter
+RUBBER_DESC=		Use rubber typesetter
+TEXCOUNT_DESC=		With texcount statistics
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=	NLS=""
-.else
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+PLIST_SUB+=		NLS="@comment "
 
-.if ${PORT_OPTIONS:MTETEX}
-RUN_DEPENDS+=	pdfetex:${PORTSDIR}/print/teTeX-base
-.endif
+NLS_USES+=		gettext
+NLS_CONFIGURE_ARGS+=	--enable-nls
+NLS_PLIST_SUB+=		NLS=""
 
-.if ${PORT_OPTIONS:MLATEXMK}
-RUN_DEPENDS+=	latexmk:${PORTSDIR}/print/latexmk
-.endif
+TETEX_RUN_DEPENDS+=	pdfetex:${PORTSDIR}/print/teTeX-base
 
-.if ${PORT_OPTIONS:MRUBBER}
-RUN_DEPENDS+=	rubber:${PORTSDIR}/textproc/rubber
-.endif
+LATEXMK_RUN_DEPENDS+=	latexmk:${PORTSDIR}/print/latexmk
 
-.if ${PORT_OPTIONS:MTEXCOUNT}
-RUN_DEPENDS+=	${LOCALBASE}/bin/texcount.${PORTVERSION}:${PORTSDIR}/texproc/p5-texcount
-.endif
+RUBBER_RUN_DEPENDS+=	rubber:${PORTSDIR}/textproc/rubber
 
+TEXCOUNT_RUN_DEPENDS+=	${LOCALBASE}/bin/texcount.${PORTVERSION}:${PORTSDIR}/texproc/p5-texcount
+
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 342366)
+++ pkg-plist	(working copy)
@@ -2,6 +2,7 @@
 share/applications/gummi.desktop
 share/pixmaps/gummi.png
 lib/gummi/latex_dvi.sh
+man/man1/gummi.1.gz
 %%DATADIR%%/ui/snippets.glade
 %%DATADIR%%/ui/gummi.glade
 %%DATADIR%%/ui/prefs.glade