Upgrade to 1.7.

6 files changed, 200 insertions, 54 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 7f2048f38d72..56f86630202d 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.6
+# Version required:	1.7
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.21 1998/05/20 01:56:53 chuckr Exp $
+# $Id: Makefile,v 1.22 1998/06/23 06:43:12 vanilla Exp $
 #
 
-DISTNAME=	imlib-1.6
+DISTNAME=	imlib-1.7
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/imlib/TAR/ \
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 35308ddacae3..b5512be58138 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.6.tar.gz) = 5c80d6ee9a769c0a9e5fcd7921c3fd85
+MD5 (imlib-1.7.tar.gz) = 37b52a18ed25d195d00d77bbf127c18e
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 34a053cafccb..cda82038a2f0 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,44 +1,188 @@
---- configure.orig	Tue Jun 23 14:08:14 1998
-+++ configure	Tue Jun 23 14:10:55 1998
-@@ -3762,16 +3762,16 @@
+--- configure.orig	Sat Jul 18 10:57:31 1998
++++ configure	Sun Jul 19 01:53:34 1998
+@@ -1699,143 +1699,6 @@
+   rm -f conf.gtktest
+ 
+ 
+-
+-
+-# Extract the first word of "djpeg", so it can be a program name with args.
+-set dummy djpeg; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1708: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  case "$DJPEG_PROG" in
+-  /*)
+-  ac_cv_path_DJPEG_PROG="$DJPEG_PROG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_DJPEG_PROG="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-fi
+-DJPEG_PROG="$ac_cv_path_DJPEG_PROG"
+-if test -n "$DJPEG_PROG"; then
+-  echo "$ac_t""$DJPEG_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-# Extract the first word of "cjpeg", so it can be a program name with args.
+-set dummy cjpeg; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1739: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  case "$CJPEG_PROG" in
+-  /*)
+-  ac_cv_path_CJPEG_PROG="$CJPEG_PROG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_CJPEG_PROG="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-fi
+-CJPEG_PROG="$ac_cv_path_CJPEG_PROG"
+-if test -n "$CJPEG_PROG"; then
+-  echo "$ac_t""$CJPEG_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-# Extract the first word of "convert", so it can be a program name with args.
+-set dummy convert; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1771: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  case "$CONVERT_PROG" in
+-  /*)
+-  ac_cv_path_CONVERT_PROG="$CONVERT_PROG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_CONVERT_PROG="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-fi
+-CONVERT_PROG="$ac_cv_path_CONVERT_PROG"
+-if test -n "$CONVERT_PROG"; then
+-  echo "$ac_t""$CONVERT_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-echo "CONVERT_PROG is $CONVERT_PROG"
+-CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
+-echo "CONVERT_PATH is $CONVERT_PATH"
+-
+-
+-# Extract the first word of "giftopnm", so it can be a program name with args.
+-set dummy giftopnm; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1807: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  case "$GIFTOPNM_PROG" in
+-  /*)
+-  ac_cv_path_GIFTOPNM_PROG="$GIFTOPNM_PROG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_GIFTOPNM_PROG="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-fi
+-GIFTOPNM_PROG="$ac_cv_path_GIFTOPNM_PROG"
+-if test -n "$GIFTOPNM_PROG"; then
+-  echo "$ac_t""$GIFTOPNM_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-echo "GIFTOPNM_PROG is $GIFTOPNM_PROG"
+-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
+-echo "NETPBM_PATH is $NETPBM_PATH"
+-
+-
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:1841: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+@@ -3770,16 +3633,16 @@
  fi
  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
+-echo "configure:3776: 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
++echo "configure:3776: 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
    cat > conftest.$ac_ext <<EOF
- #line 3773 "configure"
+ #line 3781 "configure"
  #include "confdefs.h"
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  EOF
  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_%'`
+ { (eval echo configure:3786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -3818,16 +3681,16 @@
+ 
+ 
+ 
+-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 "configure:3824: 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
++echo "configure:3824: 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
    cat > conftest.$ac_ext <<EOF
- #line 3855 "configure"
+ #line 3829 "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; }
+ { (eval echo configure:3834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
index d982f219ffb5..514e4c3907c8 100644
--- a/graphics/imlib/files/patch-ab
+++ b/graphics/imlib/files/patch-ab
@@ -1,6 +1,6 @@
---- Imlib/Imlib_private.h.orig	Thu Apr 30 04:23:24 1998
-+++ Imlib/Imlib_private.h	Thu Apr 30 04:23:46 1998
-@@ -38,10 +38,10 @@
+--- Imlib/Imlib_private.h.orig	Sun Jul 19 01:40:27 1998
++++ Imlib/Imlib_private.h	Sun Jul 19 01:40:48 1998
+@@ -47,10 +47,10 @@
  #include <png.h>
  #endif
  #ifdef HAVE_LIBTIFF
@@ -13,9 +13,9 @@
  #endif
  
  #define BYTE_ORD_24_RGB 0
---- gdk_imlib/gdk_imlib_private.h.orig	Thu Apr 30 04:34:52 1998
-+++ gdk_imlib/gdk_imlib_private.h	Thu Apr 30 04:35:11 1998
-@@ -46,10 +46,10 @@
+--- gdk_imlib//gdk_imlib_private.h.orig	Sun Jul 19 01:40:54 1998
++++ gdk_imlib//gdk_imlib_private.h	Sun Jul 19 01:41:10 1998
+@@ -48,10 +48,10 @@
  #include <png.h>
  #endif
  #ifdef HAVE_LIBTIFF
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 1e4b91132ef9..42681540a826 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -1,27 +1,5 @@
---- gdk_imlib/Makefile.in.orig	Wed Jun 10 03:52:33 1998
-+++ gdk_imlib/Makefile.in	Tue Jun 23 14:06:05 1998
-@@ -113,7 +113,7 @@
- utils.c      \
- save.c
- 
--libgdk_imlib_la_LDFLAGS      = -version-info 7:0:6
-+libgdk_imlib_la_LDFLAGS      = -version-info 1:6:0
- libgdk_imlib_la_LDDADD = $(LIBS)
- 
- DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
---- Imlib/Makefile.in.orig	Wed Jun 10 03:52:33 1998
-+++ Imlib/Makefile.in	Tue Jun 23 14:05:43 1998
-@@ -111,7 +111,7 @@
- utils.c       \
- save.c
- 
--libImlib_la_LDFLAGS    = -version-info 7:0:6
-+libImlib_la_LDFLAGS    = -version-info 1:6:0
- libImlib_la_LDDADD     = $(LIBS)
- 
- DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
---- config/Makefile.in.orig	Wed Jun 10 03:52:34 1998
-+++ config/Makefile.in	Tue Jun 23 14:04:38 1998
+--- config/Makefile.in.orig	Sun Jul 19 01:43:19 1998
++++ config/Makefile.in	Sun Jul 19 01:43:34 1998
 @@ -23,7 +23,7 @@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
@@ -31,3 +9,25 @@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
+--- Imlib/Makefile.in.orig	Sun Jul 19 01:42:19 1998
++++ Imlib/Makefile.in	Sun Jul 19 01:42:45 1998
+@@ -117,7 +117,7 @@
+ utils.c       \
+ save.c
+ 
+-libImlib_la_LDFLAGS    = -version-info 8:0:7
++libImlib_la_LDFLAGS    = -version-info 1:7:0
+ libImlib_la_LDDADD     = $(LIBS)
+ 
+ DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
+--- gdk_imlib/Makefile.in.orig	Sun Jul 19 01:42:51 1998
++++ gdk_imlib/Makefile.in	Sun Jul 19 01:43:02 1998
+@@ -119,7 +119,7 @@
+ utils.c      \
+ save.c
+ 
+-libgdk_imlib_la_LDFLAGS      = -version-info 8:0:7
++libgdk_imlib_la_LDFLAGS      = -version-info 1:7:0
+ libgdk_imlib_la_LDDADD = $(LIBS)
+ 
+ DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index 07b8a8764d80..9f3f45101216 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -1,4 +1,5 @@
 bin/imlib_config
+bin/imlib-config
 etc/imlib/im_palette.pal
 etc/imlib/imrc
 include/Imlib.h
@@ -10,11 +11,11 @@ include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.1.6
+lib/libImlib.so.1.7
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.1.6
+lib/libgdk_imlib.so.1.7
 @exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R
 @dirrm etc/imlib