Upgrade to 0.12.

12 files changed, 72 insertions, 114 deletions

diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 656e0c1adb46..0a4cdb753fbf 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk-engines
-PORTVERSION=	0.10
+PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
diff --git a/x11-themes/gtk-engines/distinfo b/x11-themes/gtk-engines/distinfo
index 6dee467f62f4..2ad4263586fd 100644
--- a/x11-themes/gtk-engines/distinfo
+++ b/x11-themes/gtk-engines/distinfo
@@ -1 +1 @@
-MD5 (gtk-engines-0.10.tar.gz) = bc202dcb0e30ce742233e9237de4edc1
+MD5 (gtk-engines-0.12.tar.gz) = c867d1ebd6dbea355765d689a11330ec
diff --git a/x11-themes/gtk-engines/files/patch-ac b/x11-themes/gtk-engines/files/patch-ac
deleted file mode 100644
index 27700a41a969..000000000000
--- a/x11-themes/gtk-engines/files/patch-ac
+++ /dev/null
@@ -1,51 +0,0 @@
---- metal/Theme/gtk/gtkrc.orig	Fri Feb 12 05:16:41 1999
-+++ metal/Theme/gtk/gtkrc	Wed Feb 17 01:23:21 1999
-@@ -1,3 +1,7 @@
-+#module_path "%%PREFIX%%/lib/gtk/themes"
-+
-+pixmap_path "%%PREFIX%%/share/themes/Metal/gtk"
-+
- style "default"
- {
-   font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1"
---- notif/Theme/gtk/gtkrc.orig	Sun Jan 31 03:05:48 1999
-+++ notif/Theme/gtk/gtkrc	Sun Jan 31 03:11:41 1999
-@@ -13,9 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
- 
--pixmap_path ".:/home/raster/themes"
-+pixmap_path "%%PREFIX%%/share/themes/Notif/gtk"
- 
- style "default"
- {
---- pixmap/Theme/gtk/gtkrc.orig	Thu Dec 17 01:05:37 1998
-+++ pixmap/Theme/gtk/gtkrc	Sun Jan 31 03:09:55 1999
-@@ -13,7 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
-+
-+pixmap_path "%%PREFIX%%/share/themes/Pixmap/gtk"
- 
- style "eventbox" {
-   bg_pixmap[NORMAL] = "<parent>"
---- redmond95/Theme/gtk/gtkrc.orig	Sun Jan 31 03:10:29 1999
-+++ redmond95/Theme/gtk/gtkrc	Sun Jan 31 03:11:23 1999
-@@ -13,9 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
- 
--pixmap_path ".:/home/raster/themes"
-+pixmap_path "%%PREFIX%%/share/themes/Redmond95/gtk"
- 
- style "default"
- {
diff --git a/x11-themes/gtk-engines/files/patch-configure b/x11-themes/gtk-engines/files/patch-configure
new file mode 100644
index 000000000000..75a816a54cd9
--- /dev/null
+++ b/x11-themes/gtk-engines/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Mar 20 03:08:42 2001
++++ configure	Tue Mar 20 03:08:57 2001
+@@ -2177,7 +2177,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgtk $GTK_LIBS $LIBS"
++LIBS="$GTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2183 "configure"
+ #include "confdefs.h"
diff --git a/x11-themes/gtk-engines/files/patch-pixmap_Theme_gtk_gtkrc b/x11-themes/gtk-engines/files/patch-pixmap_Theme_gtk_gtkrc
new file mode 100644
index 000000000000..81c3bc781101
--- /dev/null
+++ b/x11-themes/gtk-engines/files/patch-pixmap_Theme_gtk_gtkrc
@@ -0,0 +1,13 @@
+--- pixmap/Theme/gtk/gtkrc.orig	Sun Nov 19 21:53:57 2000
++++ pixmap/Theme/gtk/gtkrc	Tue Mar 20 02:49:23 2001
+@@ -13,7 +13,9 @@
+ # testgtkrc2 sets all the buttons in the main window to blue by default
+ #include "testgtkrc2"
+ 
+-#module_path ".:/home/raster/themes"
++#module_path "%%PREFIX%%/lib/gtk/themes"
++
++pixmap_path "%%PREFIX%%/share/themes/Pixmap/gtk"
+ 
+ style "eventbox" {
+   bg_pixmap[NORMAL] = "<parent>"
diff --git a/x11-themes/gtk-engines/pkg-plist b/x11-themes/gtk-engines/pkg-plist
index df0185cd54f5..c1cc20cb6dfd 100644
--- a/x11-themes/gtk-engines/pkg-plist
+++ b/x11-themes/gtk-engines/pkg-plist
@@ -1,3 +1,8 @@
+lib/gtk/themes/engines/libmetal.so
+lib/gtk/themes/engines/libnotif.so
+lib/gtk/themes/engines/libpixmap.so
+lib/gtk/themes/engines/libraleigh.so
+lib/gtk/themes/engines/libredmond95.so
 share/themes/Metal/ICON.png
 share/themes/Metal/README.html
 share/themes/Metal/gtk/gtkrc
@@ -76,15 +81,16 @@ share/themes/Pixmap/gtk/shadow1.png
 share/themes/Pixmap/gtk/shadow2.png
 share/themes/Pixmap/gtk/trough.png
 share/themes/Pixmap/gtk/vline.png
+share/themes/Raleigh/ICON.png
+share/themes/Raleigh/README.html
+share/themes/Raleigh/gtk/gtkrc
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-lib/gtk/themes/engines/libmetal.so
-lib/gtk/themes/engines/libnotif.so
-lib/gtk/themes/engines/libpixmap.so
-lib/gtk/themes/engines/libredmond95.so
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Raleigh/gtk
+@dirrm share/themes/Raleigh
 @dirrm share/themes/Pixmap/gtk
 @dirrm share/themes/Pixmap
 @dirrm share/themes/Notif/gtk
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 656e0c1adb46..0a4cdb753fbf 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk-engines
-PORTVERSION=	0.10
+PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 6dee467f62f4..2ad4263586fd 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1 +1 @@
-MD5 (gtk-engines-0.10.tar.gz) = bc202dcb0e30ce742233e9237de4edc1
+MD5 (gtk-engines-0.12.tar.gz) = c867d1ebd6dbea355765d689a11330ec
diff --git a/x11-themes/gtk-engines2/files/patch-ac b/x11-themes/gtk-engines2/files/patch-ac
deleted file mode 100644
index 27700a41a969..000000000000
--- a/x11-themes/gtk-engines2/files/patch-ac
+++ /dev/null
@@ -1,51 +0,0 @@
---- metal/Theme/gtk/gtkrc.orig	Fri Feb 12 05:16:41 1999
-+++ metal/Theme/gtk/gtkrc	Wed Feb 17 01:23:21 1999
-@@ -1,3 +1,7 @@
-+#module_path "%%PREFIX%%/lib/gtk/themes"
-+
-+pixmap_path "%%PREFIX%%/share/themes/Metal/gtk"
-+
- style "default"
- {
-   font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1"
---- notif/Theme/gtk/gtkrc.orig	Sun Jan 31 03:05:48 1999
-+++ notif/Theme/gtk/gtkrc	Sun Jan 31 03:11:41 1999
-@@ -13,9 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
- 
--pixmap_path ".:/home/raster/themes"
-+pixmap_path "%%PREFIX%%/share/themes/Notif/gtk"
- 
- style "default"
- {
---- pixmap/Theme/gtk/gtkrc.orig	Thu Dec 17 01:05:37 1998
-+++ pixmap/Theme/gtk/gtkrc	Sun Jan 31 03:09:55 1999
-@@ -13,7 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
-+
-+pixmap_path "%%PREFIX%%/share/themes/Pixmap/gtk"
- 
- style "eventbox" {
-   bg_pixmap[NORMAL] = "<parent>"
---- redmond95/Theme/gtk/gtkrc.orig	Sun Jan 31 03:10:29 1999
-+++ redmond95/Theme/gtk/gtkrc	Sun Jan 31 03:11:23 1999
-@@ -13,9 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
- 
--#module_path ".:/home/raster/themes"
-+#module_path "%%PREFIX%%/lib/gtk/themes"
- 
--pixmap_path ".:/home/raster/themes"
-+pixmap_path "%%PREFIX%%/share/themes/Redmond95/gtk"
- 
- style "default"
- {
diff --git a/x11-themes/gtk-engines2/files/patch-configure b/x11-themes/gtk-engines2/files/patch-configure
new file mode 100644
index 000000000000..75a816a54cd9
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Mar 20 03:08:42 2001
++++ configure	Tue Mar 20 03:08:57 2001
+@@ -2177,7 +2177,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgtk $GTK_LIBS $LIBS"
++LIBS="$GTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2183 "configure"
+ #include "confdefs.h"
diff --git a/x11-themes/gtk-engines2/files/patch-pixmap_Theme_gtk_gtkrc b/x11-themes/gtk-engines2/files/patch-pixmap_Theme_gtk_gtkrc
new file mode 100644
index 000000000000..81c3bc781101
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-pixmap_Theme_gtk_gtkrc
@@ -0,0 +1,13 @@
+--- pixmap/Theme/gtk/gtkrc.orig	Sun Nov 19 21:53:57 2000
++++ pixmap/Theme/gtk/gtkrc	Tue Mar 20 02:49:23 2001
+@@ -13,7 +13,9 @@
+ # testgtkrc2 sets all the buttons in the main window to blue by default
+ #include "testgtkrc2"
+ 
+-#module_path ".:/home/raster/themes"
++#module_path "%%PREFIX%%/lib/gtk/themes"
++
++pixmap_path "%%PREFIX%%/share/themes/Pixmap/gtk"
+ 
+ style "eventbox" {
+   bg_pixmap[NORMAL] = "<parent>"
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index df0185cd54f5..c1cc20cb6dfd 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -1,3 +1,8 @@
+lib/gtk/themes/engines/libmetal.so
+lib/gtk/themes/engines/libnotif.so
+lib/gtk/themes/engines/libpixmap.so
+lib/gtk/themes/engines/libraleigh.so
+lib/gtk/themes/engines/libredmond95.so
 share/themes/Metal/ICON.png
 share/themes/Metal/README.html
 share/themes/Metal/gtk/gtkrc
@@ -76,15 +81,16 @@ share/themes/Pixmap/gtk/shadow1.png
 share/themes/Pixmap/gtk/shadow2.png
 share/themes/Pixmap/gtk/trough.png
 share/themes/Pixmap/gtk/vline.png
+share/themes/Raleigh/ICON.png
+share/themes/Raleigh/README.html
+share/themes/Raleigh/gtk/gtkrc
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-lib/gtk/themes/engines/libmetal.so
-lib/gtk/themes/engines/libnotif.so
-lib/gtk/themes/engines/libpixmap.so
-lib/gtk/themes/engines/libredmond95.so
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Raleigh/gtk
+@dirrm share/themes/Raleigh
 @dirrm share/themes/Pixmap/gtk
 @dirrm share/themes/Pixmap
 @dirrm share/themes/Notif/gtk