diff options
55 files changed, 364 insertions, 121 deletions
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 7962bb13d655..6d4db6cdb879 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.7.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index 6b0d74cd8ce7..c5821a7c6f00 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -3,7 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= databases kde MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/ diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 9b67a36743b2..896f59796ca7 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,7 +3,7 @@ PORTNAME= calibre PORTVERSION= 1.48.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index ea37248634f5..472665b5ce2d 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -3,7 +3,7 @@ PORTNAME= tumbler PORTVERSION= 0.1.30 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index a49feb58ade4..d7483066a965 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index a2c325f9533a..20776e5e85f7 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Full integrated office productivity suite diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index cf6fdd7d1829..3ac74307354f 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 8a323d11dc3e..75d016d3efd6 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index ec9e12226282..0e86a4e557f0 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -3,7 +3,7 @@ PORTNAME= texmaker PORTVERSION= 4.3 -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index c78fbb430184..eac291513859 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -2,6 +2,7 @@ PORTNAME= texstudio PORTVERSION= 2.8.8 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION} diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 49a6a41815a4..c2935765cf22 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -3,7 +3,7 @@ PORTNAME= texworks PORTVERSION= 0.4.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-r${VCS_REVISION} diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile index 1eacdb781f47..242fc3a22b43 100644 --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -3,7 +3,7 @@ PORTNAME= apvlv PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index 2d552e4e324c..048db542771e 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -3,7 +3,7 @@ PORTNAME= atril PORTVERSION= 1.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile index 72c4d3d702b2..b95d3a87112a 100644 --- a/graphics/electrix/Makefile +++ b/graphics/electrix/Makefile @@ -2,7 +2,7 @@ PORTNAME= electrix PORTVERSION= 0.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 96fa9f24dbad..fdceaacff70b 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics print gnome MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \ http://mirror.slitaz.org/sources/packages/e/ diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile index b32f4e250d81..202019ea4bbf 100644 --- a/graphics/evas_generic_loaders-pdf/Makefile +++ b/graphics/evas_generic_loaders-pdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdf PORTVERSION= 1.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PKGNAMEPREFIX:S/-//}/ PKGNAMEPREFIX= evas_generic_loaders- diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 7e679cdf87e7..eb7623a9da3c 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -4,7 +4,7 @@ PORTNAME= evince PORTVERSION= 3.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 1d67d803df46..7c15bd853954 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 1.11.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 2da36ff8ebce..6c453e6f5c8f 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ PORTNAME?= gimp-app PORTVERSION= 2.8.14 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 77a906ddee8a..5ef3296650d1 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.48.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} diff --git a/graphics/inkscape/files/configure.ac b/graphics/inkscape/files/configure.ac new file mode 100644 index 000000000000..c19d64e60866 --- /dev/null +++ b/graphics/inkscape/files/configure.ac @@ -0,0 +1,14 @@ +--- configure.ac.orig 2015-01-29 19:58:01.271153231 +0100 ++++ configure.ac 2015-01-29 19:58:25.237151226 +0100 +@@ -593,6 +593,11 @@ + AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0]) + fi + ++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no) ++if test "x$popplernewernewcolorspaceapi" = "xyes"; then ++ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0]) ++fi ++ + # Poppler's b604a008 commit changes this + AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor]) + popplergfxcolor="no" diff --git a/graphics/inkscape/files/patch-config.h.in b/graphics/inkscape/files/patch-config.h.in new file mode 100644 index 000000000000..436063801eec --- /dev/null +++ b/graphics/inkscape/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig 2015-01-29 20:28:40.068026139 +0100 ++++ config.h.in 2015-01-29 20:31:07.000000000 +0100 +@@ -246,6 +246,9 @@ + /* Use even newer color space API from Poppler >= 0.26.0 */ + #undef POPPLER_EVEN_NEWER_COLOR_SPACE_API + ++/* Use even newer new color space API from Poppler >= 0.29.0 */ ++#undef POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++ + /* Use color space API from Poppler >= 0.12.2 */ + #undef POPPLER_NEW_COLOR_SPACE_API + diff --git a/graphics/inkscape/files/patch-configure b/graphics/inkscape/files/patch-configure index a775a80a07f9..7de3fd19b0cd 100644 --- a/graphics/inkscape/files/patch-configure +++ b/graphics/inkscape/files/patch-configure @@ -1,6 +1,37 @@ ---- configure.orig 2014-10-20 01:29:05.836430783 +0200 -+++ configure 2014-10-20 01:29:05.872430406 +0200 -@@ -9046,10 +9046,11 @@ +--- configure.orig 2015-01-29 19:57:54.424153129 +0100 ++++ configure 2015-01-29 20:00:37.112141976 +0100 +@@ -657,6 +657,8 @@ + LIBWPG01_CFLAGS + INKBOARD_CFLAGS + INKBOARD_LIBS ++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS ++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS + POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS + POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS + POPPLER_NEWERRORAPI_LIBS +@@ -914,6 +916,8 @@ + POPPLER_NEWERRORAPI_LIBS + POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS + POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS ++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS ++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS + LIBWPG01_CFLAGS + LIBWPG01_LIBS + LIBWPG02_CFLAGS +@@ -1630,6 +1634,12 @@ + POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS + linker flags for POPPLER_EVEN_NEWER_COLOR_SPACE_API, overriding + pkg-config ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS ++ C compiler flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, ++ overriding pkg-config ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS ++ linker flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, ++ overriding pkg-config + LIBWPG01_CFLAGS + C compiler flags for LIBWPG01, overriding pkg-config + LIBWPG01_LIBS +@@ -9047,10 +9057,11 @@ #include <stdio.h> extern unsigned GC_version; int main(void){ @@ -16,3 +47,87 @@ } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : +@@ -10561,6 +10572,83 @@ + + fi + ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API" >&5 ++$as_echo_n "checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API... " >&6; } ++ ++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"; then ++ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.29.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"; then ++ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=`$PKG_CONFIG --libs "poppler >= 0.29.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1` ++ else ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS" >&5 ++ ++ popplernewernewcolorspaceapi=no ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ popplernewernewcolorspaceapi=no ++else ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS ++ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ popplernewernewcolorspaceapi=yes ++fi ++if test "x$popplernewernewcolorspaceapi" = "xyes"; then ++ ++$as_echo "#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1" >>confdefs.h ++ ++fi ++ + # Poppler's b604a008 commit changes this + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Poppler's GfxPatch no longer uses GfxColor" >&5 + $as_echo_n "checking whether Poppler's GfxPatch no longer uses GfxColor... " >&6; } diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp new file mode 100644 index 000000000000..ab74fc0e68e2 --- /dev/null +++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp @@ -0,0 +1,83 @@ +=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' +--- src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000 ++++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000 +@@ -860,7 +860,9 @@ + blendingColorSpace = NULL; + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); +@@ -1085,7 +1087,13 @@ + + state->setFillPattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ if (obj.isNull()) { ++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); ++ } else { ++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); ++ } ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); + } else { +@@ -1126,7 +1134,13 @@ + + state->setStrokePattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ if (obj.isNull()) { ++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); ++ } else { ++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); ++ } ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); + } else { +@@ -2756,8 +2770,10 @@ + } + } + if (!obj1.isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) +- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + colorSpace = GfxColorSpace::parse(&obj1, NULL); + #else +@@ -2847,8 +2863,10 @@ + obj2.free(); + } + } +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) +- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + #else +@@ -3040,7 +3058,9 @@ + if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); + + diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index b29b5a5866a6..ae5dab82f6b6 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -2,7 +2,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile index 6d724ff97d73..11da71761a0a 100644 --- a/graphics/pdf2svg/Makefile +++ b/graphics/pdf2svg/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdf2svg PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.cityinthesky.co.uk/_media/opensource/ diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index ae14edb412ce..0fb0d7fab07b 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -glib MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist index a85e279b1ee5..741bf735899e 100644 --- a/graphics/poppler-qt4/pkg-plist +++ b/graphics/poppler-qt4/pkg-plist @@ -8,5 +8,5 @@ include/poppler/qt4/poppler-page-transition.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.so lib/libpoppler-qt4.so.4 -lib/libpoppler-qt4.so.4.4.0 +lib/libpoppler-qt4.so.4.5.0 libdata/pkgconfig/poppler-qt4.pc diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist index 3ce5f8fa9c09..381e9ce847c0 100644 --- a/graphics/poppler-qt5/pkg-plist +++ b/graphics/poppler-qt5/pkg-plist @@ -8,5 +8,5 @@ include/poppler/qt5/poppler-page-transition.h include/poppler/qt5/poppler-qt5.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.1.0 +lib/libpoppler-qt5.so.1.2.0 libdata/pkgconfig/poppler-qt5.pc diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 4d73d68f44f7..5547864f97e1 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,8 +3,8 @@ # $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $ PORTNAME= poppler -PORTVERSION= 0.26.3 -PORTREVISION?= 1 +PORTVERSION= 0.30.0 +PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -115,8 +115,10 @@ CONFIGURE_ARGS+=--disable-libcurl PLIST_SUB+= CURL="@comment " .endif +# stick with openjpeg1 for now due to regression in openjpeg2 (configure) +# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35 .if ${PORT_OPTIONS:MOPENJPEG} -CONFIGURE_ARGS+=--enable-libopenjpeg +CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1 LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 .else CONFIGURE_ARGS+=--disable-libopenjpeg diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index e9365bd4c3bd..990a61852768 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1 -SIZE (poppler-0.26.3.tar.xz) = 1593760 +SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5 +SIZE (poppler-0.30.0.tar.xz) = 1605292 diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 3cebc9ce24fd..a661d044c989 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,19 +1,28 @@ ---- glib/Makefile.in.orig 2011-10-03 23:55:25.000000000 +0200 -+++ glib/Makefile.in 2011-10-03 23:56:20.000000000 +0200 -@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" +--- glib/Makefile.in.orig 2015-01-19 11:51:06.175898921 +0100 ++++ glib/Makefile.in 2015-01-19 11:51:27.026898915 +0100 +@@ -134,7 +134,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \ - poppler-private.h + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am__objects_1 = libpoppler_glib_la-poppler-enums.lo +@@ -553,7 +552,7 @@ + $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ + $(FREETYPE_LIBS) +@@ -576,7 +575,7 @@ + @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS) + @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0 + @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) +-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la ++@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la + @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files) + @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h + @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index 02dfbc852675..5e0465e25ea7 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,101 +1,105 @@ ---- utils/Makefile.in.orig 2014-11-25 11:49:19 UTC +--- utils/Makefile.in.orig 2014-11-04 18:46:22 UTC +++ utils/Makefile.in -@@ -111,7 +111,7 @@ - am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1) +@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS) + am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) pdfdetach_LDADD = $(LDADD) --pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfdetach_DEPENDENCIES = - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent -@@ -119,31 +119,31 @@ - am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1) +-pdfdetach_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdfdetach_DEPENDENCIES = libparseargs.la + am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) --pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdffonts_DEPENDENCIES = +-pdffonts_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdffonts_DEPENDENCIES = libparseargs.la am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) $(am__objects_1) + JSInfo.$(OBJEXT) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfimages_DEPENDENCIES = +-pdfimages_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdfimages_DEPENDENCIES = libparseargs.la am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) $(am__objects_1) + JSInfo.$(OBJEXT) pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) pdfinfo_LDADD = $(LDADD) --pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfinfo_DEPENDENCIES = - am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1) +-pdfinfo_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdfinfo_DEPENDENCIES = libparseargs.la + am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) pdfseparate_LDADD = $(LDADD) --pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfseparate_DEPENDENCIES = - am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h - @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1) +-pdfseparate_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdfseparate_DEPENDENCIES = libparseargs.la + am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ + pdftocairo-pdftocairo-win32.$(OBJEXT) pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la -+am__DEPENDENCIES_1 = +-am__DEPENDENCIES_1 = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++am__DEPENDENCIES_1 = libparseargs.la am__DEPENDENCIES_2 = @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) --@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ -+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_4) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) -@@ -153,7 +153,7 @@ - pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2) +-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ ++pdftocairo_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_2) + am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ +@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht + pdftohtml-HtmlOutputDev.$(OBJEXT) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) --pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftohtml_DEPENDENCIES = +-pdftohtml_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdftohtml_DEPENDENCIES = libparseargs.la pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -162,20 +162,20 @@ - @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) + am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) pdftoppm_LDADD = $(LDADD) --pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftoppm_DEPENDENCIES = - am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1) +-pdftoppm_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdftoppm_DEPENDENCIES = libparseargs.la + am_pdftops_OBJECTS = pdftops.$(OBJEXT) pdftops_OBJECTS = $(am_pdftops_OBJECTS) pdftops_LDADD = $(LDADD) --pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftops_DEPENDENCIES = - am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \ - $(am__objects_1) +-pdftops_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdftops_DEPENDENCIES = libparseargs.la + am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) pdftotext_LDADD = $(LDADD) --pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftotext_DEPENDENCIES = - am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1) +-pdftotext_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdftotext_DEPENDENCIES = libparseargs.la + am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) pdfunite_LDADD = $(LDADD) --pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfunite_DEPENDENCIES = +-pdfunite_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++pdfunite_DEPENDENCIES = libparseargs.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false -@@ -516,7 +516,7 @@ - $(PDFTOCAIRO_CFLAGS) +@@ -527,7 +516,7 @@ AM_CPPFLAGS = \ LDADD = \ + libparseargs.la \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ $(UTILS_LIBS) - @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \ -@@ -524,7 +524,7 @@ - @BUILD_CAIRO_OUTPUT_TRUE@ $(common) + @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ +@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \ + pdftocairo-win32.h - @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \ --@BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ -+@BUILD_CAIRO_OUTPUT_TRUE@ -lpoppler-glib \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(PDFTOCAIRO_LIBS) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(PTHREAD_LIBS) + pdftocairo_LDADD = \ +- $(top_builddir)/poppler/libpoppler-cairo.la \ ++ -lpoppler-glib \ + $(LDADD) \ + $(PDFTOCAIRO_LIBS) \ + $(PTHREAD_LIBS) diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 2bcf0c196b7b..a9b5edf5db5c 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -134,10 +134,10 @@ include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 -lib/libpoppler-cpp.so.0.2.0 +lib/libpoppler-cpp.so.0.2.1 lib/libpoppler.so -lib/libpoppler.so.46 -lib/libpoppler.so.46.0.0 +lib/libpoppler.so.49 +lib/libpoppler.so.49.0.0 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile index b72cf59909ca..fd6efb40aa67 100644 --- a/graphics/py-poppler-qt4/Makefile +++ b/graphics/py-poppler-qt4/Makefile @@ -2,7 +2,7 @@ PORTNAME= poppler-qt4 PORTVERSION= 0.18.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 5b816ba603de..37205e684e3c 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= poppler PORTVERSION= 0.12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \ http://launchpadlibrarian.net/30270080/ \ diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index 60da15d25e4d..01242f3e1883 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -3,7 +3,7 @@ PORTNAME= qcomicbook PORTVERSION= 0.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://qcomicbook.org/releases/ diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index f5cdd9eb2ca5..d2e7c42c06fa 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -3,7 +3,7 @@ PORTNAME= xournal PORTVERSION= 0.4.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile index ae0838250e6e..ae373995af21 100644 --- a/graphics/zathura-pdf-poppler/Makefile +++ b/graphics/zathura-pdf-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= zathura-pdf-poppler PORTVERSION= 0.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile index 43ef94718f91..dfba90ca7a71 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pdf_viewer -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= PDF and PostScript viewer plugin for Claws Mail diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index b227583b9392..b1904e386d23 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico PORTVERSION= 2.3.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 7694f5455879..7e94b6a0ab94 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -2,6 +2,7 @@ PORTNAME= cups-filters PORTVERSION= 1.0.62 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile index 944039ac4466..04efbe4b683d 100644 --- a/print/deforaos-pdfviewer/Makefile +++ b/print/deforaos-pdfviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfviewer PORTVERSION= 0.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= http://www.defora.org/os/download/download/3686/ PKGNAMEPREFIX= deforaos- diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index bd8a5d967a1d..23b93250c691 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfcube PORTVERSION= 0.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= http://code.100allora.it/releases/pdfcube/ diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index d8868486bb41..152109685cb0 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpdfview PORTVERSION= 0.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/140746246/ diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index f7daf259be09..f7fa56f0984d 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -2,7 +2,7 @@ PORTNAME= luatex PORTVERSION= 0.79.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMEPREFIX= tex- diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile index a98059ec9129..489983d84cfa 100644 --- a/print/tex-xetex/Makefile +++ b/print/tex-xetex/Makefile @@ -2,7 +2,7 @@ PORTNAME= xetex PORTVERSION= 0.99991 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMEPREFIX= tex- diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 0a1efdcb84db..f76b71c9571e 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20140525 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMESUFFIX= -base diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata/Makefile index 8b284f7e402b..92badf118aa8 100644 --- a/sysutils/kfilemetadata/Makefile +++ b/sysutils/kfilemetadata/Makefile @@ -2,7 +2,7 @@ PORTNAME= kfilemetadata PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile index 2a4da6fdadaf..6466c3b7b56e 100644 --- a/sysutils/nepomuk-core/Makefile +++ b/sysutils/nepomuk-core/Makefile @@ -3,7 +3,7 @@ PORTNAME= nepomuk-core PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile index f22db9bcf6a1..d1880ad4c45d 100644 --- a/sysutils/tracker/Makefile +++ b/sysutils/tracker/Makefile @@ -4,7 +4,7 @@ PORTNAME= tracker PORTVERSION= 1.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 614b07c623f8..d15ad76c28fe 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfgrep PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile index f0debf4fb57a..e2fd35b947cc 100644 --- a/x11-fm/gnome-commander2/Makefile +++ b/x11-fm/gnome-commander2/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnome-commander PORTVERSION= 1.4.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME/sources/gnome-commander/1.4 diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile index 715d052ba6f4..99d5dea7e1ea 100644 --- a/x11-toolkits/rubygem-poppler/Makefile +++ b/x11-toolkits/rubygem-poppler/Makefile @@ -2,7 +2,7 @@ PORTNAME= poppler PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index c55aaf9181ac..39a93f5d240b 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -3,6 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.87.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} |