- Fix build with gcc 3.4 [1]

- Remove leftover empty directories [2]

PR:		ports/71890 [1]
Submitted by:	Sergio Mangialardi <sergio@softshark.org> [1]
Approved by:	portmgr (marcus)

6 files changed, 65 insertions, 6 deletions

diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index cf975859e13e..f26503739c73 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -28,10 +28,6 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 post-configure:
 	@${TOUCH} ${WRKSRC}/inti-config.h.in
 
diff --git a/x11-toolkits/inti/files/patch-inti::glib::property.h b/x11-toolkits/inti/files/patch-inti::glib::property.h
new file mode 100644
index 000000000000..ef690c6330a2
--- /dev/null
+++ b/x11-toolkits/inti/files/patch-inti::glib::property.h
@@ -0,0 +1,17 @@
+--- inti/glib/property.h.orig	Sat Sep 18 21:03:00 2004
++++ inti/glib/property.h	Sat Sep 18 21:04:01 2004
+@@ -187,12 +187,12 @@
+ 
+ 	void get(DataType& data) const
+ 	{
+-		property()->get(object(), data);
++		this->property()->get(this->object(), data);
+ 	}
+ 
+ 	void set(const DataType& data) const
+ 	{
+-		property()->set(object(), data);
++		this->property()->set(this->object(), data);
+ 	}
+ };
+ 
diff --git a/x11-toolkits/inti/files/patch-inti::glib::thread.h b/x11-toolkits/inti/files/patch-inti::glib::thread.h
new file mode 100644
index 000000000000..27b79503a1bc
--- /dev/null
+++ b/x11-toolkits/inti/files/patch-inti::glib::thread.h
@@ -0,0 +1,18 @@
+--- inti/glib/thread.h.orig	Sat Sep 18 21:08:25 2004
++++ inti/glib/thread.h	Sat Sep 18 21:09:00 2004
+@@ -485,13 +485,13 @@
+ 
+ 	Private()
+ 	{
+-		g_static_private_init(g_static_private());
++		g_static_private_init(this->g_static_private());
+ 	}
+ 	//!< Constructs and initializes a new private key.
+ 
+ 	~Private()
+ 	{
+-		g_static_private_free(g_static_private());
++		g_static_private_free(this->g_static_private());
+ 	}
+ 	//!< Destructor. Frees the private key.
+ 
diff --git a/x11-toolkits/inti/files/patch-inti::gtk::childproperty.h b/x11-toolkits/inti/files/patch-inti::gtk::childproperty.h
new file mode 100644
index 000000000000..9d8f61aa57ec
--- /dev/null
+++ b/x11-toolkits/inti/files/patch-inti::gtk::childproperty.h
@@ -0,0 +1,17 @@
+--- inti/gtk/childproperty.h.orig	Sat Sep 18 21:10:17 2004
++++ inti/gtk/childproperty.h	Sat Sep 18 21:12:44 2004
+@@ -139,12 +139,12 @@
+ 
+ 	void get(const Widget& child, DataType& data) const
+ 	{
+-		property()->get(object(), child, data);
++		this->property()->get(this->object(), child, data);
+ 	}
+ 
+ 	void set(Widget& child, const DataType& data) const
+ 	{
+-		property()->set(object(), child, data);
++		this->property()->set(this->object(), child, data);
+ 	}
+ };
+ 
diff --git a/x11-toolkits/inti/files/patch-inti::gtk::itemfactory.h b/x11-toolkits/inti/files/patch-inti::gtk::itemfactory.h
new file mode 100644
index 000000000000..fcf93fb02aed
--- /dev/null
+++ b/x11-toolkits/inti/files/patch-inti::gtk::itemfactory.h
@@ -0,0 +1,11 @@
+--- inti/gtk/itemfactory.h.orig	Sat Sep 18 21:25:05 2004
++++ inti/gtk/itemfactory.h	Sat Sep 18 21:26:59 2004
+@@ -373,7 +373,7 @@
+ 		int i = 0;
+ 		while ((owner.item_factory_map[i]).path)
+ 		{
+-			delete_entry(item_factory_map[i]);
++			delete_entry(owner.item_factory_map[i]);
+ 			i++;
+ 		}
+ 	}
diff --git a/x11-toolkits/inti/pkg-plist b/x11-toolkits/inti/pkg-plist
index 2621ce32d8f6..90822b81db6d 100644
--- a/x11-toolkits/inti/pkg-plist
+++ b/x11-toolkits/inti/pkg-plist
@@ -313,8 +313,8 @@ include/inti-1.0/inti/utf-string.h
 @dirrm include/inti-1.0/inti/gdk-pixbuf
 @dirrm include/inti-1.0/inti/atk/private
 @dirrm include/inti-1.0/inti/atk
-@unexec rmdir %D/include/inti-1.0/gdk 2>/dev/null || true
-@unexec rmdir %D/include/inti-1.0/gtk 2>/dev/null || true
+@unexec rmdir %D/include/inti-1.0/inti/gdk 2>/dev/null || true
+@unexec rmdir %D/include/inti-1.0/inti/gtk 2>/dev/null || true
 @unexec rmdir %D/include/inti-1.0/inti 2>/dev/null || true
 @unexec rmdir %D/include/inti-1.0 2>/dev/null || true
 lib/inti-1.0/include/inti-config.h