svn commit: r359919 - head/japanese/gjiten

[Baptiste Daroussin]

Author: bapt
Date: Mon Jun 30 20:58:12 2014
New Revision: 359919
URL: http://svnweb.freebsd.org/changeset/ports/359919
QAT: https://qat.redports.org/buildarchive/r359919/

Log:
  Support stage [1]
  While here:
  - Use options helpers when possible
  - Remove update-desktop-database (it is useless for this port)
  
  PR:		190661
  Submitted by:	darksoul at darkbsd.org

Modified:
  head/japanese/gjiten/Makefile
  head/japanese/gjiten/pkg-plist

Modified: head/japanese/gjiten/Makefile
==============================================================================
--- head/japanese/gjiten/Makefile	Mon Jun 30 20:53:41 2014	(r359918)
+++ head/japanese/gjiten/Makefile	Mon Jun 30 20:58:12 2014	(r359919)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gjiten
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	japanese gnome
 MASTER_SITES=	http://gjiten.sourceforge.net/
 
@@ -14,26 +15,27 @@ 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
@@ -46,32 +48,20 @@ RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/
 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
-	- at update-desktop-database
 
 .include <bsd.port.mk>

Modified: head/japanese/gjiten/pkg-plist
==============================================================================
--- head/japanese/gjiten/pkg-plist	Mon Jun 30 20:53:41 2014	(r359918)
+++ head/japanese/gjiten/pkg-plist	Mon Jun 30 20:58:12 2014	(r359919)
@@ -1,4 +1,5 @@
 bin/gjiten
+man/man1/gjiten.1.gz
 share/application-registry/gjiten.desktop
 share/applications/gjiten.desktop
 %%DATADIR%%/dics/compdic
@@ -26,7 +27,3 @@ share/pixmaps/left_ptr_question.png
 @dirrmtry share/locale/de_CH
 @dirrmtry share/gnome/help/gjiten/C
 @dirrmtry share/gnome/help/gjiten
- at dirrmtry share/gnome/help
- at dirrmtry share/gnome
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true