svn commit: r347829 - in head/japanese/skk-tools: . files

[Martin Wilke]

Author: miwi
Date: Tue Mar 11 02:33:17 2014
New Revision: 347829
URL: http://svnweb.freebsd.org/changeset/ports/347829
QAT: https://qat.redports.org/buildarchive/r347829/

Log:
  - Update to 1.3.3
  
  PR:		180690
  Submitted by:	Ports Fury

Deleted:
  head/japanese/skk-tools/files/
Modified:
  head/japanese/skk-tools/Makefile
  head/japanese/skk-tools/distinfo

Modified: head/japanese/skk-tools/Makefile
==============================================================================
--- head/japanese/skk-tools/Makefile	Tue Mar 11 02:32:16 2014	(r347828)
+++ head/japanese/skk-tools/Makefile	Tue Mar 11 02:33:17 2014	(r347829)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	skk-tools
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 PORTEPOCH=	1
 CATEGORIES=	japanese
 MASTER_SITES=	RINGSERVER/elisp/skk/tools \
@@ -14,10 +14,6 @@ COMMENT=	Jisyo-tools for the SKK Japanes
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	EXPR2
-OPTIONS_DEFAULT=	EXPR2
-EXPR2_DESC=	Build skkdic-expr2 (needs glib-2.x)
-
 GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/skk
@@ -25,25 +21,28 @@ DOCSDIR=	${PREFIX}/share/doc/skk
 PORTDOCS=	README.skktools
 PLIST_FILES=	bin/skkdic-count bin/skkdic-expr bin/skkdic-sort
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=		DOCS EXPR2
+OPTIONS_DEFAULT=	EXPR2
+
+EXPR2_DESC=		Build skkdic-expr2 (needs glib-2.x)
+EXPR2_USES=		pkgconfig
+EXPR2_USE=		GNOME=glib20
+EXPR2_PLIST_FILES=	bin/skkdic-expr2
+EXPR2_CONFIGURE_WITH=	skkdic-expr2
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXPR2}
-USE_GNOME=	glib20
-USES+=		pkgconfig
 PORTDOCS+=	README.skkdic-expr2
-PLIST_FILES+=	bin/skkdic-expr2
-.else
-CONFIGURE_ARGS=	--without-skkdic-expr2
 .endif
 
+post-build:
+	@${LN} -sf README.C ${WRKSRC}/READMEs/README.skktools
+
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/READMEs/README.C ${DOCSDIR}/README.skktools
-.if ${PORT_OPTIONS:MEXPR2}
-	${INSTALL_DATA} ${WRKSRC}/READMEs/README.skkdic-expr2 ${DOCSDIR}
-.endif
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>

Modified: head/japanese/skk-tools/distinfo
==============================================================================
--- head/japanese/skk-tools/distinfo	Tue Mar 11 02:32:16 2014	(r347828)
+++ head/japanese/skk-tools/distinfo	Tue Mar 11 02:33:17 2014	(r347829)
@@ -1,2 +1,2 @@
-SHA256 (skktools-1.3.2.tar.gz) = cd1cc9d6d9674d70bbc69f52ac1d1a99a8067dd113a0fa1d50685a29e58a6791
-SIZE (skktools-1.3.2.tar.gz) = 273594
+SHA256 (skktools-1.3.3.tar.gz) = 0b4c17b6ca5c5147e08e89e66d506065bda06e7fdbeee038e85d7a7c4d10216d
+SIZE (skktools-1.3.3.tar.gz) = 285219