Correct theme engines' path.

12 files changed, 20 insertions, 128 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 0e3310d9f48e..7a7cf0c34798 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -35,7 +35,4 @@ MAN1=		gtk12-config.1
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/themes/engines
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad
index fb578b3b9032..56123b2f7a29 100644
--- a/x11-toolkits/gtk12/files/patch-ad
+++ b/x11-toolkits/gtk12/files/patch-ad
@@ -1,18 +1,6 @@
---- gtk/gtkrc.c.orig	Tue May 11 04:31:09 1999
-+++ gtk/gtkrc.c	Sat May 15 19:01:44 1999
-@@ -231,9 +231,9 @@
- 
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
- 
-   return path;
- }
-@@ -246,9 +246,9 @@
+--- gtk/gtkrc.c.orig	Sat Sep  4 02:56:58 1999
++++ gtk/gtkrc.c	Sun Oct 10 05:01:48 1999
+@@ -260,9 +260,9 @@
  
    var = getenv("GTK_DATA_PREFIX");
    if (var)
@@ -24,17 +12,7 @@
    
    for (n = 0; pixmap_path[n]; n++) ;
    if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -282,15 +282,15 @@
-   
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
-   module_path[n++] = g_strdup(path);
-   g_free(path);
+@@ -292,7 +292,7 @@
  
    var = g_get_home_dir ();
    if (var)
@@ -43,7 +21,7 @@
    module_path[n++] = g_strdup(path);
    module_path[n] = NULL;
    g_free(path);
-@@ -324,7 +324,7 @@
+@@ -326,7 +326,7 @@
      }
    else
      {
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 11105aea0796..87a94944e64e 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -172,10 +172,8 @@ share/themes/Default/gtk/gtkrc.pl
 share/themes/Default/gtk/gtkrc.ru
 share/themes/Default/gtk/gtkrc.sk
 share/themes/Default/gtk/gtkrc.sl
-@exec mkdir -p %D/share/themes/engines
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
-@dirrm share/themes/engines
 @dirrm share/themes
 @dirrm include/gtk12/gdk
 @dirrm include/gtk12/gtk
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 0e3310d9f48e..7a7cf0c34798 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -35,7 +35,4 @@ MAN1=		gtk12-config.1
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/themes/engines
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad
index fb578b3b9032..56123b2f7a29 100644
--- a/x11-toolkits/gtk13/files/patch-ad
+++ b/x11-toolkits/gtk13/files/patch-ad
@@ -1,18 +1,6 @@
---- gtk/gtkrc.c.orig	Tue May 11 04:31:09 1999
-+++ gtk/gtkrc.c	Sat May 15 19:01:44 1999
-@@ -231,9 +231,9 @@
- 
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
- 
-   return path;
- }
-@@ -246,9 +246,9 @@
+--- gtk/gtkrc.c.orig	Sat Sep  4 02:56:58 1999
++++ gtk/gtkrc.c	Sun Oct 10 05:01:48 1999
+@@ -260,9 +260,9 @@
  
    var = getenv("GTK_DATA_PREFIX");
    if (var)
@@ -24,17 +12,7 @@
    
    for (n = 0; pixmap_path[n]; n++) ;
    if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -282,15 +282,15 @@
-   
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
-   module_path[n++] = g_strdup(path);
-   g_free(path);
+@@ -292,7 +292,7 @@
  
    var = g_get_home_dir ();
    if (var)
@@ -43,7 +21,7 @@
    module_path[n++] = g_strdup(path);
    module_path[n] = NULL;
    g_free(path);
-@@ -324,7 +324,7 @@
+@@ -326,7 +326,7 @@
      }
    else
      {
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 11105aea0796..87a94944e64e 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -172,10 +172,8 @@ share/themes/Default/gtk/gtkrc.pl
 share/themes/Default/gtk/gtkrc.ru
 share/themes/Default/gtk/gtkrc.sk
 share/themes/Default/gtk/gtkrc.sl
-@exec mkdir -p %D/share/themes/engines
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
-@dirrm share/themes/engines
 @dirrm share/themes
 @dirrm include/gtk12/gdk
 @dirrm include/gtk12/gtk
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 0e3310d9f48e..7a7cf0c34798 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -35,7 +35,4 @@ MAN1=		gtk12-config.1
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/themes/engines
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index fb578b3b9032..56123b2f7a29 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,18 +1,6 @@
---- gtk/gtkrc.c.orig	Tue May 11 04:31:09 1999
-+++ gtk/gtkrc.c	Sat May 15 19:01:44 1999
-@@ -231,9 +231,9 @@
- 
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
- 
-   return path;
- }
-@@ -246,9 +246,9 @@
+--- gtk/gtkrc.c.orig	Sat Sep  4 02:56:58 1999
++++ gtk/gtkrc.c	Sun Oct 10 05:01:48 1999
+@@ -260,9 +260,9 @@
  
    var = getenv("GTK_DATA_PREFIX");
    if (var)
@@ -24,17 +12,7 @@
    
    for (n = 0; pixmap_path[n]; n++) ;
    if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -282,15 +282,15 @@
-   
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
-   module_path[n++] = g_strdup(path);
-   g_free(path);
+@@ -292,7 +292,7 @@
  
    var = g_get_home_dir ();
    if (var)
@@ -43,7 +21,7 @@
    module_path[n++] = g_strdup(path);
    module_path[n] = NULL;
    g_free(path);
-@@ -324,7 +324,7 @@
+@@ -326,7 +326,7 @@
      }
    else
      {
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 11105aea0796..87a94944e64e 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -172,10 +172,8 @@ share/themes/Default/gtk/gtkrc.pl
 share/themes/Default/gtk/gtkrc.ru
 share/themes/Default/gtk/gtkrc.sk
 share/themes/Default/gtk/gtkrc.sl
-@exec mkdir -p %D/share/themes/engines
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
-@dirrm share/themes/engines
 @dirrm share/themes
 @dirrm include/gtk12/gdk
 @dirrm include/gtk12/gtk
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 0e3310d9f48e..7a7cf0c34798 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -35,7 +35,4 @@ MAN1=		gtk12-config.1
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/themes/engines
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
index fb578b3b9032..56123b2f7a29 100644
--- a/x11-toolkits/gtk30/files/patch-ad
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -1,18 +1,6 @@
---- gtk/gtkrc.c.orig	Tue May 11 04:31:09 1999
-+++ gtk/gtkrc.c	Sat May 15 19:01:44 1999
-@@ -231,9 +231,9 @@
- 
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
- 
-   return path;
- }
-@@ -246,9 +246,9 @@
+--- gtk/gtkrc.c.orig	Sat Sep  4 02:56:58 1999
++++ gtk/gtkrc.c	Sun Oct 10 05:01:48 1999
+@@ -260,9 +260,9 @@
  
    var = getenv("GTK_DATA_PREFIX");
    if (var)
@@ -24,17 +12,7 @@
    
    for (n = 0; pixmap_path[n]; n++) ;
    if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -282,15 +282,15 @@
-   
-   var = getenv("GTK_EXE_PREFIX");
-   if (var)
--    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", var, "/share/themes/engines");
-   else
--    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-+    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines");
-   module_path[n++] = g_strdup(path);
-   g_free(path);
+@@ -292,7 +292,7 @@
  
    var = g_get_home_dir ();
    if (var)
@@ -43,7 +21,7 @@
    module_path[n++] = g_strdup(path);
    module_path[n] = NULL;
    g_free(path);
-@@ -324,7 +324,7 @@
+@@ -326,7 +326,7 @@
      }
    else
      {
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 11105aea0796..87a94944e64e 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -172,10 +172,8 @@ share/themes/Default/gtk/gtkrc.pl
 share/themes/Default/gtk/gtkrc.ru
 share/themes/Default/gtk/gtkrc.sk
 share/themes/Default/gtk/gtkrc.sl
-@exec mkdir -p %D/share/themes/engines
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
-@dirrm share/themes/engines
 @dirrm share/themes
 @dirrm include/gtk12/gdk
 @dirrm include/gtk12/gtk