* use ${LOCALBASE} instead of hardcoded /usr/pkg as a location for info files

* use ${INSTALL_PROGRAM/MAN} instead of "install"
* fix my email address

5 files changed, 27 insertions, 32 deletions

diff --git a/textproc/rtfm/Makefile b/textproc/rtfm/Makefile
index 533a022145d..ef6f6577e3f 100644
--- a/textproc/rtfm/Makefile
+++ b/textproc/rtfm/Makefile
@@ -1,12 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/14 14:57:34 zuntum Exp $
 # FreeBSD Id: ports/misc/rtfm/Makefile,v 1.10 2001/01/16 17:31:43 sobomax Exp
 
 DISTNAME=	rtfm-1.0
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
+MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/	\
 		ftp://ftp.pl.freebsd.org/pub/FreeBSD/ports/distfiles/
 
-MAINTAINER=	zuntum@eik.pl
+MAINTAINER=	zuntum@netbsd.org
 COMMENT=	NetBSD documentation and GNU Texinfo files search mechanism
 
+post-patch:
+	${SED} "s,@LOCALBASE@,${LOCALBASE},g" ${WRKSRC}/rtfm.c		\
+		> ${WRKSRC}/rtfm.c.done
+	${MV} ${WRKSRC}/rtfm.c.done ${WRKSRC}/rtfm.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/rtfm ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/rtfm.1 ${PREFIX}/man/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rtfm/files/md5 b/textproc/rtfm/files/md5
index 247b8c88dda..fd9ea0e7aad 100644
--- a/textproc/rtfm/files/md5
+++ b/textproc/rtfm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
+$NetBSD: md5,v 1.2 2001/03/14 14:57:34 zuntum Exp $
 
-MD5 (rtfm-1.0.tar.gz) = aee8b617f03bafcce49919d8799e7ae6
+SHA1 (rtfm-1.0.tar.gz) = 6b31c9b36394eb7f59cc4dbff61a431107193214
diff --git a/textproc/rtfm/files/patch-sum b/textproc/rtfm/files/patch-sum
index 373b4ec670b..38b15b81283 100644
--- a/textproc/rtfm/files/patch-sum
+++ b/textproc/rtfm/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/14 14:57:34 zuntum Exp $
 
-MD5 (patch-aa) = 608efa744af0b4c978ffb68d5e4a8162
-MD5 (patch-ab) = 216fee8bd64baa51871ad27b4dfe1865
-MD5 (patch-ac) = ecc496b11e2e2dec85cb658ff71ed0ee
+SHA1 (patch-aa) = cdcf101635badb9d416b2cf076cc7bca3948439e
+SHA1 (patch-ab) = 07e82f17359ba58beef39bc7b84254e5e4b16075
diff --git a/textproc/rtfm/patches/patch-aa b/textproc/rtfm/patches/patch-aa
index c83e9d90be0..4c06b01aabc 100644
--- a/textproc/rtfm/patches/patch-aa
+++ b/textproc/rtfm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/14 14:57:34 zuntum Exp $
 
 --- rtfm.c.orig	Tue Jan 18 06:16:45 2000
 +++ rtfm.c
@@ -12,13 +12,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
 -	"/usr/local/info",
 -	"/usr/info",
 -	"/usr/local/lib/info",
-+	"/usr/pkg/info",
-+	"/usr/pkg/lib/info",
++	"@LOCALBASE@/info",
++	"@LOCALBASE@/lib/info",
  	"/usr/lib/info",
 -	"/usr/local/gnu/info",
 -	"/usr/local/gnu/lib/info",
-+	"/usr/pkg/gnu/info",
-+	"/usr/pkg/gnu/lib/info",
++	"@LOCALBASE@/gnu/info",
++	"@LOCALBASE@/gnu/lib/info",
  	"/usr/gnu/info",
  	"/usr/gnu/lib/info",
  	"/opt/gnu/info",
@@ -26,15 +26,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
  	"/usr/share/lib/info",
 -	"/usr/local/share/info",
 -	"/usr/local/share/lib/info",
-+	"/usr/pkg/share/info",
-+	"/usr/pkg/share/lib/info",
++	"@LOCALBASE@/share/info",
++	"@LOCALBASE@/share/lib/info",
  	"/usr/gnu/lib/emacs/info",
 -	"/usr/local/gnu/lib/emacs/info",
 -	"/usr/local/lib/emacs/info",
 -	"/usr/local/emacs/info",
-+	"/usr/pkg/gnu/lib/emacs/info",
-+	"/usr/pkg/lib/emacs/info",
-+	"/usr/pkg/emacs/info",
++	"@LOCALBASE@/gnu/lib/emacs/info",
++	"@LOCALBASE@/lib/emacs/info",
++	"@LOCALBASE@/emacs/info",
  	".",
  	NULL
  };
diff --git a/textproc/rtfm/patches/patch-ac b/textproc/rtfm/patches/patch-ac
deleted file mode 100644
index f04d3086ed3..00000000000
--- a/textproc/rtfm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/01/17 23:35:42 hubertf Exp $
-
---- Makefile.orig	Tue Jan 18 06:33:15 2000
-+++ Makefile
-@@ -4,7 +4,7 @@
- 	${CC} -o rtfm rtfm.c ${CFLAGS} ${LDFLAGS}
- 
- install: rtfm
--	install -c -s -o root -g wheel -m 0755 rtfm /usr/local/bin
-+	install -c -s -o root -g wheel -m 0755 rtfm ${PREFIX}/bin
- 	install -c -o root -g wheel -m 0644 rtfm.1 ${PREFIX}/man/man1
- 
- clean: