Use BSD_INSTALL_*.

4 files changed, 60 insertions, 8 deletions

diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index 4bcb4cc44dd..7194f758c03 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/07 15:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/07 15:40:23 wiz Exp $
 #
 
 DISTNAME=		tuxpaint-config-0.0.5
@@ -12,7 +12,6 @@ COMMENT=		Configuration program for tuxpaint
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
-MANCOMPRESSED=		YES
 
 post-install:
 	-${FIND} ${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null
diff --git a/graphics/tuxpaint-config/PLIST b/graphics/tuxpaint-config/PLIST
index 02b188c8226..6da256eab0f 100644
--- a/graphics/tuxpaint-config/PLIST
+++ b/graphics/tuxpaint-config/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/07 15:23:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/07 15:40:23 wiz Exp $
 bin/tuxpaint-config
-man/man1/tuxpaint-config.1.gz
+man/man1/tuxpaint-config.1
 share/doc/tuxpaint-config/AUTHORS.txt
 share/doc/tuxpaint-config/CHANGES.txt
 share/doc/tuxpaint-config/COPYING.txt
diff --git a/graphics/tuxpaint-config/distinfo b/graphics/tuxpaint-config/distinfo
index 429ded90916..951b2280483 100644
--- a/graphics/tuxpaint-config/distinfo
+++ b/graphics/tuxpaint-config/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/07 15:23:39 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/10/07 15:40:23 wiz Exp $
 
 SHA1 (tuxpaint-config-0.0.5.tar.gz) = fc3056b24743377366cef630584cd5cb7262dc55
 Size (tuxpaint-config-0.0.5.tar.gz) = 82736 bytes
-SHA1 (patch-aa) = 4e18cd02cc146087f1a899e0fb80a57012908e16
+SHA1 (patch-aa) = 033b4cf539b1fff0039575249c402fb3258c321b
diff --git a/graphics/tuxpaint-config/patches/patch-aa b/graphics/tuxpaint-config/patches/patch-aa
index 89146a6e9f5..8778ec0c226 100644
--- a/graphics/tuxpaint-config/patches/patch-aa
+++ b/graphics/tuxpaint-config/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/07 15:23:39 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/07 15:40:23 wiz Exp $
 
 --- Makefile.orig	2004-09-11 11:59:03.000000000 +0200
 +++ Makefile
@@ -39,7 +39,60 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/10/07 15:23:39 wiz Exp $
  	@echo
  	@echo "All done! Now (preferably NOT as 'root' superuser),"
  	@echo "you can type the command 'tuxpaint-config' to run the"
-@@ -245,7 +244,7 @@ install-man:
+@@ -190,8 +189,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
++	${BSD_INSTALL_PROGRAM} tuxpaint-config $(BIN_PREFIX)
+ 
+ 
+ # Install the data (sound, graphics, fonts):
+@@ -199,7 +197,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)
+ 
+@@ -218,26 +216,20 @@ 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)
+-	@echo "(...Setting permissions)"
+-	chmod a+rx,g-w,o-w $(DOC_PREFIX)
++	${BSD_INSTALL_DATA_DIR} $(DOC_PREFIX)
++	${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/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 -f $(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 	\