- Update to 0.3.5;

- use USE_LIBTOOL.

Submitted by:	Juan Salaverria <rael@vectorstar.net>

6 files changed, 27 insertions, 66 deletions

diff --git a/misc/libelysium/Makefile b/misc/libelysium/Makefile
index 06bc27ba640..c838d2bf683 100644
--- a/misc/libelysium/Makefile
+++ b/misc/libelysium/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libelysium
-PORTVERSION=	0.2.6
+PORTVERSION=	0.3.5
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://elysium.zoned.net/${PORTNAME}/
 
@@ -14,7 +14,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_GLIB=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/misc/libelysium/distinfo b/misc/libelysium/distinfo
index a9dc76ba23c..6a7553847df 100644
--- a/misc/libelysium/distinfo
+++ b/misc/libelysium/distinfo
@@ -1 +1 @@
-MD5 (libelysium-0.2.6.tar.gz) = 388c2c543d3746499254053c62efe512
+MD5 (libelysium-0.3.5.tar.gz) = 3493b5af2ea76cfec69ccdabb3945068
diff --git a/misc/libelysium/files/patch-Makefile.in b/misc/libelysium/files/patch-Makefile.in
index c4d542a1e48..1fb07991865 100644
--- a/misc/libelysium/files/patch-Makefile.in
+++ b/misc/libelysium/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in	2001/12/10 09:35:00	1.1
-+++ Makefile.in	2001/12/10 09:35:18
-@@ -85,7 +85,7 @@
- EXTRA_DIST = libelysium.spec.in 	libelysiumConf.sh.in
+--- Makefile.in.orig	Tue May 14 11:35:40 2002
++++ Makefile.in	Tue May 14 11:38:15 2002
+@@ -83,7 +83,7 @@
+ EXTRA_DIST = libelysium.spec.in libelysium.pc.in
  
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = libelysiumConf.sh
- 
- CLEANFILES = libelysiumConf.sh
+ pkgconf_DATA = libelysium.pc
+-pkgconfdir = $(libdir)/pkgconfig
++pkgconfdir = $(prefix)/libdata/pkgconfig
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =  libelysium.pc libelysium.spec
diff --git a/misc/libelysium/files/patch-configure b/misc/libelysium/files/patch-configure
index 27791c093d5..d4400ce7635 100644
--- a/misc/libelysium/files/patch-configure
+++ b/misc/libelysium/files/patch-configure
@@ -1,25 +1,13 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 10 11:37:09 2001
-+++ configure	Mon Dec 10 11:53:37 2001
-@@ -952,7 +952,7 @@
- 
- ELYSIUM_LIBDIR='-L${libdir}'
- ELYSIUM_INCLUDEDIR='-I${includedir}'
--ELYSIUM_LIBS="-lelysium -lglib"
-+ELYSIUM_LIBS="-lelysium `$GLIB_CONFIG --libs`"
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
- echo "configure:959: checking whether to enable maintainer-specific portions of Makefiles" >&5
-@@ -5462,8 +5462,8 @@
- 
- 
- 
--CFLAGS="`glib-config --cflags`"
--LDFLAGS="`glib-config --libs`"
-+CFLAGS="`$GLIB_CONFIG --cflags`"
-+LDFLAGS="`$GLIB_CONFIG --libs`"
- 
+--- configure	2002/05/14 08:41:45	1.1
++++ configure	2002/05/14 08:41:53
+@@ -5254,6 +5254,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/misc/libelysium/files/patch-ltmain.sh b/misc/libelysium/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb..00000000000
--- a/misc/libelysium/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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/misc/libelysium/pkg-plist b/misc/libelysium/pkg-plist
index 2a348490038..736d9acdfe9 100644
--- a/misc/libelysium/pkg-plist
+++ b/misc/libelysium/pkg-plist
@@ -1,7 +1,8 @@
-etc/libelysiumConf.sh
-include/libelysium/elysium-file.h
-include/libelysium/encompass-uri.h
+include/gnome-1.0/libelysium/elysium-file.h
+include/gnome-1.0/libelysium/encompass-uri.h
 lib/libelysium.a
 lib/libelysium.so
-lib/libelysium.so.0
-@dirrm include/libelysium
+lib/libelysium.so.3
+libdata/pkgconfig/libelysium.pc
+@dirrm include/gnome-1.0/libelysium
+@dirrm include/gnome-1.0