[pkgsrc/trunk]: pkgsrc/graphics/tuxpaint USE_TOOLS+=gsed for -r, plus various...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24819c237068
branches:  trunk
changeset: 639734:24819c237068
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Sep 24 11:27:51 2014 +0000

description:
USE_TOOLS+=gsed for -r, plus various patches to fix build on SunOS.

diffstat:

 graphics/tuxpaint/Makefile                     |   6 ++++--
 graphics/tuxpaint/distinfo                     |   4 +++-
 graphics/tuxpaint/patches/patch-Makefile       |  15 +++++++++++++++
 graphics/tuxpaint/patches/patch-src_tuxpaint.c |  15 +++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diffs (84 lines):

diff -r e12b70d39db7 -r 24819c237068 graphics/tuxpaint/Makefile
--- a/graphics/tuxpaint/Makefile        Wed Sep 24 11:23:57 2014 +0000
+++ b/graphics/tuxpaint/Makefile        Wed Sep 24 11:27:51 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2014/08/23 21:12:02 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2014/09/24 11:27:51 jperkin Exp $
 
 DISTNAME=      tuxpaint-0.9.22
 CATEGORIES=    graphics
@@ -12,7 +12,7 @@
 
 BUILD_DEPENDS+=        gperf-[0-9]*:../../devel/gperf
 
-USE_TOOLS+=            bash:run gmake msgfmt pkg-config
+USE_TOOLS+=            bash:run gmake gsed msgfmt pkg-config
 USE_PKGLOCALEDIR=      YES
 MANCOMPRESSED=         YES
 
@@ -29,6 +29,7 @@
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           CHMOD=${CHMOD:Q}
 MAKE_FLAGS+=           PREFIX=${PREFIX}
+MAKE_FLAGS+=           PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 MAKE_FLAGS+=           MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
 MAKE_FLAGS+=           GPERF=${PREFIX}/bin/gperf
 EGDIR=                 ${PREFIX}/share/examples/tuxpaint
@@ -49,6 +50,7 @@
 LIBS+=                 -liconv
 LIBS+=                 -lpng
 LIBS.SunOS+=           -lsocket -lnsl
+LDFLAGS.SunOS+=                -lsocket
 
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/share/tuxpaint/fonts/locale/zh_tw_docs/maketuxfont.py
diff -r e12b70d39db7 -r 24819c237068 graphics/tuxpaint/distinfo
--- a/graphics/tuxpaint/distinfo        Wed Sep 24 11:23:57 2014 +0000
+++ b/graphics/tuxpaint/distinfo        Wed Sep 24 11:27:51 2014 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.24 2014/08/23 21:12:02 wiz Exp $
+$NetBSD: distinfo,v 1.25 2014/09/24 11:27:51 jperkin Exp $
 
 SHA1 (tuxpaint-0.9.22.tar.gz) = 62ab3069f5a8e81edb83912fe3d9906c1e9b138f
 RMD160 (tuxpaint-0.9.22.tar.gz) = 4a122b87f01babb988c250f51d006a5dd59bf1de
 Size (tuxpaint-0.9.22.tar.gz) = 13301628 bytes
+SHA1 (patch-Makefile) = f61361c2d4668055ab519911c2ce58b020e632f2
+SHA1 (patch-src_tuxpaint.c) = 893092f9978feacb868c0897aa2e9be513350109
diff -r e12b70d39db7 -r 24819c237068 graphics/tuxpaint/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/tuxpaint/patches/patch-Makefile  Wed Sep 24 11:27:51 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2014/09/24 11:27:51 jperkin Exp $
+
+Use PKGLOCALEDIR.
+
+--- Makefile.orig      2014-08-19 07:28:33.000000000 +0000
++++ Makefile
+@@ -128,7 +128,7 @@ BIN_PREFIX:=$(DESTDIR)$(PREFIX)/bin
+ DATA_PREFIX:=$(DESTDIR)$(PREFIX)/share/tuxpaint
+ 
+ # Locale files
+-LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/share/locale
++LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
+ 
+ # IM files
+ IM_PREFIX=$(DESTDIR)$(PREFIX)/share/tuxpaint/im
diff -r e12b70d39db7 -r 24819c237068 graphics/tuxpaint/patches/patch-src_tuxpaint.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/tuxpaint/patches/patch-src_tuxpaint.c    Wed Sep 24 11:27:51 2014 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tuxpaint.c,v 1.1 2014/09/24 11:27:51 jperkin Exp $
+
+Fix build on SunOS.
+
+--- src/tuxpaint.c.orig        2014-08-23 19:21:06.000000000 +0000
++++ src/tuxpaint.c
+@@ -549,7 +549,7 @@ static void mtw(wchar_t * wtok, char * t
+ 
+ //#define fmemopen_alternative */ /* Uncomment this to test the fmemopen alternative in systems were fmemopen exists */
+ 
+-#if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) // MINGW/MSYS, NetBSD, and MacOSX need it, at least for now
++#if defined (WIN32) || defined (__APPLE__) || defined(__NetBSD__) || defined(__sun) // MINGW/MSYS, NetBSD, and MacOSX need it, at least for now
+ #define fmemopen_alternative 
+ #endif
+