Bug 186216 - [PATCH] japanese/libskk: switch to USE_GNOME=introspection
Summary: [PATCH] japanese/libskk: switch to USE_GNOME=introspection
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-28 23:20 UTC by Dmitry Marakasov
Modified: 2014-02-10 23:00 UTC (History)
1 user (show)

See Also:


Attachments
ja-libskk-1.0.0_1.patch (784 bytes, patch)
2014-01-28 23:20 UTC, Dmitry Marakasov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov 2014-01-28 23:20:00 UTC
- Switch to USE_GNOME=introspection to depend on gobject-introspection.
Among other things this takes care of environement for g-ir-scanner.
- Use new LIB_DEPENDS syntax
- Convert USE_GMAKE to USES

Port maintainer (hiroto.kagotani@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-28 23:20:07 UTC
Maintainer of japanese/libskk,

Please note that PR ports/186216 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186216

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-28 23:20:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Rusmir Dusko freebsd_committer freebsd_triage 2014-02-10 11:04:20 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

I'll take it.
Comment 4 Rusmir Dusko freebsd_committer freebsd_triage 2014-02-10 13:10:06 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-02-10 13:18:11 UTC
Author: nemysis
Date: Mon Feb 10 13:17:56 2014
New Revision: 343628
URL: http://svnweb.freebsd.org/changeset/ports/343628
QAT: https://qat.redports.org/buildarchive/r343628/

Log:
  - Update to 1.0.1
  - Change master site
  - Add license (GPLv3)
  - Add dependencies for lang/vala, textproc/p5-XML-Parser
  - Use the new format for LIB_DEPENDS
  - USES gmake instead of USE_GMAKE
  - USES pathfix instead of USE_GNOME gnomehack
  - Add USE_GNOME=introspection [1]
  - Remove USE_GCC=any, builds properly with Clang
  - Disable all warnings with -w
  - Add DOCS and Option
  - Support STAGEDIR and add OPTIONS_SUB
  - Remove obsolete REINPLACE
  - Strip library
  - Change WWW
  
  PR:		ports/186181, ports/186216
  Submitted by:	nemysis (self), amdmi3@ [1]
  Approved by:	maintainer timeout (14 days)

Modified:
  head/japanese/libskk/Makefile
  head/japanese/libskk/distinfo
  head/japanese/libskk/pkg-descr
  head/japanese/libskk/pkg-plist

Modified: head/japanese/libskk/Makefile
==============================================================================
--- head/japanese/libskk/Makefile	Mon Feb 10 13:05:31 2014	(r343627)
+++ head/japanese/libskk/Makefile	Mon Feb 10 13:17:56 2014	(r343628)
@@ -2,47 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	libskk
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	japanese
-MASTER_SITES=	http://cloud.github.com/downloads/ueno/libskk/
+MASTER_SITES=	https://bitbucket.org/libskk/libskk/downloads/
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Library to deal with Japanese Kana-to-Kanji conversion method
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
-		json-glib-1.0:${PORTSDIR}/devel/json-glib
+LICENSE=	GPLv3
 
-USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USE_GCC=	any
-USE_GNOME=	intltool gnomehack
-USES=		pkgconfig
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		valac:${PORTSDIR}/lang/vala \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel/libgee06 \
+		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	intltool introspection:build
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	DATADIRNAME=share
-MAN1=		skk.1
+USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -w
 
-OPTIONS_DEFINE=	NLS
+PORTDOCS=	ChangeLog NEWS README
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-post-patch:
-	# Disabling Vala version check
-	${REINPLACE_CMD} -e 's/as_fn_error.*Vala.*not found.*;;/;;/' ${WRKSRC}/configure
+OPTIONS_DEFINE=	 DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 post-install:
-	cd ${WRKSRC}/docs && ${GMAKE} install-man
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskk.so.0
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/japanese/libskk/distinfo
==============================================================================
--- head/japanese/libskk/distinfo	Mon Feb 10 13:05:31 2014	(r343627)
+++ head/japanese/libskk/distinfo	Mon Feb 10 13:17:56 2014	(r343628)
@@ -1,2 +1,2 @@
-SHA256 (libskk-1.0.0.tar.gz) = 3584cbafd7e5da595c446bfb43dd2fd488788f5fcaee50c6d77d3e9e39dd11ff
-SIZE (libskk-1.0.0.tar.gz) = 858570
+SHA256 (libskk-1.0.1.tar.gz) = 37bb7859deffd038319a8bc7f9c7d3b207d7dce6afea5e3da519381d7a05388c
+SIZE (libskk-1.0.1.tar.gz) = 860453

Modified: head/japanese/libskk/pkg-descr
==============================================================================
--- head/japanese/libskk/pkg-descr	Mon Feb 10 13:05:31 2014	(r343627)
+++ head/japanese/libskk/pkg-descr	Mon Feb 10 13:17:56 2014	(r343628)
@@ -20,4 +20,4 @@ Documentation:
 * http://du-a.org/docs/libskk/libskk/ for Vala binding reference
 * http://du-a.org/docs/gtk-doc/libskk/html/ for C binding reference
 
-WWW:	http://github.com/ueno/libskk
+WWW: http://github.com/ueno/libskk/

Modified: head/japanese/libskk/pkg-plist
==============================================================================
--- head/japanese/libskk/pkg-plist	Mon Feb 10 13:05:31 2014	(r343627)
+++ head/japanese/libskk/pkg-plist	Mon Feb 10 13:17:56 2014	(r343628)
@@ -1,21 +1,69 @@
 bin/skk
 include/libskk/libskk.h
-lib/libskk.so.0
-lib/libskk.so
-lib/libskk.la
 lib/girepository-1.0/Skk-1.0.typelib
+lib/libskk.la
+lib/libskk.so
+lib/libskk.so.0
 libdata/pkgconfig/libskk.pc
-%%NLS%%share/locale/ja/LC_MESSAGES/libskk.mo
+man/man1/skk.1.gz
 share/gir-1.0/Skk-1.0.gir
-share/vala/vapi/skk-1.0.deps
-share/vala/vapi/skk-1.0.vapi
-%%DATADIR%%/rules/tcode/keymap/latin.json
-%%DATADIR%%/rules/tcode/keymap/katakana.json
+%%DATADIR%%/rules/README.rules
+%%DATADIR%%/rules/act/keymap/default.json
+%%DATADIR%%/rules/act/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/act/keymap/hiragana.json
+%%DATADIR%%/rules/act/keymap/katakana.json
+%%DATADIR%%/rules/act/keymap/latin.json
+%%DATADIR%%/rules/act/keymap/wide-latin.json
+%%DATADIR%%/rules/act/metadata.json
+%%DATADIR%%/rules/act/rom-kana/default.json
+%%DATADIR%%/rules/azik/keymap/common.json
+%%DATADIR%%/rules/azik/keymap/default.json
+%%DATADIR%%/rules/azik/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/azik/keymap/hiragana.json
+%%DATADIR%%/rules/azik/keymap/katakana.json
+%%DATADIR%%/rules/azik/keymap/latin.json
+%%DATADIR%%/rules/azik/keymap/wide-latin.json
+%%DATADIR%%/rules/azik/metadata.json
+%%DATADIR%%/rules/azik/rom-kana/default.json
+%%DATADIR%%/rules/default/keymap/default.json
+%%DATADIR%%/rules/default/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/default/keymap/hiragana.json
+%%DATADIR%%/rules/default/keymap/katakana.json
+%%DATADIR%%/rules/default/keymap/latin.json
+%%DATADIR%%/rules/default/keymap/wide-latin.json
+%%DATADIR%%/rules/default/metadata.json
+%%DATADIR%%/rules/default/rom-kana/default.json
+%%DATADIR%%/rules/kzik/keymap/default.json
+%%DATADIR%%/rules/kzik/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/kzik/keymap/hiragana.json
+%%DATADIR%%/rules/kzik/keymap/katakana.json
+%%DATADIR%%/rules/kzik/keymap/latin.json
+%%DATADIR%%/rules/kzik/keymap/wide-latin.json
+%%DATADIR%%/rules/kzik/metadata.json
+%%DATADIR%%/rules/kzik/rom-kana/default.json
+%%DATADIR%%/rules/nicola/keymap/default.json
+%%DATADIR%%/rules/nicola/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/nicola/keymap/hiragana.json
+%%DATADIR%%/rules/nicola/keymap/kana.json
+%%DATADIR%%/rules/nicola/keymap/katakana.json
+%%DATADIR%%/rules/nicola/keymap/latin.json
+%%DATADIR%%/rules/nicola/keymap/wide-latin.json
+%%DATADIR%%/rules/nicola/metadata.json
+%%DATADIR%%/rules/nicola/rom-kana/default.json
 %%DATADIR%%/rules/tcode/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/tcode/keymap/wide-latin.json
 %%DATADIR%%/rules/tcode/keymap/hiragana.json
-%%DATADIR%%/rules/tcode/rom-kana/default.json
+%%DATADIR%%/rules/tcode/keymap/katakana.json
+%%DATADIR%%/rules/tcode/keymap/latin.json
+%%DATADIR%%/rules/tcode/keymap/wide-latin.json
 %%DATADIR%%/rules/tcode/metadata.json
+%%DATADIR%%/rules/tcode/rom-kana/default.json
+%%DATADIR%%/rules/trycode/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/trycode/keymap/hiragana.json
+%%DATADIR%%/rules/trycode/keymap/katakana.json
+%%DATADIR%%/rules/trycode/keymap/latin.json
+%%DATADIR%%/rules/trycode/keymap/wide-latin.json
+%%DATADIR%%/rules/trycode/metadata.json
+%%DATADIR%%/rules/trycode/rom-kana/default.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/hankaku-katakana.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/hiragana.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/katakana.json
@@ -23,89 +71,45 @@ share/vala/vapi/skk-1.0.vapi
 %%DATADIR%%/rules/tutcode-touch16x/keymap/wide-latin.json
 %%DATADIR%%/rules/tutcode-touch16x/metadata.json
 %%DATADIR%%/rules/tutcode-touch16x/rom-kana/default.json
-%%DATADIR%%/rules/tutcode/metadata.json
-%%DATADIR%%/rules/tutcode/rom-kana/default.json
 %%DATADIR%%/rules/tutcode/keymap/hankaku-katakana.json
 %%DATADIR%%/rules/tutcode/keymap/hiragana.json
 %%DATADIR%%/rules/tutcode/keymap/katakana.json
 %%DATADIR%%/rules/tutcode/keymap/latin.json
 %%DATADIR%%/rules/tutcode/keymap/wide-latin.json
-%%DATADIR%%/rules/trycode/metadata.json
-%%DATADIR%%/rules/trycode/keymap/latin.json
-%%DATADIR%%/rules/trycode/keymap/katakana.json
-%%DATADIR%%/rules/trycode/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/trycode/keymap/wide-latin.json
-%%DATADIR%%/rules/trycode/keymap/hiragana.json
-%%DATADIR%%/rules/trycode/rom-kana/default.json
-%%DATADIR%%/rules/nicola/metadata.json
-%%DATADIR%%/rules/nicola/rom-kana/default.json
-%%DATADIR%%/rules/nicola/keymap/default.json
-%%DATADIR%%/rules/nicola/keymap/kana.json
-%%DATADIR%%/rules/nicola/keymap/latin.json
-%%DATADIR%%/rules/nicola/keymap/katakana.json
-%%DATADIR%%/rules/nicola/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/nicola/keymap/wide-latin.json
-%%DATADIR%%/rules/nicola/keymap/hiragana.json
-%%DATADIR%%/rules/kzik/rom-kana/default.json
-%%DATADIR%%/rules/kzik/keymap/default.json
-%%DATADIR%%/rules/kzik/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/kzik/keymap/hiragana.json
-%%DATADIR%%/rules/kzik/keymap/katakana.json
-%%DATADIR%%/rules/kzik/keymap/latin.json
-%%DATADIR%%/rules/kzik/keymap/wide-latin.json
-%%DATADIR%%/rules/kzik/metadata.json
-%%DATADIR%%/rules/azik/keymap/default.json
-%%DATADIR%%/rules/azik/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/azik/keymap/hiragana.json
-%%DATADIR%%/rules/azik/keymap/katakana.json
-%%DATADIR%%/rules/azik/keymap/latin.json
-%%DATADIR%%/rules/azik/keymap/wide-latin.json
-%%DATADIR%%/rules/azik/rom-kana/default.json
-%%DATADIR%%/rules/azik/metadata.json
-%%DATADIR%%/rules/default/rom-kana/default.json
-%%DATADIR%%/rules/default/metadata.json
-%%DATADIR%%/rules/default/keymap/default.json
-%%DATADIR%%/rules/default/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/default/keymap/hiragana.json
-%%DATADIR%%/rules/default/keymap/katakana.json
-%%DATADIR%%/rules/default/keymap/latin.json
-%%DATADIR%%/rules/default/keymap/wide-latin.json
-%%DATADIR%%/rules/README.rules
-%%DATADIR%%/rules/act/rom-kana/default.json
-%%DATADIR%%/rules/act/metadata.json
-%%DATADIR%%/rules/act/keymap/default.json
-%%DATADIR%%/rules/act/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/act/keymap/hiragana.json
-%%DATADIR%%/rules/act/keymap/katakana.json
-%%DATADIR%%/rules/act/keymap/latin.json
-%%DATADIR%%/rules/act/keymap/wide-latin.json
-@dirrmtry %%DATADIR%%/rules/tutcode/rom-kana
-@dirrmtry %%DATADIR%%/rules/tutcode/keymap
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x/rom-kana
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x/keymap
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x
-@dirrmtry %%DATADIR%%/rules/tutcode
-@dirrmtry %%DATADIR%%/rules/trycode/rom-kana
-@dirrmtry %%DATADIR%%/rules/trycode/keymap
-@dirrmtry %%DATADIR%%/rules/trycode
-@dirrmtry %%DATADIR%%/rules/tcode/rom-kana
-@dirrmtry %%DATADIR%%/rules/tcode/keymap
-@dirrmtry %%DATADIR%%/rules/tcode
-@dirrmtry %%DATADIR%%/rules/nicola/rom-kana
-@dirrmtry %%DATADIR%%/rules/nicola/keymap
-@dirrmtry %%DATADIR%%/rules/nicola
-@dirrmtry %%DATADIR%%/rules/kzik/rom-kana
-@dirrmtry %%DATADIR%%/rules/kzik/keymap
-@dirrmtry %%DATADIR%%/rules/kzik
-@dirrmtry %%DATADIR%%/rules/default/rom-kana
-@dirrmtry %%DATADIR%%/rules/default/keymap
-@dirrmtry %%DATADIR%%/rules/default
-@dirrmtry %%DATADIR%%/rules/azik/rom-kana
-@dirrmtry %%DATADIR%%/rules/azik/keymap
-@dirrmtry %%DATADIR%%/rules/azik
-@dirrmtry %%DATADIR%%/rules/act/rom-kana
-@dirrmtry %%DATADIR%%/rules/act/keymap
-@dirrmtry %%DATADIR%%/rules/act
-@dirrmtry %%DATADIR%%/rules
-@dirrmtry %%DATADIR%%
-@dirrmtry include/libskk
+%%DATADIR%%/rules/tutcode/metadata.json
+%%DATADIR%%/rules/tutcode/rom-kana/default.json
+%%NLS%%share/locale/ja/LC_MESSAGES/libskk.mo
+share/vala/vapi/skk-1.0.deps
+share/vala/vapi/skk-1.0.vapi
+@dirrm %%DATADIR%%/rules/tutcode/rom-kana
+@dirrm %%DATADIR%%/rules/tutcode/keymap
+@dirrm %%DATADIR%%/rules/tutcode-touch16x/rom-kana
+@dirrm %%DATADIR%%/rules/tutcode-touch16x/keymap
+@dirrm %%DATADIR%%/rules/tutcode-touch16x
+@dirrm %%DATADIR%%/rules/tutcode
+@dirrm %%DATADIR%%/rules/trycode/rom-kana
+@dirrm %%DATADIR%%/rules/trycode/keymap
+@dirrm %%DATADIR%%/rules/trycode
+@dirrm %%DATADIR%%/rules/tcode/rom-kana
+@dirrm %%DATADIR%%/rules/tcode/keymap
+@dirrm %%DATADIR%%/rules/tcode
+@dirrm %%DATADIR%%/rules/nicola/rom-kana
+@dirrm %%DATADIR%%/rules/nicola/keymap
+@dirrm %%DATADIR%%/rules/nicola
+@dirrm %%DATADIR%%/rules/kzik/rom-kana
+@dirrm %%DATADIR%%/rules/kzik/keymap
+@dirrm %%DATADIR%%/rules/kzik
+@dirrm %%DATADIR%%/rules/default/rom-kana
+@dirrm %%DATADIR%%/rules/default/keymap
+@dirrm %%DATADIR%%/rules/default
+@dirrm %%DATADIR%%/rules/azik/rom-kana
+@dirrm %%DATADIR%%/rules/azik/keymap
+@dirrm %%DATADIR%%/rules/azik
+@dirrm %%DATADIR%%/rules/act/rom-kana
+@dirrm %%DATADIR%%/rules/act/keymap
+@dirrm %%DATADIR%%/rules/act
+@dirrm %%DATADIR%%/rules
+@dirrm %%DATADIR%%
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
+@dirrm include/libskk
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 dfilter service freebsd_committer freebsd_triage 2014-02-10 22:51:09 UTC
Author: amdmi3
Date: Mon Feb 10 22:51:01 2014
New Revision: 343695
URL: http://svnweb.freebsd.org/changeset/ports/343695
QAT: https://qat.redports.org/buildarchive/r343695/

Log:
  Bits from original ports/186216 which were noc committed + additional
  fixes.
  
  - Remove g-ir-scanner from BUILD_DEPENDS since it's handled by USE_GNOME
  - Do not hide warnings
  - Whitespace fix
  
  PR:		186216
  Submitted by:	amdmi3
  Approved by:	maintainer timeout

Modified:
  head/japanese/libskk/Makefile

Modified: head/japanese/libskk/Makefile
==============================================================================
--- head/japanese/libskk/Makefile	Mon Feb 10 22:50:36 2014	(r343694)
+++ head/japanese/libskk/Makefile	Mon Feb 10 22:51:01 2014	(r343695)
@@ -11,8 +11,7 @@ COMMENT=	Library to deal with Japanese K
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		valac:${PORTSDIR}/lang/vala \
+BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel/libgee06 \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
@@ -22,11 +21,11 @@ USE_GNOME=	intltool introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include -w
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	ChangeLog NEWS README
 
-OPTIONS_DEFINE=	 DOCS NLS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"