From 9807afcb602d970ee86027a46a72552f83b0c0c3 Mon Sep 17 00:00:00 2001
From: fredb <fredb@pkgsrc.org>
Date: Wed, 17 Apr 2002 04:45:06 +0000
Subject: Update dependency on xforms. We're mainly bumping the dependency and
 package revision, since we may now link against the forms shared library, and
 because we also have to add a dependency on jpeg lib.

---
 mail/xfmail/Makefile         |  5 ++++-
 mail/xfmail/distinfo         |  4 ++--
 mail/xfmail/patches/patch-ad | 20 +++++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'mail/xfmail')

diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 3f4d383d331..43e91a263c9 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2001/12/20 09:48:03 tron Exp $
+# $NetBSD: Makefile,v 1.23 2002/04/17 04:45:14 fredb Exp $
 
 DISTNAME=		xfmail-1.4.7
+PKGREVISION=		1
 CATEGORIES=		mail x11
 MASTER_SITES=		ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
 EXTRACT_SUFX=		.tar.bz2
@@ -19,6 +20,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_X11BASE=		YES
+USE_XPM=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
@@ -32,6 +34,7 @@ post-install:
 
 .include "../../databases/gdbm/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/xforms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index fe2beb8a192..98ac061ee8b 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/10/12 19:49:25 tron Exp $
+$NetBSD: distinfo,v 1.4 2002/04/17 04:45:14 fredb Exp $
 
 SHA1 (xfmail-1.4.7.tar.bz2) = 3d4df175c67433330fd1e8418f8f12c27323e64c
 Size (xfmail-1.4.7.tar.bz2) = 452411 bytes
 SHA1 (patch-aa) = 117ebc7c64c278ec9faeb9168b4c014d85ae7608
 SHA1 (patch-ab) = 83e6abecd67fbdfcbd2e6c1372b3997b53505b3b
 SHA1 (patch-ac) = 38aa66b7446ad007e2e0b26e21c21f519442360d
-SHA1 (patch-ad) = e9dee799655661b36de19992e205ef4ed367c65d
+SHA1 (patch-ad) = c9eb240fbfb3d4bc8b69107b690c75d325232d93
 SHA1 (patch-ae) = e51f9ef076cd751fd8abb93c4f9122ad5f921520
 SHA1 (patch-af) = d9dcf7c83a0c956c8126fcb36758c52ceaa67c40
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
index 47517184204..2d1b65cda2c 100644
--- a/mail/xfmail/patches/patch-ad
+++ b/mail/xfmail/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $
+$NetBSD: patch-ad,v 1.5 2002/04/17 04:45:14 fredb Exp $
 
---- config/configure.in.orig	Wed Nov  8 21:14:50 2000
+--- config/configure.in.orig	Wed Nov  8 14:14:50 2000
 +++ config/configure.in
 @@ -62,7 +62,7 @@
      fi])
@@ -20,7 +20,21 @@ $NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $
  					[int x; x=0], xfmail_cv_permiss=yes, xfmail_cv_permiss=no)])
                 if test x$xfmail_cv_permiss = xno; then
                         CPPFLAGS="-fpermissive $CPPFLAGS"
-@@ -217,14 +217,14 @@
+@@ -95,8 +95,12 @@
+ AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LIBS="-lXpm $LIBS",
+   [XFMAIL_LIB_ERROR(libXpm,libXpm)])
+ 
++dnl Check for jpeg library
++AC_CHECK_LIB(jpeg, jpeg_set_defaults,LIBS="-ljpeg $LIBS",
++  [XFMAIL_LIB_ERROR(libjpeg,libjpeg)])
++
+ dnl Check for libforms or libxforms
+-AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms $LIBS",
++AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms -ljpeg -lXpm $LIBS",
+   [AC_CHECK_LIB(xforms, fl_initialize, LIBS="-lxforms $LIBS",
+   [XFMAIL_LIB_ERROR(libforms nor libxforms,libforms)])])
+ 
+@@ -217,14 +221,14 @@
  AC_CHECK_HEADER(X11/xpm.h,[],XFMAIL_LIB_ERROR(X11/xpm.h,libXpm))
  
  dnl Check for xforms headers
-- 
cgit v1.2.3