From 4f2b142bca271104520eead806c89b8cd50cedc3 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 4 Sep 2007 21:16:05 +0000
Subject: update to 0.0.8 changes: -can now configure Tux Paint for all users
 -new "Use All Users Settings" checkbox -Added more screen resolution
 possibilities -support new features of Tux Paint 0.9.17 -bugfixes -Added
 papersize support; pulling papersizes from libpaper

---
 graphics/tuxpaint-config/Makefile         |  7 ++-
 graphics/tuxpaint-config/PLIST            |  4 +-
 graphics/tuxpaint-config/distinfo         | 10 ++--
 graphics/tuxpaint-config/patches/patch-aa | 78 ++++++++++++++++---------------
 4 files changed, 52 insertions(+), 47 deletions(-)

(limited to 'graphics/tuxpaint-config')

diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index c6b472aac1a..110b346e342 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/05/22 20:21:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/04 21:16:05 drochner Exp $
 #
 
-DISTNAME=		tuxpaint-config-0.0.5
-PKGREVISION=		1
+DISTNAME=		tuxpaint-config-0.0.8
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.billsgames.com/unix/x/tuxpaint/config/
 
@@ -16,8 +15,8 @@ USE_TOOLS+=		gmake
 post-install:
 	-${FIND} ${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null
 	-${FIND} ${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null
-	${RMDIR} ${PREFIX}/share/tuxpaint-config/fonts
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
+.include "../../print/libpaper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint-config/PLIST b/graphics/tuxpaint-config/PLIST
index 6da256eab0f..d7201a92e2e 100644
--- a/graphics/tuxpaint-config/PLIST
+++ b/graphics/tuxpaint-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/07 15:40:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/09/04 21:16:05 drochner Exp $
 bin/tuxpaint-config
 man/man1/tuxpaint-config.1
 share/doc/tuxpaint-config/AUTHORS.txt
@@ -6,6 +6,7 @@ share/doc/tuxpaint-config/CHANGES.txt
 share/doc/tuxpaint-config/COPYING.txt
 share/doc/tuxpaint-config/README.txt
 share/doc/tuxpaint-config/TODO.txt
+share/doc/tuxpaint-config/html/README.html
 share/tuxpaint-config/images/icon-win32.ico
 share/tuxpaint-config/images/icon.png
 share/tuxpaint-config/images/icon16x16.png
@@ -19,4 +20,5 @@ share/tuxpaint-config/images/win32-icon32x32x256.png
 share/tuxpaint-config/images/win32-icon48x48x256.png
 @dirrm share/tuxpaint-config/images
 @dirrm share/tuxpaint-config
+@dirrm share/doc/tuxpaint-config/html
 @dirrm share/doc/tuxpaint-config
diff --git a/graphics/tuxpaint-config/distinfo b/graphics/tuxpaint-config/distinfo
index 410d6adbaa3..00a4b0f68c5 100644
--- a/graphics/tuxpaint-config/distinfo
+++ b/graphics/tuxpaint-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:14 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/09/04 21:16:06 drochner Exp $
 
-SHA1 (tuxpaint-config-0.0.5.tar.gz) = fc3056b24743377366cef630584cd5cb7262dc55
-RMD160 (tuxpaint-config-0.0.5.tar.gz) = ec73bc7746805aab6dc789c73a35d86d5c498f7b
-Size (tuxpaint-config-0.0.5.tar.gz) = 82736 bytes
-SHA1 (patch-aa) = 033b4cf539b1fff0039575249c402fb3258c321b
+SHA1 (tuxpaint-config-0.0.8.tar.gz) = fadfc473f4b9ecce4584d4ca6ad6387e52eda1aa
+RMD160 (tuxpaint-config-0.0.8.tar.gz) = bce690059ff1a740e1c94779b305b2cdfd1761ea
+Size (tuxpaint-config-0.0.8.tar.gz) = 90683 bytes
+SHA1 (patch-aa) = 6590cfdccf092040b467b0ed17599dafddac0f9a
diff --git a/graphics/tuxpaint-config/patches/patch-aa b/graphics/tuxpaint-config/patches/patch-aa
index 8778ec0c226..bc5036fbc59 100644
--- a/graphics/tuxpaint-config/patches/patch-aa
+++ b/graphics/tuxpaint-config/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2007/09/04 21:16:06 drochner Exp $
 
---- Makefile.orig	2004-09-11 11:59:03.000000000 +0200
+--- Makefile.orig	2007-07-01 17:06:18.000000000 +0200
 +++ Makefile
-@@ -14,7 +14,7 @@
+@@ -20,7 +20,7 @@ VER_DATE=`date +"%Y-%m-%d"`
  
  # Where to install things:
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
  
  
  # Program:
-@@ -30,7 +30,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint-con
+@@ -37,7 +37,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint-con
  # Docs and man page:
  
  DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
@@ -20,16 +20,16 @@ $NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
  
  
  # Tux Paint's 'System-wide' Config file:
-@@ -69,7 +69,7 @@ FLTK_LIBS=`fltk-config --ldstaticflags`
+@@ -77,7 +77,7 @@ FLTK_LIBS=`fltk-config --ldflags`
+ PAPER_LIB=-lpaper
  
- # The entire set of CFLAGS:
- 
--CFLAGS=-O2 -Wall $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-+CFLAGS+=-Wall $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
- 	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
- 	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
+ # Default CFLAGS:
+-CFLAGS=-O2 -Wall
++CFLAGS+=-Wall
  
-@@ -90,8 +90,7 @@ all:	tuxpaint-config translations
+ # The entire set of CFLAGS:
+ ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
+@@ -147,8 +147,7 @@ install-win32:
  # to do this as superuser ("root"))
  
  install:	install-bin install-data install-man install-doc \
@@ -39,42 +39,46 @@ $NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
  	@echo
  	@echo "All done! Now (preferably NOT as 'root' superuser),"
  	@echo "you can type the command 'tuxpaint-config' to run the"
-@@ -190,8 +189,7 @@ install-icon:
+@@ -248,8 +247,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
+-	@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):
-@@ -199,7 +197,7 @@ install-bin:
+@@ -257,7 +255,7 @@ install-bin:
  install-data:
  	@echo
  	@echo "...Installing data files..."
--	install -d $(DATA_PREFIX)
+-	@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)
+ 	@cp -R data/* $(DATA_PREFIX)
+ 	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
  
-@@ -218,26 +216,20 @@ install-doc:
+@@ -276,28 +274,22 @@ install-doc:
  	@echo
  	@echo "...Installing documentation..."
  	@echo "(English)"
--	install -d $(DOC_PREFIX)
--	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/TODO.txt $(DOC_PREFIX)
+-	@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 a+rx,g-w,o-w $(DOC_PREFIX)
+-	@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)
  
  
@@ -83,21 +87,21 @@ $NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
  install-man:
  	@echo "...Installing man pages..."
 -	# man1 directory...
--	install -d $(MAN_PREFIX)/man1/
+-	@install -d $(MAN_PREFIX)/man1/
  	# tuxpaint-config.1
--	cp src/tuxpaint-config.1 $(MAN_PREFIX)/man1/
--	gzip -f $(MAN_PREFIX)/man1/tuxpaint-config.1
--	chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-config.1.gz
+-	@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!
-@@ -245,7 +237,7 @@ install-man:
- tuxpaint-config:	obj/tuxpaint-config.o obj/tuxpaint-config2.o	\
- 			obj/defaults.o
- 	$(CXX) $(CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
--			obj/tuxpaint-config2.o obj/defaults.o $(FLTK_LIBS)
-+			obj/tuxpaint-config2.o obj/defaults.o $(FLTK_LIBS) -lintl
+@@ -307,7 +299,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!
-- 
cgit v1.2.3