5 files changed, 49 insertions, 19 deletions

diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index a31060a3212b..cc8237d87139 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.16
-PORTREVISION=	5
+PORTVERSION=	0.17
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libglade
@@ -20,10 +19,11 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOMECTRL=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-bonobo --enable-gnomedb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/devel/libglade/distinfo b/devel/libglade/distinfo
index 1cebc003d06c..2cc60a7658db 100644
--- a/devel/libglade/distinfo
+++ b/devel/libglade/distinfo
@@ -1 +1 @@
-MD5 (libglade-0.16.tar.gz) = 6b98bbf13ee08e571d96765662dfd344
+MD5 (libglade-0.17.tar.gz) = 38b2e2cfd813783fe157617813bfe3b3
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index 7c58782cbc50..b176d42e4de6 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -1,14 +1,23 @@
---- Makefile.in.orig	Sat Feb 10 05:27:41 2001
-+++ Makefile.in	Tue May 22 11:30:14 2001
-@@ -36,3 +36,3 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Sep  7 06:00:35 2001
++++ Makefile.in	Tue Sep 11 15:11:04 2001
+@@ -34,7 +34,7 @@
+ includedir = @includedir@
+ oldincludedir = /usr/include
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
-@@ -168,11 +168,11 @@
+ top_builddir = .
+ 
+@@ -167,15 +167,15 @@
+ bin_SCRIPTS = libglade-config libglade-xgettext
+ noinst_PROGRAMS = test-libglade
  test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
--SUBDIRS = intl po macros glade doc
-+SUBDIRS = intl po macros glade
+-SUBDIRS = intl macros glade doc
++SUBDIRS = intl macros glade
  
 -m4datadir = $(datadir)/aclocal
 +m4datadir = $(prefix)/share/aclocal
@@ -21,3 +30,5 @@
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libglade.pc $(libglade_gnome_pc) $(libglade_bonobo_pc) \
+   $(libglade_gnomedb_pc)
+ 
diff --git a/devel/libglade/files/patch-ltmain.sh b/devel/libglade/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/libglade/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/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/libglade/pkg-plist b/devel/libglade/pkg-plist
index fa43e6f06be2..cdd8c14cd329 100644
--- a/devel/libglade/pkg-plist
+++ b/devel/libglade/pkg-plist
@@ -1,13 +1,10 @@
 bin/libglade-config
 bin/libglade-xgettext
 etc/libgladeConf.sh
-include/glade/glade.h
-include/glade/glade-xml.h
-include/glade/glade-build.h
-include/glade/glade-widget-tree.h
-lib/libglade.a
-lib/libglade.so
-lib/libglade.so.4
+include/libglade-1.0/glade/glade-build.h
+include/libglade-1.0/glade/glade-widget-tree.h
+include/libglade-1.0/glade/glade-xml.h
+include/libglade-1.0/glade/glade.h
 lib/libglade-bonobo.a
 lib/libglade-bonobo.so
 lib/libglade-bonobo.so.4
@@ -17,9 +14,13 @@ lib/libglade-gnome.so.4
 lib/libglade-gnomedb.a
 lib/libglade-gnomedb.so
 lib/libglade-gnomedb.so.4
-libdata/pkgconfig/libglade.pc
+lib/libglade.a
+lib/libglade.so
+lib/libglade.so.4
 libdata/pkgconfig/libglade-bonobo.pc
 libdata/pkgconfig/libglade-gnome.pc
 libdata/pkgconfig/libglade-gnomedb.pc
+libdata/pkgconfig/libglade.pc
 share/aclocal/libglade.m4
-@dirrm include/glade
+@dirrm include/libglade-1.0/glade
+@dirrm include/libglade-1.0