Index: head/textproc/stardict3/Makefile =================================================================== --- head/textproc/stardict3/Makefile (revision 424617) +++ head/textproc/stardict3/Makefile (revision 424618) @@ -1,58 +1,53 @@ # Created by: eric # $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@FreeBSD.org +MAINTAINER= makc@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 GNU_CONFIGURE= yes 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 +GNOME_VARS= GCONF_SCHEMAS=stardict.schemas \ + INSTALLS_OMF=yes -.include - -.if ${PORT_OPTIONS:MGNOME} -GCONF_SCHEMAS= stardict.schemas -INSTALLS_OMF= yes -.endif - post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \ ${WRKSRC}/dict/src/conf.cpp @${REINPLACE_CMD} \ -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 .include Index: head/textproc/stardict3/distinfo =================================================================== --- head/textproc/stardict3/distinfo (revision 424617) +++ head/textproc/stardict3/distinfo (revision 424618) @@ -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 Index: head/textproc/stardict3/files/patch-lib__src__libcommon.h =================================================================== --- head/textproc/stardict3/files/patch-lib__src__libcommon.h (revision 424617) +++ head/textproc/stardict3/files/patch-lib__src__libcommon.h (nonexistent) @@ -1,14 +0,0 @@ ---- ./lib/src/libcommon.h.orig 2012-01-13 06:21:34.000000000 +0000 -+++ ./lib/src/libcommon.h 2013-10-02 15:13:21.563936478 +0000 -@@ -188,7 +188,11 @@ - } - - namespace zip { -+#if ZLIB_VERNUM > 0x1250 -+typedef ResourceWrapper gzFile; -+#else - typedef ResourceWrapper gzFile; -+#endif - } - - /* Create a new temporary file. Return file name in file name encoding. Property changes on: head/textproc/stardict3/files/patch-lib__src__libcommon.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/stardict3/files/patch-lib__configure =================================================================== --- head/textproc/stardict3/files/patch-lib__configure (revision 424617) +++ head/textproc/stardict3/files/patch-lib__configure (nonexistent) @@ -1,11 +0,0 @@ ---- ./lib/configure.orig 2011-07-09 10:12:02.000000000 +0000 -+++ ./lib/configure 2011-10-23 14:15:34.560609051 +0000 -@@ -15135,7 +15135,7 @@ - # Checks for typedefs, structures, and compiler characteristics. - - # Checks for library functions. --DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 zlib libxml-2.0 >= 2.5" -+DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 libxml-2.0 >= 2.5" - - - Property changes on: head/textproc/stardict3/files/patch-lib__configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp =================================================================== --- head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp (revision 424617) +++ head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp (revision 424618) @@ -1,13 +1,14 @@ ---- ./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 dictmask; -- std::vector reslist[dictmask.size()]; +- size_t dictmask_size = dictmask.size(); +- std::vector reslist[dictmask_size]; - if (libs.LookupData("letter", reslist, NULL, NULL, NULL, dictmask)) + std::vector< std::vector > reslist(dictmask.size()); + if (libs.LookupData("letter", &reslist[0], NULL, NULL, NULL, dictmask)) return EXIT_SUCCESS; else return EXIT_FAILURE;