svn commit: r424618 - in head/textproc/stardict3: . files

[Max Brazhnikov]

Author: makc
Date: Tue Oct 25 12:27:41 2016
New Revision: 424618
URL: https://svnweb.freebsd.org/changeset/ports/424618

Log:
  textproc/stardict3:
  - Update to 3.0.6
  - Take maintainership

Deleted:
  head/textproc/stardict3/files/patch-lib__configure
  head/textproc/stardict3/files/patch-lib__src__libcommon.h
Modified:
  head/textproc/stardict3/Makefile
  head/textproc/stardict3/distinfo
  head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp

Modified: head/textproc/stardict3/Makefile
==============================================================================
--- head/textproc/stardict3/Makefile	Tue Oct 25 12:15:20 2016	(r424617)
+++ head/textproc/stardict3/Makefile	Tue Oct 25 12:27:41 2016	(r424618)
@@ -2,17 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	stardict
-PORTVERSION=	3.0.4
-PORTREVISION=	2
+PORTVERSION=	3.0.6
 CATEGORIES=	textproc
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	SF/stardict-4/${PORTVERSION}
 DIST_SUBDIR=	stardict
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Dictionary lookup program written in Gtk2
 
-BROKEN=		Unfetchable (google code has gone away)
-
 LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
 		libenchant.so:textproc/enchant
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
@@ -22,27 +19,22 @@ CONFIGURE_ARGS=	--disable-festival \
 		--disable-gucharmap \
 		--disable-espeak \
 		--disable-tools \
-		--disable-updateinfo
+		--disable-updateinfo \
+		--disable-advertisement
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	intltool
 
-PROJECTHOST=	stardict-3
-
 OPTIONS_DEFINE=	GNOME
 OPTIONS_SUB=	yes
 
 GNOME_USE=	GNOME=gnomeprefix,gnomedocutils,libgnomeui
 GNOME_USE_OFF=	GNOME=gtk20
 GNOME_CONFIGURE_ENABLE=	gnome-support schemas-install scrollkeeper
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNOME}
-GCONF_SCHEMAS=	stardict.schemas
-INSTALLS_OMF=	yes
-.endif
+GNOME_VARS=	GCONF_SCHEMAS=stardict.schemas \
+		INSTALLS_OMF=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
@@ -51,6 +43,9 @@ post-patch:
 		-e '/as_fn_error.*gnome-doc-utils/d' \
 		-e '/DEP_MODULES=/s/"$$/ gmodule-2.0"/' \
 		${WRKSRC}/dict/configure
+	@${REINPLACE_CMD} \
+		-e '/^DEP_MODULES=/s/zlib//' \
+		${WRKSRC}/lib/configure
 
 post-patch-GNOME-off:
 	${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in

Modified: head/textproc/stardict3/distinfo
==============================================================================
--- head/textproc/stardict3/distinfo	Tue Oct 25 12:15:20 2016	(r424617)
+++ head/textproc/stardict3/distinfo	Tue Oct 25 12:27:41 2016	(r424618)
@@ -1,2 +1,3 @@
-SHA256 (stardict/stardict-3.0.4.tar.bz2) = c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8
-SIZE (stardict/stardict-3.0.4.tar.bz2) = 8961622
+TIMESTAMP = 1477395134
+SHA256 (stardict/stardict-3.0.6.tar.bz2) = 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7
+SIZE (stardict/stardict-3.0.6.tar.bz2) = 9341740

Modified: head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp
==============================================================================
--- head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp	Tue Oct 25 12:15:20 2016	(r424617)
+++ head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp	Tue Oct 25 12:27:41 2016	(r424618)
@@ -1,10 +1,11 @@
---- ./dict/tests/t_lookupdata.cpp.orig	2012-12-11 08:15:24.000000000 +0000
-+++ ./dict/tests/t_lookupdata.cpp	2012-12-11 08:29:56.172016591 +0000
-@@ -38,8 +38,8 @@
+--- dict/tests/t_lookupdata.cpp.orig	2013-11-18 08:10:23 UTC
++++ dict/tests/t_lookupdata.cpp
+@@ -38,9 +38,8 @@ int main(int argc, char *argv[])
  	List dict_list;
  	libs.load(dict_list);
  	std::vector<InstantDictIndex> dictmask;
--	std::vector<gchar *> reslist[dictmask.size()];
+-	size_t dictmask_size = dictmask.size();
+-	std::vector<gchar *> reslist[dictmask_size];
 -	if (libs.LookupData("letter", reslist, NULL, NULL, NULL, dictmask)) 
 +	std::vector< std::vector<gchar *> > reslist(dictmask.size());
 +	if (libs.LookupData("letter", &reslist[0], NULL, NULL, NULL, dictmask))