5 files changed, 8 insertions, 32 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index cd05fb1ec832..deebaf93d04c 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	1.0.19
+PORTVERSION=	1.0.20
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bonobo
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	gnomeprint.16:${PORTSDIR}/print/gnomeprint
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 58465a1ace34..d42a4528c705 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-1.0.19.tar.gz) = 97a13cb5c86a5d75c3507a4ad2813090
+MD5 (gnome/bonobo-1.0.20.tar.bz2) = c4c586e2f8670a0adf6116f9b7e6e496
diff --git a/devel/bonobo/files/patch-monikers::Makefile.in b/devel/bonobo/files/patch-monikers::Makefile.in
index 86b054c5fc37..ed1a71440c37 100644
--- a/devel/bonobo/files/patch-monikers::Makefile.in
+++ b/devel/bonobo/files/patch-monikers::Makefile.in
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- monikers/Makefile.in.orig	Tue Jan 22 14:02:06 2002
-+++ monikers/Makefile.in	Tue Jan 22 14:07:14 2002
+--- monikers/Makefile.in.orig	Thu Apr 11 17:19:45 2002
++++ monikers/Makefile.in	Thu Apr 11 17:21:09 2002
 @@ -72,7 +72,7 @@
  BONOBO_LIBDIR = @BONOBO_LIBDIR@
  BONOBO_LIBS = @BONOBO_LIBS@
@@ -12,12 +9,3 @@ $FreeBSD$
  BONOBO_TEST_LIBS = @BONOBO_TEST_LIBS@
  BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
  CATALOGS = @CATALOGS@
-@@ -212,7 +212,7 @@
- 	bonobo-moniker-std.c			
- 
- 
--libmoniker_std_la_LDFLAGS = -module
-+libmoniker_std_la_LDFLAGS = -module -avoid-version
- 
- bonobo_moniker_gunzip_SOURCES = \
- 	bonobo-moniker-gunzip.c		\
diff --git a/devel/bonobo/files/patch-storage-modules::Makefile.in b/devel/bonobo/files/patch-storage-modules::Makefile.in
deleted file mode 100644
index 5faf5c7fce74..000000000000
--- a/devel/bonobo/files/patch-storage-modules::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- storage-modules/Makefile.in	2002/01/22 11:54:43	1.1
-+++ storage-modules/Makefile.in	2002/01/22 11:55:39
-@@ -169,7 +169,7 @@
-         $(GNOME_INCLUDEDIR)
- 
- 
--common_ldflags = -avoid-version
-+common_ldflags = -avoid-version -module
- 
- bonobo_plugindir = $(PLUGIN_DIR)
- bonobo_plugin_LTLIBRARIES = libstorage_efs.la libstorage_fs.la 
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 5a50886aa4b9..58e93115897c 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -256,6 +256,6 @@ share/locale/zh_TW/LC_MESSAGES/bonobo.mo
 @dirrm share/gnome/bonobo/docs
 @dirrm share/gnome/bonobo
 @dirrm lib/bonobo/plugin
-@dirrm lib/bonobo/monikers
-@dirrm lib/bonobo
 @dirrm include/gnome-1.0/bonobo
+@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true