Update to 1.9.11.

5 files changed, 46 insertions, 13 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 636e429d97f8..f1da04c5b24b 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	imlib
-PORTVERSION=	1.9.10
-PORTREVISION=	1
+PORTVERSION=	1.9.11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/imlib
@@ -21,12 +20,14 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib --disable-modules
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		imlib-config.1 imlib_config.1
+
 pre-configure:
 	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
 
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index bb81fe7a4cf4..cad54cc5cafb 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.10.tar.gz) = 47323fff0f9209abd2fc0f738d63424e
+MD5 (imlib-1.9.11.tar.gz) = ed50588bb7dbc00b177ba61926e6e0d0
diff --git a/graphics/imlib/files/patch-Imlib_Makefile.in b/graphics/imlib/files/patch-Imlib_Makefile.in
index dfb4091a2bed..cd054464d97b 100644
--- a/graphics/imlib/files/patch-Imlib_Makefile.in
+++ b/graphics/imlib/files/patch-Imlib_Makefile.in
@@ -1,7 +1,14 @@
---- Imlib/Makefile.in.orig	Tue Mar 27 22:21:27 2001
-+++ Imlib/Makefile.in	Tue Apr  3 13:12:00 2001
-@@ -126,3 +126,3 @@
+
+$FreeBSD$
+
+--- Imlib/Makefile.in.orig	Wed Aug  1 02:34:50 2001
++++ Imlib/Makefile.in	Thu Aug  2 20:15:30 2001
+@@ -138,7 +138,7 @@
+ 	snprintf.c
  
--libImlib_la_LDFLAGS = -version-info 10:10:9
+ 
+-libImlib_la_LDFLAGS = -version-info 10:11:9
 +libImlib_la_LDFLAGS = -version-info 5:0:0
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
+ libImlib_la_LIBADD = $(SUPPORT_LIBS)
+ 
diff --git a/graphics/imlib/files/patch-gdk__imlib_Makefile.in b/graphics/imlib/files/patch-gdk__imlib_Makefile.in
index 4e28d8e1926f..7f6ada598108 100644
--- a/graphics/imlib/files/patch-gdk__imlib_Makefile.in
+++ b/graphics/imlib/files/patch-gdk__imlib_Makefile.in
@@ -1,9 +1,16 @@
---- gdk_imlib/Makefile.in.orig	Tue Mar 27 22:21:26 2001
-+++ gdk_imlib/Makefile.in	Tue Apr  3 13:14:15 2001
-@@ -153,4 +153,4 @@
+
+$FreeBSD$
+
+--- gdk_imlib/Makefile.in.orig	Wed Aug  1 02:34:50 2001
++++ gdk_imlib/Makefile.in	Thu Aug  2 20:16:59 2001
+@@ -175,8 +175,8 @@
+ 	modules.c
  
--libgdk_imlib_la_LDFLAGS = -version-info 10:10:9
+ 
+-libgdk_imlib_la_LDFLAGS = -version-info 10:11:9
 -libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
-+libgdk_imlib_la_LDFLAGS = -export-dynamic -version-info 5:0:0
++libgdk_imlib_la_LDFLAGS = -version-info 5:0:0
 +libgdk_imlib_la_LIBADD = $(GTK_LIBS) $(SUPPORT_LIBS)
  
+ include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
+ 
diff --git a/graphics/imlib/files/patch-ltmain.sh b/graphics/imlib/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/graphics/imlib/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -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"