diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
| commit | 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch) | |
| tree | 17937489af4c767844fc63b684ae3e7b31948812 /graphics | |
| parent | e959473966b963953d63d5f00fae8751f2decf0f (diff) | |
| download | freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'graphics')
75 files changed, 1189 insertions, 391 deletions
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile index 2d71518fb84b..3750149ee09c 100644 --- a/graphics/cairo-java/Makefile +++ b/graphics/cairo-java/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairo-java/Makefile,v 1.2 2005/10/29 22:06:06 marcus Exp $ +# $MCom: ports/graphics/cairo-java/Makefile,v 1.4 2006/09/14 12:47:28 ahze Exp $ # PORTNAME= cairo-java -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= graphics java -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,7 +20,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ USE_BZIP2= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.2+ diff --git a/graphics/cairo-java/distinfo b/graphics/cairo-java/distinfo index 3670d791425a..0a8275cd4629 100644 --- a/graphics/cairo-java/distinfo +++ b/graphics/cairo-java/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/cairo-java-1.0.4.tar.bz2) = a10528654e52b5f22d7e80d74029be98 -SHA256 (gnome2/cairo-java-1.0.4.tar.bz2) = 310d17b9a4637c1f97c7971c334fa8c9f760ba6586bebb5d558e968004a67e52 -SIZE (gnome2/cairo-java-1.0.4.tar.bz2) = 254634 +MD5 (gnome2/cairo-java-1.0.5.tar.bz2) = 2e532ab7d4afe681cfec3b70132d7a80 +SHA256 (gnome2/cairo-java-1.0.5.tar.bz2) = dbe9ace5ce65e434628c4b10c6a3b21110a699c8fabce1fc35b8e2f17ceac7e9 +SIZE (gnome2/cairo-java-1.0.5.tar.bz2) = 256184 diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 94cf2e613922..d62b8c2cbc9c 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/cairomm/Makefile,v 1.4 2006/09/06 22:06:40 marcus Exp $ # PORTNAME= cairomm -PORTVERSION= 0.6.0 +PORTVERSION= 1.2.2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -17,16 +18,17 @@ LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ cairo.2:${PORTSDIR}/graphics/cairo GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ + AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -BROKEN="Does not build" +BROKEN= Does not build .endif .if defined(NOPORTDOCS) diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo index 2a46bb524247..6c4a3de43927 100644 --- a/graphics/cairomm/distinfo +++ b/graphics/cairomm/distinfo @@ -1,3 +1,3 @@ -MD5 (cairomm-0.6.0.tar.gz) = 9d967cf486b0ac59d451d47922c99e6f -SHA256 (cairomm-0.6.0.tar.gz) = 274d27e8d8644038ec9f9605627753cf2cbfa5c5a62240d67cbbb2d928d408e2 -SIZE (cairomm-0.6.0.tar.gz) = 442864 +MD5 (cairomm-1.2.2.tar.gz) = fabb040a5ff2cf0529af55ff46d22d2d +SHA256 (cairomm-1.2.2.tar.gz) = 6f02087249f1f9e9293fdfcf008c0d3066a4e52d5c625d6129a451ccb8bdeaae +SIZE (cairomm-1.2.2.tar.gz) = 582629 diff --git a/graphics/cairomm/files/patch-docs_reference_Makefile.in b/graphics/cairomm/files/patch-docs_reference_Makefile.in new file mode 100644 index 000000000000..560b3dc7b704 --- /dev/null +++ b/graphics/cairomm/files/patch-docs_reference_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/Makefile.in.orig Thu Jul 6 00:29:26 2006 ++++ docs/reference/Makefile.in Thu Jul 6 00:29:40 2006 +@@ -342,7 +342,7 @@ + + $(index_html): $(DOXYGEN_CONFIGFILE) $(wildcard $(top_srcdir)/cairomm/*.h) $(HTML_TEMPLATE_FILES) + -rm -rf html +- doxygen $(DOXYGEN_CONFIGFILE) \ ++ $(DOXYGEN) $(DOXYGEN_CONFIGFILE) \ + 2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt + + html: $(index_html) diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist index bfb563b8148b..42d9079b10ed 100644 --- a/graphics/cairomm/pkg-plist +++ b/graphics/cairomm/pkg-plist @@ -7,183 +7,192 @@ include/cairomm-1.0/cairomm/fontoptions.h include/cairomm-1.0/cairomm/path.h include/cairomm-1.0/cairomm/pattern.h include/cairomm-1.0/cairomm/refptr.h +include/cairomm-1.0/cairomm/scaledfont.h include/cairomm-1.0/cairomm/surface.h include/cairomm-1.0/cairomm/win32_surface.h include/cairomm-1.0/cairomm/xlib_surface.h lib/libcairomm-1.0.a lib/libcairomm-1.0.la lib/libcairomm-1.0.so -lib/libcairomm-1.0.so.0 +lib/libcairomm-1.0.so.1 libdata/pkgconfig/cairomm-1.0.pc -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/annotated.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm.css -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error-members.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dirs.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/doxygen.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/files.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_func.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_type.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_vars.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_enum.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_eval.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_type.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.dot -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/hierarchy.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/index.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.map -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.md5 -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherits.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaceCairo.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_enum.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_eval.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_type.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaces.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/path_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/path_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h-source.html -%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h.html -%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference/html -%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference -%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0 +share/doc/libcairomm-1.0/reference/html/annotated.html +share/doc/libcairomm-1.0/reference/html/cairomm.css +share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html +share/doc/libcairomm-1.0/reference/html/cairomm_8h.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error.html +share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/context_8h-source.html +share/doc/libcairomm-1.0/reference/html/context_8h.html +share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d.html +share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d_dep.map +share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d_dep.png +share/doc/libcairomm-1.0/reference/html/dirs.html +share/doc/libcairomm-1.0/reference/html/doxygen.png +share/doc/libcairomm-1.0/reference/html/enums_8h-source.html +share/doc/libcairomm-1.0/reference/html/enums_8h.html +share/doc/libcairomm-1.0/reference/html/exception_8h-source.html +share/doc/libcairomm-1.0/reference/html/exception_8h.html +share/doc/libcairomm-1.0/reference/html/files.html +share/doc/libcairomm-1.0/reference/html/fontface_8h-source.html +share/doc/libcairomm-1.0/reference/html/fontface_8h.html +share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html +share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html +share/doc/libcairomm-1.0/reference/html/functions.html +share/doc/libcairomm-1.0/reference/html/functions_func.html +share/doc/libcairomm-1.0/reference/html/functions_type.html +share/doc/libcairomm-1.0/reference/html/functions_vars.html +share/doc/libcairomm-1.0/reference/html/globals.html +share/doc/libcairomm-1.0/reference/html/globals_enum.html +share/doc/libcairomm-1.0/reference/html/globals_eval.html +share/doc/libcairomm-1.0/reference/html/globals_type.html +share/doc/libcairomm-1.0/reference/html/graph_legend.dot +share/doc/libcairomm-1.0/reference/html/graph_legend.html +share/doc/libcairomm-1.0/reference/html/graph_legend.png +share/doc/libcairomm-1.0/reference/html/hierarchy.html +share/doc/libcairomm-1.0/reference/html/index.html +share/doc/libcairomm-1.0/reference/html/inherit__graph__0.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__0.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__0.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__1.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__1.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__1.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__2.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__2.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__2.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__3.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__3.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__3.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__4.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__4.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__4.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__5.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__5.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__5.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__6.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__6.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__6.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__7.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__7.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__8.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__8.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__8.png +share/doc/libcairomm-1.0/reference/html/inherits.html +share/doc/libcairomm-1.0/reference/html/namespaceCairo.html +share/doc/libcairomm-1.0/reference/html/namespacemembers.html +share/doc/libcairomm-1.0/reference/html/namespacemembers_enum.html +share/doc/libcairomm-1.0/reference/html/namespacemembers_eval.html +share/doc/libcairomm-1.0/reference/html/namespacemembers_type.html +share/doc/libcairomm-1.0/reference/html/namespaces.html +share/doc/libcairomm-1.0/reference/html/pages.html +share/doc/libcairomm-1.0/reference/html/path_8h-source.html +share/doc/libcairomm-1.0/reference/html/path_8h.html +share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html +share/doc/libcairomm-1.0/reference/html/pattern_8h.html +share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html +share/doc/libcairomm-1.0/reference/html/refptr_8h.html +share/doc/libcairomm-1.0/reference/html/scaledfont_8h-source.html +share/doc/libcairomm-1.0/reference/html/scaledfont_8h.html +share/doc/libcairomm-1.0/reference/html/surface_8h-source.html +share/doc/libcairomm-1.0/reference/html/surface_8h.html +share/doc/libcairomm-1.0/reference/html/tabs.css +share/doc/libcairomm-1.0/reference/html/todo.html +share/doc/libcairomm-1.0/reference/html/win32__surface_8h-source.html +share/doc/libcairomm-1.0/reference/html/win32__surface_8h.html +share/doc/libcairomm-1.0/reference/html/xlib__surface_8h-source.html +share/doc/libcairomm-1.0/reference/html/xlib__surface_8h.html +@dirrm share/doc/libcairomm-1.0/reference/html +@dirrm share/doc/libcairomm-1.0/reference +@dirrm share/doc/libcairomm-1.0 @dirrm include/cairomm-1.0/cairomm @dirrm include/cairomm-1.0 diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile index 8398f4a12d86..050b5391baf8 100644 --- a/graphics/comix/Makefile +++ b/graphics/comix/Makefile @@ -3,10 +3,12 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/comix/Makefile,v 1.4 2006/10/03 19:05:14 mezz Exp $ # PORTNAME= comix PORTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,11 +20,11 @@ RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging NO_BUILD= yes +USE_XLIB= yes USE_GNOME= desktopfileutils pygtk2 WANT_GNOME= yes USE_PYTHON= yes USE_GETTEXT= yes -USE_X_PREFIX= yes INSTALLS_ICONS= yes DOCS= COPYING ChangeLog README @@ -31,7 +33,7 @@ MAN1= comix.1 .include <bsd.port.pre.mk> .if (${HAVE_GNOME:Mnautilus2}!="" || defined(WITH_THUMBNAILS)) && !defined(WITHOUT_THUMBNAILS) -USE_GNOME+= gconf2 +USE_GNOME+= gnomehier gconf2 MAN1+= comicthumb.1 GCONF_SCHEMAS= comicbook.schemas PLIST_SUB+= THUMBNAILS:="" diff --git a/graphics/comix/pkg-plist b/graphics/comix/pkg-plist index f12ddadeb10b..098b70a36292 100644 --- a/graphics/comix/pkg-plist +++ b/graphics/comix/pkg-plist @@ -57,9 +57,20 @@ share/pixmaps/comix/silk-transform.png share/pixmaps/comix/silk-view.png share/pixmaps/comix/silk-zoom.png @dirrm share/pixmaps/comix +@dirrmtry share/pixmaps %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications %%THUMBNAILS:%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime %%THUMBNAILS:%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/graphics/crystalspace-devel/files/patch-configure b/graphics/crystalspace-devel/files/patch-configure new file mode 100644 index 000000000000..26e7850c443d --- /dev/null +++ b/graphics/crystalspace-devel/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig Tue Oct 10 17:24:44 2006 ++++ configure Tue Oct 10 17:29:10 2006 +@@ -39605,7 +39605,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ft2build.h> +- #include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H +@@ -39760,7 +39759,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ft2build.h> +- #include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H diff --git a/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp b/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp new file mode 100644 index 000000000000..486843d8769a --- /dev/null +++ b/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp @@ -0,0 +1,214 @@ +--- plugins/font/server/freefnt2/freefnt2.cpp.orig Thu Oct 12 12:48:44 2006 ++++ plugins/font/server/freefnt2/freefnt2.cpp Thu Oct 12 12:54:51 2006 +@@ -30,10 +30,11 @@ + #include "iutil/comp.h" + + #include <ft2build.h> +-#include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H ++#include FT_SIZES_H ++#include FT_OUTLINE_H + + #include "freefnt2.h" + +@@ -372,6 +373,20 @@ + return true; + } + ++static void GridFitCbox (FT_BBox& cbox, FT_UInt& glyphW, FT_UInt& glyphH) ++{ ++ /* compute the control box, and grid fit it */ ++#define FT_PIX_FLOOR( x ) ( (x) & ~63 ) ++#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 ) ++ cbox.xMin = FT_PIX_FLOOR( cbox.xMin ); ++ cbox.yMin = FT_PIX_FLOOR( cbox.yMin ); ++ cbox.xMax = FT_PIX_CEIL( cbox.xMax ); ++ cbox.yMax = FT_PIX_CEIL( cbox.yMax ); ++ ++ glyphW = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 ); ++ glyphH = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 ); ++} ++ + csPtr<iDataBuffer> csFreeType2Font::GetGlyphBitmap (utf32_char c, + csBitmapMetrics& metrics) + { +@@ -381,37 +396,65 @@ + if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0; + + if (server->FreetypeError (FT_Load_Glyph (face->face, ci, +- FT_LOAD_RENDER | FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO), ++ FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO), + "Could not load glyph %u for %s", ci, name)) + { + return 0; + } + +- int stride = (face->face->glyph->bitmap.width + 7) / 8; ++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width ++ * or height is 0 */ ++ FT_Outline* outline = &face->face->glyph->outline; ++ FT_BBox cbox; ++ FT_Outline_Get_CBox( outline, &cbox ); ++ FT_UInt glyphW, glyphH; ++ GridFitCbox (cbox, glyphW, glyphH); + int maxrows = (size->metrics.height + 63) >> 6; +- int bitmapsize = maxrows*stride; +- uint8* bitmap = new uint8 [bitmapsize]; +- memset (bitmap, 0, bitmapsize); ++ int stride, bitmapsize; ++ uint8* bitmap; ++ if ((glyphW > 0) && (glyphH > 0)) ++ { ++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph, ++ FT_RENDER_MODE_MONO), ++ "Could not render glyph %u for %s", ci, name)) ++ { ++ return 0; ++ } ++ stride = (face->face->glyph->bitmap.width + 7) / 8; ++ bitmapsize = maxrows*stride; ++ } ++ else ++ bitmapsize = 0; + + int descend = (-size->metrics.descender + 63) >> 6;; + +- int startrow = maxrows - (descend + face->face->glyph->bitmap_top); +- +- int endrow = startrow + face->face->glyph->bitmap.rows; ++ if (bitmapsize > 0) ++ { ++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top); ++ int endrow = startrow + face->face->glyph->bitmap.rows; + +- if (startrow < 0) startrow = 0; +- if (endrow > maxrows) endrow = maxrows; ++ if (startrow < 0) startrow = 0; ++ if (endrow > maxrows) endrow = maxrows; + +- int n, i; +- for (n = 0, i = startrow; i < endrow; i++, n++) +- memcpy (bitmap + stride*i, +- face->face->glyph->bitmap.buffer + +- n * face->face->glyph->bitmap.pitch, +- MIN(stride, face->face->glyph->bitmap.pitch)); ++ bitmap = new uint8 [bitmapsize]; ++ memset (bitmap, 0, bitmapsize); ++ int n, i; ++ for (n = 0, i = startrow; i < endrow; i++, n++) ++ memcpy (bitmap + stride*i, ++ face->face->glyph->bitmap.buffer + ++ n * face->face->glyph->bitmap.pitch, ++ MIN(stride, face->face->glyph->bitmap.pitch)); ++ metrics.width = face->face->glyph->bitmap.width; ++ metrics.left = face->face->glyph->bitmap_left; ++ } ++ else ++ { ++ bitmap = 0; ++ metrics.width = glyphW >> 6; ++ metrics.left = (FT_Int)( cbox.xMin >> 6 ); ++ } + +- metrics.width = face->face->glyph->bitmap.width; + metrics.height = maxrows; +- metrics.left = face->face->glyph->bitmap_left; + metrics.top = maxrows - descend; + + return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize, +@@ -427,42 +470,70 @@ + if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0; + + if (server->FreetypeError (FT_Load_Glyph (face->face, ci, +- FT_LOAD_RENDER | FT_RENDER_MODE_NORMAL), ++ FT_LOAD_TARGET_NORMAL), + "Could not load glyph %u for %s", ci, name)) + { + return 0; + } + +- if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY) +- // That's not what we want. +- return 0; +- +- int stride = face->face->glyph->bitmap.width; ++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width ++ * or height is 0 */ ++ FT_Outline* outline = &face->face->glyph->outline; ++ FT_BBox cbox; ++ FT_Outline_Get_CBox( outline, &cbox ); ++ FT_UInt glyphW, glyphH; ++ GridFitCbox (cbox, glyphW, glyphH); + int maxrows = (size->metrics.height + 63) >> 6; +- int bitmapsize = maxrows * stride; +- // Allocate at least 1 byte +- uint8* bitmap = (bitmapsize > 0) ? new uint8 [bitmapsize] : new uint8[1]; +- memset (bitmap, 0, bitmapsize); ++ int stride, bitmapsize; ++ uint8* bitmap; ++ if ((glyphW > 0) && (glyphH > 0)) ++ { ++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph, ++ FT_RENDER_MODE_NORMAL), ++ "Could not render glyph %u for %s", ci, name)) ++ { ++ return 0; ++ } ++ if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY) ++ { ++ // That's not what we want. ++ return 0; ++ } ++ stride = face->face->glyph->bitmap.width; ++ bitmapsize = maxrows*stride; ++ metrics.width = face->face->glyph->bitmap.width; ++ metrics.left = face->face->glyph->bitmap_left; ++ } ++ else ++ { ++ bitmapsize = 0; ++ metrics.width = glyphW >> 6; ++ metrics.left = (FT_Int)( cbox.xMin >> 6 ); ++ } + + int descend = (-size->metrics.descender + 63) >> 6; + +- int startrow = maxrows - (descend + face->face->glyph->bitmap_top); +- +- int endrow = startrow + face->face->glyph->bitmap.rows; ++ if (bitmapsize > 0) ++ { ++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top); ++ int endrow = startrow + face->face->glyph->bitmap.rows; + +- if (startrow < 0) startrow = 0; +- if (endrow > maxrows) endrow = maxrows; ++ if (startrow < 0) startrow = 0; ++ if (endrow > maxrows) endrow = maxrows; + +- int n, i; +- for (n = 0, i = startrow; i < endrow; i++, n++) +- memcpy (bitmap + stride*i, +- face->face->glyph->bitmap.buffer + +- n * face->face->glyph->bitmap.pitch, +- MIN(stride, face->face->glyph->bitmap.pitch)); ++ bitmap = new uint8 [bitmapsize]; ++ memset (bitmap, 0, bitmapsize); ++ int n, i; ++ for (n = 0, i = startrow; i < endrow; i++, n++) ++ memcpy (bitmap + stride*i, ++ face->face->glyph->bitmap.buffer + ++ n * face->face->glyph->bitmap.pitch, ++ MIN(stride, face->face->glyph->bitmap.pitch)); ++ } ++ else ++ bitmap = 0; + +- metrics.width = face->face->glyph->bitmap.width; + metrics.height = maxrows; +- metrics.left = face->face->glyph->bitmap_left; + metrics.top = maxrows - descend; + + return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize, diff --git a/graphics/crystalspace/files/patch-configure b/graphics/crystalspace/files/patch-configure new file mode 100644 index 000000000000..26e7850c443d --- /dev/null +++ b/graphics/crystalspace/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.orig Tue Oct 10 17:24:44 2006 ++++ configure Tue Oct 10 17:29:10 2006 +@@ -39605,7 +39605,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ft2build.h> +- #include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H +@@ -39760,7 +39759,6 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ft2build.h> +- #include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H diff --git a/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp b/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp new file mode 100644 index 000000000000..ef9cf0e13fa5 --- /dev/null +++ b/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp @@ -0,0 +1,215 @@ +--- plugins/font/server/freefnt2/freefnt2.cpp.orig Tue Oct 10 17:29:34 2006 ++++ plugins/font/server/freefnt2/freefnt2.cpp Tue Oct 10 17:36:40 2006 +@@ -29,10 +29,12 @@ + #include "iutil/eventh.h" + #include "iutil/comp.h" + #include <ft2build.h> +-#include FT_INTERNAL_OBJECTS_H + #include FT_FREETYPE_H + #include FT_GLYPH_H + #include FT_MODULE_H ++#include FT_SIZES_H ++#include FT_OUTLINE_H ++ + #include "freefnt2.h" + + CS_IMPLEMENT_PLUGIN +@@ -370,6 +372,20 @@ + return true; + } + ++static void GridFitCbox (FT_BBox& cbox, FT_UInt& glyphW, FT_UInt& glyphH) ++{ ++ /* compute the control box, and grid fit it */ ++#define FT_PIX_FLOOR( x ) ( (x) & ~63 ) ++#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 ) ++ cbox.xMin = FT_PIX_FLOOR( cbox.xMin ); ++ cbox.yMin = FT_PIX_FLOOR( cbox.yMin ); ++ cbox.xMax = FT_PIX_CEIL( cbox.xMax ); ++ cbox.yMax = FT_PIX_CEIL( cbox.yMax ); ++ ++ glyphW = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 ); ++ glyphH = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 ); ++} ++ + csPtr<iDataBuffer> csFreeType2Font::GetGlyphBitmap (utf32_char c, + csBitmapMetrics& metrics) + { +@@ -379,37 +395,65 @@ + if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0; + + if (server->FreetypeError (FT_Load_Glyph (face->face, ci, +- FT_LOAD_RENDER | FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO), ++ FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO), + "Could not load glyph %u for %s", ci, name)) + { + return 0; + } + +- int stride = (face->face->glyph->bitmap.width + 7) / 8; ++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width ++ * or height is 0 */ ++ FT_Outline* outline = &face->face->glyph->outline; ++ FT_BBox cbox; ++ FT_Outline_Get_CBox( outline, &cbox ); ++ FT_UInt glyphW, glyphH; ++ GridFitCbox (cbox, glyphW, glyphH); + int maxrows = (size->metrics.height + 63) >> 6; +- int bitmapsize = maxrows*stride; +- uint8* bitmap = new uint8 [bitmapsize]; +- memset (bitmap, 0, bitmapsize); ++ int stride, bitmapsize; ++ uint8* bitmap; ++ if ((glyphW > 0) && (glyphH > 0)) ++ { ++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph, ++ FT_RENDER_MODE_MONO), ++ "Could not render glyph %u for %s", ci, name)) ++ { ++ return 0; ++ } ++ stride = (face->face->glyph->bitmap.width + 7) / 8; ++ bitmapsize = maxrows*stride; ++ } ++ else ++ bitmapsize = 0; + + int descend = (-size->metrics.descender + 63) >> 6;; + +- int startrow = maxrows - (descend + face->face->glyph->bitmap_top); +- +- int endrow = startrow + face->face->glyph->bitmap.rows; ++ if (bitmapsize > 0) ++ { ++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top); ++ int endrow = startrow + face->face->glyph->bitmap.rows; + +- if (startrow < 0) startrow = 0; +- if (endrow > maxrows) endrow = maxrows; ++ if (startrow < 0) startrow = 0; ++ if (endrow > maxrows) endrow = maxrows; + +- int n, i; +- for (n = 0, i = startrow; i < endrow; i++, n++) +- memcpy (bitmap + stride*i, +- face->face->glyph->bitmap.buffer + +- n * face->face->glyph->bitmap.pitch, +- MIN(stride, face->face->glyph->bitmap.pitch)); ++ bitmap = new uint8 [bitmapsize]; ++ memset (bitmap, 0, bitmapsize); ++ int n, i; ++ for (n = 0, i = startrow; i < endrow; i++, n++) ++ memcpy (bitmap + stride*i, ++ face->face->glyph->bitmap.buffer + ++ n * face->face->glyph->bitmap.pitch, ++ MIN(stride, face->face->glyph->bitmap.pitch)); ++ metrics.width = face->face->glyph->bitmap.width; ++ metrics.left = face->face->glyph->bitmap_left; ++ } ++ else ++ { ++ bitmap = 0; ++ metrics.width = glyphW >> 6; ++ metrics.left = (FT_Int)( cbox.xMin >> 6 ); ++ } + +- metrics.width = face->face->glyph->bitmap.width; + metrics.height = maxrows; +- metrics.left = face->face->glyph->bitmap_left; + metrics.top = maxrows - descend; + + return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize, +@@ -425,42 +469,70 @@ + if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0; + + if (server->FreetypeError (FT_Load_Glyph (face->face, ci, +- FT_LOAD_RENDER | FT_RENDER_MODE_NORMAL), ++ FT_LOAD_TARGET_NORMAL), + "Could not load glyph %u for %s", ci, name)) + { + return 0; + } + +- if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY) +- // That's not what we want. +- return 0; +- +- int stride = face->face->glyph->bitmap.width; ++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width ++ * or height is 0 */ ++ FT_Outline* outline = &face->face->glyph->outline; ++ FT_BBox cbox; ++ FT_Outline_Get_CBox( outline, &cbox ); ++ FT_UInt glyphW, glyphH; ++ GridFitCbox (cbox, glyphW, glyphH); + int maxrows = (size->metrics.height + 63) >> 6; +- int bitmapsize = maxrows * stride; +- // malloc at least 1 byte (malloc 0 bytes is undefined). +- uint8* bitmap = (bitmapsize > 0) ? new uint8 [bitmapsize] : new uint8[1]; +- memset (bitmap, 0, bitmapsize); ++ int stride, bitmapsize; ++ uint8* bitmap; ++ if ((glyphW > 0) && (glyphH > 0)) ++ { ++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph, ++ FT_RENDER_MODE_NORMAL), ++ "Could not render glyph %u for %s", ci, name)) ++ { ++ return 0; ++ } ++ if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY) ++ { ++ // That's not what we want. ++ return 0; ++ } ++ stride = face->face->glyph->bitmap.width; ++ bitmapsize = maxrows*stride; ++ metrics.width = face->face->glyph->bitmap.width; ++ metrics.left = face->face->glyph->bitmap_left; ++ } ++ else ++ { ++ bitmapsize = 0; ++ metrics.width = glyphW >> 6; ++ metrics.left = (FT_Int)( cbox.xMin >> 6 ); ++ } + + int descend = (-size->metrics.descender + 63) >> 6; + +- int startrow = maxrows - (descend + face->face->glyph->bitmap_top); +- +- int endrow = startrow + face->face->glyph->bitmap.rows; ++ if (bitmapsize > 0) ++ { ++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top); ++ int endrow = startrow + face->face->glyph->bitmap.rows; + +- if (startrow < 0) startrow = 0; +- if (endrow > maxrows) endrow = maxrows; ++ if (startrow < 0) startrow = 0; ++ if (endrow > maxrows) endrow = maxrows; + +- int n, i; +- for (n = 0, i = startrow; i < endrow; i++, n++) +- memcpy (bitmap + stride*i, +- face->face->glyph->bitmap.buffer + +- n * face->face->glyph->bitmap.pitch, +- MIN(stride, face->face->glyph->bitmap.pitch)); ++ bitmap = new uint8 [bitmapsize]; ++ memset (bitmap, 0, bitmapsize); ++ int n, i; ++ for (n = 0, i = startrow; i < endrow; i++, n++) ++ memcpy (bitmap + stride*i, ++ face->face->glyph->bitmap.buffer + ++ n * face->face->glyph->bitmap.pitch, ++ MIN(stride, face->face->glyph->bitmap.pitch)); ++ } ++ else ++ bitmap = 0; + +- metrics.width = face->face->glyph->bitmap.width; + metrics.height = maxrows; +- metrics.left = face->face->glyph->bitmap_left; + metrics.top = maxrows - descend; + + return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize, diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index c573b15d4902..1c89297220f7 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -7,8 +7,7 @@ # PORTNAME= diacanvas2 -PORTVERSION= 0.14.2 -PORTREVISION= 1 +PORTVERSION= 0.14.4 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= diacanvas @@ -32,11 +31,4 @@ post-patch: @${REINPLACE_CMD} -e \ 's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.png ${DOCSDIR} -.endif - .include <bsd.port.mk> diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo index 440c317ee7c6..8e4314469d97 100644 --- a/graphics/diacanvas2/distinfo +++ b/graphics/diacanvas2/distinfo @@ -1,3 +1,3 @@ -MD5 (diacanvas2-0.14.2.tar.gz) = bd78fff277279abb003bb271baef3788 -SHA256 (diacanvas2-0.14.2.tar.gz) = 06eb7ad7936ca4ba483b2ae2f1f9cb90186529a76ca7020e3bc5d7c674fc9ce3 -SIZE (diacanvas2-0.14.2.tar.gz) = 725584 +MD5 (diacanvas2-0.14.4.tar.gz) = b3db6c961de3023489a4d2419dab89bd +SHA256 (diacanvas2-0.14.4.tar.gz) = 90972c659015b4d9c45b31177e464df46494d293e83e9ea3657e8b8358edca1c +SIZE (diacanvas2-0.14.4.tar.gz) = 718229 diff --git a/graphics/diacanvas2/files/patch-python_diacanvas.override b/graphics/diacanvas2/files/patch-python_diacanvas.override new file mode 100644 index 000000000000..2b5457da9a72 --- /dev/null +++ b/graphics/diacanvas2/files/patch-python_diacanvas.override @@ -0,0 +1,58 @@ +--- python/diacanvas.override.orig Tue Oct 26 03:54:46 2004 ++++ python/diacanvas.override Fri Oct 13 14:22:52 2006 +@@ -182,55 +182,6 @@ _wrap_dia_canvas_text_new (PyGObject *se + return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT); + } + %% +-override dia_canvas_item_new kwargs +-static int +-_wrap_dia_canvas_item_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ITEM); +-} +-%% +-override dia_canvas_group_new kwargs +-static int +-_wrap_dia_canvas_group_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_GROUP); +-} +-%% +-override dia_canvas_element_new kwargs +-static int +-_wrap_dia_canvas_element_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ELEMENT); +-} +-%% +-override dia_canvas_line_new kwargs +-static int +-_wrap_dia_canvas_line_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_LINE); +-} +-%% +-override dia_canvas_box_new kwargs +-static int +-_wrap_dia_canvas_box_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_BOX); +-} +-%% +-override dia_canvas_image_new kwargs +-static int +-_wrap_dia_canvas_image_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_IMAGE); +-} +-%% +-override dia_canvas_text_new kwargs +-static int +-_wrap_dia_canvas_text_new (PyGObject *self, PyObject *args, PyObject *kwargs) +-{ +- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT); +-} +-%% + override dia_canvas_get_pango_layout noargs + static PyObject * + _wrap_dia_canvas_get_pango_layout(PyGObject *self) diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist index d4c6a2e30ad6..028492d3a767 100644 --- a/graphics/diacanvas2/pkg-plist +++ b/graphics/diacanvas2/pkg-plist @@ -59,53 +59,11 @@ lib/libdiacanvas2.so.0 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.la %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so libdata/pkgconfig/diacanvas2.pc -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvas.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasBox.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasEditable.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasElement.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroup.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroupable.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasImage.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasItem.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasLine.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasText.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasView.html -%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasViewItem.html -%%PORTDOCS%%%%DOCSDIR%%/DiaConstraint.html -%%PORTDOCS%%%%DOCSDIR%%/DiaHandle.html -%%PORTDOCS%%%%DOCSDIR%%/DiaHandleLayer.html -%%PORTDOCS%%%%DOCSDIR%%/DiaSolver.html -%%PORTDOCS%%%%DOCSDIR%%/DiaTool.html -%%PORTDOCS%%%%DOCSDIR%%/DiaUndoManager.html -%%PORTDOCS%%%%DOCSDIR%%/DiaVariable.html -%%PORTDOCS%%%%DOCSDIR%%/arrowhead.png -%%PORTDOCS%%%%DOCSDIR%%/chap-DiaCanvas.html -%%PORTDOCS%%%%DOCSDIR%%/chap-Geometry.html -%%PORTDOCS%%%%DOCSDIR%%/chap-Objects.html -%%PORTDOCS%%%%DOCSDIR%%/chap-Python.html -%%PORTDOCS%%%%DOCSDIR%%/chap-Solver.html -%%PORTDOCS%%%%DOCSDIR%%/chap-Views.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas.png -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaEvent.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaExpression.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaGeometry.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-LibArt-rendering.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-X11-rendering.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaStrength.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaUndoManager.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-Exporting.html -%%PORTDOCS%%%%DOCSDIR%%/diacanvasview.png -%%PORTDOCS%%%%DOCSDIR%%/diasolver.png -%%PORTDOCS%%%%DOCSDIR%%/element.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/line.png share/locale/nl/LC_MESSAGES/diacanvas.mo share/pygtk/2.0/defs/dia-boxed.defs share/pygtk/2.0/defs/diacanvas.defs share/pygtk/2.0/defs/diageometry.defs share/pygtk/2.0/defs/diashape.defs share/pygtk/2.0/defs/diaview.defs -@dirrm %%PORTDOCS%%%%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/diacanvas @dirrm include/diacanvas diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 393ea75105f9..fe7573bb9c82 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,7 +7,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= djvu @@ -78,9 +78,9 @@ post-install: .endfor .endfor .if !defined(WITHOUT_X11) - @${MKDIR} ${X11BASE}/lib/browser_plugins + @${MKDIR} ${LOCALBASE}/lib/browser_plugins ${LN} -sf ${PREFIX}/lib/djvulibre/plugins/nsdejavu.so \ - ${X11BASE}/lib/browser_plugins/nsdejavu.so + ${LOCALBASE}/lib/browser_plugins/nsdejavu.so .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index 3406dc25b2fa..1a4f931045c3 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -48,9 +48,9 @@ share/djvu/osi/zh/messages.xml share/djvu/pubtext/DjVuMessages.dtd share/djvu/pubtext/DjVuOCR.dtd share/djvu/pubtext/DjVuXML-s.dtd -%%X11%%@exec mkdir -p %%X11BASE%%/lib/browser_plugins -%%X11%%@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%X11BASE%%/lib/browser_plugins/nsdejavu.so -%%X11%%@unexec rm -f %%X11BASE%%/lib/browser_plugins/nsdejavu.so +%%X11%%@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins +%%X11%%@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so +%%X11%%@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so @dirrm share/djvu/pubtext @dirrm share/djvu/osi/zh @dirrm share/djvu/osi/ja @@ -66,4 +66,4 @@ share/djvu/pubtext/DjVuXML-s.dtd @dirrmtry man/fr @dirrmtry man/de/man1 @dirrmtry man/de -@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true +@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile index ae0a5e45d633..0ed08a440535 100644 --- a/graphics/fyre/Makefile +++ b/graphics/fyre/Makefile @@ -7,7 +7,7 @@ PORTNAME= fyre PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://samy.kerneled.org/ports/ \ http://www.felinemenace.org/~nemo/ @@ -15,14 +15,15 @@ MASTER_SITES= http://samy.kerneled.org/ports/ \ MAINTAINER= sbahra@kerneled.org COMMENT= Chaos map rendering system with GTK+-2 interface +BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils LIB_DEPENDS= Half:${PORTSDIR}/graphics/OpenEXR \ gnet-2.0:${PORTSDIR}/net/gnet2 USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GNOME= libglade2 +USE_XLIB= yes +USE_GNOME= libglade2 desktopfileutils USE_GETOPT_LONG=yes - +INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -42,10 +43,8 @@ pre-everything:: .endif .endif -# check for update-desktop-database should go here -PLIST_SUB+= WITH_FDO="@comment " - post-install: + @-update-desktop-database .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/graphics/fyre/pkg-plist b/graphics/fyre/pkg-plist index 18a128d1c618..30f9fceb4f5f 100644 --- a/graphics/fyre/pkg-plist +++ b/graphics/fyre/pkg-plist @@ -1,17 +1,22 @@ bin/fyre +share/applications/fyre.desktop %%PORTDOCS%%%%DOCSDIR%%/README -%%WITH_FDO%%share/applications/fyre.desktop -share/fyre/animation-render.glade -share/fyre/explorer.glade -share/fyre/metadata-emblem.png -share/fyre/about-box.fa -share/fyre/fyre-48x48.png -share/fyre/fyre-32x32.png -share/fyre/fyre-16x16.png -%%WITH_FDO%%share/pixmaps/fyre-48x48.png +%%DATADIR%%/about-box.fa +%%DATADIR%%/animation-render.glade +%%DATADIR%%/explorer.glade +%%DATADIR%%/fyre-16x16.png +%%DATADIR%%/fyre-32x32.png +%%DATADIR%%/fyre-48x48.png +%%DATADIR%%/metadata-emblem.png share/icons/hicolor/48x48/mimetypes/application-x-fyre-animation.png -share/mime/packages/fyre.xml share/mime/application/x-fyre-animation.xml -@dirrm share/fyre +share/mime/packages/fyre.xml +share/pixmaps/fyre-48x48.png +@dirrmtry share/pixmaps +@dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%WITH_FDO%%@dirrmtry share/applications +@dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@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/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index b398a0145eb4..c5f7018aa600 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@lovett.com> # # $FreeBSD$ -# +# $MCom: ports/graphics/gdk-pixbuf/Makefile,v 1.2 2006/09/10 00:51:10 mezz Exp $ PORTNAME?= gdk-pixbuf PORTVERSION= 0.22.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22 @@ -23,9 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME+= gnomehack gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/graphics/gdk-pixbuf/files/patch-ad b/graphics/gdk-pixbuf/files/patch-ad index 06e8ed03edaf..37e0eca6216e 100644 --- a/graphics/gdk-pixbuf/files/patch-ad +++ b/graphics/gdk-pixbuf/files/patch-ad @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- gdk-pixbuf-config.in.orig Tue Oct 23 20:44:44 2001 +++ gdk-pixbuf-config.in Fri Oct 26 11:06:32 2001 @@ -40,11 +40,11 @@ diff --git a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S index 84b8fd88b41e..ea3dd6a8158a 100644 --- a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S +++ b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1 +++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21 @@ -19,6 +19,8 @@ diff --git a/graphics/gdk-pixbuf/files/patch-ltmain.sh b/graphics/gdk-pixbuf/files/patch-ltmain.sh index 91c341790451..d35b31cea82a 100644 --- a/graphics/gdk-pixbuf/files/patch-ltmain.sh +++ b/graphics/gdk-pixbuf/files/patch-ltmain.sh @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ltmain.sh.orig Sun Jan 20 16:11:07 2002 +++ ltmain.sh Tue Jan 22 13:34:20 2002 @@ -1060,6 +1060,7 @@ diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 3aa52f09351a..aee9765c2b33 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.25 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gtkmmviewer @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= gtkmmviewer MAINTAINER= dinoex@FreeBSD.org COMMENT= Yet another GTK+ based image viewer -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gdkpixbuf gnomehier USE_GETTEXT= yes diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist index 16359d8c422f..4e5cc0596eba 100644 --- a/graphics/gimageview/pkg-plist +++ b/graphics/gimageview/pkg-plist @@ -121,6 +121,7 @@ share/gnome/apps/Graphics/gimageview.desktop share/locale/fr/LC_MESSAGES/gimageview.mo share/locale/ja/LC_MESSAGES/gimageview.mo share/pixmaps/gimv.png +@dirrmtry share/pixmaps @dirrm lib/gimageview/archiver @dirrm lib/gimageview/image_loader @dirrm lib/gimageview/image_saver diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 69f6414e7c5e..87d72307e68c 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,10 +3,11 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# +# $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $ PORTNAME= gimp PORTVERSION= 2.2.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -34,7 +35,6 @@ CONFLICTS= gimp-1.* gimpshop-[0-9]* SHLIBVER?= 200 USE_BZIP2= yes -USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -104,7 +104,7 @@ CONFIGURE_ARGS+= --enable-mp .if ${HAVE_GNOME:Mgnomepanel}!="" USE_GNOME+= gnomepanel desktopfileutils -CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome +CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS} PKGNAMESUFFIX:= -gnome PLIST_SUB+= GNOMEPANEL:="" diff --git a/graphics/gimp-app/files/patch-gimptool-2.0.in b/graphics/gimp-app/files/patch-gimptool-2.0.in index e4ed3c228dda..3ee0f17b8be2 100644 --- a/graphics/gimp-app/files/patch-gimptool-2.0.in +++ b/graphics/gimp-app/files/patch-gimptool-2.0.in @@ -1,6 +1,3 @@ - -$FreeBSD: /tmp/pcvs/ports/graphics/gimp-app/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $ - --- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002 +++ gimptool-2.0.in Fri May 17 20:46:18 2002 @@ -215,19 +215,19 @@ diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 6998b0799940..6946abf9f87a 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -1937,3 +1937,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo @dirrm etc/gimp/2.2 @dirrm etc/gimp %%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/graphics/gimp-greycstoration/Makefile b/graphics/gimp-greycstoration/Makefile index f69c40f93675..dddfdd0782cd 100644 --- a/graphics/gimp-greycstoration/Makefile +++ b/graphics/gimp-greycstoration/Makefile @@ -7,6 +7,7 @@ PORTNAME= greycstoration PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.haypocalc.com/perso/prog/greycstoration/ \ http://bio3k.softboard.ru/uploads/arch/ @@ -20,7 +21,6 @@ BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp \ GNU_CONFIGURE= yes USE_BZIP2= yes -USE_X_PREFIX= yes USE_GNOME= gtk20 # Redifine this if you need diff --git a/graphics/gimp-help/Makefile b/graphics/gimp-help/Makefile index ba71db5cf195..ba303a4c7b0a 100644 --- a/graphics/gimp-help/Makefile +++ b/graphics/gimp-help/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/gimp-help/Makefile,v 1.1 2006/07/18 13:04:28 ahze Exp $ PORTNAME= gimp-help PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ @@ -25,7 +25,6 @@ COMMENT= GIMP user's manual BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp RUN_DEPENDS= gimp:${PORTSDIR}/graphics/gimp -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/gimp-pmosaic/Makefile b/graphics/gimp-pmosaic/Makefile index 531a2fd3c5e3..ff1a2711cb38 100644 --- a/graphics/gimp-pmosaic/Makefile +++ b/graphics/gimp-pmosaic/Makefile @@ -7,7 +7,7 @@ PORTNAME= pmosaic PORTVERSION= 1.08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.kirchgessner.net/pub/gimp-1.2/ PKGNAMEPREFIX= gimp- @@ -20,7 +20,6 @@ BUILD_DEPENDS= gimp-config:${PORTSDIR}/graphics/gimp1 RUN_DEPENDS= gimp:${PORTSDIR}/graphics/gimp1 WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} -o pmosaic `gimp-config --cflags` \ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 69f6414e7c5e..87d72307e68c 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -3,10 +3,11 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# +# $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $ PORTNAME= gimp PORTVERSION= 2.2.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -34,7 +35,6 @@ CONFLICTS= gimp-1.* gimpshop-[0-9]* SHLIBVER?= 200 USE_BZIP2= yes -USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -104,7 +104,7 @@ CONFIGURE_ARGS+= --enable-mp .if ${HAVE_GNOME:Mgnomepanel}!="" USE_GNOME+= gnomepanel desktopfileutils -CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome +CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS} PKGNAMESUFFIX:= -gnome PLIST_SUB+= GNOMEPANEL:="" diff --git a/graphics/gimp/files/patch-gimptool-2.0.in b/graphics/gimp/files/patch-gimptool-2.0.in index 6f254900f5ca..3ee0f17b8be2 100644 --- a/graphics/gimp/files/patch-gimptool-2.0.in +++ b/graphics/gimp/files/patch-gimptool-2.0.in @@ -1,6 +1,3 @@ - -$FreeBSD: /tmp/pcvs/ports/graphics/gimp/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $ - --- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002 +++ gimptool-2.0.in Fri May 17 20:46:18 2002 @@ -215,19 +215,19 @@ diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist index 6998b0799940..6946abf9f87a 100644 --- a/graphics/gimp/pkg-plist +++ b/graphics/gimp/pkg-plist @@ -1937,3 +1937,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo @dirrm etc/gimp/2.2 @dirrm etc/gimp %%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 38b7e29a63e9..a3e163ce9f56 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -36,13 +36,13 @@ CONFLICTS= gimp-2.* gimp-gnome-2.* gimpshop-[0-9]* SHLIBVER?= 2 USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gtk12 USE_GETTEXT= yes GNU_CONFIGURE== yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ARGS= --disable-perl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${MPEG_WRKSRC}" \ diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist index 3993fbf503ef..e8b47efe555d 100644 --- a/graphics/gimp1/pkg-plist +++ b/graphics/gimp1/pkg-plist @@ -1561,3 +1561,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp.mo @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/tips @dirrm %%DATADIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 2dd1d53b2cf3..24ecd9a2d9f4 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -7,6 +7,7 @@ PORTNAME= gimpshop PORTVERSION= 2.2.11 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= http://www.plasticbugs.com/blogimg/ \ http://freebsd.powered.net/distfiles/ @@ -27,7 +28,7 @@ CONFLICTS= gimp-1.* gimp-2.* gimp-gnome-2.* SHLIBVER?= 200 USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_XPM= yes USE_GMAKE= yes USE_GETTEXT= yes @@ -87,7 +88,7 @@ CONFIGURE_ARGS+= --enable-mp .if ${HAVE_GNOME:Mgnomepanel}!="" USE_GNOME+= gnomepanel desktopfileutils -CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome +CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS} PLIST_SUB+= GNOMEPANEL:="" GNOME_ENABLED= yes diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist index be3ca2cabacf..98bea6e673d8 100644 --- a/graphics/gimpshop/pkg-plist +++ b/graphics/gimpshop/pkg-plist @@ -1938,3 +1938,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo @dirrmtry etc/gimp/2.2 @dirrmtry etc/gimp %%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile index eaa66f056cb0..a4872ecfb3b8 100644 --- a/graphics/gqview-devel/Makefile +++ b/graphics/gqview-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gqview PORTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,6 @@ COMMENT= Another gtk2-based graphic file viewer LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_X_PREFIX= yes USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gqview-devel/pkg-plist b/graphics/gqview-devel/pkg-plist index 1bfe4eae9a72..4d638a3dfdb7 100644 --- a/graphics/gqview-devel/pkg-plist +++ b/graphics/gqview-devel/pkg-plist @@ -78,3 +78,21 @@ share/gnome/apps/Graphics/gqview.desktop share/gnome/pixmaps/gqview.png @dirrm %%DOCSDIR%%/html @dirrm %%DOCSDIR%% +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index a4612441cd23..0ba57dac0d08 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gqview PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,6 @@ COMMENT= Another gtk2-based graphic file viewer LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_X_PREFIX= yes USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile index 213c2ff881f7..4267a45ca313 100644 --- a/graphics/gsculpt/Makefile +++ b/graphics/gsculpt/Makefile @@ -8,7 +8,7 @@ PORTNAME= gsculpt PORTVERSION= 0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -28,8 +28,9 @@ post-patch: @${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \ s,gtk-config,${GTK_CONFIG},g ; \ s,/usr/include/glib.h,${LOCALBASE}/include/glib12/glib.h,g ; \ - s,/usr/include/gtk/,${X11BASE}/include/gtk12/gtk/,g ; \ - s,/usr/include/gdk/,${X11BASE}/include/gtk12/gdk/,g" ${WRKSRC}/Makefile + s,/usr/include/gtk/,${LOCALBASE}/include/gtk12/gtk/,g ; \ + s,/usr/include/gdk/,${LOCALBASE}/include/gtk12/gdk/,g" \ + ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/gsculpt ${PREFIX}/bin diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 8bd582e84d12..7558613d4c47 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkam PORTVERSION= 0.1.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -18,7 +18,7 @@ COMMENT= Download and view files from various digital cameras LIB_DEPENDS= exif-gtk.5:${PORTSDIR}/graphics/libexif-gtk \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 -USE_X_PREFIX= yes +USE_XLIB= yes WANT_GNOME= yes USE_GNOME= gnomehack gnomehier gnometarget gtk20 GNU_CONFIGURE= yes @@ -29,7 +29,7 @@ MAN1= gtkam.1 .include <bsd.port.pre.mk> -.if exists(${X11BASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP) +.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP) WITH_GIMP= yes .endif diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist index 65e033494582..f870a62bd320 100644 --- a/graphics/gtkam/pkg-plist +++ b/graphics/gtkam/pkg-plist @@ -63,3 +63,11 @@ share/locale/uk/LC_MESSAGES/gtkam.mo %%GNOME:%%@dirrm share/gnome/help/gtkam/C %%GNOME:%%@dirrm share/gnome/help/gtkam %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index 0537747507f3..e2c261c0420e 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -3,11 +3,11 @@ # Whom: Mark Pulford <mark@kyne.com.au> # # $FreeBSD$ -# +# $MCom: ports/graphics/imagesort/Makefile,v 1.1 2006/10/04 13:18:57 ahze Exp $ PORTNAME= imagesort PORTVERSION= 2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/X @@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/X MAINTAINER= ports@FreeBSD.org COMMENT= A flexible X utility for managing many image files -USE_X_PREFIX= yes USE_GNOME= imlib +CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include do-install: ${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index ed6bdb66b618..3275aa8a1334 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -3,11 +3,11 @@ # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # # $FreeBSD$ -# +# $MCom: ports/graphics/imlib/Makefile,v 1.2 2006/09/10 00:51:11 mezz Exp $ PORTNAME= imlib PORTVERSION= 1.9.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/imlib/1.9 @@ -22,10 +22,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gtk12 gnomehack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile index 1a03dd1690b9..4fc2a3fdf358 100644 --- a/graphics/isreal/Makefile +++ b/graphics/isreal/Makefile @@ -3,11 +3,11 @@ # Whom: Mark Pulford <mark@kyne.com.au> # # $FreeBSD$ -# +# $MCom: ports/graphics/isreal/Makefile,v 1.1 2006/10/04 13:20:38 ahze Exp $ PORTNAME= isreal PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= markp @@ -19,6 +19,7 @@ COMMENT= An image classification utility PLIST_FILES= bin/isreal USE_XLIB= yes USE_GNOME= imlib +CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include do-install: ${INSTALL_PROGRAM} ${WRKSRC}/isreal ${PREFIX}/bin diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile index 6355d3ded45e..8bb9c5d417b0 100644 --- a/graphics/jumpgis/Makefile +++ b/graphics/jumpgis/Makefile @@ -7,7 +7,7 @@ PORTNAME= jumpgis PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics java MASTER_SITES= http://www.jump-project.org/downloads/jump/:main \ http://people.tecnik93.com/~sam/ports/:extra @@ -63,8 +63,8 @@ do-install: .if ${HAVE_GNOME:Mgnomelibs}!="" @${ECHO_MSG} "---> Installing GNOME application links" - ${INSTALL_DATA} ${DISTDIR}/jump.desktop ${X11BASE}/share/gnome/applications/ - ${INSTALL_DATA} ${DISTDIR}/jump.png ${X11BASE}/share/gnome/pixmaps/ + ${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/gnome/applications/ + ${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/gnome/pixmaps/ .endif .include <bsd.port.post.mk> diff --git a/graphics/jumpgis/pkg-plist b/graphics/jumpgis/pkg-plist index 42f348f1a5df..d753d8493ea9 100644 --- a/graphics/jumpgis/pkg-plist +++ b/graphics/jumpgis/pkg-plist @@ -7,10 +7,9 @@ jumpgis/lib/jump-1.1.2.jar jumpgis/lib/junit.jar jumpgis/lib/xercesImpl.jar jumpgis/lib/xml-apis.jar +%%GNOMELINKS%%share/gnome/applications/jump.desktop +%%GNOMELINKS%%share/gnome/pixmaps/jump.png @exec mkdir -p %D/jumpgis/lib/ext @dirrm jumpgis/lib/ext @dirrm jumpgis/lib @dirrm jumpgis -@cwd %%X11BASE%% -%%GNOMELINKS%%share/gnome/applications/jump.desktop -%%GNOMELINKS%%share/gnome/pixmaps/jump.png diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index c1e77bf3d8dc..8eb4561b6f89 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.12 2006/04/13 07:52:35 bland Exp $ +# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.14 2006/08/21 15:32:21 ahze Exp $ # PORTNAME= libgnomecanvasmm -PORTVERSION= 2.14.0 +PORTVERSION= 2.16.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,12 +22,12 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomecanvasmm26 USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GCC= 3.4 USE_GNOME= gnomehack libgnomecanvas GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static PLIST_SUB= VERSION="2.6" API_VERSION="2.6" diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo index f7e182efc6a4..87806eef911c 100644 --- a/graphics/libgnomecanvasmm26/distinfo +++ b/graphics/libgnomecanvasmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = a4e5bf13a31e38b4f30b99153bc10aca -SHA256 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 93c22a04032163d5efe2d95b1b5e7b055221ad0246c64d0dd9584338f93cb4f8 -SIZE (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 327771 +MD5 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = fe54d7f437d03044f863672d6dd38e9f +SHA256 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 5f3297cb1b047bc5a02044f54847fbcd7d0044461fc5f28ee351d2d4f6b91ed7 +SIZE (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 333980 diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index ac126f8a3b22..e5b79be29127 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/librsvg/Makefile,v 1.2 2006/09/10 00:51:11 mezz Exp $ PORTNAME= librsvg PORTVERSION= 1.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/librsvg/1.0 @@ -20,9 +20,9 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GNOME= gnomelibs gdkpixbuf -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/librsvg/files/patch-Makefile.in b/graphics/librsvg/files/patch-Makefile.in index b11b408da623..076b991ecdcc 100644 --- a/graphics/librsvg/files/patch-Makefile.in +++ b/graphics/librsvg/files/patch-Makefile.in @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- Makefile.in.orig Fri Jul 27 16:29:51 2001 +++ Makefile.in Fri Jul 27 16:30:27 2001 @@ -110,7 +110,7 @@ diff --git a/graphics/librsvg/files/patch-librsvg-config.in b/graphics/librsvg/files/patch-librsvg-config.in index 84d673894427..2c4c58a1984e 100644 --- a/graphics/librsvg/files/patch-librsvg-config.in +++ b/graphics/librsvg/files/patch-librsvg-config.in @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- librsvg-config.in 2001/10/05 14:55:24 1.1 +++ librsvg-config.in 2001/10/05 15:05:57 @@ -39,9 +39,7 @@ diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile index dbc72cab66f7..b00edf37c3c2 100644 --- a/graphics/p5-Cairo/Makefile +++ b/graphics/p5-Cairo/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.2 2005/09/05 00:16:51 ahze Exp $ +# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.5 2006/09/06 22:53:39 ahze Exp $ # PORTNAME= Cairo -PORTVERSION= 0.03 +PORTVERSION= 1.00 CATEGORIES= graphics perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gtk2-perl diff --git a/graphics/p5-Cairo/distinfo b/graphics/p5-Cairo/distinfo index db27e973845b..c98d9218e375 100644 --- a/graphics/p5-Cairo/distinfo +++ b/graphics/p5-Cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (Cairo-0.03.tar.gz) = 6ad0ab39eb8f56272373a9ea4515f37a -SHA256 (Cairo-0.03.tar.gz) = 59d0141c8146f864f421f07b3bf2193c0ded40b4dc67f28feb5fa18ca265dd8a -SIZE (Cairo-0.03.tar.gz) = 31402 +MD5 (Cairo-1.00.tar.gz) = 60ec93dbe00c9dcefcfb22ca913c237a +SHA256 (Cairo-1.00.tar.gz) = 87afd67c6158257709783890bed75943f628ba2dc213803f9b9b024d348566b1 +SIZE (Cairo-1.00.tar.gz) = 42587 diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile index 83d8863d39ac..a8d809810ca8 100644 --- a/graphics/passepartout/Makefile +++ b/graphics/passepartout/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/passepartout/Makefile,v 1.4 2006/09/30 15:31:05 ahze Exp $ PORTNAME= passepartout PORTVERSION= 0.4 -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= graphics gnome MASTER_SITES= http://www.stacken.kth.se/project/pptout/files/ @@ -20,7 +20,6 @@ RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \ @@ -31,15 +30,15 @@ MAN1= xml2ps.1 passepartout.1x .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_cxx +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_cxx .endif .if exists(${LOCALBASE}/lib/libfam.a) -WITH_FAM= yes +WITH_FAM= yes .endif .if defined(WITH_FAM) -LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam +LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif .include <bsd.port.post.mk> diff --git a/graphics/passepartout/pkg-plist b/graphics/passepartout/pkg-plist index 76d035248b41..0abb21e7f120 100644 --- a/graphics/passepartout/pkg-plist +++ b/graphics/passepartout/pkg-plist @@ -28,4 +28,3 @@ share/xml/passepartout/xml2ps.dtd @dirrm %%DOCSDIR%%/examples @dirrm %%DOCSDIR%% @dirrm share/xml/passepartout -@dirrmtry share/xml diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile index 9df35ba2fc12..caf118652088 100644 --- a/graphics/pixelize/Makefile +++ b/graphics/pixelize/Makefile @@ -8,7 +8,7 @@ PORTNAME= pixelize PORTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} \ ftp://lashwhip.com/pub/ \ @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Use many scaled down images to try to duplicate another image USE_GNOME= gtk12 imlib -IMLIB_CONFIG= ${X11BASE}/bin/imlib-config +IMLIB_CONFIG= ${LOCALBASE}/bin/imlib-config post-patch: @${REINPLACE_CMD} -e "s|^CC|#CC|" -e "s|CFLAGS = -g|CFLAGS+= |" \ diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile index e4b1a83bcee7..e213ab9771ca 100644 --- a/graphics/ruby-cairo/Makefile +++ b/graphics/ruby-cairo/Makefile @@ -3,11 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.2 2005/10/17 07:05:40 mezz Exp $ +# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.4 2006/09/09 20:07:18 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.0.0 +PORTVERSION= 1.2.0 CATEGORIES= graphics ruby MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-cairo/distinfo b/graphics/ruby-cairo/distinfo index 71734529b637..130c5386bf22 100644 --- a/graphics/ruby-cairo/distinfo +++ b/graphics/ruby-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (rcairo-1.0.0.tar.gz) = e6c6442b24155146ba986dc7774e45e3 -SHA256 (rcairo-1.0.0.tar.gz) = 2662611b9fe8e7c26e8f3c55e1de85ce9fe6f94209ed3e49f4e78bd371a9b5c3 -SIZE (rcairo-1.0.0.tar.gz) = 42088 +MD5 (rcairo-1.2.0.tar.gz) = d5b4da3a6aafd28cf2a0dcbdafb82b04 +SHA256 (rcairo-1.2.0.tar.gz) = f21a21cb30a07693980d5d40b9fc03554d15709a141751efe8d2f73636544b4d +SIZE (rcairo-1.2.0.tar.gz) = 47529 diff --git a/graphics/ruby-cairo/pkg-plist b/graphics/ruby-cairo/pkg-plist index 142bf2ce1e9f..2916e53a041a 100644 --- a/graphics/ruby-cairo/pkg-plist +++ b/graphics/ruby-cairo/pkg-plist @@ -1,11 +1,11 @@ %%RUBY_SITEARCHLIBDIR%%/cairo.so %%RUBY_SITEARCHLIBDIR%%/rb_cairo.h %%RUBY_SITELIBDIR%%/cairo.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pdf.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pdf2.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/png.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ps.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ps2.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scalable.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text2.rb %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% %%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile index 91acaa6da329..c355211a1e2d 100644 --- a/graphics/sdl_ttf/Makefile +++ b/graphics/sdl_ttf/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl_ttf PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ DISTNAME= SDL_ttf-${PORTVERSION} diff --git a/graphics/sdl_ttf/files/patch-SDL_ttf.c b/graphics/sdl_ttf/files/patch-SDL_ttf.c new file mode 100644 index 000000000000..dbfadc22790f --- /dev/null +++ b/graphics/sdl_ttf/files/patch-SDL_ttf.c @@ -0,0 +1,19 @@ +--- SDL_ttf.c.orig Mon May 1 05:26:17 2006 ++++ SDL_ttf.c Sun Sep 24 15:46:44 2006 +@@ -48,7 +48,6 @@ + #include <freetype/ftoutln.h> + #include <freetype/ttnameid.h> + */ +-#include <freetype/internal/ftobjs.h> + + #ifndef FT_OPEN_STREAM + #define FT_OPEN_STREAM ft_open_stream +@@ -278,7 +277,7 @@ + } + memset(stream, 0, sizeof(*stream)); + +- stream->memory = library->memory; ++ stream->memory = NULL; + stream->read = RWread; + stream->descriptor.pointer = src; + stream->pos = (unsigned long)position; diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index 294ce956f0c9..21f3c925d153 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -8,7 +8,7 @@ PORTNAME= swfdec PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.schleef.org/swfdec/download/ @@ -18,7 +18,7 @@ COMMENT= Flash Rendering Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ oil-0.3.1:${PORTSDIR}/devel/liboil -USE_X_PREFIX= yes +USE_XLIB= yes USE_SDL= sdl USE_GNOME= gnomehack gtk20 libartlgpl2 USE_GSTREAMER80= gconf @@ -31,7 +31,7 @@ INSTALLS_SHLIB= yes PLIST_SUB= VERSION=${PORTVERSION:R} -.if exists(${X11BASE}/bin/gimp-2.2) +.if exists(${LOCALBASE}/bin/gimp-2.2) WITH_GIMP=yes .endif diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist index aba7ab94647b..d563e90d6881 100644 --- a/graphics/swfdec/pkg-plist +++ b/graphics/swfdec/pkg-plist @@ -22,9 +22,9 @@ include/swfdec-%%VERSION%%/swfdec_text.h include/swfdec-%%VERSION%%/swfdec_transform.h include/swfdec-%%VERSION%%/swfdec_types.h include/swfdec-%%VERSION%%/tags.h -lib/gtk-2.0/2.4.0/loaders/swf_loader.a -lib/gtk-2.0/2.4.0/loaders/swf_loader.la -lib/gtk-2.0/2.4.0/loaders/swf_loader.so +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.a +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.la +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.so lib/libswfdec-%%VERSION%%.a lib/libswfdec-%%VERSION%%.la lib/libswfdec-%%VERSION%%.so diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index f03c13d3cdbc..339973e30859 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,6 +7,7 @@ PORTNAME= ufraw PORTVERSION= 0.9.1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= SF @@ -19,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ RUN_DEPENDS= ${BUILD_DEPENDS} GNU_CONFIGURE= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= glib20 gnomehack intltool intlhack gtk20 libartlgpl2 WANT_GNOME= yes diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist index 42c0d666fa69..2314a9aeb331 100644 --- a/graphics/ufraw/pkg-plist +++ b/graphics/ufraw/pkg-plist @@ -3,4 +3,5 @@ bin/ufraw-batch libexec/gimp/2.2/plug-ins/ufraw-gimp share/applications/ufraw.desktop share/pixmaps/ufraw.png +@dirrmtry share/pixmaps @dirrmtry share/applications diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile index 2a3d43d25507..f7ed8594c9df 100644 --- a/graphics/vertex/Makefile +++ b/graphics/vertex/Makefile @@ -7,7 +7,7 @@ PORTNAME= vertex PORTVERSION= 0.1.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://wolfpack.twu.net/users/wolfpack/ @@ -17,7 +17,7 @@ COMMENT= A 3D modeller for generating efficient game models LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GL= yes USE_GNOME= imlib USE_GMAKE= yes diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini index 7428f4c3062b..647c154d41dd 100644 --- a/graphics/vertex/files/patch-platforms.ini +++ b/graphics/vertex/files/patch-platforms.ini @@ -1,6 +1,6 @@ ---- vertex/platforms.ini.orig Wed Oct 1 06:44:17 2003 -+++ vertex/platforms.ini Tue Oct 21 22:05:42 2003 -@@ -22,23 +22,23 @@ +--- vertex/platforms.ini.orig Mon Nov 1 00:35:03 2004 ++++ vertex/platforms.ini Thu Oct 5 17:14:40 2006 +@@ -22,23 +22,26 @@ Platform = UNIX Description = For most any UNIX system @@ -17,35 +17,46 @@ + CPP = %%CXX%% PlatformSearchPathInclude = /usr/include/ - PlatformSearchPathInclude = /usr/X11R6/include/ ++ PlatformSearchPathInclude = %%LOCALBASE%%/include/ + PlatformSearchPathInclude = %%X11BASE%%/include/ PlatformSearchPathLib = /lib/ PlatformSearchPathLib = /usr/lib/ - PlatformSearchPathLib = /usr/X11R6/lib/ ++ PlatformSearchPathLib = %%LOCALBASE%%/lib/ + PlatformSearchPathLib = %%X11BASE%%/lib/ PlatformSearchPathEtc = /etc/ PlatformSearchPathEtc = /usr/etc/ PlatformSearchPathBin = /bin/ PlatformSearchPathBin = /usr/bin/ - PlatformSearchPathBin = /usr/X11R6/bin/ ++ PlatformSearchPathBin = %%LOCALBASE%%/bin/ + PlatformSearchPathBin = %%X11BASE%%/bin/ PlatformSearchPathData = /usr/share/icons/ PlatformFeature = debug Description = Just adds -g to the CFLAGS for debugging -@@ -51,7 +51,7 @@ +@@ -51,7 +54,7 @@ # Newer versions of Imlib only need to link to -lImlib # FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz FeatureLIBS = -lImlib - FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ FeatureDepend = Imlib-lib DependType = Library MustExist = Yes -@@ -83,11 +83,11 @@ +@@ -66,6 +69,7 @@ + Description = An implementation of OpenGL (ie Mesa3D) + MustExist = Yes + FeatureLIBS = -lGL -lGLU ++ FeatureLIB_DIR = -L%%X11BASE%%/lib/ + FeatureDepend = gl-lib + DependType = Library + MustExist = Yes +@@ -83,11 +87,11 @@ MustExist = Yes FeatureCFLAGS = `gtk-config --cflags` FeatureLIBS = `gtk-config --libs` - FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ FeatureDepend = gtk-lib DependType = Library MustExist = Yes @@ -54,12 +65,12 @@ DependGrepString = gtk_init FeatureDepend = gtk-devel DependType = Program -@@ -98,7 +98,7 @@ +@@ -98,7 +102,7 @@ MustExist = Yes FeatureCFLAGS = FeatureLIBS = -lgtkgl - FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ FeatureDepend = gtkgl-lib DependType = Library MustExist = Yes diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c index 11789bbc9265..63dc6bb58d03 100644 --- a/graphics/vertex/files/patch-vmahelp.c +++ b/graphics/vertex/files/patch-vmahelp.c @@ -10,7 +10,7 @@ $FreeBSD$ - "/usr/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/local/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ \ - "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index 572fa3d88ab2..0eb3c86e55c0 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/wxsvg/Makefile,v 1.1 2006/09/22 01:48:33 ahze Exp $ PORTNAME= wxsvg DISTVERSION= 1.0b6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +18,7 @@ COMMENT= C++ library to create, manipulate, and render SVG files BUILD_DEPENDS= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26 RUN_DEPENDS= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WX_CONFIG= wxgtk2-2.6-config USE_AUTOTOOLS= libtool:15 USE_GNOME= libartlgpl2 diff --git a/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp new file mode 100644 index 000000000000..f0182faeaa77 --- /dev/null +++ b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp @@ -0,0 +1,49 @@ +--- src/freetype/SVGCanvasTextFreetype.cpp.orig Thu Sep 21 21:42:35 2006 ++++ src/freetype/SVGCanvasTextFreetype.cpp Thu Sep 21 21:45:02 2006 +@@ -165,7 +165,7 @@ + } + } + +-gint moveto(FT_Vector* to, gpointer data) ++gint moveto(const FT_Vector* to, gpointer data) + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + +@@ -181,7 +181,7 @@ + return 0; + } + +-static gint lineto (FT_Vector* to, gpointer data) ++static gint lineto (const FT_Vector* to, gpointer data) + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) +@@ -194,7 +194,7 @@ + return 0; + } + +-static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data) ++static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data) + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) +@@ -209,8 +209,8 @@ + return 0; + } + +-static gint cubicto(FT_Vector* ftcontrol1, FT_Vector* ftcontrol2, +- FT_Vector* to, gpointer data) ++static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2, ++ const FT_Vector* to, gpointer data) + { + wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data; + if (!canvasText->m_endpath) +@@ -227,7 +227,7 @@ + return 0; + } + +-static const FT_Outline_Funcs outline_funcs = ++static FT_Outline_Funcs outline_funcs = + { + moveto, lineto, conicto, cubicto, 0, 0 + }; diff --git a/graphics/xpdf/files/patch-splash_SplashFTFont.cc b/graphics/xpdf/files/patch-splash_SplashFTFont.cc new file mode 100644 index 000000000000..856e3376eb3b --- /dev/null +++ b/graphics/xpdf/files/patch-splash_SplashFTFont.cc @@ -0,0 +1,77 @@ +--- splash/SplashFTFont.cc.orig 2005-12-23 16:57:18.076514614 +0100 ++++ splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +0100 +@@ -14,7 +14,8 @@ + + #include <ft2build.h> + #include FT_OUTLINE_H +-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl ++#include FT_SIZES_H // needed for FT_New_Size decl ++#include FT_GLYPH_H + #include "gmem.h" + #include "SplashMath.h" + #include "SplashGlyphBitmap.h" +@@ -25,11 +26,12 @@ + + //------------------------------------------------------------------------ + +-static int glyphPathMoveTo(FT_Vector *pt, void *path); +-static int glyphPathLineTo(FT_Vector *pt, void *path); +-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path); +-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2, +- FT_Vector *pt, void *path); ++static int glyphPathMoveTo( const FT_Vector *pt, void *path); ++static int glyphPathLineTo( const FT_Vector *pt, void *path); ++static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt, ++ void* path ); ++static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2, ++ const FT_Vector *pt, void *path); + + //------------------------------------------------------------------------ + // SplashFTFont +@@ -210,7 +212,7 @@ + }; + + SplashPath *SplashFTFont::getGlyphPath(int c) { +- static FT_Outline_Funcs outlineFuncs = { ++ static const FT_Outline_Funcs outlineFuncs = { + &glyphPathMoveTo, + &glyphPathLineTo, + &glyphPathConicTo, +@@ -249,7 +251,7 @@ + return path.path; + } + +-static int glyphPathMoveTo(FT_Vector *pt, void *path) { ++static int glyphPathMoveTo( const FT_Vector *pt, void *path) { + SplashFTFontPath *p = (SplashFTFontPath *)path; + + if (p->needClose) { +@@ -260,7 +262,7 @@ + return 0; + } + +-static int glyphPathLineTo(FT_Vector *pt, void *path) { ++static int glyphPathLineTo(const FT_Vector *pt, void *path) { + SplashFTFontPath *p = (SplashFTFontPath *)path; + + p->path->lineTo(pt->x / 64.0, -pt->y / 64.0); +@@ -268,7 +270,7 @@ + return 0; + } + +-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) { ++static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) { + SplashFTFontPath *p = (SplashFTFontPath *)path; + SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc; + +@@ -306,8 +308,8 @@ + return 0; + } + +-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2, +- FT_Vector *pt, void *path) { ++static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2, ++ const FT_Vector *pt, void *path) { + SplashFTFontPath *p = (SplashFTFontPath *)path; + + p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0, |