Reduce diff to upstream; install more files.

Bump PKGREVISION.

4 files changed, 12 insertions, 112 deletions

diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index effc54d62b4..8f930f123a6 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/08/23 21:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/08/24 15:30:43 wiz Exp $
 
 DISTNAME=		tuxpaint-config-0.0.13
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 
@@ -13,12 +14,10 @@ USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake msgfmt
 
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	MAN_PREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=		ARCH_LINKS=-lintl
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
-post-install:
-	${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null || ${TRUE}
-	${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null || ${TRUE}
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
diff --git a/graphics/tuxpaint-config/PLIST b/graphics/tuxpaint-config/PLIST
index b0d27d18e8a..f5646207226 100644
--- a/graphics/tuxpaint-config/PLIST
+++ b/graphics/tuxpaint-config/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2014/08/23 21:40:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/08/24 15:30:43 wiz Exp $
+X11R6/include/X11/pixmaps/tuxpaint-config.xpm
 bin/tuxpaint-config
 man/man1/tuxpaint-config.1
 share/doc/tuxpaint-config/AUTHORS.txt
@@ -56,6 +57,7 @@ share/locale/vec/LC_MESSAGES/tuxpaint-config.mo
 share/locale/vi/LC_MESSAGES/tuxpaint-config.mo
 share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
 share/locale/zu/LC_MESSAGES/tuxpaint-config.mo
+share/pixmaps/tuxpaint-config.png
 share/tuxpaint-config/images/icon-win32.ico
 share/tuxpaint-config/images/icon.png
 share/tuxpaint-config/images/icon16x16.png
diff --git a/graphics/tuxpaint-config/distinfo b/graphics/tuxpaint-config/distinfo
index 87044f7fc59..cba80d6519d 100644
--- a/graphics/tuxpaint-config/distinfo
+++ b/graphics/tuxpaint-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2014/08/23 21:40:46 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/08/24 15:30:43 wiz Exp $
 
 SHA1 (tuxpaint-config-0.0.13.tar.gz) = 8b31ddf91eb130824351c652da87cfd6275304bb
 RMD160 (tuxpaint-config-0.0.13.tar.gz) = 991f5b14a6e1f7082eba1f8eb34c4e5aaf45926d
 Size (tuxpaint-config-0.0.13.tar.gz) = 451667 bytes
-SHA1 (patch-aa) = 7e6e6611ed2b39a7639ed0ab607dd24ffb60407b
+SHA1 (patch-aa) = 4d5419eeded5c75b263ffa483db5b96b2181e97a
diff --git a/graphics/tuxpaint-config/patches/patch-aa b/graphics/tuxpaint-config/patches/patch-aa
index 8fafc4d6b58..f28a6388e7a 100644
--- a/graphics/tuxpaint-config/patches/patch-aa
+++ b/graphics/tuxpaint-config/patches/patch-aa
@@ -1,110 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2014/08/23 21:40:47 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2014/08/24 15:30:43 wiz Exp $
+
+"install -D" is not portable; create directories manually.
 
 --- Makefile.orig	2011-02-22 18:57:26.000000000 +0000
 +++ Makefile
-@@ -20,7 +20,7 @@ VER_DATE=`date +"%Y-%m-%d"`
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- 
- 
- # Program:
-@@ -37,7 +37,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint-con
- # Docs and man page:
- 
- DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
--MAN_PREFIX=$(PREFIX)/share/man/
-+MAN_PREFIX=$(PREFIX)/${PKGMANDIR}
- 
- 
- # Tux Paint's 'System-wide' Config file:
-@@ -84,7 +84,7 @@ FLTK_LIBS=`fltk-config --ldflags`
- PAPER_LIB=-lpaper
- 
- # Default CFLAGS:
--CFLAGS=-O2 -Wall
-+CFLAGS+=-Wall
- 
- # The entire set of CFLAGS:
- ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-@@ -154,8 +154,7 @@ install-win32:
- # to do this as superuser ("root"))
- 
- install:	install-bin install-data install-man install-doc \
--		install-gnome install-kde install-kde-icons \
--		install-icon install-gettext
-+		install-gettext
- 	@echo
- 	@echo "All done! Now (preferably NOT as 'root' superuser),"
- 	@echo "you can type the command 'tuxpaint-config' to run the"
-@@ -255,8 +254,7 @@ install-icon:
- install-bin:
- 	@echo
- 	@echo "...Installing program itself..."
--	@cp tuxpaint-config $(BIN_PREFIX)
--	@chmod a+rx,g-w,o-w $(BIN_PREFIX)/tuxpaint-config$(EXE_EXT)
-+	${BSD_INSTALL_PROGRAM} tuxpaint-config $(BIN_PREFIX)
- 
- 
- # Install the data (sound, graphics, fonts):
-@@ -264,7 +262,7 @@ install-bin:
- install-data:
- 	@echo
- 	@echo "...Installing data files..."
--	@install -d $(DATA_PREFIX)
-+	${BSD_INSTALL_DATA_DIR} $(DATA_PREFIX)
- 	@cp -R data/* $(DATA_PREFIX)
- 	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
- 
-@@ -275,28 +273,22 @@ install-doc:
- 	@echo
- 	@echo "...Installing documentation..."
- 	@echo "(English)"
--	@install -d $(DOC_PREFIX)
--	@install -d $(DOC_PREFIX)/html
--	@cp docs/AUTHORS.txt $(DOC_PREFIX)
--	@cp docs/CHANGES.txt $(DOC_PREFIX)
--	@cp docs/COPYING.txt $(DOC_PREFIX)
--	@cp docs/README.txt $(DOC_PREFIX)
--	@cp docs/html/README.html $(DOC_PREFIX)/html
--	@cp docs/TODO.txt $(DOC_PREFIX)
--	@echo "(...Setting permissions)"
--	@chmod -R a+rx,g-w,o-w $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)/html
-+	${BSD_INSTALL_DATA} docs/AUTHORS.txt $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA} docs/CHANGES.txt $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA} docs/COPYING.txt $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA} docs/README.txt $(DOC_PREFIX)
-+	${BSD_INSTALL_DATA} docs/html/README.html $(DOC_PREFIX)/html
-+	${BSD_INSTALL_DATA} docs/TODO.txt $(DOC_PREFIX)
- 
- 
- # Install the man page:
- 
- install-man:
- 	@echo "...Installing man pages..."
--	# man1 directory...
--	@install -d $(MAN_PREFIX)/man1/
- 	# tuxpaint-config.1
--	@cp src/tuxpaint-config.1 $(MAN_PREFIX)/man1/
--	@gzip -9f $(MAN_PREFIX)/man1/tuxpaint-config.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-config.1.gz
-+	${BSD_INSTALL_MAN} src/tuxpaint-config.1 $(MAN_PREFIX)/man1/
- 
- 
- # Build the program!
-@@ -306,7 +298,7 @@ tuxpaint-config:	obj/tuxpaint-config.o o
- 	@echo Linking
- 	$(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
- 			obj/tuxpaint-config2.o obj/defaults.o $(ARCH_LIBS) \
--			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB)
-+			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) -lintl
- 
- 
- # Build the object for the program!
 @@ -338,9 +330,13 @@ obj/resource.o:	visualc/resource.rc visu
  POFILES:=$(wildcard src/po/*.po)
  MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES))