Upgrade imlib to 1.6.

PR:		ports/6893
Submitted by:	Brett Taylor <brett@peloton.physics.montana.edu>

4 files changed, 46 insertions, 32 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 60a9f8a93599..7f2048f38d72 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.3
+# Version required:	1.6
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.20 1998/05/04 20:22:44 jseger Exp $
+# $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $
 #
 
-DISTNAME=	imlib-1.3
+DISTNAME=	imlib-1.6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
 		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
@@ -17,14 +17,14 @@ LIB_DEPENDS=    png\\.2\\.:${PORTSDIR}/graphics/png \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
-		gtk\\.1\\.:${PORTSDIR}/x11/gtk
+		gtk\\.1\\.4:${PORTSDIR}/x11/gtk
 
 USE_GMAKE=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib \
-		INSTALL="/usr/bin/install -c"
+		INSTALL="$${INSTALL} -c"
 WRKSRC=		${WRKDIR}/imlib
 
 post-install:
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index fa45814fb45a..35308ddacae3 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.3.tar.gz) = 6b672e10e70c0a8b0a51de823c6f6859
+MD5 (imlib-1.6.tar.gz) = 5c80d6ee9a769c0a9e5fcd7921c3fd85
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
index ad2d4ad457f7..34a053cafccb 100644
--- a/graphics/imlib2/files/patch-aa
+++ b/graphics/imlib2/files/patch-aa
@@ -1,30 +1,44 @@
---- configure.orig	Wed Apr 22 07:47:30 1998
-+++ configure	Thu Apr 30 05:05:50 1998
-@@ -3215,14 +3215,14 @@
-   GX_LIBS="$GTK_LIBS"
+--- configure.orig	Tue Jun 23 14:08:14 1998
++++ configure	Tue Jun 23 14:10:55 1998
+@@ -3762,16 +3762,16 @@
  fi
- 
--echo $ac_n "checking for main in -ltiff""... $ac_c" 1>&6
--echo "configure:3220: checking for main in -ltiff" >&5
--ac_lib_var=`echo tiff'_'main | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for main in -ltiff34""... $ac_c" 1>&6
-+echo "configure:3220: checking for main in -ltiff34" >&5
-+ac_lib_var=`echo tiff34'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+-echo "configure:3768: checking for tiffio.h" >&5
++  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
++echo "configure:3768: checking for tiff34/tiffio.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-   ac_save_LIBS="$LIBS"
--LIBS="-ltiff $GX_LIBS $LIBS"
-+LIBS="-ltiff34 $GX_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3228 "configure"
+   cat > conftest.$ac_ext <<EOF
+ #line 3773 "configure"
  #include "confdefs.h"
-@@ -3252,7 +3252,7 @@
- #define $ac_tr_lib 1
+-#include <tiffio.h>
++#include <tiff34/tiffio.h>
  EOF
- 
--  LIBS="-ltiff $LIBS"
-+  LIBS="-ltiff34 $LIBS"
- 
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:3778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -3844,16 +3844,16 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
+-echo "configure:3850: checking for gif_lib.h" >&5
++  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
++echo "configure:3850: checking for giflib/gif_lib.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
  else
-   echo "$ac_t""no" 1>&6
+   cat > conftest.$ac_ext <<EOF
+ #line 3855 "configure"
+ #include "confdefs.h"
+-#include <gif_lib.h>
++#include <giflib/gif_lib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:3860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 86a3d8e5f171..ec40e1c2e25b 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -10,9 +10,9 @@ include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.1.3
+lib/libImlib.so.1.6
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.1.3
+lib/libgdk_imlib.so.1.6
 @dirrm etc/imlib