svn commit: r360238 - head/textproc/stardict3

[Tijl Coosemans]

Author: tijl
Date: Wed Jul  2 18:20:33 2014
New Revision: 360238
URL: http://svnweb.freebsd.org/changeset/ports/360238
QAT: https://qat.redports.org/buildarchive/r360238/

Log:
  - Add USES=libtool
  - Fix problem with DATADIRNAME by setting CPPFLAGS/LIBS instead of patching
  - Silence post-patch

Modified:
  head/textproc/stardict3/Makefile
  head/textproc/stardict3/pkg-plist

Modified: head/textproc/stardict3/Makefile
==============================================================================
--- head/textproc/stardict3/Makefile	Wed Jul  2 18:18:37 2014	(r360237)
+++ head/textproc/stardict3/Makefile	Wed Jul  2 18:20:33 2014	(r360238)
@@ -3,7 +3,7 @@
 
 PORTNAME=	stardict
 PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	GOOGLE_CODE
 DIST_SUBDIR=	stardict
@@ -20,8 +20,9 @@ CONFIGURE_ARGS=	--disable-festival \
 		--disable-gucharmap \
 		--disable-espeak \
 		--disable-updateinfo
-LIBS=		-L${LOCALBASE}/lib
-USES=		tar:bzip2 gettext gmake pathfix pkgconfig
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 CONFIGURE_WRKSRC=	${WRKSRC}/dict
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
@@ -47,13 +48,14 @@ MAKE_ARGS+=	AUTOMAKE="${TRUE}" ACLOCAL="
 
 post-patch:
 .if !${PORT_OPTIONS:MGNOME}
-	${REINPLACE_CMD} -e '/DATADIRNAME=lib/s,lib,share,' ${WRKSRC}/dict/m4/intltool.m4
-	${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in
-	${REINPLACE_CMD} -e '/^GNOME_DOC_INIT/d' \
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in
+	@${REINPLACE_CMD} -e '/^GNOME_DOC_INIT/d' \
 		-e '/^help\/Makefile/d' ${WRKSRC}/dict/configure.ac
 .endif
-	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
+	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
 		${WRKSRC}/dict/src/conf.cpp
+	@${REINPLACE_CMD} '/^stardict_LDADD =/s/$$/ -lgmodule-2.0/' \
+		${WRKSRC}/dict/src/Makefile.in
 
 pre-configure:
 	cd ${WRKSRC}/lib && \

Modified: head/textproc/stardict3/pkg-plist
==============================================================================
--- head/textproc/stardict3/pkg-plist	Wed Jul  2 18:18:37 2014	(r360237)
+++ head/textproc/stardict3/pkg-plist	Wed Jul  2 18:20:33 2014	(r360238)
@@ -1,23 +1,13 @@
 bin/stardict
-lib/stardict/plugins/stardict_dictdotcn.la
 lib/stardict/plugins/stardict_dictdotcn.so
-lib/stardict/plugins/stardict_html_parsedata.la
 lib/stardict/plugins/stardict_html_parsedata.so
-lib/stardict/plugins/stardict_man.la
 lib/stardict/plugins/stardict_man.so
-lib/stardict/plugins/stardict_powerword_parsedata.la
 lib/stardict/plugins/stardict_powerword_parsedata.so
-lib/stardict/plugins/stardict_qqwry.la
 lib/stardict/plugins/stardict_qqwry.so
-lib/stardict/plugins/stardict_spell.la
 lib/stardict/plugins/stardict_spell.so
-lib/stardict/plugins/stardict_wiki_parsedata.la
 lib/stardict/plugins/stardict_wiki_parsedata.so
-lib/stardict/plugins/stardict_wordnet.la
 lib/stardict/plugins/stardict_wordnet.so
-lib/stardict/plugins/stardict_wordnet_parsedata.la
 lib/stardict/plugins/stardict_wordnet_parsedata.so
-lib/stardict/plugins/stardict_xdxf_parsedata.la
 lib/stardict/plugins/stardict_xdxf_parsedata.so
 %%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server
 man/man1/stardict.1.gz