Sun Aug 24 15:30:43 2014 UTC ()
Reduce diff to upstream; install more files.
Bump PKGREVISION.


(wiz)
diff -r1.18 -r1.19 pkgsrc/graphics/tuxpaint-config/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/tuxpaint-config/PLIST
diff -r1.6 -r1.7 pkgsrc/graphics/tuxpaint-config/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/tuxpaint-config/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/graphics/tuxpaint-config/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint-config/Makefile 2014/08/23 21:40:46 1.18
+++ pkgsrc/graphics/tuxpaint-config/Makefile 2014/08/24 15:30:43 1.19
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.18 2014/08/23 21:40:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2014/08/24 15:30:43 wiz Exp $
2 2
3DISTNAME= tuxpaint-config-0.0.13 3DISTNAME= tuxpaint-config-0.0.13
 4PKGREVISION= 1
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.tuxpaint.org/ 9HOMEPAGE= http://www.tuxpaint.org/
9COMMENT= Configuration program for tuxpaint 10COMMENT= Configuration program for tuxpaint
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12USE_LANGUAGES= c++ 13USE_LANGUAGES= c++
13USE_TOOLS+= gmake msgfmt 14USE_TOOLS+= gmake msgfmt
14 15
15INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} 16INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
 17INSTALL_MAKE_FLAGS+= MAN_PREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
 18MAKE_FLAGS+= ARCH_LINKS=-lintl
16INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 19INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
17 20
18post-install: 
19 ${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null || ${TRUE} 
20 ${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null || ${TRUE} 
21 
22.include "../../devel/gettext-lib/buildlink3.mk" 21.include "../../devel/gettext-lib/buildlink3.mk"
23.include "../../print/libpaper/buildlink3.mk" 22.include "../../print/libpaper/buildlink3.mk"
24.include "../../x11/fltk13/buildlink3.mk" 23.include "../../x11/fltk13/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/tuxpaint-config/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint-config/PLIST 2014/08/23 21:40:46 1.5
+++ pkgsrc/graphics/tuxpaint-config/PLIST 2014/08/24 15:30:43 1.6
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.5 2014/08/23 21:40:46 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2014/08/24 15:30:43 wiz Exp $
 2X11R6/include/X11/pixmaps/tuxpaint-config.xpm
2bin/tuxpaint-config 3bin/tuxpaint-config
3man/man1/tuxpaint-config.1 4man/man1/tuxpaint-config.1
4share/doc/tuxpaint-config/AUTHORS.txt 5share/doc/tuxpaint-config/AUTHORS.txt
5share/doc/tuxpaint-config/CHANGES.txt 6share/doc/tuxpaint-config/CHANGES.txt
6share/doc/tuxpaint-config/COPYING.txt 7share/doc/tuxpaint-config/COPYING.txt
7share/doc/tuxpaint-config/README.txt 8share/doc/tuxpaint-config/README.txt
8share/doc/tuxpaint-config/TODO.txt 9share/doc/tuxpaint-config/TODO.txt
9share/doc/tuxpaint-config/html/README.html 10share/doc/tuxpaint-config/html/README.html
10share/locale/ach/LC_MESSAGES/tuxpaint-config.mo 11share/locale/ach/LC_MESSAGES/tuxpaint-config.mo
11share/locale/an/LC_MESSAGES/tuxpaint-config.mo 12share/locale/an/LC_MESSAGES/tuxpaint-config.mo
12share/locale/ar/LC_MESSAGES/tuxpaint-config.mo 13share/locale/ar/LC_MESSAGES/tuxpaint-config.mo
13share/locale/ast/LC_MESSAGES/tuxpaint-config.mo 14share/locale/ast/LC_MESSAGES/tuxpaint-config.mo
14share/locale/bg/LC_MESSAGES/tuxpaint-config.mo 15share/locale/bg/LC_MESSAGES/tuxpaint-config.mo
@@ -46,24 +47,25 @@ share/locale/ru/LC_MESSAGES/tuxpaint-con @@ -46,24 +47,25 @@ share/locale/ru/LC_MESSAGES/tuxpaint-con
46share/locale/sat/LC_MESSAGES/tuxpaint-config.mo 47share/locale/sat/LC_MESSAGES/tuxpaint-config.mo
47share/locale/sk/LC_MESSAGES/tuxpaint-config.mo 48share/locale/sk/LC_MESSAGES/tuxpaint-config.mo
48share/locale/sl/LC_MESSAGES/tuxpaint-config.mo 49share/locale/sl/LC_MESSAGES/tuxpaint-config.mo
49share/locale/son/LC_MESSAGES/tuxpaint-config.mo 50share/locale/son/LC_MESSAGES/tuxpaint-config.mo
50share/locale/sr/LC_MESSAGES/tuxpaint-config.mo 51share/locale/sr/LC_MESSAGES/tuxpaint-config.mo
51share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo 52share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo
52share/locale/sv/LC_MESSAGES/tuxpaint-config.mo 53share/locale/sv/LC_MESSAGES/tuxpaint-config.mo
53share/locale/tr/LC_MESSAGES/tuxpaint-config.mo 54share/locale/tr/LC_MESSAGES/tuxpaint-config.mo
54share/locale/uk/LC_MESSAGES/tuxpaint-config.mo 55share/locale/uk/LC_MESSAGES/tuxpaint-config.mo
55share/locale/vec/LC_MESSAGES/tuxpaint-config.mo 56share/locale/vec/LC_MESSAGES/tuxpaint-config.mo
56share/locale/vi/LC_MESSAGES/tuxpaint-config.mo 57share/locale/vi/LC_MESSAGES/tuxpaint-config.mo
57share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo 58share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
58share/locale/zu/LC_MESSAGES/tuxpaint-config.mo 59share/locale/zu/LC_MESSAGES/tuxpaint-config.mo
 60share/pixmaps/tuxpaint-config.png
59share/tuxpaint-config/images/icon-win32.ico 61share/tuxpaint-config/images/icon-win32.ico
60share/tuxpaint-config/images/icon.png 62share/tuxpaint-config/images/icon.png
61share/tuxpaint-config/images/icon16x16.png 63share/tuxpaint-config/images/icon16x16.png
62share/tuxpaint-config/images/icon32x32.png 64share/tuxpaint-config/images/icon32x32.png
63share/tuxpaint-config/images/icon32x32.xpm 65share/tuxpaint-config/images/icon32x32.xpm
64share/tuxpaint-config/images/icon48x48.png 66share/tuxpaint-config/images/icon48x48.png
65share/tuxpaint-config/images/win32-icon16x16x16.png 67share/tuxpaint-config/images/win32-icon16x16x16.png
66share/tuxpaint-config/images/win32-icon16x16x256.png 68share/tuxpaint-config/images/win32-icon16x16x256.png
67share/tuxpaint-config/images/win32-icon32x32x16.png 69share/tuxpaint-config/images/win32-icon32x32x16.png
68share/tuxpaint-config/images/win32-icon32x32x256.png 70share/tuxpaint-config/images/win32-icon32x32x256.png
69share/tuxpaint-config/images/win32-icon48x48x256.png 71share/tuxpaint-config/images/win32-icon48x48x256.png
cvs diff -r1.6 -r1.7 pkgsrc/graphics/tuxpaint-config/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint-config/distinfo 2014/08/23 21:40:46 1.6
+++ pkgsrc/graphics/tuxpaint-config/distinfo 2014/08/24 15:30:43 1.7
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.6 2014/08/23 21:40:46 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2014/08/24 15:30:43 wiz Exp $
2 2
3SHA1 (tuxpaint-config-0.0.13.tar.gz) = 8b31ddf91eb130824351c652da87cfd6275304bb 3SHA1 (tuxpaint-config-0.0.13.tar.gz) = 8b31ddf91eb130824351c652da87cfd6275304bb
4RMD160 (tuxpaint-config-0.0.13.tar.gz) = 991f5b14a6e1f7082eba1f8eb34c4e5aaf45926d 4RMD160 (tuxpaint-config-0.0.13.tar.gz) = 991f5b14a6e1f7082eba1f8eb34c4e5aaf45926d
5Size (tuxpaint-config-0.0.13.tar.gz) = 451667 bytes 5Size (tuxpaint-config-0.0.13.tar.gz) = 451667 bytes
6SHA1 (patch-aa) = 7e6e6611ed2b39a7639ed0ab607dd24ffb60407b 6SHA1 (patch-aa) = 4d5419eeded5c75b263ffa483db5b96b2181e97a
cvs diff -r1.5 -r1.6 pkgsrc/graphics/tuxpaint-config/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/tuxpaint-config/patches/Attic/patch-aa 2014/08/23 21:40:47 1.5
+++ pkgsrc/graphics/tuxpaint-config/patches/Attic/patch-aa 2014/08/24 15:30:43 1.6
@@ -1,120 +1,19 @@ @@ -1,120 +1,19 @@
1$NetBSD: patch-aa,v 1.5 2014/08/23 21:40:47 wiz Exp $ 1$NetBSD: patch-aa,v 1.6 2014/08/24 15:30:43 wiz Exp $
 2
 3"install -D" is not portable; create directories manually.
2 4
3--- Makefile.orig 2011-02-22 18:57:26.000000000 +0000 5--- Makefile.orig 2011-02-22 18:57:26.000000000 +0000
4+++ Makefile 6+++ Makefile
5@@ -20,7 +20,7 @@ VER_DATE=`date +"%Y-%m-%d"` 
6  
7 # Where to install things: 
8  
9-PREFIX=/usr/local 
10+#PREFIX=/usr/local 
11  
12  
13 # Program: 
14@@ -37,7 +37,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint-con 
15 # Docs and man page: 
16  
17 DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/ 
18-MAN_PREFIX=$(PREFIX)/share/man/ 
19+MAN_PREFIX=$(PREFIX)/${PKGMANDIR} 
20  
21  
22 # Tux Paint's 'System-wide' Config file: 
23@@ -84,7 +84,7 @@ FLTK_LIBS=`fltk-config --ldflags` 
24 PAPER_LIB=-lpaper 
25  
26 # Default CFLAGS: 
27-CFLAGS=-O2 -Wall 
28+CFLAGS+=-Wall 
29  
30 # The entire set of CFLAGS: 
31 ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ 
32@@ -154,8 +154,7 @@ install-win32: 
33 # to do this as superuser ("root")) 
34  
35 install: install-bin install-data install-man install-doc \ 
36- install-gnome install-kde install-kde-icons \ 
37- install-icon install-gettext 
38+ install-gettext 
39 @echo 
40 @echo "All done! Now (preferably NOT as 'root' superuser)," 
41 @echo "you can type the command 'tuxpaint-config' to run the" 
42@@ -255,8 +254,7 @@ install-icon: 
43 install-bin: 
44 @echo 
45 @echo "...Installing program itself..." 
46- @cp tuxpaint-config $(BIN_PREFIX) 
47- @chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint-config$(EXE_EXT) 
48+ ${BSD_INSTALL_PROGRAM} tuxpaint-config $(BIN_PREFIX) 
49  
50  
51 # Install the data (sound, graphics, fonts): 
52@@ -264,7 +262,7 @@ install-bin: 
53 install-data: 
54 @echo 
55 @echo "...Installing data files..." 
56- @install -d $(DATA_PREFIX) 
57+ ${BSD_INSTALL_DATA_DIR} $(DATA_PREFIX) 
58 @cp -R data/* $(DATA_PREFIX) 
59 @chmod -R a+rX,g-w,o-w $(DATA_PREFIX) 
60  
61@@ -275,28 +273,22 @@ install-doc: 
62 @echo 
63 @echo "...Installing documentation..." 
64 @echo "(English)" 
65- @install -d $(DOC_PREFIX) 
66- @install -d $(DOC_PREFIX)/html 
67- @cp docs/AUTHORS.txt $(DOC_PREFIX) 
68- @cp docs/CHANGES.txt $(DOC_PREFIX) 
69- @cp docs/COPYING.txt $(DOC_PREFIX) 
70- @cp docs/README.txt $(DOC_PREFIX) 
71- @cp docs/html/README.html $(DOC_PREFIX)/html 
72- @cp docs/TODO.txt $(DOC_PREFIX) 
73- @echo "(...Setting permissions)" 
74- @chmod -R a+rx,g-w,o-w $(DOC_PREFIX) 
75+ ${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX) 
76+ ${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)/html 
77+ ${BSD_INSTALL_DATA} docs/AUTHORS.txt $(DOC_PREFIX) 
78+ ${BSD_INSTALL_DATA} docs/CHANGES.txt $(DOC_PREFIX) 
79+ ${BSD_INSTALL_DATA} docs/COPYING.txt $(DOC_PREFIX) 
80+ ${BSD_INSTALL_DATA} docs/README.txt $(DOC_PREFIX) 
81+ ${BSD_INSTALL_DATA} docs/html/README.html $(DOC_PREFIX)/html 
82+ ${BSD_INSTALL_DATA} docs/TODO.txt $(DOC_PREFIX) 
83  
84  
85 # Install the man page: 
86  
87 install-man: 
88 @echo "...Installing man pages..." 
89- # man1 directory... 
90- @install -d $(MAN_PREFIX)/man1/ 
91 # tuxpaint-config.1 
92- @cp src/tuxpaint-config.1 $(MAN_PREFIX)/man1/ 
93- @gzip -9f $(MAN_PREFIX)/man1/tuxpaint-config.1 
94- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-config.1.gz 
95+ ${BSD_INSTALL_MAN} src/tuxpaint-config.1 $(MAN_PREFIX)/man1/ 
96  
97  
98 # Build the program! 
99@@ -306,7 +298,7 @@ tuxpaint-config: obj/tuxpaint-config.o o 
100 @echo Linking 
101 $(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o \ 
102 obj/tuxpaint-config2.o obj/defaults.o $(ARCH_LIBS) \ 
103- $(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) 
104+ $(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) -lintl 
105  
106  
107 # Build the object for the program! 
108@@ -338,9 +330,13 @@ obj/resource.o: visualc/resource.rc visu 7@@ -338,9 +330,13 @@ obj/resource.o: visualc/resource.rc visu
109 POFILES:=$(wildcard src/po/*.po) 8 POFILES:=$(wildcard src/po/*.po)
110 MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES)) 9 MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES))
111 INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES)) 10 INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
112+INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES)) 11+INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES))
113  12
114+$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo 13+$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
115+ install -d -m 755 $@ 14+ install -d -m 755 $@
116 $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo 15 $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
117- install -D -m 644 $< $@ 16- install -D -m 644 $< $@
118+ install -m 644 $< $@ 17+ install -m 644 $< $@
119+ 18+
120  19