diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
| commit | e18151212d3326dbf04797c6d5300fb1211ee875 (patch) | |
| tree | 1ca56d6a4227efdb653cc8e2b2cbedbbc8de3d88 /graphics | |
| parent | cc0f3248a2eb77d7e3df88333fd25eb8594223dc (diff) | |
| download | ports-e18151212d3326dbf04797c6d5300fb1211ee875.tar.gz ports-e18151212d3326dbf04797c6d5300fb1211ee875.zip | |
Notes
Diffstat (limited to 'graphics')
31 files changed, 356 insertions, 213 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index e7c86885f9e4..5c6c9822b909 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,27 +3,28 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/cairo/Makefile,v 1.30 2005/10/04 04:35:57 ahze Exp $ # PORTNAME= cairo -PORTVERSION= 0.4.0 +PORTVERSION= 1.0.2 CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/snapshots/ +MASTER_SITES= http://cairographics.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support -LIB_DEPENDS= pixman.1:${PORTSDIR}/graphics/libpixman \ - freetype.9:${PORTSDIR}/print/freetype2 \ +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -USE_GNOME= gnometarget gnomehack -USE_LIBTOOL_VER=15 +CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ + --enable-pdf \ + --enable-ps +USE_GNOME= gnometarget gnomehack ltverhack +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} - CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ LDFLAGS="${PTHREAD_LIBS}" @@ -31,10 +32,12 @@ OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off .include <bsd.port.pre.mk> -.if defined(WITH_GLITZ) || exists(${LOCALBASE}/lib/libglitz.a) +.if defined(WITH_GLITZ) LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz +CONFIGURE_ARGS+= --enable-glitz PLIST_SUB+= GLITZ="" .else +CONFIGURE_ARGS+= --disable-glitz PLIST_SUB+= GLITZ="@comment " .endif @@ -49,7 +52,10 @@ PLIST_SUB+= X11="" post-patch: .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ - ${WRKSRC}/src/*.* + ${WRKSRC}/src/*.* \ + ${WRKSRC}/pixman/src/*.* .endif + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ + ${WRKSRC}/test/Makefile.in .include <bsd.port.post.mk> diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 3243e4b2e893..bd6f30e26f2e 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,2 +1,2 @@ -MD5 (cairo-0.4.0.tar.gz) = 2c76c6f6717cb5fc7398eb2e0f9cb025 -SIZE (cairo-0.4.0.tar.gz) = 781463 +MD5 (cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984 +SIZE (cairo-1.0.2.tar.gz) = 1458903 diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c new file mode 100644 index 000000000000..8cd60665fef0 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-ft-font.c @@ -0,0 +1,28 @@ +--- src/cairo-ft-font.c.orig Tue Aug 16 14:46:46 2005 ++++ src/cairo-ft-font.c Tue Aug 16 14:46:59 2005 +@@ -44,6 +44,11 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <time.h> ++#include <unistd.h> ++ + #include <ft2build.h> + #include FT_FREETYPE_H + #include FT_OUTLINE_H +@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_ + key->id = id; + + /* 1607 is just an arbitrary prime. */ +- hash = _cairo_hash_string (filename); ++ if (filename != NULL) { ++ hash = _cairo_hash_string (filename); ++ } else { ++ srandom(time(NULL) * getpid()); ++ hash = random(); ++ } + hash += ((unsigned long) id) * 1607; + + key->base.hash_entry.hash = hash; diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index aec401c94fa9..437d0b55b4b7 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -2,32 +2,55 @@ include/cairo/cairo-features.h include/cairo/cairo-ft.h %%GLITZ%%include/cairo/cairo-glitz.h include/cairo/cairo-pdf.h -include/cairo/cairo-png.h include/cairo/cairo-ps.h +%%X11%%include/cairo/cairo-xlib-xrender.h %%X11%%include/cairo/cairo-xlib.h include/cairo/cairo.h lib/libcairo.a lib/libcairo.so -lib/libcairo.so.1 +lib/libcairo.so.2 libdata/pkgconfig/cairo.pc -%%DOCSDIR%%/cairo/cairo-ATSUI-Fonts.html +%%DOCSDIR%%/cairo/Drawing.html +%%DOCSDIR%%/cairo/Fonts.html +%%DOCSDIR%%/cairo/Support.html +%%DOCSDIR%%/cairo/Surfaces.html +%%DOCSDIR%%/cairo/bindings-errors.html +%%DOCSDIR%%/cairo/bindings-fonts.html +%%DOCSDIR%%/cairo/bindings-memory.html +%%DOCSDIR%%/cairo/bindings-overloading.html +%%DOCSDIR%%/cairo/bindings-path.html +%%DOCSDIR%%/cairo/bindings-patterns.html +%%DOCSDIR%%/cairo/bindings-return-values.html +%%DOCSDIR%%/cairo/bindings-streams.html +%%DOCSDIR%%/cairo/bindings-surfaces.html +%%DOCSDIR%%/cairo/cairo-Error-handling.html +%%DOCSDIR%%/cairo/cairo-Font-Options.html %%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html -%%DOCSDIR%%/cairo/cairo-Glitz-backend.html -%%DOCSDIR%%/cairo/cairo-Microsoft-Windows-Backend.html -%%DOCSDIR%%/cairo/cairo-PDF-Backend.html -%%DOCSDIR%%/cairo/cairo-PNG-Backend.html -%%DOCSDIR%%/cairo/cairo-PS-Backend.html -%%DOCSDIR%%/cairo/cairo-Quartz-Backend.html -%%DOCSDIR%%/cairo/cairo-XCB-Backend.html -%%DOCSDIR%%/cairo/cairo-XLib-Backend.html +%%DOCSDIR%%/cairo/cairo-Glitz-Surfaces.html +%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html +%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html +%%DOCSDIR%%/cairo/cairo-PNG-Support.html +%%DOCSDIR%%/cairo/cairo-Paths.html +%%DOCSDIR%%/cairo/cairo-Patterns.html +%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html +%%DOCSDIR%%/cairo/cairo-Scaled-Fonts.html +%%DOCSDIR%%/cairo/cairo-Text.html +%%DOCSDIR%%/cairo/cairo-Transformations.html +%%DOCSDIR%%/cairo/cairo-Types.html +%%DOCSDIR%%/cairo/cairo-Version-Information.html +%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html +%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html +%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html +%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html %%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html -%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html %%DOCSDIR%%/cairo/cairo-cairo-surface-t.html %%DOCSDIR%%/cairo/cairo-cairo-t.html %%DOCSDIR%%/cairo/cairo.devhelp %%DOCSDIR%%/cairo/home.png %%DOCSDIR%%/cairo/index.html %%DOCSDIR%%/cairo/index.sgml +%%DOCSDIR%%/cairo/ix01.html +%%DOCSDIR%%/cairo/language-bindings.html %%DOCSDIR%%/cairo/left.png %%DOCSDIR%%/cairo/pt01.html %%DOCSDIR%%/cairo/pt02.html diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index f1ff2b2702f5..75a3ba5ecf3e 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/eog/Makefile,v 1.9 2005/10/04 03:00:35 ahze Exp $ # PORTNAME= eog -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ librsvg2 desktopfileutils libgnomeui USE_X_PREFIX= yes INSTALLS_OMF= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -30,6 +31,10 @@ GCONF_SCHEMAS= eog.schemas .include <bsd.port.pre.mk> +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +WITH_EXIF= yes +.endif + .if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.12) LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif .endif diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index b370fc72f13f..53ebdf94e042 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.10.2.tar.bz2) = 09884ebaf4d520195093b2a516252579 -SIZE (gnome2/eog-2.10.2.tar.bz2) = 870480 +MD5 (gnome2/eog-2.12.1.tar.bz2) = d5dc20850777bb85ec90ff92817106dd +SIZE (gnome2/eog-2.12.1.tar.bz2) = 799227 diff --git a/graphics/eog/files/patch-libeog_eog-image-list.c b/graphics/eog/files/patch-libeog_eog-image-list.c new file mode 100644 index 000000000000..609cd0469a4e --- /dev/null +++ b/graphics/eog/files/patch-libeog_eog-image-list.c @@ -0,0 +1,17 @@ +--- libeog/eog-image-list.c.orig Thu Aug 25 14:57:02 2005 ++++ libeog/eog-image-list.c Thu Aug 25 14:57:46 2005 +@@ -450,12 +450,13 @@ + case GNOME_VFS_MONITOR_EVENT_CREATED: + + if (list && list->priv) { ++ gchar *str; + node = list->priv->store; + + while (node != NULL && !found) { + + uri = eog_image_get_uri(node->data); +- gchar *str = gnome_vfs_uri_to_string ++ str = gnome_vfs_uri_to_string + (uri, GNOME_VFS_URI_HIDE_NONE); + found = (strcmp (str, info_uri)==0)?TRUE:FALSE; + g_free (str); diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index b1d8e407371a..9ab737a65952 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -30,6 +30,10 @@ share/gnome/help/eog/ko/legal.xml share/gnome/help/eog/sv/eog.xml share/gnome/help/eog/sv/figures/eog_start_window.png share/gnome/help/eog/sv/legal.xml +share/gnome/help/eog/uk/eog.xml +share/gnome/help/eog/uk/figures/eog_save_as_window.png +share/gnome/help/eog/uk/figures/eog_start_window.png +share/gnome/help/eog/uk/legal.xml share/gnome/help/eog/zh_CN/eog.xml share/gnome/help/eog/zh_CN/figures/eog_start_window.png share/gnome/help/eog/zh_CN/legal.xml @@ -45,6 +49,7 @@ share/gnome/omf/eog/eog-it.omf share/gnome/omf/eog/eog-ja.omf share/gnome/omf/eog/eog-ko.omf share/gnome/omf/eog/eog-sv.omf +share/gnome/omf/eog/eog-uk.omf share/gnome/omf/eog/eog-zh_CN.omf share/gnome/omf/eog/eog-zh_TW.omf share/gnome/pixmaps/eog/down-right.png @@ -93,6 +98,7 @@ share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo +share/locale/ku/LC_MESSAGES/eog.mo share/locale/lt/LC_MESSAGES/eog.mo share/locale/lv/LC_MESSAGES/eog.mo share/locale/mk/LC_MESSAGES/eog.mo @@ -123,6 +129,7 @@ share/locale/ta/LC_MESSAGES/eog.mo share/locale/th/LC_MESSAGES/eog.mo share/locale/tk/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo +share/locale/ug/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo @@ -134,16 +141,22 @@ share/locale/zu/LC_MESSAGES/eog.mo @unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures @dirrm share/gnome/help/eog/zh_TW @dirrm share/gnome/help/eog/zh_CN/figures @dirrm share/gnome/help/eog/zh_CN +@dirrm share/gnome/help/eog/uk/figures +@dirrm share/gnome/help/eog/uk @dirrm share/gnome/help/eog/sv/figures @dirrm share/gnome/help/eog/sv @dirrm share/gnome/help/eog/ko/figures diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 42d8fb1e39c1..190410c12660 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,13 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/evince/Makefile,v 1.35 2005/10/20 01:37:54 ahze Exp $ # PORTNAME= evince -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer @@ -17,38 +19,78 @@ COMMENT= GNOME 2 multi-format document viewer LIB_DEPENDS= poppler.0:${PORTSDIR}/graphics/poppler USE_BZIP2= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +USE_REINPLACE= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GHOSTSCRIPT=yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libgnomeprintui \ - desktopfileutils + desktopfileutils gnomedocutils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas +OPTIONS= DVI "Enable DVI viewer support" off \ + T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \ + NAUTILUS "Enable Nautilus plugin" on \ + DBUS "Enable D-BUS support" off \ + DJVU "Enable DJVU support" off + +.include <bsd.port.pre.mk> + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) \ + || exists(${LOCALBASE}/lib/libdbus-glib-1.so) +WITH_DBUS= yes +.endif + +.if defined(WITH_DVI) || defined(WITH_T1LIB) +BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base +RUN_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base + +CONFIGURE_ARGS+= --enable-dvi +GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas +. if defined(WITH_T1LIB) +LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib + +CONFIGURE_ARGS+= --enable-t1lib +. endif +.endif + +.if !defined(WITHOUT_NAUTILUS) +USE_GNOME+= nautilus2 +CONFIGURE_ARGS+= --enable-nautilus +PLIST_SUB+= NAUTILUS="" +.else +CONFIGURE_ARGS+= --disable-nautilus +PLIST_SUB+= NAUTILUS="@comment " +.endif + +.if exists(${X11BASE}/bin/djview) +DJVU_DIR?= # empty +.else +DJVU_DIR?= -nox11 +.endif + .if defined(WITH_DJVU) -LIB_DEPENDS+= djvulibre.14:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS+= djvulibre.15:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .else CONFIGURE_ARGS+= --disable-djvu .endif -pre-everything:: -.if !defined(WITH_DJVU) - @${ECHO_MSG} - @${ECHO_MSG} "If you want DjVu support included, hit Ctrl-C now and use" - @${ECHO_MSG} "\"make WITH_DJVU=yes\"" - @${ECHO_MSG} "NOTE: GNOME/Gtk+ users may want to avoid QT dependency required" - @${ECHO_MSG} "by defaut djvulibre installation. They need to use - @${ECHO_MSG} "\"make WITHOUT_X11=yes\" when build that library then." - @${ECHO_MSG} +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus .endif +post-patch: + @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/dvi/mdvi-lib/Makefile.in + post-install: @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 1ee219b32558..381e7baf0a1b 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,2 +1,2 @@ -MD5 (evince-0.3.0.tar.bz2) = 33e760db0295b393864b969f3b62a52a -SIZE (evince-0.3.0.tar.bz2) = 640308 +MD5 (evince-0.4.0.tar.bz2) = cc41e30108bc54a345bd6ca2556ab857 +SIZE (evince-0.4.0.tar.bz2) = 891605 diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c new file mode 100644 index 000000000000..05a0c788287d --- /dev/null +++ b/graphics/evince/files/patch-shell_main.c @@ -0,0 +1,20 @@ +--- shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400 ++++ shell/main.c 2005-09-01 04:15:33.000000000 -0400 +@@ -152,7 +152,7 @@ + if (!files) { + #if DBUS_VERSION <= 33 + call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { +@@ -193,7 +193,7 @@ + call = dbus_g_proxy_begin_call (remote_object, "OpenURI", + DBUS_TYPE_STRING, &uri, + DBUS_TYPE_STRING, &page_label, +- DBUS_TYPE_UINT32, timestamp, ++ DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 97ba11412ea8..19fe298a8fd8 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -1,14 +1,30 @@ bin/evince bin/evince-thumbnailer +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so +%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so.0 share/gnome/applications/evince.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true share/gnome/evince/evince-password.glade +share/gnome/evince/evince-properties.glade +share/gnome/evince/evince-toolbar.xml share/gnome/evince/evince-ui.xml -share/gnome/evince/pdf-icon.png +share/gnome/evince/hand-open.png share/gnome/help/evince/C/evince.xml share/gnome/help/evince/C/figures/evince_start_window.png share/gnome/help/evince/C/legal.xml +share/gnome/help/evince/el/evince.xml +share/gnome/help/evince/el/figures/evince_start_window.png +share/gnome/help/evince/es/evince.xml +share/gnome/help/evince/es/figures/evince_start_window.png +share/gnome/help/evince/sr/evince.xml +share/gnome/help/evince/sr/figures/evince_start_window.png +share/gnome/help/evince/uk/evince.xml +share/gnome/help/evince/uk/figures/evince_start_window.png share/gnome/omf/evince/evince-C.omf +share/gnome/omf/evince/evince-el.omf +share/gnome/omf/evince/evince-es.omf +share/gnome/omf/evince/evince-sr.omf +share/gnome/omf/evince/evince-uk.omf share/locale/bg/LC_MESSAGES/evince.mo share/locale/ca/LC_MESSAGES/evince.mo share/locale/cs/LC_MESSAGES/evince.mo @@ -17,26 +33,53 @@ share/locale/de/LC_MESSAGES/evince.mo share/locale/el/LC_MESSAGES/evince.mo share/locale/en_CA/LC_MESSAGES/evince.mo share/locale/en_GB/LC_MESSAGES/evince.mo +share/locale/es/LC_MESSAGES/evince.mo +share/locale/et/LC_MESSAGES/evince.mo +share/locale/eu/LC_MESSAGES/evince.mo share/locale/fi/LC_MESSAGES/evince.mo share/locale/fr/LC_MESSAGES/evince.mo +share/locale/gl/LC_MESSAGES/evince.mo +share/locale/gu/LC_MESSAGES/evince.mo +share/locale/he/LC_MESSAGES/evince.mo +share/locale/hi/LC_MESSAGES/evince.mo +share/locale/hu/LC_MESSAGES/evince.mo share/locale/ja/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo share/locale/lt/LC_MESSAGES/evince.mo share/locale/nb/LC_MESSAGES/evince.mo +share/locale/ne/LC_MESSAGES/evince.mo share/locale/nl/LC_MESSAGES/evince.mo share/locale/no/LC_MESSAGES/evince.mo +share/locale/pa/LC_MESSAGES/evince.mo +share/locale/pl/LC_MESSAGES/evince.mo share/locale/pt_BR/LC_MESSAGES/evince.mo share/locale/ru/LC_MESSAGES/evince.mo share/locale/rw/LC_MESSAGES/evince.mo +share/locale/sk/LC_MESSAGES/evince.mo +share/locale/sq/LC_MESSAGES/evince.mo +share/locale/sr/LC_MESSAGES/evince.mo +share/locale/sr@Latn/LC_MESSAGES/evince.mo share/locale/sv/LC_MESSAGES/evince.mo +share/locale/th/LC_MESSAGES/evince.mo +share/locale/tr/LC_MESSAGES/evince.mo +share/locale/uk/LC_MESSAGES/evince.mo share/locale/wa/LC_MESSAGES/evince.mo share/locale/zh_CN/LC_MESSAGES/evince.mo share/locale/zh_TW/LC_MESSAGES/evince.mo @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true @dirrm share/gnome/omf/evince +@dirrm share/gnome/help/evince/uk/figures +@dirrm share/gnome/help/evince/uk +@dirrm share/gnome/help/evince/sr/figures +@dirrm share/gnome/help/evince/sr +@dirrm share/gnome/help/evince/es/figures +@dirrm share/gnome/help/evince/es +@dirrm share/gnome/help/evince/el/figures +@dirrm share/gnome/help/evince/el @dirrm share/gnome/help/evince/C/figures @dirrm share/gnome/help/evince/C @dirrm share/gnome/help/evince @dirrm share/gnome/evince +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index e7cd752d493c..48dadc5e3621 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@ahze.net> # # $FreeBSD$ +# $MCom: ports/graphics/glitz/Makefile,v 1.4 2005/08/09 22:54:54 ahze Exp $ # PORTNAME= glitz -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.4 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -16,7 +17,7 @@ COMMENT= OpenGL image compositing library USE_REINPLACE= yes USE_GL= yes USE_GNOME= pkgconfig gnometarget gnomehack -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/graphics/glitz/distinfo b/graphics/glitz/distinfo index 51d835dad7b2..abf70c1b2477 100644 --- a/graphics/glitz/distinfo +++ b/graphics/glitz/distinfo @@ -1,2 +1,2 @@ -MD5 (glitz-0.4.0.tar.gz) = 32a34fa31686be88cc5c518085444a68 -SIZE (glitz-0.4.0.tar.gz) = 391481 +MD5 (glitz-0.4.4.tar.gz) = 56162ec6f5df9603c0e98391c64565f8 +SIZE (glitz-0.4.4.tar.gz) = 425742 diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile index 5ca6a5d96a36..12bea45427e9 100644 --- a/graphics/gstreamer-plugins-cairo/Makefile +++ b/graphics/gstreamer-plugins-cairo/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $ # CATEGORIES= graphics @@ -14,6 +15,4 @@ GST_PLUGIN= cairo MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins -IGNORE= Cairo needs to be updated to 1.0 for plugin to work. - .include "${MASTERDIR}/Makefile" diff --git a/graphics/gstreamer-plugins-cairo80/Makefile b/graphics/gstreamer-plugins-cairo80/Makefile index 5ca6a5d96a36..12bea45427e9 100644 --- a/graphics/gstreamer-plugins-cairo80/Makefile +++ b/graphics/gstreamer-plugins-cairo80/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $ # CATEGORIES= graphics @@ -14,6 +15,4 @@ GST_PLUGIN= cairo MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins -IGNORE= Cairo needs to be updated to 1.0 for plugin to work. - .include "${MASTERDIR}/Makefile" diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 4bddea772adf..3ffeb8feadab 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,14 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.48 2005/09/06 18:43:35 mezz Exp $ # PORTNAME= libgnomecanvas -PORTVERSION= 2.10.2 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +20,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 -USE_GNOME= gnomehack libglade2 libartlgpl2 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index fa70270723a9..0279b3e30005 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.10.2.tar.bz2) = 976eada7b499ae6e74966f8888c015d1 -SIZE (gnome2/libgnomecanvas-2.10.2.tar.bz2) = 552370 +MD5 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 62c0edd3d27803d341662fd9088b2d9b +SIZE (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 590010 diff --git a/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c b/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c new file mode 100644 index 000000000000..75c1fd41d8f0 --- /dev/null +++ b/graphics/libgnomecanvas/files/patch-libgnomecanvas_gnome-canvas-shape.c @@ -0,0 +1,11 @@ +--- libgnomecanvas/gnome-canvas-shape.c.orig Fri May 20 16:55:35 2005 ++++ libgnomecanvas/gnome-canvas-shape.c Fri May 20 16:55:41 2005 +@@ -1343,7 +1343,7 @@ gcbp_destroy_gdk (GnomeCanvasShape * sha + { + GnomeCanvasShapePrivGdk * gdk; + +- g_assert (!((GnomeCanvasItem *)shape)->canvas->aa); ++ /*g_assert (!((GnomeCanvasItem *)shape)->canvas->aa);*/ + + gdk = shape->priv->gdk; + diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 0d5dfea1271e..1fc4c55602e7 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,8 +15,35 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.1000 +lib/libgnomecanvas-2.so.0 libdata/pkgconfig/libgnomecanvas-2.0.pc +%%DOCSDIR%%/GnomeCanvas.html +%%DOCSDIR%%/GnomeCanvasBpath.html +%%DOCSDIR%%/GnomeCanvasClipgroup.html +%%DOCSDIR%%/GnomeCanvasEllipse.html +%%DOCSDIR%%/GnomeCanvasGroup.html +%%DOCSDIR%%/GnomeCanvasItem.html +%%DOCSDIR%%/GnomeCanvasLine.html +%%DOCSDIR%%/GnomeCanvasPixbuf.html +%%DOCSDIR%%/GnomeCanvasPolygon.html +%%DOCSDIR%%/GnomeCanvasRE.html +%%DOCSDIR%%/GnomeCanvasRect.html +%%DOCSDIR%%/GnomeCanvasRichText.html +%%DOCSDIR%%/GnomeCanvasShape.html +%%DOCSDIR%%/GnomeCanvasText.html +%%DOCSDIR%%/GnomeCanvasWidget.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-path-def.html +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-util.html +%%DOCSDIR%%/libgnomecanvas.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -41,6 +68,7 @@ share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/gl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/gu/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -75,8 +103,8 @@ share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo -share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -91,5 +119,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm include/libgnomecanvas-2.0/libgnomecanvas @dirrm include/libgnomecanvas-2.0 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 87b9a037c479..5b3dd6dc7008 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,14 +3,15 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.73 2005/10/11 22:27:04 marcus Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.9.5 -PORTREVISION= 2 +PORTVERSION= 2.12.7 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,10 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_REINPLACE= yes -WANT_GNOME= yes -USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 +USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ @@ -46,75 +46,46 @@ PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 -OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no - -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif +OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .include <bsd.port.pre.mk> .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -.else -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -.endif +WITH_MOZILLA?= firefox +.if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox HEADERS_SUFX= - -.if !defined(WITH_MOZILLA) -HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla" +.elif ${WITH_MOZILLA}=="mozilla" +MOZILLA= mozilla HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla-devel" +.elif ${WITH_MOZILLA}=="mozilla-devel" +MOZILLA= mozilla HEADERS_SUFX= -devel .else -.if ${WITH_MOZILLA}=="firefox" -HEADERS_SUFX= -.endif -.endif +BROKEN= "Unknown Gecko source specified (${WITH_MOZILLA})" .endif + +BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} +RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} + +.if ${WITH_MOZILLA}=="mozilla-devel" && ${OSVERSION} < 500000 +USE_GCC= 3.4 .endif +CONFIGURE_ENV+= MOZILLA_CONFIG=no +CONFIGURE_ARGS+=--enable-mozilla-plugin=yes + PLIST_SUB+= PLUGIN="" .else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in -PLIST_SUB+= PLUGIN="@comment " -.endif +CONFIGURE_ARGS+=--enable-mozilla-plugin=no -.if ${OSVERSION} < 500000 -.if defined(WITH_MOZILLA) -.if ${WITH_MOZILLA}=="mozilla-devel" -USE_GCC= 3.4 -.endif -.endif +PLIST_SUB+= PLUGIN="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - ${WRKSRC}/librsvg-2.0.pc.in .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" - @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure -.else - @${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \ + @${REINPLACE_CMD} -e 's|mozilla-plugin|${MOZILLA}-plugin${HEADERS_SUFX}|g' \ ${WRKSRC}/configure .endif -.endif - -pre-build: - @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile - -.if defined(WITH_MOZILLA_PLUGIN) -post-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins - ${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \ - ${PREFIX}/lib/browser_plugins -.endif .include <bsd.port.post.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 40f8c84a55e4..7ca3362f9855 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a -SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785 +MD5 (gnome2/librsvg-2.12.7.tar.bz2) = 2113f01fbf228f3f8fc17c49966143fe +SIZE (gnome2/librsvg-2.12.7.tar.bz2) = 396901 diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in deleted file mode 100644 index 6bcb7ef6882e..000000000000 --- a/graphics/librsvg2/files/extra-patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed Jan 26 04:47:10 2005 -+++ Makefile.in Wed Jan 26 04:47:24 2005 -@@ -199,7 +199,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data -+SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data - - @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view - @HAVE_GTK_FALSE@target_rsvg_view = diff --git a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in deleted file mode 100644 index 8210a432bc0d..000000000000 --- a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- librsvg-2.0.pc.in.orig Fri Jun 4 20:23:35 2004 -+++ librsvg-2.0.pc.in Wed Jun 9 01:58:50 2004 -@@ -7,5 +7,5 @@ - Description: library that renders svg files - Version: @VERSION@ - Requires: glib-2.0 gdk-pixbuf-2.0 --Libs: -L${libdir} -lrsvg-2 -+Libs: -L${libdir} -lrsvg-2 %%PTHREAD_LIBS%% - Cflags: -I${includedir}/librsvg-2 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 97a0a3fd20e0..835590afdfa7 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,27 +1,20 @@ ---- moz-plugin/Makefile.in.orig Tue Jan 25 23:31:56 2005 -+++ moz-plugin/Makefile.in Tue Jan 25 23:32:32 2005 -@@ -252,15 +252,15 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +--- moz-plugin/Makefile.in.orig Fri Sep 9 23:59:09 2005 ++++ moz-plugin/Makefile.in Sat Sep 10 00:01:22 2005 +@@ -204,7 +204,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-plugindir = $(libdir)/mozilla/plugins/ ++plugindir = $(libdir)/browser_plugins/ + @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = + + @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la +@@ -253,7 +253,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) -- @$(NORMAL_INSTALL) + @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(plugindir) -- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -- else :; fi; \ -- done -+# @$(NORMAL_INSTALL) -+# $(mkinstalldirs) $(DESTDIR)$(plugindir) -+# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -+# if test -f $$p; then \ -+# f="`echo $$p | sed -e 's|^.*/||'`"; \ -+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -+# else :; fi; \ -+# done - - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) ++@WITH_MOZILLA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(plugindir) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c deleted file mode 100644 index f6e05c030dc4..000000000000 --- a/graphics/librsvg2/files/patch-rsvg-paint-server.c +++ /dev/null @@ -1,14 +0,0 @@ ---- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005 -+++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005 -@@ -84,10 +84,10 @@ - const RsvgPSCtx *ctx) - { - RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self; -+ ArtPixMaxDepth color[3]; - guint32 rgb = z->rgb; - if (z->currentcolour) - rgb = rsvg_state_current(ctx->ctx)->current_color; -- ArtPixMaxDepth color[3]; - - color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16); - color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff); diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c deleted file mode 100644 index 2642a2539b36..000000000000 --- a/graphics/librsvg2/files/patch-rsvg-shapes.c +++ /dev/null @@ -1,14 +0,0 @@ ---- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005 -+++ rsvg-shapes.c Tue Jan 25 23:44:01 2005 -@@ -2579,10 +2579,10 @@ - const char * id, *value; - double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0; - gboolean has_vbox = FALSE, overflow = 0; -- id = NULL; - RsvgDefsDrawableSvg * svg; - RsvgDefsDrawableGroup * group; - RsvgState state; -+ id = NULL; - rsvg_state_init(&state); - - if (rsvg_property_bag_size (atts)) diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 5604203a5e03..de42cc94224b 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -2,14 +2,13 @@ bin/rsvg bin/rsvg-view include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h -include/librsvg-2/librsvg/rsvg-gz.h include/librsvg-2/librsvg/rsvg.h %%PLUGIN%%lib/browser_plugins/libmozsvgdec.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.so -lib/librsvg-2.so.11 +lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc share/doc/librsvg/html/home.png share/doc/librsvg/html/index.html diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 9307727c6c08..19124133b48a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,31 +3,23 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ +# $MCom: ports/graphics/poppler/Makefile,v 1.14 2005/09/03 04:44:58 ahze Exp $ # PORTNAME= poppler -PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER= gnome@FreeBSD.org COMMENT= A PDF rendering library -LIB_DEPENDS= cairo.1:${PORTSDIR}/graphics/cairo - USE_X_PREFIX= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack gtk20 INSTALLS_SHLIB= yes -USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|poppler-[@]VERSION[@]|poppler|g' \ - ${WRKSRC}/poppler-cairo.pc.in \ - ${WRKSRC}/poppler-splash.pc.in - .include <bsd.port.mk> diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 7085df922c3f..68c71d7bc4a5 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -MD5 (poppler-0.3.1.tar.gz) = 1d2843e84753f71491417ad70ee8d1da -SIZE (poppler-0.3.1.tar.gz) = 739976 +MD5 (poppler-0.4.2.tar.gz) = beb1eea135a3c5b679a7a22d01a500c0 +SIZE (poppler-0.4.2.tar.gz) = 777935 diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 7aedfec0f409..6a247e409432 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -6,8 +6,6 @@ include/poppler/BuiltinFontTables.h include/poppler/CMap.h include/poppler/CairoFontEngine.h include/poppler/CairoOutputDev.h -include/poppler/CairoOutputDevImage.h -include/poppler/CairoOutputDevX.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h @@ -17,6 +15,7 @@ include/poppler/Dict.h include/poppler/Error.h include/poppler/ErrorCodes.h include/poppler/FontEncodingTables.h +include/poppler/FontInfo.h include/poppler/Function.cc include/poppler/Function.h include/poppler/Gfx.h @@ -57,6 +56,7 @@ include/poppler/goo/GooHash.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h +include/poppler/goo/GooTimer.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/gtypes.h |