From 559aa32f62d1f50d11187ea689582bb336957ad2 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 24 Sep 2014 22:00:06 +0000
Subject: Replace patch with a MAKE_FLAGS line.

---
 graphics/tuxpaint/Makefile               |  4 ++--
 graphics/tuxpaint/distinfo               |  3 +--
 graphics/tuxpaint/patches/patch-Makefile | 15 ---------------
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 graphics/tuxpaint/patches/patch-Makefile

(limited to 'graphics/tuxpaint')

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index a0395f18ca1..70b7639f9f5 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2014/09/24 11:27:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.82 2014/09/24 22:00:06 wiz Exp $
 
 DISTNAME=	tuxpaint-0.9.22
 CATEGORIES=	graphics
@@ -29,7 +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+=		LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
 MAKE_FLAGS+=		MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
 MAKE_FLAGS+=		GPERF=${PREFIX}/bin/gperf
 EGDIR=			${PREFIX}/share/examples/tuxpaint
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index cb56ca204a8..484ded58f10 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.25 2014/09/24 11:27:51 jperkin Exp $
+$NetBSD: distinfo,v 1.26 2014/09/24 22:00:06 wiz 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
deleted file mode 100644
index 2a17aeba855..00000000000
--- a/graphics/tuxpaint/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
-- 
cgit v1.2.3