DESTDIR support.diff -r1.4 -r1.5 pkgsrc/mail/serialmail/Makefile
(schmonz)
@@ -1,27 +1,30 @@ | @@ -1,27 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2008/07/30 10:54:10 schmonz Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2010/03/15 17:31:29 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= serialmail-0.75 | 4 | DISTNAME= serialmail-0.75 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 1 | |
6 | CATEGORIES= mail | 6 | CATEGORIES= mail | |
7 | MASTER_SITES= http://cr.yp.to/software/ | 7 | MASTER_SITES= http://cr.yp.to/software/ | |
8 | 8 | |||
9 | MAINTAINER= schmonz@NetBSD.org | 9 | MAINTAINER= schmonz@NetBSD.org | |
10 | HOMEPAGE= http://cr.yp.to/serialmail.html | 10 | HOMEPAGE= http://cr.yp.to/serialmail.html | |
11 | COMMENT= Tools for passing mail across serial links | 11 | COMMENT= Tools for passing mail across serial links | |
12 | 12 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | |||
14 | ||||
13 | DEPENDS+= qmail>=1.03nb7:../../mail/qmail | 15 | DEPENDS+= qmail>=1.03nb7:../../mail/qmail | |
14 | 16 | |||
15 | USE_TOOLS+= nroff | 17 | USE_TOOLS+= nroff | |
18 | INSTALLATION_DIRS= share/doc/${PKGBASE} | |||
16 | 19 | |||
17 | # We change conf-home from the default "/usr/local" and don't | 20 | # We change conf-home from the default "/usr/local" and don't | |
18 | # provide compatibility symlinks. We also patch to install docs | 21 | # provide compatibility symlinks. We also patch to install docs | |
19 | # following hier(7), to set reasonable permissions on standard | 22 | # following hier(7), to set reasonable permissions on standard | |
20 | # pkgsrc directories, and to avoid overwriting the "setlock" binary | 23 | # pkgsrc directories, and to avoid overwriting the "setlock" binary | |
21 | # provided by sysutils/daemontools. | 24 | # provided by sysutils/daemontools. | |
22 | DJB_RESTRICTED= YES | 25 | DJB_RESTRICTED= YES | |
23 | 26 | |||
24 | SUBST_FILES.djbware+= leapsecs_read.c | 27 | SUBST_FILES.djbware+= leapsecs_read.c | |
25 | 28 | |||
26 | .include "../../mk/djbware.mk" | 29 | .include "../../mk/djbware.mk" | |
27 | .include "../../mk/bsd.pkg.mk" | 30 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2008/07/30 10:54:10 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.3 2010/03/15 17:31:29 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137 | 3 | SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137 | |
4 | RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83 | 4 | RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83 | |
5 | Size (serialmail-0.75.tar.gz) = 55079 bytes | 5 | Size (serialmail-0.75.tar.gz) = 55079 bytes | |
6 | SHA1 (patch-aa) = 0ccbe27149addddcd839ed71cc07b68d7473100b | 6 | SHA1 (patch-aa) = 0ccbe27149addddcd839ed71cc07b68d7473100b | |
7 | SHA1 (patch-ab) = af02dc2acf416ae63f93de08bdafdad80faebc12 | 7 | SHA1 (patch-ab) = af02dc2acf416ae63f93de08bdafdad80faebc12 | |
8 | SHA1 (patch-ac) = 7802bf7b955883b274dcb9429e1bf12c34dd6bd9 |
$NetBSD: patch-ac,v 1.1 2010/03/15 17:31:29 schmonz Exp $
--- Makefile.orig 1998-11-15 02:28:23.000000000 +0000
+++ Makefile
@@ -28,6 +28,14 @@ auto-str.o: \
compile auto-str.c substdio.h readwrite.h exit.h
./compile auto-str.c
+auto_destdir.c: \
+auto-str conf-destdir
+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
+
+auto_destdir.o: \
+compile auto_destdir.c
+ ./compile auto_destdir.c
+
auto_home.c: \
auto-str conf-home
./auto-str auto_home `head -1 conf-home` > auto_home.c
@@ -240,9 +248,9 @@ compile hier.c auto_home.h
./compile hier.c
install: \
-load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
+load install.o hier.o auto_destdir.o strerr.a substdio.a open.a error.a \
str.a
- ./load install hier.o auto_home.o strerr.a substdio.a \
+ ./load install hier.o auto_destdir.o strerr.a substdio.a \
open.a error.a str.a
install.o: \
@@ -251,8 +259,8 @@ exit.h
./compile install.c
instcheck: \
-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
- ./load instcheck hier.o auto_home.o strerr.a substdio.a \
+load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a
+ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
error.a str.a
instcheck.o: \