Various fixes and other miscellaneous cruft removed.

Submitted by:	reg

4 files changed, 27 insertions, 29 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index ab7f4c6851ec..f721e6e4a9dd 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -14,11 +14,13 @@ MASTER_SITE_SUBDIR=	unstable/sources/bonobo
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
+		intl.1:${PORTSDIR}/devel/gettext \
 		gdk_pixbuf.1:${PORTSDIR}/graphics/gdk-pixbuf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/devel/bonobo/files/patch-aa b/devel/bonobo/files/patch-aa
index 643fc46cbfdf..be29dd026954 100644
--- a/devel/bonobo/files/patch-aa
+++ b/devel/bonobo/files/patch-aa
@@ -1,25 +1,5 @@
 --- configure.orig	Wed Jan 26 08:41:19 2000
 +++ configure	Fri Jan 28 12:09:41 2000
-@@ -2291,8 +2291,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -2306,7 +2306,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -4538,6 +4538,8 @@
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab
index cd32267b62a7..381d75a62442 100644
--- a/devel/bonobo/files/patch-ab
+++ b/devel/bonobo/files/patch-ab
@@ -23,6 +23,22 @@
  
  
  #bin_PROGRAMS = gnomine bonobo-application-x-mines
+@@ -154,12 +154,14 @@
+ EXTRA_DIST = flag.xpm mine.xpm face-cool.xpm face-sad.xpm 	face-smile.xpm face-win.xpm face-worried.xpm 	gnomine.desktop README AUTHORS $(gnorba_DATA)
+ 
+ 
+-Games_DATA = gnomine.desktop
++Games_DATA = gnomine-bonobo.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
++gnomine-bonobo.desktop: gnomine.desktop
++	cp gnomine.desktop gnomine-bonobo.desktop
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
 --- components/audio-ulaw/Makefile.in.orig	Wed Jan 26 08:49:38 2000
 +++ components/audio-ulaw/Makefile.in	Fri Jan 28 11:00:35 2000
 @@ -130,7 +130,7 @@
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index f18515004402..8cac20d8f426 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -60,21 +60,20 @@ include/bonobo/bonobo-view.h
 include/bonobo/bonobo-widget.h
 include/bonobo/bonobo-wrapper.h
 include/efs.h
-lib/libbonobo.a
-lib/libbonobo.so.1
-lib/libbonobo.so
 lib/libbonobo-xml.a
-lib/libbonobo-xml.so.0
 lib/libbonobo-xml.so
+lib/libbonobo-xml.so.0
+lib/libbonobo.a
+lib/libbonobo.so
+lib/libbonobo.so.1
 lib/libefs.a
-lib/libefs.so.0
 lib/libefs.so
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+lib/libefs.so.0
 lib/libstorage_efs.so
 lib/libstorage_fs.so
-share/gnome/apps/Games/gnomine.desktop
-share/gnome/idl/bonobo.idl
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/gnome/apps/Games/gnomine-bonobo.desktop
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/bonobo-advise.idl
 share/gnome/idl/bonobo-canvas.idl
@@ -89,6 +88,7 @@ share/gnome/idl/bonobo-property.idl
 share/gnome/idl/bonobo-storage.idl
 share/gnome/idl/bonobo-ui-handler.idl
 share/gnome/idl/bonobo-unknown.idl
+share/gnome/idl/bonobo.idl
 share/gnome/mime-info/bonobo.keys
 share/locale/da/LC_MESSAGES/bonobo.mo
 share/locale/de/LC_MESSAGES/bonobo.mo