Hi Following diff updates x11/gtk-theme-switch to recent release that supports GTK+2. Firefox and GAIM seem to be happy with it. Please test and comment.
Alek diff -xCVS -urN gtk-theme-switch/Makefile gtk-theme-switch.new/Makefile --- gtk-theme-switch/Makefile Fri Dec 17 16:18:33 2004 +++ gtk-theme-switch.new/Makefile Sun Oct 23 10:05:13 2005 @@ -2,7 +2,7 @@ COMMENT= "switch GTK+ themes quickly" -DISTNAME= gtk-theme-switch-1.0.1 +DISTNAME= gtk-theme-switch-2.0.0rc2 CATEGORIES= x11 graphics HOMEPAGE= http://www.muhri.net/nav.php3?node=gts @@ -14,22 +14,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xi c glib gmodule iconv intl m +WANTLIB= X11 c m Xrender freetype Xft fontconfig \ + glib-2.0.0.0 gmodule-2.0.0.0 pangox-1.0.0.0 \ + gobject-2.0.0.0 pangoxft-1.0.0.0 pango-1.0.0.0 \ + atk-1.0.0.0 MASTER_SITES= http://www.muhri.net/ -LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ +MODULES= devel/gettext +LIB_DEPENDS= gtk-x11-2.0.600.0,gdk_pixbuf-2.0.600.0,gdk-x11-2.0.600.0::x11/gtk+2 -MAKE_FLAGS= CC="${CC}" \ - CFLAGS="${CFLAGS} `gtk-config --cflags`" \ - LIBS="${LIBS} `gtk-config --libs`" - -USE_X11= Yes - NO_REGRESS= Yes - -do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/switch ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/switch.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff -xCVS -urN gtk-theme-switch/distinfo gtk-theme-switch.new/distinfo --- gtk-theme-switch/distinfo Wed Jan 5 18:54:01 2005 +++ gtk-theme-switch.new/distinfo Sun Oct 23 09:55:51 2005 @@ -1,4 +1,4 @@ -MD5 (gtk-theme-switch-1.0.1.tar.gz) = a1ce98489cbe410c5483e155e5834c46 -RMD160 (gtk-theme-switch-1.0.1.tar.gz) = f602a5d390ba58fd7239ca91d068ad274359d882 -SHA1 (gtk-theme-switch-1.0.1.tar.gz) = 5be8b703c494d65cdc88339df92c267c77c35009 -SIZE (gtk-theme-switch-1.0.1.tar.gz) = 12886 +MD5 (gtk-theme-switch-2.0.0rc2.tar.gz) = f51b254fb347a86feef12db4bd76be6f +RMD160 (gtk-theme-switch-2.0.0rc2.tar.gz) = dca1de3cbc01b6e2c2bcdb08c59e886eed748370 +SHA1 (gtk-theme-switch-2.0.0rc2.tar.gz) = 929b94b6e6becbf6ebac9abe839fca95059cce75 +SIZE (gtk-theme-switch-2.0.0rc2.tar.gz) = 14046 diff -xCVS -urN gtk-theme-switch/patches/patch-Makefile gtk-theme-switch.new/patches/patch-Makefile --- gtk-theme-switch/patches/patch-Makefile Tue Jun 22 06:28:23 2004 +++ gtk-theme-switch.new/patches/patch-Makefile Sun Oct 23 10:07:37 2005 @@ -1,12 +1,36 @@ $OpenBSD: patch-Makefile,v 1.1 2004/06/22 04:28:23 sturm Exp $ ---- Makefile.orig Wed Jun 11 00:02:59 2003 -+++ Makefile Mon Jun 21 22:21:30 2004 -@@ -6,7 +6,7 @@ VERSION = 1.0.1 +--- Makefile.orig Wed Jun 11 07:16:36 2003 ++++ Makefile Sun Oct 23 10:07:33 2005 +@@ -1,24 +1,22 @@ + GCC = cc +-PREFIX=/usr/local +-CFLAGS = -O2 -Wall $(shell pkg-config --cflags gtk+-2.0) +-LIBS = $(shell pkg-config --libs gtk+-2.0) +-CFLAGS += -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED ++CFLAGS += -O2 -Wall `pkg-config --cflags gtk+-2.0` ++LIBS = `pkg-config --libs gtk+-2.0` ++CFLAGS += -DGTK_DISABLE_BROKEN + + VERSION = 2.0.0rc2 all: switch switch: switch.c switch.h -- ${GCC} -o switch switch.c ${CFLAGS} ${LIBS} -+ ${CC} -o switch switch.c ${CFLAGS} ${LIBS} +- ${GCC} -o switch2 switch.c ${CFLAGS} ${LIBS} ++ ${CC} -o switch2 switch.c ${CFLAGS} ${LIBS} clean: - -rm -f switch *~ + -rm -f switch2 *~ + +-install: all +- strip switch2 ++install: + mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/man +- install -c switch2 ${PREFIX}/bin +- install -c switch.1 ${PREFIX}/man ++ mkdir -p ${PREFIX}/man/man1 ++ ${BSD_INSTALL_PROGRAM} switch2 ${PREFIX}/bin ++ ${BSD_INSTALL_MAN} switch.1 ${PREFIX}/man/man1/switch2.1 + + dist: clean + rm -rf /tmp/gtk-theme-switch-$(VERSION) diff -xCVS -urN gtk-theme-switch/patches/patch-switch_c gtk-theme-switch.new/patches/patch-switch_c --- gtk-theme-switch/patches/patch-switch_c Tue Jan 14 02:01:19 2003 +++ gtk-theme-switch.new/patches/patch-switch_c Sun Oct 23 10:00:28 2005 @@ -1,7 +1,7 @@ $OpenBSD: patch-switch_c,v 1.1.1.1 2003/01/14 01:01:19 naddy Exp $ ---- switch.c.orig Tue May 28 12:32:34 2002 -+++ switch.c Tue May 28 12:32:51 2002 -@@ -679,11 +679,11 @@ static short install_tarball (gchar *pat +--- switch.c.orig Wed Jun 11 07:16:36 2003 ++++ switch.c Sun Oct 23 10:00:04 2005 +@@ -697,11 +697,11 @@ static short install_tarball (gchar *pat if (path[0] != '/') { gchar *cwd = g_get_current_dir(); diff -xCVS -urN gtk-theme-switch/pkg/DESCR gtk-theme-switch.new/pkg/DESCR --- gtk-theme-switch/pkg/DESCR Mon Dec 15 22:55:48 2003 +++ gtk-theme-switch.new/pkg/DESCR Sun Oct 23 10:01:08 2005 @@ -3,5 +3,3 @@ change the font used with it, an optional GUI dock, and it can install themes downloaded from http://gtk.themes.org, preview them, or switch to them immediately. - -/usr/ports/x11/gtk-engines/ has some sample themes. diff -xCVS -urN gtk-theme-switch/pkg/PLIST gtk-theme-switch.new/pkg/PLIST --- gtk-theme-switch/pkg/PLIST Wed Sep 15 21:26:29 2004 +++ gtk-theme-switch.new/pkg/PLIST Sun Oct 23 10:07:45 2005 @@ -1,3 +1,3 @@ @comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:29 espie Exp $ -bin/switch [EMAIL PROTECTED] man/man1/switch.1 +bin/switch2 [EMAIL PROTECTED] man/man1/switch2.1
