Index: head/japanese/gjiten/Makefile
===================================================================
--- head/japanese/gjiten/Makefile	(revision 359918)
+++ head/japanese/gjiten/Makefile	(revision 359919)
@@ -1,77 +1,67 @@
 # Created by: Stephane Lapie <stephane.lapie@darkbsd.org>
 # $FreeBSD$
 
 PORTNAME=	gjiten
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	japanese gnome
 MASTER_SITES=	http://gjiten.sourceforge.net/
 
 MAINTAINER=	stephane.lapie@darkbsd.org
 COMMENT=	Japanese dictionary program for GNOME
 
 OPTIONS_DEFINE=	UTF8 KANJIPAD DOCS NLS
 UTF8_DESC=	Use UTF-8 edict dictionaries
 KANJIPAD_DESC=	Use Kanjipad
 
 USE_GNOME=	gtk20 gconf2 libglade2 libgnomeui
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	gjiten-doc.ja.html
-MAN1=		gjiten.1
 GCONF_SCHEMAS=	gjiten-dicfiles.schemas gjiten.schemas
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-MAKE_ENV+=	USE_NLS=no
-.endif
+NLS_USES=		gettext
+NLS_MAKE_ENV_OFF=	USE_NLS=no
 
+KANJIPAD_RUN_DEPENDS=	${LOCALBASE}/bin/kanjipad:${PORTSDIR}/japanese/kanjipad
+BUILD_DEPENDS=	${LOCALBASE}/bin/xmlto:${PORTSDIR}/textproc/xmlto
+
+DICTIONARIES=	kanjidic edict compdic
+GJITEN_DICS=	${DATADIR}/dics/
+
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MUTF8}
 EDICT_DIR=	${LOCALBASE}/share/dict/edict-utf-8
 EDICT_FILE=	${EDICT_DIR}/edict
 RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/japanese/edict-utf-8
 .else
 EDICT_DIR=	${LOCALBASE}/share/dict/edict
 EDICT_FILE=	${EDICT_DIR}/edict
 RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/japanese/edict
 USES+=		iconv:build
 .endif
 
-DICTIONARIES=	kanjidic edict compdic
-GJITEN_DICS=	${DATADIR}/dics/
-
-.if ${PORT_OPTIONS:MKANJIPAD}
-RUN_DEPENDS+=	${LOCALBASE}/bin/kanjipad:${PORTSDIR}/japanese/kanjipad
-.endif
-
-BUILD_DEPENDS+=	${LOCALBASE}/bin/xmlto:${PORTSDIR}/textproc/xmlto
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}
+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/help/ja/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/help/ja/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${INSTALL} -d ${GJITEN_DICS}
+	${INSTALL} -d ${STAGEDIR}${GJITEN_DICS}
 .if ${PORT_OPTIONS:MUTF8}
 .for f in ${DICTIONARIES}
-	${INSTALL_DATA} ${EDICT_DIR}/${f} ${GJITEN_DICS}
+	${INSTALL_DATA} ${EDICT_DIR}/${f} ${STAGEDIR}${GJITEN_DICS}
 .endfor
 .else
 .for f in ${DICTIONARIES}
-	${ICONV_CMD} -c -f EUC-JP -t UTF-8 ${EDICT_DIR}/${f} > ${GJITEN_DICS}/${f}
+	${ICONV_CMD} -c -f EUC-JP -t UTF-8 ${EDICT_DIR}/${f} > ${STAGEDIR}${GJITEN_DICS}/${f}
 .endfor
 .endif
-	-@update-desktop-database
 
 .include <bsd.port.mk>
Index: head/japanese/gjiten/pkg-plist
===================================================================
--- head/japanese/gjiten/pkg-plist	(revision 359918)
+++ head/japanese/gjiten/pkg-plist	(revision 359919)
@@ -1,32 +1,29 @@
 bin/gjiten
+man/man1/gjiten.1.gz
 share/application-registry/gjiten.desktop
 share/applications/gjiten.desktop
 %%DATADIR%%/dics/compdic
 %%DATADIR%%/dics/edict
 %%DATADIR%%/dics/kanjidic
 %%DATADIR%%/gjiten-settings.glade
 %%DATADIR%%/radkfile.utf8
 %%DATADIR%%/vconj.utf8
 share/gnome/help/gjiten/C/gjiten.xml
 share/gnome/help/gjiten/C/legal.xml
 %%NLS%%share/locale/de/LC_MESSAGES/gjiten.mo
 %%NLS%%share/locale/de_CH/LC_MESSAGES/gjiten.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/gjiten.mo
 share/omf/gjiten/gjiten-C.omf
 share/pixmaps/gjiten/gjiten-logo.png
 share/pixmaps/jiten.png
 share/pixmaps/kanjidic.png
 share/pixmaps/kanjipad.png
 share/pixmaps/left_ptr_question.png
 @dirrm share/pixmaps/gjiten
 @dirrm share/omf/gjiten
 @dirrm share/gjiten/dics
 @dirrm share/gjiten
 @dirrmtry share/locale/de_CH/LC_MESSAGES
 @dirrmtry share/locale/de_CH
 @dirrmtry share/gnome/help/gjiten/C
 @dirrmtry share/gnome/help/gjiten
-@dirrmtry share/gnome/help
-@dirrmtry share/gnome
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true