Wed Sep 24 22:00:06 2014 UTC ()
Replace patch with a MAKE_FLAGS line.


(wiz)
diff -r1.81 -r1.82 pkgsrc/graphics/tuxpaint/Makefile
diff -r1.25 -r1.26 pkgsrc/graphics/tuxpaint/distinfo
diff -r1.1 -r0 pkgsrc/graphics/tuxpaint/patches/patch-Makefile
cvs diff -r1.81 -r1.82 pkgsrc/graphics/tuxpaint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint/Makefile 2014/09/24 11:27:51 1.81
+++ pkgsrc/graphics/tuxpaint/Makefile 2014/09/24 22:00:06 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.81 2014/09/24 11:27:51 jperkin Exp $ 1# $NetBSD: Makefile,v 1.82 2014/09/24 22:00:06 wiz Exp $
2 2
3DISTNAME= tuxpaint-0.9.22 3DISTNAME= tuxpaint-0.9.22
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.tuxpaint.org/ 8HOMEPAGE= http://www.tuxpaint.org/
9COMMENT= Drawing program for small children 9COMMENT= Drawing program for small children
10# program itself is gnu-gpl-v2, other licenses are packaged fonts 10# program itself is gnu-gpl-v2, other licenses are packaged fonts
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd
12 12
13BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 13BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
14 14
@@ -19,27 +19,27 @@ MANCOMPRESSED= YES @@ -19,27 +19,27 @@ MANCOMPRESSED= YES
19CONFLICTS+= tuxpaint-stamps<2003.12.23 19CONFLICTS+= tuxpaint-stamps<2003.12.23
20 20
21BROKEN_GETTEXT_DETECTION= yes 21BROKEN_GETTEXT_DETECTION= yes
22REPLACE_BASH= src/tuxpaint-import.sh 22REPLACE_BASH= src/tuxpaint-import.sh
23 23
24PKG_SYSCONFSUBDIR= tuxpaint 24PKG_SYSCONFSUBDIR= tuxpaint
25MAKE_FLAGS+= CONFDIR=${PKG_SYSCONFDIR:Q} 25MAKE_FLAGS+= CONFDIR=${PKG_SYSCONFDIR:Q}
26MAKE_FLAGS+= CP=${CP:Q} 26MAKE_FLAGS+= CP=${CP:Q}
27MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 27MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
28MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q} 28MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q}
29MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 29MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
30MAKE_FLAGS+= CHMOD=${CHMOD:Q} 30MAKE_FLAGS+= CHMOD=${CHMOD:Q}
31MAKE_FLAGS+= PREFIX=${PREFIX} 31MAKE_FLAGS+= PREFIX=${PREFIX}
32MAKE_FLAGS+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 32MAKE_FLAGS+= LOCALE_PREFIX=$(DESTDIR)$(PREFIX)/$(PKGLOCALEDIR)/locale
33MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/ 33MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
34MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf 34MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf
35EGDIR= ${PREFIX}/share/examples/tuxpaint 35EGDIR= ${PREFIX}/share/examples/tuxpaint
36CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf 36CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
37 37
38INSTALL_MAKE_FLAGS+= PKG_ROOT=${DESTDIR} 38INSTALL_MAKE_FLAGS+= PKG_ROOT=${DESTDIR}
39INSTALL_MAKE_FLAGS+= CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint 39INSTALL_MAKE_FLAGS+= CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint
40 40
41.include "../../mk/bsd.fast.prefs.mk" 41.include "../../mk/bsd.fast.prefs.mk"
42 42
43.if ${OPSYS} == "NetBSD" 43.if ${OPSYS} == "NetBSD"
44CPPFLAGS+= -DHAVE_STRCASESTR 44CPPFLAGS+= -DHAVE_STRCASESTR
45.endif 45.endif
cvs diff -r1.25 -r1.26 pkgsrc/graphics/tuxpaint/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint/distinfo 2014/09/24 11:27:51 1.25
+++ pkgsrc/graphics/tuxpaint/distinfo 2014/09/24 22:00:06 1.26
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.25 2014/09/24 11:27:51 jperkin Exp $ 1$NetBSD: distinfo,v 1.26 2014/09/24 22:00:06 wiz Exp $
2 2
3SHA1 (tuxpaint-0.9.22.tar.gz) = 62ab3069f5a8e81edb83912fe3d9906c1e9b138f 3SHA1 (tuxpaint-0.9.22.tar.gz) = 62ab3069f5a8e81edb83912fe3d9906c1e9b138f
4RMD160 (tuxpaint-0.9.22.tar.gz) = 4a122b87f01babb988c250f51d006a5dd59bf1de 4RMD160 (tuxpaint-0.9.22.tar.gz) = 4a122b87f01babb988c250f51d006a5dd59bf1de
5Size (tuxpaint-0.9.22.tar.gz) = 13301628 bytes 5Size (tuxpaint-0.9.22.tar.gz) = 13301628 bytes
6SHA1 (patch-Makefile) = f61361c2d4668055ab519911c2ce58b020e632f2 
7SHA1 (patch-src_tuxpaint.c) = 893092f9978feacb868c0897aa2e9be513350109 6SHA1 (patch-src_tuxpaint.c) = 893092f9978feacb868c0897aa2e9be513350109
File Deleted: pkgsrc/graphics/tuxpaint/patches/patch-Makefile