13 files changed, 133 insertions, 94 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index dc09a78b5e45..78b795471f02 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.9.4
+# Version required:	1.9.7
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	imlib-1.9.4
+DISTNAME=	imlib-1.9.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/imlib
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index b82d90eab08c..765fbb050ed7 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
+MD5 (imlib-1.9.7.tar.gz) = 0b897b599e6e651d8ec189971aef4eca
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 1d43b872d636..ed8f6a0c02e2 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,7 +1,16 @@
---- configure.orig	Thu Feb 25 01:44:38 1999
-+++ configure	Mon Mar  1 20:30:08 1999
-@@ -2304,8 +2304,8 @@
- echo "configure:2305: checking If dynamic linking works on this system" >&5
+--- configure.orig	Wed Sep  1 04:00:37 1999
++++ configure	Mon Sep  6 15:17:37 1999
+@@ -1826,7 +1826,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -2367,8 +2367,8 @@
+ echo "configure:2368: checking whether to build gmodulized imlib" >&5
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
 -  LIBS="$LIBS `glib-config --libs gmodule`"
@@ -11,7 +20,7 @@
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
-@@ -2354,8 +2354,8 @@
+@@ -2418,8 +2418,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -22,21 +31,39 @@
     
     
     echo "$ac_t""yes" 1>&6
-@@ -4153,7 +4153,7 @@
+@@ -4217,7 +4217,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lXext $X_LIBS $LIBS"
 +LIBS="-lXext -lX11 $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4159 "configure"
+ #line 4223 "configure"
  #include "confdefs.h"
-@@ -4488,7 +4488,7 @@
+@@ -4536,7 +4536,7 @@
+   echo "$ac_t""$jpeg_ok" 1>&6
+   if test "$jpeg_ok" = yes; then 
+     JPEGLIBS="-ljpeg"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBJPEG 1
+ EOF
+ 
+@@ -4552,7 +4552,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff $GX_LIBS $LIBS"
 +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4494 "configure"
+ #line 4558 "configure"
  #include "confdefs.h"
+@@ -4609,7 +4609,7 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   TIFFLIBS="-ltiff"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBTIFF 1
+ EOF
+ 
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 205e21a9d237..7de2e091ecdd 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -4,8 +4,8 @@
  libImlib_la_SOURCES =  	cache.c			colors.c		load.c			misc.c			rend.c			utils.c			save.c			snprintf.c
  
  
--libImlib_la_LDFLAGS = -version-info 10:4:9
-+libImlib_la_LDFLAGS = -version-info 4:0:0
+-libImlib_la_LDFLAGS = -version-info 10:7:9
++libImlib_la_LDFLAGS = -version-info 5:0:0
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
  libImlib_la_LIBADD = $(SUPPORT_LIBS)
  
@@ -15,8 +15,8 @@
  libgdk_imlib_la_SOURCES =  	cache.c      			colors.c     			globals.c    			load.c       			misc.c       			rend.c       			utils.c      			save.c				modules.c
  
  
--libgdk_imlib_la_LDFLAGS = -version-info 10:4:9
-+libgdk_imlib_la_LDFLAGS = -version-info 4:0:0
+-libgdk_imlib_la_LDFLAGS = -version-info 10:7:9
++libgdk_imlib_la_LDFLAGS = -version-info 5:0:0
  libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
  
  include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index 3844624f5149..3b7ede7e47bb 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -1,5 +1,7 @@
 bin/imlib-config
 bin/imlib_config
+etc/imlib/im_palette-small.pal
+etc/imlib/im_palette-tiny.pal
 etc/imlib/im_palette.pal
 etc/imlib/imrc
 include/Imlib.h
@@ -10,34 +12,18 @@ include/gdk_imlib_private.h
 include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.so
-lib/libImlib.so.4
+lib/libImlib.so.5
 lib/libgdk_imlib.a
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.4
-lib/libimlib-bmp.a
+lib/libgdk_imlib.so.5
 lib/libimlib-bmp.so
-lib/libimlib-bmp.so.0
-lib/libimlib-gif.a
 lib/libimlib-gif.so
-lib/libimlib-gif.so.0
-lib/libimlib-jpeg.a
 lib/libimlib-jpeg.so
-lib/libimlib-jpeg.so.0
-lib/libimlib-png.a
 lib/libimlib-png.so
-lib/libimlib-png.so.0
-lib/libimlib-ppm.a
 lib/libimlib-ppm.so
-lib/libimlib-ppm.so.0
-lib/libimlib-ps.a
 lib/libimlib-ps.so
-lib/libimlib-ps.so.0
-lib/libimlib-tiff.a
 lib/libimlib-tiff.so
-lib/libimlib-tiff.so.0
-lib/libimlib-xpm.a
 lib/libimlib-xpm.so
-lib/libimlib-xpm.so.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/imlib.m4
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index dc09a78b5e45..78b795471f02 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.9.4
+# Version required:	1.9.7
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	imlib-1.9.4
+DISTNAME=	imlib-1.9.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/imlib
diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index b82d90eab08c..765fbb050ed7 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
+MD5 (imlib-1.9.7.tar.gz) = 0b897b599e6e651d8ec189971aef4eca
diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa
index 1d43b872d636..ed8f6a0c02e2 100644
--- a/graphics/imlib2-tmp/files/patch-aa
+++ b/graphics/imlib2-tmp/files/patch-aa
@@ -1,7 +1,16 @@
---- configure.orig	Thu Feb 25 01:44:38 1999
-+++ configure	Mon Mar  1 20:30:08 1999
-@@ -2304,8 +2304,8 @@
- echo "configure:2305: checking If dynamic linking works on this system" >&5
+--- configure.orig	Wed Sep  1 04:00:37 1999
++++ configure	Mon Sep  6 15:17:37 1999
+@@ -1826,7 +1826,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -2367,8 +2367,8 @@
+ echo "configure:2368: checking whether to build gmodulized imlib" >&5
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
 -  LIBS="$LIBS `glib-config --libs gmodule`"
@@ -11,7 +20,7 @@
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
-@@ -2354,8 +2354,8 @@
+@@ -2418,8 +2418,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -22,21 +31,39 @@
     
     
     echo "$ac_t""yes" 1>&6
-@@ -4153,7 +4153,7 @@
+@@ -4217,7 +4217,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lXext $X_LIBS $LIBS"
 +LIBS="-lXext -lX11 $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4159 "configure"
+ #line 4223 "configure"
  #include "confdefs.h"
-@@ -4488,7 +4488,7 @@
+@@ -4536,7 +4536,7 @@
+   echo "$ac_t""$jpeg_ok" 1>&6
+   if test "$jpeg_ok" = yes; then 
+     JPEGLIBS="-ljpeg"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBJPEG 1
+ EOF
+ 
+@@ -4552,7 +4552,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff $GX_LIBS $LIBS"
 +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4494 "configure"
+ #line 4558 "configure"
  #include "confdefs.h"
+@@ -4609,7 +4609,7 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   TIFFLIBS="-ltiff"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBTIFF 1
+ EOF
+ 
diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index 3844624f5149..3b7ede7e47bb 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -1,5 +1,7 @@
 bin/imlib-config
 bin/imlib_config
+etc/imlib/im_palette-small.pal
+etc/imlib/im_palette-tiny.pal
 etc/imlib/im_palette.pal
 etc/imlib/imrc
 include/Imlib.h
@@ -10,34 +12,18 @@ include/gdk_imlib_private.h
 include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.so
-lib/libImlib.so.4
+lib/libImlib.so.5
 lib/libgdk_imlib.a
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.4
-lib/libimlib-bmp.a
+lib/libgdk_imlib.so.5
 lib/libimlib-bmp.so
-lib/libimlib-bmp.so.0
-lib/libimlib-gif.a
 lib/libimlib-gif.so
-lib/libimlib-gif.so.0
-lib/libimlib-jpeg.a
 lib/libimlib-jpeg.so
-lib/libimlib-jpeg.so.0
-lib/libimlib-png.a
 lib/libimlib-png.so
-lib/libimlib-png.so.0
-lib/libimlib-ppm.a
 lib/libimlib-ppm.so
-lib/libimlib-ppm.so.0
-lib/libimlib-ps.a
 lib/libimlib-ps.so
-lib/libimlib-ps.so.0
-lib/libimlib-tiff.a
 lib/libimlib-tiff.so
-lib/libimlib-tiff.so.0
-lib/libimlib-xpm.a
 lib/libimlib-xpm.so
-lib/libimlib-xpm.so.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/imlib.m4
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index dc09a78b5e45..78b795471f02 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.9.4
+# Version required:	1.9.7
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	imlib-1.9.4
+DISTNAME=	imlib-1.9.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/imlib
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index b82d90eab08c..765fbb050ed7 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
+MD5 (imlib-1.9.7.tar.gz) = 0b897b599e6e651d8ec189971aef4eca
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
index 1d43b872d636..ed8f6a0c02e2 100644
--- a/graphics/imlib2/files/patch-aa
+++ b/graphics/imlib2/files/patch-aa
@@ -1,7 +1,16 @@
---- configure.orig	Thu Feb 25 01:44:38 1999
-+++ configure	Mon Mar  1 20:30:08 1999
-@@ -2304,8 +2304,8 @@
- echo "configure:2305: checking If dynamic linking works on this system" >&5
+--- configure.orig	Wed Sep  1 04:00:37 1999
++++ configure	Mon Sep  6 15:17:37 1999
+@@ -1826,7 +1826,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -2367,8 +2367,8 @@
+ echo "configure:2368: checking whether to build gmodulized imlib" >&5
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
 -  LIBS="$LIBS `glib-config --libs gmodule`"
@@ -11,7 +20,7 @@
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
-@@ -2354,8 +2354,8 @@
+@@ -2418,8 +2418,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -22,21 +31,39 @@
     
     
     echo "$ac_t""yes" 1>&6
-@@ -4153,7 +4153,7 @@
+@@ -4217,7 +4217,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lXext $X_LIBS $LIBS"
 +LIBS="-lXext -lX11 $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4159 "configure"
+ #line 4223 "configure"
  #include "confdefs.h"
-@@ -4488,7 +4488,7 @@
+@@ -4536,7 +4536,7 @@
+   echo "$ac_t""$jpeg_ok" 1>&6
+   if test "$jpeg_ok" = yes; then 
+     JPEGLIBS="-ljpeg"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBJPEG 1
+ EOF
+ 
+@@ -4552,7 +4552,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff $GX_LIBS $LIBS"
 +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4494 "configure"
+ #line 4558 "configure"
  #include "confdefs.h"
+@@ -4609,7 +4609,7 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   TIFFLIBS="-ltiff"
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg"; cat >> confdefs.h <<\EOF
+ #define HAVE_LIBTIFF 1
+ EOF
+ 
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 3844624f5149..3b7ede7e47bb 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,5 +1,7 @@
 bin/imlib-config
 bin/imlib_config
+etc/imlib/im_palette-small.pal
+etc/imlib/im_palette-tiny.pal
 etc/imlib/im_palette.pal
 etc/imlib/imrc
 include/Imlib.h
@@ -10,34 +12,18 @@ include/gdk_imlib_private.h
 include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.so
-lib/libImlib.so.4
+lib/libImlib.so.5
 lib/libgdk_imlib.a
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.4
-lib/libimlib-bmp.a
+lib/libgdk_imlib.so.5
 lib/libimlib-bmp.so
-lib/libimlib-bmp.so.0
-lib/libimlib-gif.a
 lib/libimlib-gif.so
-lib/libimlib-gif.so.0
-lib/libimlib-jpeg.a
 lib/libimlib-jpeg.so
-lib/libimlib-jpeg.so.0
-lib/libimlib-png.a
 lib/libimlib-png.so
-lib/libimlib-png.so.0
-lib/libimlib-ppm.a
 lib/libimlib-ppm.so
-lib/libimlib-ppm.so.0
-lib/libimlib-ps.a
 lib/libimlib-ps.so
-lib/libimlib-ps.so.0
-lib/libimlib-tiff.a
 lib/libimlib-tiff.so
-lib/libimlib-tiff.so.0
-lib/libimlib-xpm.a
 lib/libimlib-xpm.so
-lib/libimlib-xpm.so.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/imlib.m4