Update to 0.6.

5 files changed, 48 insertions, 13 deletions

diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index f23bf490600c..98cd72404f7b 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo-conf
-PORTVERSION=	0.2
+PORTVERSION=	0.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/bonobo-conf
@@ -17,7 +17,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo
index 3400a98070aa..7f9f072ca933 100644
--- a/devel/bonobo-conf/distinfo
+++ b/devel/bonobo-conf/distinfo
@@ -1 +1 @@
-MD5 (bonobo-conf-0.2.tar.gz) = c986be0916df20b9aa92f17d6f2f5be4
+MD5 (bonobo-conf-0.6.tar.gz) = 08a13f52ddb683e51f81a3a6dd19c119
diff --git a/devel/bonobo-conf/files/patch-ab b/devel/bonobo-conf/files/patch-ab
index 0807f0915b04..b03821813700 100644
--- a/devel/bonobo-conf/files/patch-ab
+++ b/devel/bonobo-conf/files/patch-ab
@@ -1,20 +1,32 @@
---- monikers/Makefile.in.orig	Mon Apr 16 07:54:46 2001
-+++ monikers/Makefile.in	Thu Apr 19 21:18:39 2001
-@@ -169,6 +169,6 @@
+
+$FreeBSD$
+
+--- monikers/Makefile.in.orig	Thu Jul  5 20:02:08 2001
++++ monikers/Makefile.in	Thu Jul  5 20:03:24 2001
+@@ -173,10 +173,10 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -libmoniker_config_la_LDFLAGS = 
 +libmoniker_config_la_LDFLAGS = -avoid-version
- libmoniker_config_la_DEPENDENCIES = 
+ libmoniker_config_la_DEPENDENCIES =  ../bonobo-conf/libbonobo_conf.la
  libmoniker_config_la_OBJECTS =  bonobo-moniker-config.lo
 -libmoniker_gconf_la_LDFLAGS = 
 +libmoniker_gconf_la_LDFLAGS = -avoid-version
- @ENABLE_GCONF_TRUE@libmoniker_gconf_la_DEPENDENCIES = 
-@@ -181,6 +181,6 @@
+ @ENABLE_GCONF_TRUE@libmoniker_gconf_la_DEPENDENCIES =  \
+ @ENABLE_GCONF_TRUE@../bonobo-conf/libbonobo_conf.la
+ @ENABLE_GCONF_TRUE@libmoniker_gconf_la_OBJECTS =  \
+@@ -188,11 +188,11 @@
+ bonobo_moniker_xmldb_OBJECTS =  bonobo-config-xmldb.$(OBJEXT) \
+ bonobo-config-dirdb.$(OBJEXT) bonobo-moniker-xmldb.$(OBJEXT)
  bonobo_moniker_xmldb_DEPENDENCIES =  ../bonobo-conf/libbonobo_conf.la
 -bonobo_moniker_xmldb_LDFLAGS = 
-+bonobo_moniker_xmldb_LDFLAGS =
- test_xmldb_OBJECTS =  test-xmldb.o bonobo-config-xmldb.o
++bonobo_moniker_xmldb_LDFLAGS = -avoid-version
+ test_xmldb_OBJECTS =  test-xmldb.$(OBJEXT) bonobo-config-xmldb.$(OBJEXT) \
+ bonobo-config-dirdb.$(OBJEXT)
  test_xmldb_DEPENDENCIES =  ../bonobo-conf/libbonobo_conf.la
 -test_xmldb_LDFLAGS = 
 +test_xmldb_LDFLAGS = -avoid-version
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff --git a/devel/bonobo-conf/files/patch-ltmain.sh b/devel/bonobo-conf/files/patch-ltmain.sh
new file mode 100644
index 000000000000..b5efb98a9487
--- /dev/null
+++ b/devel/bonobo-conf/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/05 17:05:16	1.1
++++ ltmain.sh	2001/07/05 17:05:44
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/bonobo-conf/pkg-plist b/devel/bonobo-conf/pkg-plist
index cf7dd4fc44e0..81ea096461e4 100644
--- a/devel/bonobo-conf/pkg-plist
+++ b/devel/bonobo-conf/pkg-plist
@@ -1,9 +1,15 @@
 bin/bonobo-moniker-xmldb
 bin/cedit
 include/bonobo-conf/Bonobo_Config.h
+include/bonobo-conf/bonobo-config-control.h
 include/bonobo-conf/bonobo-config-database.h
 include/bonobo-conf/bonobo-config-utils.h
+include/bonobo-conf/bonobo-property-bag-proxy.h
+include/bonobo-conf/bonobo-property-editor.h
+include/bonobo-conf/bonobo-property-frame.h
+lib/bonobo/monikers/libmoniker_config.a
 lib/bonobo/monikers/libmoniker_config.so
+lib/bonobo/monikers/libmoniker_gconf.a
 lib/bonobo/monikers/libmoniker_gconf.so
 lib/bonobo_confConf.sh
 lib/libbonobo_conf.a
@@ -40,10 +46,9 @@ share/gnome/oaf/Bonobo_Moniker_config.oaf
 share/gnome/oaf/Bonobo_Moniker_gconf.oaf
 share/gnome/oaf/Bonobo_Moniker_xmldb.oaf
 share/locale/de/LC_MESSAGES/bonobo-conf.mo
+share/locale/sv/LC_MESSAGES/bonobo-conf.mo
 @dirrm share/gnome/bonobo-conf/html/bonobo-conf
 @dirrm share/gnome/bonobo-conf/html
 @dirrm share/gnome/bonobo-conf
 @dirrm share/aclocal/gnome-macros
-@dirrm lib/bonobo/monikers
-@dirrm lib/bonobo
 @dirrm include/bonobo-conf