Untangle dependencies: split out the "exrdisplay" GUI app which needs

fltk from the rest.
Now eg KDE doesn't require fltk anymore which looked a bit strange.

8 files changed, 96 insertions, 7 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 6df719eb673..7d930956184 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.443 2007/01/05 19:34:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.444 2007/01/11 19:03:05 drochner Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -206,6 +206,7 @@ SUBDIR+=	ocrad
 SUBDIR+=	opencv
 SUBDIR+=	opendis
 SUBDIR+=	openexr
+SUBDIR+=	openexr-exrdisplay
 SUBDIR+=	optipng
 SUBDIR+=	ov519view
 SUBDIR+=	p5-Chart
diff --git a/graphics/openexr-exrdisplay/DESCR b/graphics/openexr-exrdisplay/DESCR
new file mode 100644
index 00000000000..6eb352d7d2a
--- /dev/null
+++ b/graphics/openexr-exrdisplay/DESCR
@@ -0,0 +1,4 @@
+OpenEXR is a high dynamic-range (HDR) image file format developed by
+Industrial Light & Magic for use in computer imaging applications.
+
+This package contains the "exrdisplay" application.
diff --git a/graphics/openexr-exrdisplay/Makefile b/graphics/openexr-exrdisplay/Makefile
new file mode 100644
index 00000000000..6b9d8661965
--- /dev/null
+++ b/graphics/openexr-exrdisplay/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2007/01/11 19:03:05 drochner Exp $
+
+DISTNAME=	openexr-1.4.0a
+PKGNAME=	openexr-exrdisplay-1.4.0
+CATEGORIES=	games
+MASTER_SITES=	http://savannah.nongnu.org/download/openexr/
+
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://www.openexr.com/
+COMMENT=	GUI for openexr
+
+CONFLICTS+=	openexr<1.4.0nb1
+PATCHDIR=	${.CURDIR}/../../graphics/openexr/patches
+DISTINFO_FILE=	${.CURDIR}/../../graphics/openexr/distinfo
+
+WRKSRC=			${WRKDIR}/openexr-1.4.0
+USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+PTHREAD_OPTS+=		require
+
+BUILD_DIRS=		exrdisplay
+INSTALL_DIRS=		exrdisplay
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "IRIX"
+LDFLAGS+=		-lmx
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openexr-exrdisplay/PLIST b/graphics/openexr-exrdisplay/PLIST
new file mode 100644
index 00000000000..0ec837787b4
--- /dev/null
+++ b/graphics/openexr-exrdisplay/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2007/01/11 19:03:05 drochner Exp $
+bin/exrdisplay
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 6f39c05a8d0..1668768234e 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/10/29 13:51:18 dsainty Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/11 19:03:05 drochner Exp $
 
 DISTNAME=	openexr-1.4.0a
 PKGNAME=	openexr-1.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/openexr/
 
@@ -26,5 +26,4 @@ LDFLAGS+=		-lmx
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index 227efe21245..fb923378baa 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/29 13:13:07 dsainty Exp $
-bin/exrdisplay
+@comment $NetBSD: PLIST,v 1.4 2007/01/11 19:03:05 drochner Exp $
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 7bf0b97f914..6263de7576c 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/10/29 12:19:15 dsainty Exp $
+$NetBSD: distinfo,v 1.8 2007/01/11 19:03:05 drochner Exp $
 
 SHA1 (openexr-1.4.0a.tar.gz) = d7f2188b677ea28cafb104f2ace6c0f50b5aadee
 RMD160 (openexr-1.4.0a.tar.gz) = 74e43977c88fc9a3d7c74bcd808a477489dad8c2
 Size (openexr-1.4.0a.tar.gz) = 9673041 bytes
 SHA1 (patch-ab) = af6a9601b68e8cab51de75f6d1a05476fdfa3b87
+SHA1 (patch-ac) = 8fb11127c0449fd1a7748768eda560d1d02056a8
diff --git a/graphics/openexr/patches/patch-ac b/graphics/openexr/patches/patch-ac
new file mode 100644
index 00000000000..68e4ad4e185
--- /dev/null
+++ b/graphics/openexr/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1 2007/01/11 19:03:05 drochner Exp $
+
+--- exrdisplay/Makefile.in.orig	2006-08-09 07:45:52.000000000 +0200
++++ exrdisplay/Makefile.in
+@@ -60,12 +60,12 @@ am_exrdisplay_OBJECTS = main.$(OBJEXT) I
+ 	$(am__objects_1) loadImage.$(OBJEXT) scaleImage.$(OBJEXT)
+ exrdisplay_OBJECTS = $(am_exrdisplay_OBJECTS)
+ exrdisplay_LDADD = $(LDADD)
+-@HAVE_FLTK_TRUE@exrdisplay_DEPENDENCIES =  \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Iex/libIex.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Half/libHalf.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Imath/libImath.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/IlmImf/libIlmImf.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/IlmThread/libIlmThread.la
++#@HAVE_FLTK_TRUE@exrdisplay_DEPENDENCIES =  \
++#@HAVE_FLTK_TRUE@	$(top_builddir)/Iex/libIex.la \
++#@HAVE_FLTK_TRUE@	$(top_builddir)/Half/libHalf.la \
++#@HAVE_FLTK_TRUE@	$(top_builddir)/Imath/libImath.la \
++#@HAVE_FLTK_TRUE@	$(top_builddir)/IlmImf/libIlmImf.la \
++#@HAVE_FLTK_TRUE@	$(top_builddir)/IlmThread/libIlmThread.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -210,16 +210,16 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-@HAVE_FLTK_TRUE@INCLUDES = @GL_CXXFLAGS@ @CG_CXXFLAGS@ @FLTK_CXXFLAGS@ -I$(top_builddir) \
+-@HAVE_FLTK_TRUE@	   -I$(top_srcdir)/Iex -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
+-@HAVE_FLTK_TRUE@           -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config
++@HAVE_FLTK_TRUE@INCLUDES = @GL_CXXFLAGS@ @CG_CXXFLAGS@ @FLTK_CXXFLAGS@ -I$(top_builddir) -I$(prefix)/include/OpenEXR
++#@HAVE_FLTK_TRUE@	   -I$(top_srcdir)/Iex -I$(top_srcdir)/Half -I$(top_srcdir)/Imath \
++#@HAVE_FLTK_TRUE@           -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config
+ 
+ @HAVE_FLTK_TRUE@LDADD = @CG_LDFLAGS@ @FLTK_LDFLAGS@ \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Iex/libIex.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Half/libHalf.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/Imath/libImath.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/IlmImf/libIlmImf.la \
+-@HAVE_FLTK_TRUE@	$(top_builddir)/IlmThread/libIlmThread.la \
++@HAVE_FLTK_TRUE@	-lIex \
++@HAVE_FLTK_TRUE@	-lHalf \
++@HAVE_FLTK_TRUE@	-lImath \
++@HAVE_FLTK_TRUE@	-lIlmImf \
++@HAVE_FLTK_TRUE@	-lIlmThread \
+ @HAVE_FLTK_TRUE@	-lz
+ 
+ @HAVE_CG_FALSE@fragshader_sources =