Thu Oct 29 21:58:39 2009 UTC ()
Support DESTDIR and PKGMANDIR


(tnn)
diff -r1.11 -r1.12 pkgsrc/sysutils/wtail/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/wtail/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/wtail/patches/patch-aa
cvs diff -r1.11 -r1.12 pkgsrc/sysutils/wtail/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/wtail/Makefile 2006/03/04 21:30:43 1.11
+++ pkgsrc/sysutils/wtail/Makefile 2009/10/29 21:58:38 1.12
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:43 jlam Exp $ 1# $NetBSD: Makefile,v 1.12 2009/10/29 21:58:38 tnn Exp $
2# 2#
3 3
4DISTNAME= wtail-0.2.2 4DISTNAME= wtail-0.2.2
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://www.teaser.fr/~amajorel/wtail/ 7MASTER_SITES= http://www.teaser.fr/~amajorel/wtail/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/ 10HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/
11COMMENT= Watch multiple files at once 11COMMENT= Watch multiple files at once
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14MAKE_ENV+= SED=${SED:Q} 15MAKE_ENV+= SED=${SED:Q}
15 16
16.include "../../devel/ncurses/buildlink3.mk" 17.include "../../devel/ncurses/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/wtail/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/wtail/distinfo 2005/02/24 13:40:59 1.2
+++ pkgsrc/sysutils/wtail/distinfo 2009/10/29 21:58:38 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2005/02/24 13:40:59 agc Exp $ 1$NetBSD: distinfo,v 1.3 2009/10/29 21:58:38 tnn Exp $
2 2
3SHA1 (wtail-0.2.2.tar.gz) = 609f4ebe064c155829e96f865bee93e727b692e8 3SHA1 (wtail-0.2.2.tar.gz) = 609f4ebe064c155829e96f865bee93e727b692e8
4RMD160 (wtail-0.2.2.tar.gz) = cb118254ef80c2a26d0ce2b482ca6b64d0401417 4RMD160 (wtail-0.2.2.tar.gz) = cb118254ef80c2a26d0ce2b482ca6b64d0401417
5Size (wtail-0.2.2.tar.gz) = 13633 bytes 5Size (wtail-0.2.2.tar.gz) = 13633 bytes
6SHA1 (patch-aa) = 1605c1836fddce4c3fef589e3cf5a11d6bab33d6 6SHA1 (patch-aa) = b37d9383f512c3e14fb590d6f07b8e2fbb12ad00
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/wtail/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/wtail/patches/patch-aa 2003/02/16 00:25:30 1.1.1.1
+++ pkgsrc/sysutils/wtail/patches/patch-aa 2009/10/29 21:58:38 1.2
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1$NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $ 1$NetBSD: patch-aa,v 1.2 2009/10/29 21:58:38 tnn Exp $
2 2
3--- Makefile.orig Tue Jan 14 00:12:57 2003 3--- Makefile.orig 2003-01-14 00:12:57.000000000 +0100
4+++ Makefile Sun Feb 16 01:09:18 2003 4+++ Makefile
5@@ -5,7 +5,7 @@ 5@@ -5,7 +5,7 @@
6  6
7  7
8 # Variables that you may want to modify 8 # Variables that you may want to modify
9-PREFIX = /usr/local 9-PREFIX = /usr/local
10+#PREFIX = /usr/local 10+#PREFIX = /usr/local
11 TMPDIR = ~/tmp 11 TMPDIR = ~/tmp
12  12
13 # Variables that you probably don't want to modify 13 # Variables that you probably don't want to modify
14@@ -22,12 +22,12 @@ 14@@ -22,12 +22,14 @@ clean:
15 rm -f $(OBJ) wtail 15 rm -f $(OBJ) wtail
16  16
17 install: 17 install:
18- mkdir -p '$(PREFIX)'/bin 18- mkdir -p '$(PREFIX)'/bin
19- cp wtail '$(PREFIX)'/bin 19- cp wtail '$(PREFIX)'/bin
20- touch -r wtail '$(PREFIX)'/bin/wtail 20- touch -r wtail '$(PREFIX)'/bin/wtail
21- mkdir -p "$(MAN)"/man1 21- mkdir -p "$(MAN)"/man1
22- sed 's/@{VERSION}/'$(VERSION)'/g' wtail.1 >"$(MAN)"/man1/wtail.1 22- sed 's/@{VERSION}/'$(VERSION)'/g' wtail.1 >"$(MAN)"/man1/wtail.1
23- touch -r wtail.1 "$(MAN)"/man1/wtail.1 23- touch -r wtail.1 "$(MAN)"/man1/wtail.1
24+ ${BSD_INSTALL_PROGRAM} wtail $(PREFIX)/bin/ 24+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin
 25+ ${BSD_INSTALL_PROGRAM} wtail $(DESTDIR)$(PREFIX)/bin
25+ ${SED} 's/@{VERSION}/'$(VERSION)'/g' wtail.1 > wtail.1.fixed 26+ ${SED} 's/@{VERSION}/'$(VERSION)'/g' wtail.1 > wtail.1.fixed
26+ ${BSD_INSTALL_MAN} wtail.1.fixed $(PREFIX)/man/man1/wtail.1 27+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
27+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/doc/wtail 28+ ${BSD_INSTALL_MAN} wtail.1.fixed $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/wtail.1
 29+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/doc/wtail
28+ ${BSD_INSTALL_DATA} README CHANGES COPYING FAQ VERSION \ 30+ ${BSD_INSTALL_DATA} README CHANGES COPYING FAQ VERSION \
29+ $(PREFIX)/share/doc/wtail/ 31+ $(DESTDIR)$(PREFIX)/share/doc/wtail/
30  32
31 test: chatter 33 test: chatter
32 ./chatter /tmp/wtail.a /tmp/wtail.b /tmp/wtail.c \ 34 ./chatter /tmp/wtail.a /tmp/wtail.b /tmp/wtail.c \
33@@ -51,7 +51,7 @@ 35@@ -51,7 +53,7 @@ dist:
34 arc=$(ARC); cd $(TMPDIR) && tar -cf - $$arc | gzip >$$arc.tar.gz 36 arc=$(ARC); cd $(TMPDIR) && tar -cf - $$arc | gzip >$$arc.tar.gz
35  37
36 wtail: $(OBJ) 38 wtail: $(OBJ)
37- $(CC) $(LDFLAGS) -o $@ $(OBJ) -lcurses 39- $(CC) $(LDFLAGS) -o $@ $(OBJ) -lcurses
38+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) -lcurses 40+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) -lcurses
39  41
40 version.c: VERSION 42 version.c: VERSION
41 cat VERSION | sed 's/.*/const char version[] = "&";/' >$@ 43 cat VERSION | sed 's/.*/const char version[] = "&";/' >$@