summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/pulseaudio/Makefile6
-rw-r--r--deskutils/orage/Makefile1
-rw-r--r--graphics/epdfview/Makefile4
-rw-r--r--graphics/epdfview/distinfo6
-rw-r--r--graphics/epdfview/files/patch-MainView.cxx33
-rw-r--r--graphics/epdfview/files/patch-PrintPtr.cxx103
-rw-r--r--graphics/epdfview/pkg-plist8
-rw-r--r--graphics/gimp-app/Makefile21
-rw-r--r--graphics/gimp-app/distinfo6
-rw-r--r--graphics/gimp-app/pkg-plist2
-rw-r--r--graphics/osg-devel/Makefile34
-rw-r--r--graphics/osg-devel/distinfo6
-rw-r--r--graphics/osg-devel/files/patch-src-osgViewer-CMakeLists.txt11
-rw-r--r--graphics/osg-devel/pkg-plist7
-rw-r--r--www/mozilla/Makefile6
15 files changed, 108 insertions, 146 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 15c639e2e..4277a7ca8 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/pulseaudio/Makefile,v 1.13 2009/03/08 19:14:47 marcus Exp $
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.14 2009/04/07 06:48:12 marcus Exp $
#
PORTNAME= pulseaudio
@@ -51,6 +51,10 @@ MAN5= default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
.include <bsd.port.pre.mk>
+.if ${ARCH} == "sparc64"
+BROKEN= Does not compile on sparc64
+.endif
+
.if defined(WITH_JACK)
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
PLIST_SUB+= JACK=""
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index f458526c7..1790da3c2 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= orage
PORTVERSION= 4.6.0
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 8e606242f..c0ac24cac 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= epdfview
-PORTVERSION= 0.1.6
-PORTREVISION= 8
+PORTVERSION= 0.1.7
+PORTREVISION= 2
CATEGORIES= graphics print gnome
MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
LOCAL/chinsan
diff --git a/graphics/epdfview/distinfo b/graphics/epdfview/distinfo
index 8485b77dd..0d58288c1 100644
--- a/graphics/epdfview/distinfo
+++ b/graphics/epdfview/distinfo
@@ -1,3 +1,3 @@
-MD5 (epdfview-0.1.6.tar.bz2) = cce9edb41b4a8308e0ef0eea24b5a1ab
-SHA256 (epdfview-0.1.6.tar.bz2) = 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
-SIZE (epdfview-0.1.6.tar.bz2) = 406037
+MD5 (epdfview-0.1.7.tar.bz2) = 1919bb19c16ef0a97d48b0a8303d3c7b
+SHA256 (epdfview-0.1.7.tar.bz2) = 0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
+SIZE (epdfview-0.1.7.tar.bz2) = 443609
diff --git a/graphics/epdfview/files/patch-MainView.cxx b/graphics/epdfview/files/patch-MainView.cxx
new file mode 100644
index 000000000..7ef5f1bf6
--- /dev/null
+++ b/graphics/epdfview/files/patch-MainView.cxx
@@ -0,0 +1,33 @@
+--- src/gtk/MainView.cxx.orig 2009-03-01 05:00:55.000000000 +0800
++++ src/gtk/MainView.cxx 2009-03-28 12:18:20.000000000 +0800
+@@ -77,7 +77,7 @@
+ static void main_window_zoom_out_cb (GtkWidget *, gpointer);
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+
+ #if defined (HAVE_CUPS)
+ static void main_window_print_cb (GtkWidget *, gpointer);
+@@ -1479,18 +1479,19 @@
+ pter->setPageMode (mode);
+ }
+
+-void
++gboolean
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+ g_assert ( NULL != data && "The data parameter is NULL.");
+
+ MainPter *pter = (MainPter *)data;
+ // Only zoom when the CTRL-Button is down...
+- if ( !(event->state & GDK_CONTROL_MASK) ) return;
++ if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
+ if ( event->direction == GDK_SCROLL_UP ) {
+ pter->zoomInActivated ();
+ } else if ( event->direction == GDK_SCROLL_DOWN ) {
+ pter->zoomOutActivated ();
+ }
++ return TRUE;
+ }
+
diff --git a/graphics/epdfview/files/patch-PrintPtr.cxx b/graphics/epdfview/files/patch-PrintPtr.cxx
deleted file mode 100644
index 48eb6f84a..000000000
--- a/graphics/epdfview/files/patch-PrintPtr.cxx
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Naur ./src/PrintPter.cxx ../epdfview-0.1.6/src/PrintPter.cxx
---- ./src/PrintPter.cxx 2008-08-28 15:27:16.000000000 +0200
-+++ ../epdfview-0.1.6/src/PrintPter.cxx 2008-08-28 15:27:32.000000000 +0200
-@@ -230,20 +230,27 @@
- ppdFindOption (printerPPD, "PageSize");
- view.clearPageSizeList ();
- int pageSizeToSelect = 0;
-- ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
-- for ( int currentSize = 0 ;
-- currentSize < pageSizeOption->num_choices ;
-- ++currentSize, ++pageSizeChoice )
-+ if ( 0 != pageSizeOption )
- {
-- const gchar *sizeName = pageSizeChoice->text;
-- const gchar *sizeValue = pageSizeChoice->choice;
--
-- view.addPageSize (_(sizeName), sizeValue);
-- if ( pageSizeChoice->marked )
-+ ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
-+ for ( int currentSize = 0 ;
-+ currentSize < pageSizeOption->num_choices ;
-+ ++currentSize, ++pageSizeChoice )
- {
-- pageSizeToSelect = currentSize;
-+ const gchar *sizeName = pageSizeChoice->text;
-+ const gchar *sizeValue = pageSizeChoice->choice;
-+
-+ view.addPageSize (_(sizeName), sizeValue);
-+ if ( pageSizeChoice->marked )
-+ {
-+ pageSizeToSelect = currentSize;
-+ }
- }
- }
-+ else
-+ {
-+ view.addPageSize (_("A4"), "A4");
-+ }
- view.selectPageSize (pageSizeToSelect);
-
- // Get the resolutions.
-@@ -251,29 +258,36 @@
- ppdFindOption (printerPPD, "Resolution");
- view.clearResolutionList ();
- int resolutionToSelect = 0;
-- ppd_choice_t *resolutionChoice = resolutionOption->choices;
-- for ( int currentRes = 0 ;
-- currentRes < resolutionOption->num_choices ;
-- ++currentRes, ++resolutionChoice )
-+ if ( 0 != resolutionOption )
- {
-- const gchar *resName = resolutionChoice->text;
-- const gchar *resValue = resolutionChoice->choice;
--
-- view.addResolution (_(resName), resValue);
-- if ( resolutionChoice->marked )
-+ ppd_choice_t *resolutionChoice = resolutionOption->choices;
-+ for ( int currentRes = 0 ;
-+ currentRes < resolutionOption->num_choices ;
-+ ++currentRes, ++resolutionChoice )
- {
-- resolutionToSelect = currentRes;
-+ const gchar *resName = resolutionChoice->text;
-+ const gchar *resValue = resolutionChoice->choice;
-+
-+ view.addResolution (_(resName), resValue);
-+ if ( resolutionChoice->marked )
-+ {
-+ resolutionToSelect = currentRes;
-+ }
- }
- }
-+ else
-+ {
-+ view.addResolution (_("300 DPI"), "300x300dpi");
-+ }
- view.selectResolution (resolutionToSelect);
-
- // Get the color models.
- ppd_option_t *colorModelOption =
- ppdFindOption (printerPPD, "ColorModel");
- view.clearColorModelList ();
-+ int colorModelToSelect = 0;
- if ( NULL != colorModelOption )
- {
-- int colorModelToSelect = 0;
- ppd_choice_t *colorModelChoice = colorModelOption->choices;
- for ( int currentColor = 0 ;
- currentColor < colorModelOption->num_choices ;
-@@ -288,12 +302,12 @@
- colorModelToSelect = currentColor;
- }
- }
-- view.selectColorModel (colorModelToSelect);
- }
- else
- {
- view.addColorModel (_("Grayscale"), "Gray");
- }
-+ view.selectColorModel (colorModelToSelect);
- ppdClose (printerPPD);
- }
- }
diff --git a/graphics/epdfview/pkg-plist b/graphics/epdfview/pkg-plist
index f31c126a0..3e69d34f9 100644
--- a/graphics/epdfview/pkg-plist
+++ b/graphics/epdfview/pkg-plist
@@ -1,12 +1,20 @@
bin/epdfview
%%NLS%%share/locale/ca/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/de/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/el/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/es/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/fr/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/it/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/pl/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/ru/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/vi/LC_MESSAGES/epdfview.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/epdfview.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/epdfview.mo
share/applications/epdfview.desktop
%%DATADIR%%/pixmaps/icon_epdfview-24.png
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index fbe50163d..608abab44 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -2,13 +2,13 @@
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
-# $FreeBSD: ports/graphics/gimp-app/Makefile,v 1.232 2009/02/24 01:33:06 marcus Exp $
-# $MCom: ports/graphics/gimp-app/Makefile,v 1.32 2009/02/27 00:21:44 marcus Exp $
+# $FreeBSD: ports/graphics/gimp-app/Makefile,v 1.234 2009/03/21 04:52:37 marcus Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.30 2009/01/04 22:16:26 marcus Exp $
#
PORTNAME= gimp-app
-DISTVERSION= 2.6.5
-PORTREVISION?= 2
+DISTVERSION= 2.6.6
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -45,7 +45,7 @@ USE_XORG= xpm xmu xext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \
- desktopfileutils librsvg2
+ desktopfileutils
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
@@ -68,7 +68,8 @@ OPTIONS?= DEBUG "debugging" off \
DBUS "D-BUS support" on \
GVFS "Use GVFS for the URI plug-in" on \
HELPBROWSER "internal help browser" on \
- MP "multiple processor support" off
+ MP "multiple processor support" off \
+ RSVG "SVG format support" on
.endif
.include <bsd.port.pre.mk>
@@ -90,6 +91,14 @@ MLINKS= gimp-2.6.1 gimp.1 \
gimp-console-2.6.1 gimp-console.1 \
gimprc-2.6.5 gimprc.5
+.if defined(WITHOUT_RSVG)
+CONFIGURE_ARGS+= --without-librsvg
+PLIST_SUB+= SVG="@comment "
+.else
+USE_GNOME+= librsvg2
+PLIST_SUB+= SVG=""
+.endif
+
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index f7185a1fa..bc2404b24 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.6.5.tar.bz2) = cd13050bc6bde6d8d8fd38eff6276033
-SHA256 (gimp-2.6.5.tar.bz2) = 6209081f5c29fc22e0d376367b017618f7afb0b179f994b16b4cc68106cbe521
-SIZE (gimp-2.6.5.tar.bz2) = 16043778
+MD5 (gimp-2.6.6.tar.bz2) = 23d880dd09cd62c936ed04666a53f8e4
+SHA256 (gimp-2.6.6.tar.bz2) = 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
+SIZE (gimp-2.6.6.tar.bz2) = 16075908
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 1c8f7bc07..ca271443a 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -367,7 +367,7 @@ libexec/gimp/2.2/plug-ins/file-psp
libexec/gimp/2.2/plug-ins/file-raw
libexec/gimp/2.2/plug-ins/file-sgi
libexec/gimp/2.2/plug-ins/file-sunras
-libexec/gimp/2.2/plug-ins/file-svg
+%%SVG%%libexec/gimp/2.2/plug-ins/file-svg
libexec/gimp/2.2/plug-ins/file-tga
libexec/gimp/2.2/plug-ins/file-tiff-load
libexec/gimp/2.2/plug-ins/file-tiff-save
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 5abdef3fc..edfd92272 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= osg
-PORTVERSION= 2.7.9
+PORTVERSION= 2.9.2
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/
-DISTNAME= OpenSceneGraph-${PORTVERSION}
PKGNAMESUFFIX= -devel
+DISTNAME= OpenSceneGraph-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ OpenGL scene graph library for real-time rendering
@@ -21,16 +21,19 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
+CONFLICTS= osg-[0-9]*
+
USE_ZIP= yes
USE_CMAKE= yes
USE_GL= gl glu
USE_GNOME= pkgconfig
USE_XORG= x11
USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
PLIST_SUB= OSG_VERSION=${PORTVERSION} \
- OSG_SHLIBVER=54 \
- OPENTHREADS_VERSION=2.3.1 \
+ OSG_SHLIBVER=57 \
+ OPENTHREADS_VERSION=2.4.0 \
OPENTHREADS_SHLIBVER=11
PORTSCOUT= limitw:1,odd
@@ -45,20 +48,21 @@ OPTIONS= CURL "Support for cURL" off \
ITK "Support for InsightToolkit" off \
VNC "Support for LibVNCServer" off \
OPENEXR "Support for OpenEXR" off \
+ FFMPEG "Support for FFmpeg" off \
SVG "Support for SVG through librsvg2" off \
PDF "Support for PDF through poppler" off \
XRANDR "Use Xrandr" on
-# broken
+# broken (openvrml from ports is too old)
# OPENVRML "Support for OpenVRML" off
.include <bsd.port.pre.mk>
# GUI toolkits are only needed for building examples, which are not even installed
-FORCE_IGNORE= FLTK GLUT SDL FOX Qt3 Qt4 wxWidgets # only needed for examples
-FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL # not in ports (yet?)
-FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common and lightweight
-FORCE_PC_IGNORE= GTK GTKGL # only needed for examples
+FORCE_IGNORE= FLTK GLUT SDL FOX Qt3 Qt4 wxWidgets OpenAL # only for examples
+FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL # not in ports
+FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
+FORCE_PC_IGNORE= GTK GTKGL # only for examples
FORCE_PC_REQUIRE=
# options that affect FIND_PACKAGE
@@ -82,7 +86,7 @@ PLIST_SUB+= FREETYPE="@comment "
.if defined(WITH_GDAL)
FORCE_REQUIRE+= GDAL
-LIB_DEPENDS+= gdal.13:${PORTSDIR}/graphics/gdal
+LIB_DEPENDS+= gdal.14:${PORTSDIR}/graphics/gdal
PLIST_SUB+= GDAL=""
.else
FORCE_IGNORE+= GDAL
@@ -140,6 +144,7 @@ FORCE_REQUIRE+= ITK
BUILD_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
RUN_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
PLIST_SUB+= ITK=""
+CXXFLAGS+= -DVCL_CAN_STATIC_CONST_INIT_FLOAT=0
.else
FORCE_IGNORE+= ITK
PLIST_SUB+= ITK="@comment "
@@ -163,6 +168,15 @@ FORCE_IGNORE+= OpenEXR
PLIST_SUB+= OPENEXR="@comment "
.endif
+.if defined(WITH_FFMPEG)
+FORCE_REQUIRE+= FFmpeg
+LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+PLIST_SUB+= FFMPEG=""
+.else
+FORCE_IGNORE+= FFmpeg
+PLIST_SUB+= FFMPEG="@comment "
+.endif
+
# options that affect PKG_CHECK_MODULES
.if defined(WITH_SVG)
FORCE_PC_REQUIRE+=RSVG
diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo
index acdf818b2..52c67ec8e 100644
--- a/graphics/osg-devel/distinfo
+++ b/graphics/osg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenSceneGraph-2.7.9.zip) = 14629ae17c6a5207630713608d7f3c56
-SHA256 (OpenSceneGraph-2.7.9.zip) = bb2248b65ea6ff1a7f865f28e8b421951ac3d1623dc0ab10ebf30665e10992fb
-SIZE (OpenSceneGraph-2.7.9.zip) = 6702867
+MD5 (OpenSceneGraph-2.9.2.zip) = b15e0864fefbd37b071c545dd1760e90
+SHA256 (OpenSceneGraph-2.9.2.zip) = afa9323808dd4da08fa53f50d7cd257d05cd0a6436ac2c6238791fca03ca4d02
+SIZE (OpenSceneGraph-2.9.2.zip) = 6813410
diff --git a/graphics/osg-devel/files/patch-src-osgViewer-CMakeLists.txt b/graphics/osg-devel/files/patch-src-osgViewer-CMakeLists.txt
deleted file mode 100644
index 6d00269d1..000000000
--- a/graphics/osg-devel/files/patch-src-osgViewer-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgViewer/CMakeLists.txt.orig 2009-01-26 16:48:50.000000000 +0300
-+++ src/osgViewer/CMakeLists.txt 2009-02-04 19:00:45.000000000 +0300
-@@ -117,7 +117,7 @@
- IF(OSGVIEWER_USE_XRANDR)
- ADD_DEFINITIONS(-DOSGVIEWER_USE_XRANDR)
- SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XRANDR_INCLUDE_DIRS} )
-- LINK_LIBRARIES(Xrandr)
-+ LINK_LIBRARIES(${XRANDR_LDFLAGS})
- ENDIF(OSGVIEWER_USE_XRANDR)
-
- # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist
index 00d42c704..08c896cee 100644
--- a/graphics/osg-devel/pkg-plist
+++ b/graphics/osg-devel/pkg-plist
@@ -20,6 +20,7 @@ include/osg/AnimationPath
include/osg/ApplicationUsage
include/osg/ArgumentParser
include/osg/Array
+include/osg/AudioStream
include/osg/AutoTransform
include/osg/Billboard
include/osg/BlendColor
@@ -190,6 +191,8 @@ include/osgAnimation/Export
include/osgAnimation/Interpolator
include/osgAnimation/Keyframe
include/osgAnimation/LinkVisitor
+include/osgAnimation/MorphGeometry
+include/osgAnimation/RigGeometry
include/osgAnimation/Sampler
include/osgAnimation/Skeleton
include/osgAnimation/Skinning
@@ -391,6 +394,7 @@ include/osgUtil/Export
include/osgUtil/GLObjectsVisitor
include/osgUtil/HalfWayMapGenerator
include/osgUtil/HighlightMapGenerator
+include/osgUtil/IncrementalCompileOperation
include/osgUtil/IntersectVisitor
include/osgUtil/IntersectionVisitor
include/osgUtil/LineSegmentIntersector
@@ -399,6 +403,7 @@ include/osgUtil/Optimizer
include/osgUtil/PlaneIntersector
include/osgUtil/PolytopeIntersector
include/osgUtil/PositionalStateContainer
+include/osgUtil/PrintVisitor
include/osgUtil/ReflectionMapGenerator
include/osgUtil/RenderBin
include/osgUtil/RenderLeaf
@@ -406,6 +411,7 @@ include/osgUtil/RenderStage
include/osgUtil/ReversePrimitiveFunctor
include/osgUtil/SceneGraphBuilder
include/osgUtil/SceneView
+include/osgUtil/ShaderGen
include/osgUtil/Simplifier
include/osgUtil/SmoothingVisitor
include/osgUtil/StateGraph
@@ -527,6 +533,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so
%%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so
+%%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so
%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so
%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so
lib/osgPlugins-%%OSG_VERSION%%/osgdb_geo.so
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index c6dd5096e..4e04bd681 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,11 +3,11 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile,v 1.53 2008/08/04 16:58:03 mezz Exp $
+# $MCom: ports/www/mozilla/Makefile,v 1.54 2008/08/07 04:43:01 mezz Exp $
PORTNAME= mozilla
PORTVERSION= 1.7.13
-PORTREVISION?= 10
+PORTREVISION?= 11
PORTEPOCH= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -24,7 +24,7 @@ DEPRECATED= The mozilla team has shifted the development branch of mozilla to \
seamonkey, this port is outdated and has many vulnerabilities. \
Please consider using www/seamonkey or www/firefox instead.
-CONFLICTS= xulrunner-[0-9]*
+CONFLICTS= libxul-[0-9]*
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
USE_GMAKE= yes
USE_BZIP2= yes