From b356f996cb84d4d3cb6ac7e59380e523afc2390e Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Wed, 3 Nov 2004 11:17:53 +0000
Subject: expose hidden dependency on png and explicitly link against libpng
 and libiconv. fixes build on Solaris.

bump PKGREVISION for png dependency.
---
 graphics/tuxpaint/Makefile         | 10 +++++++++-
 graphics/tuxpaint/distinfo         |  4 ++--
 graphics/tuxpaint/patches/patch-aa | 12 ++++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'graphics/tuxpaint')

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index ee51b27a112..83643229e5e 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2004/10/07 14:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/03 11:17:53 grant Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.14
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
 		ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
@@ -22,6 +23,12 @@ MAKE_ENV+=		CONFDIR="${PKG_SYSCONFDIR}" CP="${CP}" CHMOD="${CHMOD}"
 EGDIR=			${PREFIX}/share/examples/tuxpaint
 CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 
+# this uses iconv and png functions directly, so link against them
+# explicitly.
+MAKE_ENV+=		LIBS="${LIBS}"
+LIBS+=			-liconv
+LIBS+=			-lpng
+
 post-install:
 	-${FIND} ${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
 	-${RMDIR} ${PREFIX}/share/doc/tuxpaint/cz
@@ -32,5 +39,6 @@ post-install:
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index 63b0b900f8c..68e0da61b8a 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2004/10/07 15:32:56 wiz Exp $
+$NetBSD: distinfo,v 1.14 2004/11/03 11:17:53 grant Exp $
 
 SHA1 (tuxpaint-0.9.14.tar.gz) = d899f15ae348413b85e5d0cacf971db2c604b036
 Size (tuxpaint-0.9.14.tar.gz) = 3208894 bytes
-SHA1 (patch-aa) = d73f3d2d37eb426de525f32e7a226b28e9a9232f
+SHA1 (patch-aa) = 1319f4cfab14cf1d5f592ab1c615f03b4fbd76ac
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index 038347667f1..80d43e72e13 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2004/10/07 15:32:57 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2004/11/03 11:17:53 grant Exp $
 
---- Makefile.orig	2004-10-04 00:32:26.000000000 +0200
+--- Makefile.orig	2004-10-04 08:32:26.000000000 +1000
 +++ Makefile
 @@ -11,7 +11,7 @@
  
@@ -64,7 +64,7 @@ $NetBSD: patch-aa,v 1.9 2004/10/07 15:32:57 wiz Exp $
  
  
  # Install example stamps
-@@ -698,7 +690,7 @@ install-man:
+@@ -698,10 +690,10 @@ install-man:
  tuxpaint:	obj/tuxpaint.o $(HQXX_O) $(ARCH_LIBS)
  	@echo
  	@echo "...Linking Tux Paint..."
@@ -72,4 +72,8 @@ $NetBSD: patch-aa,v 1.9 2004/10/07 15:32:57 wiz Exp $
 +	@$(CC) $(CFLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(DEFS) \
  		-o tuxpaint obj/tuxpaint.o $(HQXX_O) \
  		$(ARCH_LIBS) $(SDL_LIBS) \
- 		-lm $(ARCH_LINKS)
+-		-lm $(ARCH_LINKS)
++		-lm $(ARCH_LINKS) $(LIBS)
+ 	@$(RSRC_CMD)
+ 	@$(MIMESET_CMD)
+ 
-- 
cgit v1.2.3