Changes 1.9.15:

* Minor bug fixes

4 files changed, 34 insertions, 34 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index bcdb912d32a..e93d380ffdb 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.88 2004/11/27 08:09:37 tron Exp $
+# $NetBSD: Makefile,v 1.89 2004/12/03 13:42:47 adam Exp $
 
-DISTNAME=		imlib-1.9.14
-PKGREVISION=		7
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/imlib/1.9/}
+DISTNAME=	imlib-1.9.15
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.nl.rasterman.com/imlib.html
-COMMENT=		Image manipulation library for X11
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.nl.rasterman.com/imlib.html
+COMMENT=	Image manipulation library for X11
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
-USE_X11=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE=	imlib.pc.in
+USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+PKGCONFIG_OVERRIDE=	imlib.pc.in
 UNLIMIT_RESOURCES=	datasize
 
 CPPFLAGS+=		-DENABLE_NLS
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index fd0644c0822..b9f7e3415b6 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2004/03/13 17:35:54 cube Exp $
+$NetBSD: distinfo,v 1.15 2004/12/03 13:42:47 adam Exp $
 
-SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6
-Size (imlib-1.9.14.tar.gz) = 748591 bytes
+SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
+Size (imlib-1.9.15.tar.bz2) = 683242 bytes
 SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
 SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
-SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b
-SHA1 (patch-ah) = 703f83ad25e0a8af8427ccd4d8492f7fa83f26a3
+SHA1 (patch-ag) = 961a92dfedc79570aacdd75102e63a32171ece55
+SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
 SHA1 (patch-ai) = 4c1ab5bd72cd3a5070a84b08e7870591d5a3b309
diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag
index 1cdc3167638..13405735a59 100644
--- a/graphics/imlib/patches/patch-ag
+++ b/graphics/imlib/patches/patch-ag
@@ -1,15 +1,15 @@
-$NetBSD: patch-ag,v 1.4 2002/08/25 18:39:13 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2004/12/03 13:42:47 adam Exp $
 
---- configure.orig	Mon Mar 25 11:45:33 2002
+--- configure.orig	2004-09-23 01:15:44.000000000 +0000
 +++ configure
-@@ -7670,8 +7670,8 @@
+@@ -23645,8 +23645,8 @@ echo "${ECHO_T}$ac_cv_header_tiffio_h" >
+ 
  fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ if test $ac_cv_header_tiffio_h = yes; then
 -  TIFFLIBS="-ltiff"
--    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
+-    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff";
 +  TIFFLIBS="-ltiff -ljpeg -lz"
-+    SUPPORT_LIBS="$SUPPORT_LIBS $TIFFLIBS"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz";
+ cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBTIFF 1
- EOF
- 
+ _ACEOF
diff --git a/graphics/imlib/patches/patch-ah b/graphics/imlib/patches/patch-ah
index bf1841071ef..cb39b5821b8 100644
--- a/graphics/imlib/patches/patch-ah
+++ b/graphics/imlib/patches/patch-ah
@@ -1,18 +1,18 @@
-$NetBSD: patch-ah,v 1.1 2002/11/26 12:32:21 jmmv Exp $
+$NetBSD: patch-ah,v 1.2 2004/12/03 13:42:47 adam Exp $
 
---- config/Makefile.in.orig	Mon Mar 25 17:50:27 2002
+--- config/Makefile.in.orig	2004-09-23 01:16:17.000000000 +0000
 +++ config/Makefile.in
-@@ -23,7 +23,8 @@ bindir = @bindir@
+@@ -158,7 +158,8 @@ prefix = @prefix@
+ program_transform_name = @program_transform_name@
  sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
 -sysconfdir = @sysconfdir@
 +realsysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -219,7 +220,7 @@ maintainer-clean-generic clean mostlycle
+ target_alias = @target_alias@
+ EXTRA_DIST = imrc.in im_palette.pal im_palette-small.pal im_palette-tiny.pal
+ sysconf_DATA = imrc im_palette.pal im_palette-small.pal im_palette-tiny.pal
+@@ -331,7 +332,7 @@ uninstall-am: uninstall-info-am uninstal
  
  
  imrc: imrc.in