From 81e8b8d242d531fd3ec44441bb19872a4a44e970 Mon Sep 17 00:00:00 2001 From: Alexander Nedotsukov Date: Mon, 25 Aug 2003 23:39:08 +0000 Subject: Update to 1.3.6 Approved by: marcus (mentor) --- devel/libbonobomm/Makefile | 8 ++++++-- devel/libbonobomm/distinfo | 2 +- devel/libbonobomm/files/patch-Makefile.in | 11 ----------- devel/libbonobomm/files/patch-bonobo::Makefile.in | 11 ----------- devel/libbonobomm/files/patch-tools::m4::Makefile.in | 18 +++++++++--------- devel/libbonobomm/pkg-plist | 6 +++--- 6 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 devel/libbonobomm/files/patch-Makefile.in delete mode 100644 devel/libbonobomm/files/patch-bonobo::Makefile.in (limited to 'devel/libbonobomm') 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 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 -- cgit v1.2.3