Update to 1.3.6

Approved by: marcus (mentor)

12 files changed, 33 insertions, 73 deletions

diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index ebf5b1c63f4b..ce936b5065c9 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libbonobomm
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
@@ -16,7 +16,7 @@ MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ interfaces for libbonobo
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
-		ORBit-2-cpp.6:${PORTSDIR}/devel/orbitcpp
+		ORBit-2-cpp.7:${PORTSDIR}/devel/orbitcpp
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
@@ -26,4 +26,8 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
+# Cleanup bad autogenerated files from tarball
+post-configure:
+	${GMAKE} -C ${WRKSRC}/bonobomm/generated clean
+
 .include <bsd.port.mk>
diff --git a/devel/libbonobomm/distinfo b/devel/libbonobomm/distinfo
index 191fc9b34b5a..50841a8afdd7 100644
--- a/devel/libbonobomm/distinfo
+++ b/devel/libbonobomm/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobomm-1.3.5.tar.gz) = e6660db6d394b3bb37d2c7bcb4af5457
+MD5 (gnome2/libbonobomm-1.3.6.tar.gz) = e7b3102073608a11b19b85329b156689
diff --git a/devel/libbonobomm/files/patch-Makefile.in b/devel/libbonobomm/files/patch-Makefile.in
deleted file mode 100644
index 7bd2bfcc4243..000000000000
--- a/devel/libbonobomm/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Aug 17 12:06:44 2003
-+++ Makefile.in	Sun Aug 17 12:07:02 2003
-@@ -99,7 +99,7 @@
- 
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig
--pkgconfig_DATA = libbonobomm-2.0.pc libbonobomm-2.0-uninstalled.pc
-+pkgconfig_DATA = libbonobomm-2.0.pc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
- CONFIG_HEADER = ./bonobomm/libbonobommconfig.h
diff --git a/devel/libbonobomm/files/patch-bonobo::Makefile.in b/devel/libbonobomm/files/patch-bonobo::Makefile.in
deleted file mode 100644
index 5d285691ecd8..000000000000
--- a/devel/libbonobomm/files/patch-bonobo::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- bonobomm/Makefile.in.orig	Fri May 23 11:44:18 2003
-+++ bonobomm/Makefile.in	Fri May 23 11:44:36 2003
-@@ -96,7 +96,7 @@
- 
- EXTRA_DIST = README libbonobomm.h libbonobommconfig.h.in
- 
--libbonobomm_includedir = $(includedir)/libgnomemm-2.0
-+libbonobomm_includedir = $(includedir)/libbonobomm-2.0
- libbonobomm_include_HEADERS = libbonobomm.h
- 
- libbonobomm_configdir = $(libdir)/libbonobomm-2.0/include
diff --git a/devel/libbonobomm/files/patch-tools::m4::Makefile.in b/devel/libbonobomm/files/patch-tools::m4::Makefile.in
index d57fb633da65..5a3a8950e781 100644
--- a/devel/libbonobomm/files/patch-tools::m4::Makefile.in
+++ b/devel/libbonobomm/files/patch-tools::m4::Makefile.in
@@ -1,13 +1,13 @@
---- tools/m4/Makefile.in.orig	Fri May 23 11:00:56 2003
-+++ tools/m4/Makefile.in	Fri May 23 11:30:53 2003
-@@ -100,8 +100,8 @@
- 
- # Install the .m4, files:
- 
+--- tools/m4/Makefile.in.orig	Mon Aug 25 19:45:36 2003
++++ tools/m4/Makefile.in	Mon Aug 25 19:46:18 2003
+@@ -168,8 +168,8 @@
+ # than putting them in separate directories and expecting packages
+ # to provide correct m4 include arguments.
+ # We should probably do this properly some time. TODO.
 -tools_m4_includedir = $(libdir)/gtkmm-2.0/proc/m4
--tools_m4_include_HEADERS = class_bonoboobject.m4 convert_libbonobo.m4 corbamethod.m4
+-tools_m4_include_HEADERS = $(files_tools_m4_install)
 +tools_m4_includedir = $(libdir)/libbonobomm-2.0/proc/m4
 +tools_m4_include_HEADERS = $(files_tools_m4)
+ subdir = tools/m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
- CONFIG_HEADER = ../../bonobomm/libbonobommconfig.h
- CONFIG_CLEAN_FILES = 
diff --git a/devel/libbonobomm/pkg-plist b/devel/libbonobomm/pkg-plist
index 2d641b3c248d..5cfa4359dda9 100644
--- a/devel/libbonobomm/pkg-plist
+++ b/devel/libbonobomm/pkg-plist
@@ -18,13 +18,13 @@ lib/libbonobomm-2.0/proc/m4/corbamethod.m4
 lib/libbonobomm-2.0/include/libbonobommconfig.h
 lib/libbonobomm_generated_skels-1.3.a
 lib/libbonobomm_generated_skels-1.3.so
-lib/libbonobomm_generated_skels-1.3.so.0
+lib/libbonobomm_generated_skels-1.3.so.7
 lib/libbonobomm_generated_stubs-1.3.a
 lib/libbonobomm_generated_stubs-1.3.so
-lib/libbonobomm_generated_stubs-1.3.so.0
+lib/libbonobomm_generated_stubs-1.3.so.7
 lib/libbonobomm_servers-1.3.a
 lib/libbonobomm_servers-1.3.so
-lib/libbonobomm_servers-1.3.so.6
+lib/libbonobomm_servers-1.3.so.7
 libdata/pkgconfig/libbonobomm-2.0.pc
 @dirrm lib/libbonobomm-2.0/include
 @dirrm lib/libbonobomm-2.0/proc/m4
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index d948e8591b2f..33dc3aa23ecc 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libbonobouimm
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
diff --git a/x11-toolkits/libbonobouimm/distinfo b/x11-toolkits/libbonobouimm/distinfo
index 7e714e4d98a4..a1c14a97559b 100644
--- a/x11-toolkits/libbonobouimm/distinfo
+++ b/x11-toolkits/libbonobouimm/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobouimm-1.3.5.tar.gz) = 8a162b3b91568ff78a5125b4127eaa55
+MD5 (gnome2/libbonobouimm-1.3.6.tar.gz) = a2cc5ca96095405bbd9eed8b2457d336
diff --git a/x11-toolkits/libbonobouimm/files/patch-Makefile.in b/x11-toolkits/libbonobouimm/files/patch-Makefile.in
deleted file mode 100644
index f77ad3762720..000000000000
--- a/x11-toolkits/libbonobouimm/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Aug 17 11:55:52 2003
-+++ Makefile.in	Sun Aug 17 11:56:43 2003
-@@ -101,7 +101,7 @@
- 
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig
--pkgconfig_DATA = libbonobouimm-2.0.pc libbonobouimm-2.0-uninstalled.pc
-+pkgconfig_DATA = libbonobouimm-2.0.pc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
- CONFIG_HEADER = ./bonobomm/libbonobouimmconfig.h
diff --git a/x11-toolkits/libbonobouimm/files/patch-bonobo::Makefile.in b/x11-toolkits/libbonobouimm/files/patch-bonobo::Makefile.in
deleted file mode 100644
index 952f6e885647..000000000000
--- a/x11-toolkits/libbonobouimm/files/patch-bonobo::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- bonobomm/Makefile.in.orig	Fri May 23 11:42:48 2003
-+++ bonobomm/Makefile.in	Fri May 23 11:41:26 2003
-@@ -98,7 +98,7 @@
- 
- EXTRA_DIST = README libbonobouimm.h libbonobouimmconfig.h.in
- 
--libbonobouimm_includedir = $(includedir)/libgnomemm-2.0
-+libbonobouimm_includedir = $(includedir)/libbonobouimm-2.0
- libbonobouimm_include_HEADERS = libbonobouimm.h
- 
- libbonobouimm_configdir = $(libdir)/libbonobouimm-2.0/include
diff --git a/x11-toolkits/libbonobouimm/files/patch-tools::m4::Makefile.in b/x11-toolkits/libbonobouimm/files/patch-tools::m4::Makefile.in
index 417aef05bf08..3fe3388030eb 100644
--- a/x11-toolkits/libbonobouimm/files/patch-tools::m4::Makefile.in
+++ b/x11-toolkits/libbonobouimm/files/patch-tools::m4::Makefile.in
@@ -1,13 +1,13 @@
---- tools/m4/Makefile.in.orig	Fri May 23 11:34:03 2003
-+++ tools/m4/Makefile.in	Fri May 23 11:35:44 2003
-@@ -102,8 +102,8 @@
- 
- # Install the .m4, files:
- 
--tools_m4_includedir = $(libdir)/libgnomemm-2.0/proc/m4
--tools_m4_include_HEADERS = convert_libbonoboui.m4
+--- tools/m4/Makefile.in.orig	Mon Aug 25 20:48:51 2003
++++ tools/m4/Makefile.in	Mon Aug 25 20:49:56 2003
+@@ -170,8 +170,8 @@
+ # than putting them in separate directories and expecting packages
+ # to provide correct m4 include arguments.
+ # We should probably do this properly some time. TODO.
+-tools_m4_includedir = $(libdir)/gtkmm-2.0/proc/m4
+-tools_m4_include_HEADERS = $(files_tools_m4_install)
 +tools_m4_includedir = $(libdir)/libbonobouimm-2.0/proc/m4
 +tools_m4_include_HEADERS = $(files_tools_m4)
+ subdir = tools/m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
- CONFIG_HEADER = ../../bonobomm/libbonobouimmconfig.h
- CONFIG_CLEAN_FILES = 
diff --git a/x11-toolkits/libbonobouimm/pkg-plist b/x11-toolkits/libbonobouimm/pkg-plist
index 64aa7c7f92b8..7c671fee2428 100644
--- a/x11-toolkits/libbonobouimm/pkg-plist
+++ b/x11-toolkits/libbonobouimm/pkg-plist
@@ -26,10 +26,10 @@ lib/libbonobouimm-2.0/proc/m4/convert_libbonoboui.m4
 lib/libbonobouimm-2.0/include/libbonobouimmconfig.h
 lib/libbonobouimm_servers-1.3.a
 lib/libbonobouimm_servers-1.3.so
-lib/libbonobouimm_servers-1.3.so.6
+lib/libbonobouimm_servers-1.3.so.7
 lib/libbonobouimm_widgets-1.3.a
 lib/libbonobouimm_widgets-1.3.so
-lib/libbonobouimm_widgets-1.3.so.6
+lib/libbonobouimm_widgets-1.3.so.7
 libdata/pkgconfig/libbonobouimm-2.0.pc
 @dirrm lib/libbonobouimm-2.0/include
 @dirrm lib/libbonobouimm-2.0/proc/m4