On Tue, 06 Dec 2011, Brad wrote:
> ----- Original message -----
> > Sure, though it was clear brad tried to sneak in non-cleanup things in a
> > diff he calls a 'cleanup diff'...
>
> No. I explained what changes were there in my post.
Btw... Here's a diff: opinions?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 6 Dec 2011 10:23:37 -0000 1.37
+++ Makefile 6 Dec 2011 20:02:26 -0000
@@ -7,7 +7,7 @@ COMMENT = C++ cross-platform GUI toolkit
V = 2.8.12
DISTNAME = wxWidgets-${V}
PKGNAME = wxWidgets-gtk2-${V}
-REVISION = 1
+REVISION = 2
CATEGORIES = x11
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
@@ -24,7 +24,6 @@ SHARED_LIBS = wx_base 2.1 \
wx_gtk2_gizmos_xrc 2.1 \
wx_gtk2_gl 2.1 \
wx_gtk2_html 2.1 \
- wx_gtk2_media 2.1 \
wx_gtk2_ogl 2.1 \
wx_gtk2_plot 2.1 \
wx_gtk2_qa 2.1 \
@@ -43,11 +42,11 @@ PERMIT_PACKAGE_FTP = Yes
WANTLIB += GL GLU SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c expat
-WANTLIB += fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gstinterfaces-0.10
-WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 iodbc jpeg m
-WANTLIB += mspack pango-1.0 pangoft2-1.0 pixman-1 pthread pthread-stubs
-WANTLIB += stdc++ tiff xcb xcb-render xcb-shm xml2 z
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
+WANTLIB += iodbc jpeg m mspack pango-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += pthread pthread-stubs stdc++ tiff xcb xcb-render
+WANTLIB += xcb-shm z
MODULES = devel/gettext
@@ -55,8 +54,6 @@ BUILD_DEPENDS = devel/cppunit
LIB_DEPENDS = archivers/libmspack \
databases/iodbc \
devel/sdl \
- multimedia/gstreamer-0.10/core \
- multimedia/gstreamer-0.10/plugins-base \
x11/gtk+2
REGRESS_DEPENDS = ${BUILD_PKGPATH}>=${V}
@@ -71,7 +68,6 @@ USE_GMAKE = Yes
AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE =autoconf no-autoheader
CONFIGURE_ARGS =--disable-backtrace \
- --enable-mediactrl \
--enable-unicode \
--with-odbc \
--with-opengl \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 6 Dec 2011 10:23:38 -0000 1.10
+++ pkg/PLIST 6 Dec 2011 20:02:27 -0000
@@ -634,7 +634,6 @@ include/wx/zstream.h
@lib lib/libwx_gtk2_gizmos_xrc.so.${LIBwx_gtk2_gizmos_xrc_VERSION}
@lib lib/libwx_gtk2_gl.so.${LIBwx_gtk2_gl_VERSION}
@lib lib/libwx_gtk2_html.so.${LIBwx_gtk2_html_VERSION}
-@lib lib/libwx_gtk2_media.so.${LIBwx_gtk2_media_VERSION}
@lib lib/libwx_gtk2_ogl.so.${LIBwx_gtk2_ogl_VERSION}
@lib lib/libwx_gtk2_plot.so.${LIBwx_gtk2_plot_VERSION}
@lib lib/libwx_gtk2_qa.so.${LIBwx_gtk2_qa_VERSION}
