DESTDIR supportdiff -r1.6 -r1.7 pkgsrc/net/ishell/Makefile
(joerg)
@@ -1,27 +1,29 @@ | @@ -1,27 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2006/02/05 23:10:25 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2010/02/11 21:43:39 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ish-v${VERSION} | 4 | DISTNAME= ish-v${VERSION} | |
5 | PKGNAME= ishell-${VERSION} | 5 | PKGNAME= ishell-${VERSION} | |
6 | WRKSRC= ${WRKDIR}/ISHELL-v${VERSION}/ | 6 | WRKSRC= ${WRKDIR}/ISHELL-v${VERSION}/ | |
7 | PKGREVISION= 1 | 7 | PKGREVISION= 1 | |
8 | CATEGORIES= net | 8 | CATEGORIES= net | |
9 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icmpshell/} | 9 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icmpshell/} | |
10 | 10 | |||
11 | MAINTAINER= pancake@phreaker.net | 11 | MAINTAINER= pancake@phreaker.net | |
12 | HOMEPAGE= http://icmpshell.sourceforge.net/ | 12 | HOMEPAGE= http://icmpshell.sourceforge.net/ | |
13 | COMMENT= Allow remote shell using ICMP | 13 | COMMENT= Allow remote shell using ICMP | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | |||
16 | ||||
15 | VERSION= 0.2 | 17 | VERSION= 0.2 | |
16 | 18 | |||
17 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 19 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
18 | 20 | |||
19 | USE_TOOLS+= gmake | 21 | USE_TOOLS+= gmake | |
20 | NO_CONFIGURE= yes | 22 | NO_CONFIGURE= yes | |
21 | 23 | |||
22 | LIBS.SunOS+= -lnsl -lsocket | 24 | LIBS.SunOS+= -lnsl -lsocket | |
23 | MAKE_ENV+= LIBS=${LIBS:M*:Q} | 25 | MAKE_ENV+= LIBS=${LIBS:M*:Q} | |
24 | 26 | |||
25 | INSTALLATION_DIRS= bin sbin | 27 | INSTALLATION_DIRS= bin sbin | |
26 | 28 | |||
27 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2005/02/24 12:13:50 agc Exp $ | 1 | $NetBSD: distinfo,v 1.4 2010/02/11 21:43:39 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (ish-v0.2.tar.gz) = 2d5d16cdd8c097220ee885bedbefb7f41115e6b2 | 3 | SHA1 (ish-v0.2.tar.gz) = 2d5d16cdd8c097220ee885bedbefb7f41115e6b2 | |
4 | RMD160 (ish-v0.2.tar.gz) = 8582e044914f1d68ee7c2257d3be8cb8e8db2999 | 4 | RMD160 (ish-v0.2.tar.gz) = 8582e044914f1d68ee7c2257d3be8cb8e8db2999 | |
5 | Size (ish-v0.2.tar.gz) = 6531 bytes | 5 | Size (ish-v0.2.tar.gz) = 6531 bytes | |
6 | SHA1 (patch-aa) = 5a2a8782188874431a7ab03ea09aa60c266d2669 | 6 | SHA1 (patch-aa) = 2a14a33a1ca7dfdc6e736cf10b88f667b264b8b1 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2004/04/12 00:09:06 minskim Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2010/02/11 21:43:39 joerg Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig 2002-01-31 11:35:52.000000000 -0600 | 3 | --- Makefile.orig 2002-01-31 11:35:52.000000000 -0600 | |
4 | +++ Makefile | 4 | +++ Makefile | |
5 | @@ -1,38 +1,24 @@ | 5 | @@ -1,38 +1,24 @@ | |
6 | -CC = gcc | 6 | -CC = gcc | |
7 | -CFLAGS1 = -O2 -Wall | 7 | -CFLAGS1 = -O2 -Wall | |
8 | -CFLAGS2 = -O2 -Wall -lsocket | 8 | -CFLAGS2 = -O2 -Wall -lsocket | |
9 | -STRIP = strip | 9 | -STRIP = strip | |
10 | - | 10 | - | |
11 | -default: | 11 | -default: | |
12 | - @echo "-------------------------------" | 12 | - @echo "-------------------------------" | |
13 | - @echo "Make with the OS from the list:" | 13 | - @echo "Make with the OS from the list:" | |
14 | - @echo "" | 14 | - @echo "" | |
@@ -43,17 +43,17 @@ $NetBSD: patch-aa,v 1.2 2004/04/12 00:09 | @@ -43,17 +43,17 @@ $NetBSD: patch-aa,v 1.2 2004/04/12 00:09 | |||
43 | +ishd: $(ishd_OBJECTS) | 43 | +ishd: $(ishd_OBJECTS) | |
44 | + $(CC) $(ishd_OBJECTS) $(LDFLAGS) $(LIBS) -o $@ | 44 | + $(CC) $(ishd_OBJECTS) $(LDFLAGS) $(LIBS) -o $@ | |
45 | 45 | |||
46 | -cc2: | 46 | -cc2: | |
47 | - $(CC) $(CFLAGS2) -o ish ish.c ish_main.c | 47 | - $(CC) $(CFLAGS2) -o ish ish.c ish_main.c | |
48 | - $(CC) $(CFLAGS2) -o ishd ishd.c ish_main.c ish_open.c | 48 | - $(CC) $(CFLAGS2) -o ishd ishd.c ish_main.c ish_open.c | |
49 | +clean: | 49 | +clean: | |
50 | + ${RM} -f ish ishd | 50 | + ${RM} -f ish ishd | |
51 | 51 | |||
52 | -fin: | 52 | -fin: | |
53 | - $(STRIP) ish | 53 | - $(STRIP) ish | |
54 | - $(STRIP) ishd | 54 | - $(STRIP) ishd | |
55 | +install: | 55 | +install: | |
56 | + ${BSD_INSTALL_PROGRAM} ./ish ${PREFIX}/bin/ishell | 56 | + ${BSD_INSTALL_PROGRAM} ./ish ${DESTDIR}${PREFIX}/bin/ishell | |
57 | + ${BSD_INSTALL_PROGRAM} ./ishd ${PREFIX}/sbin/ishelld | 57 | + ${BSD_INSTALL_PROGRAM} ./ishd ${DESTDIR}${PREFIX}/sbin/ishelld | |
58 | 58 | |||
59 | +.PHONY: all clean install | 59 | +.PHONY: all clean install |