Honor pkgsrc LIBS.diff -r1.13 -r1.14 pkgsrc/net/ywho/Makefile
(dholland)
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2012/06/01 00:14:24 dholland Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2012/06/23 22:52:35 dholland Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ywho-1.3 | 4 | DISTNAME= ywho-1.3 | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= # ftp://ftp.gw.com/pub/people/kim/ | 6 | MASTER_SITES= # ftp://ftp.gw.com/pub/people/kim/ | |
7 | 7 | |||
8 | MAINTAINER= kim@tac.nyc.ny.us | 8 | MAINTAINER= kim@tac.nyc.ny.us | |
9 | COMMENT= Who, users, uptime on clients in a sun-RPC network | 9 | COMMENT= Who, users, uptime on clients in a sun-RPC network | |
10 | 10 | |||
11 | PKG_DESTDIR_SUPPORT= user-destdir | 11 | PKG_DESTDIR_SUPPORT= user-destdir | |
12 | 12 | |||
13 | NO_CONFIGURE= yes | 13 | NO_CONFIGURE= yes | |
14 | MAKE_FLAGS+= DEST=${DESTDIR}${PREFIX} PKGMANDIR=${PKGMANDIR} | 14 | MAKE_FLAGS+= DEST=${DESTDIR}${PREFIX} PKGMANDIR=${PKGMANDIR} | |
15 | MAKE_FLAGS+= EXTRA_LIBS=${LIBS:Q} | |||
15 | BUILD_TARGET= all | 16 | BUILD_TARGET= all | |
16 | 17 | |||
17 | LIBS.SunOS+= -lnsl | 18 | LIBS.SunOS+= -lnsl | |
18 | 19 | |||
19 | INSTALL_TARGET= install install.man | 20 | INSTALL_TARGET= install install.man | |
20 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | 21 | INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 | |
21 | 22 | |||
22 | .include "../../mk/bsd.pkg.mk" | 23 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2011/11/14 23:52:26 dholland Exp $ | 1 | $NetBSD: distinfo,v 1.6 2012/06/23 22:52:35 dholland Exp $ | |
2 | 2 | |||
3 | SHA1 (ywho-1.3.tar.gz) = 68dd6b8122b8821c7354254464c1946850753589 | 3 | SHA1 (ywho-1.3.tar.gz) = 68dd6b8122b8821c7354254464c1946850753589 | |
4 | RMD160 (ywho-1.3.tar.gz) = e362928ddc5f2bb13ebd86f2be2a9839e33c0df4 | 4 | RMD160 (ywho-1.3.tar.gz) = e362928ddc5f2bb13ebd86f2be2a9839e33c0df4 | |
5 | Size (ywho-1.3.tar.gz) = 7741 bytes | 5 | Size (ywho-1.3.tar.gz) = 7741 bytes | |
6 | SHA1 (patch-Makefile) = cdbb41244f3f4cf85dd9f0c3aee9b3d257fb0ab4 | 6 | SHA1 (patch-Makefile) = b71a566ba6dfd459acac3e1579826765ea78ef4e | |
7 | SHA1 (patch-aa) = 0662aef67b208679ba67d77c425f28ebc14dbc03 | 7 | SHA1 (patch-aa) = 0662aef67b208679ba67d77c425f28ebc14dbc03 |
@@ -1,28 +1,34 @@ | @@ -1,28 +1,34 @@ | |||
1 | $NetBSD: patch-Makefile,v 1.1 2011/11/14 23:52:26 dholland Exp $ | 1 | $NetBSD: patch-Makefile,v 1.2 2012/06/23 22:52:35 dholland Exp $ | |
2 | 2 | |||
3 | Honor PKGMANDIR. | 3 | - Honor PKGMANDIR. | |
4 | - Honor pkgsrc LIBS. | |||
4 | 5 | |||
5 | --- Makefile~ 2000-12-17 17:08:52.000000000 +0000 | 6 | --- Makefile.orig 2000-12-17 17:08:52.000000000 +0000 | |
6 | +++ Makefile | 7 | +++ Makefile | |
7 | @@ -7,6 +7,7 @@ SHELL = /bin/sh | 8 | @@ -7,9 +7,11 @@ SHELL = /bin/sh | |
8 | CFLAGS = -O2 -Wall # -g -DDEBUG | 9 | CFLAGS = -O2 -Wall # -g -DDEBUG | |
9 | LDFLAGS = # -g | 10 | LDFLAGS = # -g | |
10 | DEST = /usr/local | 11 | DEST = /usr/local | |
11 | +PKGMANDIR = man | 12 | +PKGMANDIR = man | |
12 | OBJS = ywho.o xdr.o | 13 | OBJS = ywho.o xdr.o | |
13 | SRCS = ywho.c xdr.c | 14 | SRCS = ywho.c xdr.c | |
14 | LIBS = -lrpcsvc #-lsocket -lnsl | 15 | -LIBS = -lrpcsvc #-lsocket -lnsl | |
15 | @@ -37,12 +38,12 @@ depend: | 16 | +LIBS = -lrpcsvc $(EXTRA_LIBS) | |
17 | +EXTRA_LIBS = #-lsocket -lnsl | |||
18 | ||||
19 | all: ywho | |||
20 | ||||
21 | @@ -37,12 +39,12 @@ depend: | |||
16 | 22 | |||
17 | install.man: | 23 | install.man: | |
18 | rm -f \ | 24 | rm -f \ | |
19 | - $(DEST)/man/man1/ywho.1 \ | 25 | - $(DEST)/man/man1/ywho.1 \ | |
20 | - $(DEST)/man/man1/yusers.1 \ | 26 | - $(DEST)/man/man1/yusers.1 \ | |
21 | - $(DEST)/man/man1/yuptime.1 | 27 | - $(DEST)/man/man1/yuptime.1 | |
22 | - install -m 0444 ywho.man $(DEST)/man/man1/ywho.1 | 28 | - install -m 0444 ywho.man $(DEST)/man/man1/ywho.1 | |
23 | - ln -s ywho.1 $(DEST)/man/man1/yusers.1 | 29 | - ln -s ywho.1 $(DEST)/man/man1/yusers.1 | |
24 | - ln -s ywho.1 $(DEST)/man/man1/yuptime.1 | 30 | - ln -s ywho.1 $(DEST)/man/man1/yuptime.1 | |
25 | + $(DEST)/$(PKGMANDIR)/man1/ywho.1 \ | 31 | + $(DEST)/$(PKGMANDIR)/man1/ywho.1 \ | |
26 | + $(DEST)/$(PKGMANDIR)/man1/yusers.1 \ | 32 | + $(DEST)/$(PKGMANDIR)/man1/yusers.1 \ | |
27 | + $(DEST)/$(PKGMANDIR)/man1/yuptime.1 | 33 | + $(DEST)/$(PKGMANDIR)/man1/yuptime.1 | |
28 | + install -m 0444 ywho.man $(DEST)/$(PKGMANDIR)/man1/ywho.1 | 34 | + install -m 0444 ywho.man $(DEST)/$(PKGMANDIR)/man1/ywho.1 |