diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-09-24 11:27:51 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-09-24 11:27:51 +0000 |
commit | daf735485e8b48d017a256ee4472095cad153bdf (patch) | |
tree | c9701fb9b7fd00608ba469b46836fc926561f9ed /graphics/tuxpaint | |
parent | b3c9dd388834457325abb0fec1274964f1a40458 (diff) | |
download | pkgsrc-daf735485e8b48d017a256ee4472095cad153bdf.tar.gz |
USE_TOOLS+=gsed for -r, plus various patches to fix build on SunOS.
Diffstat (limited to 'graphics/tuxpaint')
-rw-r--r-- | graphics/tuxpaint/Makefile | 6 | ||||
-rw-r--r-- | graphics/tuxpaint/distinfo | 4 | ||||
-rw-r--r-- | graphics/tuxpaint/patches/patch-Makefile | 15 | ||||
-rw-r--r-- | graphics/tuxpaint/patches/patch-src_tuxpaint.c | 15 |
4 files changed, 37 insertions, 3 deletions
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile index fa7e6300593..a0395f18ca1 100644 --- a/graphics/tuxpaint/Makefile +++ b/graphics/tuxpaint/Makefile @@ -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 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd 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+= CPPFLAGS=${CPPFLAGS:Q} 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 @@ MAKE_FLAGS+= LIBS=${LIBS:M*:Q} 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 --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo index 241e2322f2f..cb56ca204a8 100644 --- a/graphics/tuxpaint/distinfo +++ b/graphics/tuxpaint/distinfo @@ -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 --git a/graphics/tuxpaint/patches/patch-Makefile b/graphics/tuxpaint/patches/patch-Makefile new file mode 100644 index 00000000000..2a17aeba855 --- /dev/null +++ b/graphics/tuxpaint/patches/patch-Makefile @@ -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 --git a/graphics/tuxpaint/patches/patch-src_tuxpaint.c b/graphics/tuxpaint/patches/patch-src_tuxpaint.c new file mode 100644 index 00000000000..cd7d641a2de --- /dev/null +++ b/graphics/tuxpaint/patches/patch-src_tuxpaint.c @@ -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 + |