From ecee80b7bca33d5ab92a35ee8568c6ead9d6c8b0 Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 15 Mar 2010 17:28:10 +0000 Subject: DESTDIR support. --- mail/dot-forward/Makefile | 4 +++- mail/dot-forward/distinfo | 3 ++- mail/dot-forward/patches/patch-aa | 43 +++++++++++++++++++++++++++++++++++++++ mail/ezmlm-idx/Makefile | 14 +++++++------ mail/ezmlm-idx/distinfo | 3 ++- mail/ezmlm-idx/patches/patch-ac | 17 ++++++++++++++++ mail/ezmlm/Makefile | 4 +++- mail/ezmlm/Makefile.common | 4 +++- mail/ezmlm/distinfo | 3 ++- mail/ezmlm/patches/patch-aa | 17 ++++++++++++++++ mail/fastforward/Makefile | 4 +++- mail/fastforward/distinfo | 4 +++- mail/fastforward/patches/patch-aa | 43 +++++++++++++++++++++++++++++++++++++++ mail/fastforward/patches/patch-ab | 26 +++++++++++++++++++++++ mail/mess822/Makefile | 3 ++- mail/mess822/distinfo | 3 ++- mail/mess822/patches/patch-ad | 43 +++++++++++++++++++++++++++++++++++++++ mail/qmail-conf/Makefile | 6 ++++-- mail/qmail-conf/distinfo | 3 ++- mail/qmail-conf/patches/patch-aa | 36 ++++++++++++++++++++++++++++++++ mail/qmailanalog/Makefile | 4 +++- mail/qmailanalog/distinfo | 3 ++- mail/qmailanalog/patches/patch-aa | 42 ++++++++++++++++++++++++++++++++++++++ mail/qtools/Makefile | 10 +++++---- mail/qtools/distinfo | 3 ++- mail/qtools/patches/patch-ab | 42 ++++++++++++++++++++++++++++++++++++++ mail/serialmail/Makefile | 5 ++++- mail/serialmail/distinfo | 3 ++- mail/serialmail/patches/patch-ac | 42 ++++++++++++++++++++++++++++++++++++++ 29 files changed, 409 insertions(+), 28 deletions(-) create mode 100644 mail/dot-forward/patches/patch-aa create mode 100644 mail/ezmlm-idx/patches/patch-ac create mode 100644 mail/ezmlm/patches/patch-aa create mode 100644 mail/fastforward/patches/patch-aa create mode 100644 mail/fastforward/patches/patch-ab create mode 100644 mail/mess822/patches/patch-ad create mode 100644 mail/qmail-conf/patches/patch-aa create mode 100644 mail/qmailanalog/patches/patch-aa create mode 100644 mail/qtools/patches/patch-ab create mode 100644 mail/serialmail/patches/patch-ac (limited to 'mail') diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile index 6f0c82ee405..ab77dd15445 100644 --- a/mail/dot-forward/Makefile +++ b/mail/dot-forward/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2009/05/19 09:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/03/15 17:28:10 schmonz Exp $ # DISTNAME= dot-forward-0.71 @@ -11,6 +11,8 @@ HOMEPAGE= http://cr.yp.to/dot-forward.html COMMENT= Reads sendmail's .forward files under qmail LICENSE= public-domain +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= qmail>=1.03nb7:../../mail/qmail USE_TOOLS+= nroff diff --git a/mail/dot-forward/distinfo b/mail/dot-forward/distinfo index 57ae0ed54c1..d30a1ffdef5 100644 --- a/mail/dot-forward/distinfo +++ b/mail/dot-forward/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:21 agc Exp $ +$NetBSD: distinfo,v 1.3 2010/03/15 17:28:10 schmonz Exp $ SHA1 (dot-forward-0.71.tar.gz) = 2adacc13bb43fcf7ae13d3fbeaadd2649ff91137 RMD160 (dot-forward-0.71.tar.gz) = 1e5fd7558296cf213274e6e80944ba26fed74c79 Size (dot-forward-0.71.tar.gz) = 26352 bytes +SHA1 (patch-aa) = ae2cd9f340d25f721203c65505e3a5426d295313 diff --git a/mail/dot-forward/patches/patch-aa b/mail/dot-forward/patches/patch-aa new file mode 100644 index 00000000000..f49dbc97454 --- /dev/null +++ b/mail/dot-forward/patches/patch-aa @@ -0,0 +1,43 @@ +$NetBSD: patch-aa,v 1.1 2010/03/15 17:28:10 schmonz Exp $ + +--- Makefile.orig 1998-05-19 10:15:50.000000000 +0000 ++++ Makefile +@@ -31,6 +31,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_qmail `head -1 conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_qmail.c: \ + auto-str conf-qmail + ./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c +@@ -181,9 +189,9 @@ compile hier.c auto_qmail.h + ./compile hier.c + + install: \ +-load install.o hier.o auto_qmail.o strerr.a substdio.a error.a open.a \ ++load install.o hier.o auto_destdir.o strerr.a substdio.a error.a open.a \ + str.a +- ./load install hier.o auto_qmail.o strerr.a substdio.a \ ++ ./load install hier.o auto_destdir.o strerr.a substdio.a \ + error.a open.a str.a + + install.o: \ +@@ -192,9 +200,9 @@ exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o hier.o auto_qmail.o strerr.a substdio.a error.a \ ++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a \ + str.a +- ./load instcheck hier.o auto_qmail.o strerr.a substdio.a \ ++ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ + error.a str.a + + instcheck.o: \ diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 01fd33a2403..015cec6d372 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2009/05/19 09:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2010/03/15 17:29:23 schmonz Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -17,9 +17,11 @@ CONFLICTS= ezmlm-[0-9]* DISTFILES+= ${EZMLM_VERS}.tar.gz PLIST_SRC+= PLIST.idx +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews DJB_RESTRICTED= no +DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q} > conf-destdir PKG_SYSCONFSUBDIR= ezmlm CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" @@ -42,11 +44,11 @@ pre-patch: cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < idx.patch post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/ezcgirc ${EGDIR}/ezcgirc - ${INSTALL_DATA} ${WRKSRC}/ezmlmrc ${EGDIR}/ezmlmrc - ${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${EGDIR}/ezmlmglrc - ${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${EGDIR}/ezmlmsubrc + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/ezcgirc ${DESTDIR}${EGDIR}/ezcgirc + ${INSTALL_DATA} ${WRKSRC}/ezmlmrc ${DESTDIR}${EGDIR}/ezmlmrc + ${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${DESTDIR}${EGDIR}/ezmlmglrc + ${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${DESTDIR}${EGDIR}/ezmlmsubrc .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo index 78bd6fab914..8060372992c 100644 --- a/mail/ezmlm-idx/distinfo +++ b/mail/ezmlm-idx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2006/12/29 06:21:06 schmonz Exp $ +$NetBSD: distinfo,v 1.18 2010/03/15 17:29:23 schmonz Exp $ SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b @@ -8,3 +8,4 @@ RMD160 (ezmlm-idx-0.444.tar.gz) = 7af28d61c604123113e6718d263d7d207f09fd33 Size (ezmlm-idx-0.444.tar.gz) = 615519 bytes SHA1 (patch-aa) = 1a30d5f859ed87723f2c32e33a3b96167c460446 SHA1 (patch-ab) = a8f41d4fad49dca3e65a317e95bc54a1b530afe0 +SHA1 (patch-ac) = 1a3e784f3c20fc0214d20671ce5a33dcc8b14427 diff --git a/mail/ezmlm-idx/patches/patch-ac b/mail/ezmlm-idx/patches/patch-ac new file mode 100644 index 00000000000..c95b95ce1d2 --- /dev/null +++ b/mail/ezmlm-idx/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.7 2010/03/15 17:29:23 schmonz Exp $ + +--- Makefile.orig 2006-11-23 19:12:29.000000000 +0000 ++++ Makefile +@@ -1095,9 +1095,9 @@ compile seek_set.c seek.h + ./compile seek_set.c + + setup: \ +-it man install conf-bin conf-man BIN MAN +- ./install "`head -n 1 conf-bin`" < BIN +- ./install "`head -n 1 conf-man`" < MAN ++it man install conf-bin conf-man conf-destdir BIN MAN ++ ./install "`head -1 conf-destdir``head -n 1 conf-bin`" < BIN ++ ./install "`head -1 conf-destdir``head -n 1 conf-man`" < MAN + + sgetopt.0: \ + sgetopt.3 diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index f59a4e2da76..41ab5c07edf 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/05/19 09:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/03/15 17:28:46 schmonz Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -13,9 +13,11 @@ LICENSE= public-domain CONFLICTS= ezmlm-idx-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews DJB_RESTRICTED= no +DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q} > conf-destdir INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5 diff --git a/mail/ezmlm/Makefile.common b/mail/ezmlm/Makefile.common index 55fb2404c6b..37960dc476d 100644 --- a/mail/ezmlm/Makefile.common +++ b/mail/ezmlm/Makefile.common @@ -1,5 +1,7 @@ -# $NetBSD: Makefile.common,v 1.9 2006/01/05 03:00:21 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.10 2010/03/15 17:28:46 schmonz Exp $ # +# used by mail/ezmlm/Makefile +# used by mail/ezmlm-idx/Makefile EZMLM_VERS= ezmlm-0.53 diff --git a/mail/ezmlm/distinfo b/mail/ezmlm/distinfo index e3648fc16dc..718c530665d 100644 --- a/mail/ezmlm/distinfo +++ b/mail/ezmlm/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:22 agc Exp $ +$NetBSD: distinfo,v 1.3 2010/03/15 17:28:46 schmonz Exp $ SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b Size (ezmlm-0.53.tar.gz) = 62693 bytes +SHA1 (patch-aa) = a6ca78b9862d2c87b8ff0ea4bb3efbba891715a9 diff --git a/mail/ezmlm/patches/patch-aa b/mail/ezmlm/patches/patch-aa new file mode 100644 index 00000000000..b1f89b9d31f --- /dev/null +++ b/mail/ezmlm/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.1 2010/03/15 17:28:46 schmonz Exp $ + +--- Makefile.orig 1997-06-30 03:11:54.000000000 +0000 ++++ Makefile +@@ -610,9 +610,9 @@ compile seek_set.c seek_set.c seek.h see + ./compile seek_set.c + + setup: \ +-it man install conf-bin conf-man +- ./install "`head -1 conf-bin`" < BIN +- ./install "`head -1 conf-man`" < MAN ++it man install conf-bin conf-man conf-destdir ++ ./install "`head -1 conf-destdir``head -1 conf-bin`" < BIN ++ ./install "`head -1 conf-destdir``head -1 conf-man`" < MAN + + sgetopt.0: \ + sgetopt.3 diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile index d1a79176641..0204fb8df6d 100644 --- a/mail/fastforward/Makefile +++ b/mail/fastforward/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/03/12 13:19:49 obache Exp $ +# $NetBSD: Makefile,v 1.20 2010/03/15 17:29:43 schmonz Exp $ # DISTNAME= fastforward-0.51 @@ -11,6 +11,8 @@ HOMEPAGE= http://cr.yp.to/fastforward.html COMMENT= Sendmail-style /etc/aliases support for qmail LICENSE= public-domain +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= qmail>=1.03nb7:../../mail/qmail CONFLICTS+= esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]* diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo index fb7386c3a31..b8f8b4ca464 100644 --- a/mail/fastforward/distinfo +++ b/mail/fastforward/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:22 agc Exp $ +$NetBSD: distinfo,v 1.3 2010/03/15 17:29:43 schmonz Exp $ SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25 Size (fastforward-0.51.tar.gz) = 40659 bytes +SHA1 (patch-aa) = 6b0dfb2cf364fbc9eb86830585210c303a68ae5f +SHA1 (patch-ab) = 8ec7eff525bbd1b216c47020adaa5af3daf72580 diff --git a/mail/fastforward/patches/patch-aa b/mail/fastforward/patches/patch-aa new file mode 100644 index 00000000000..9905c4fa332 --- /dev/null +++ b/mail/fastforward/patches/patch-aa @@ -0,0 +1,43 @@ +$NetBSD: patch-aa,v 1.1 2010/03/15 17:29:43 schmonz Exp $ + +--- Makefile.orig 1998-05-19 16:25:42.000000000 +0000 ++++ Makefile +@@ -31,6 +31,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_qmail `head -1 conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_qmail.c: \ + auto-str conf-qmail + ./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c +@@ -227,9 +235,9 @@ compile hier.c auto_qmail.h + ./compile hier.c + + install: \ +-load install.o hier.o auto_qmail.o strerr.a substdio.a error.a open.a \ ++load install.o hier.o auto_destdir.o strerr.a substdio.a error.a open.a \ + str.a +- ./load install hier.o auto_qmail.o strerr.a substdio.a \ ++ ./load install hier.o auto_destdir.o strerr.a substdio.a \ + error.a open.a str.a + + install.o: \ +@@ -238,9 +246,9 @@ exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o hier.o auto_qmail.o strerr.a substdio.a error.a \ ++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a \ + str.a +- ./load instcheck hier.o auto_qmail.o strerr.a substdio.a \ ++ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ + error.a str.a + + instcheck.o: \ diff --git a/mail/fastforward/patches/patch-ab b/mail/fastforward/patches/patch-ab new file mode 100644 index 00000000000..0297f505fe0 --- /dev/null +++ b/mail/fastforward/patches/patch-ab @@ -0,0 +1,26 @@ +$NetBSD: patch-ab,v 1.1 2010/03/15 17:29:43 schmonz Exp $ + +--- hier.c.orig 1998-05-19 16:25:42.000000000 +0000 ++++ hier.c +@@ -5,8 +5,10 @@ void hier() + h(auto_qmail,-1,-1,0755); + + d(auto_qmail,"bin",-1,-1,0755); +- d(auto_qmail,"doc",-1,-1,0755); +- d(auto_qmail,"doc/fastforward",-1,-1,0755); ++ d(auto_qmail,"share",-1,-1,0755); ++ d(auto_qmail,"share/doc",-1,-1,0755); ++ d(auto_qmail,"share/doc/qmail",-1,-1,0755); ++ d(auto_qmail,"share/doc/qmail/fastforward",-1,-1,0755); + d(auto_qmail,"man",-1,-1,0755); + d(auto_qmail,"man/man1",-1,-1,0755); + d(auto_qmail,"man/cat1",-1,-1,0755); +@@ -19,7 +21,7 @@ void hier() + c(auto_qmail,"bin","setmaillist",-1,-1,0755); + c(auto_qmail,"bin","newinclude",-1,-1,0755); + +- c(auto_qmail,"doc/fastforward","ALIASES",-1,-1,0644); ++ c(auto_qmail,"share/doc/qmail/fastforward","ALIASES",-1,-1,0644); + + c(auto_qmail,"man/man1","fastforward.1",-1,-1,0644); + c(auto_qmail,"man/man1","printforward.1",-1,-1,0644); diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile index c7e3896cacd..8d758ee6f51 100644 --- a/mail/mess822/Makefile +++ b/mail/mess822/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2009/06/12 18:54:32 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2010/03/15 17:30:02 schmonz Exp $ # DISTNAME= mess822-0.58 @@ -20,6 +20,7 @@ USE_TOOLS+= nroff # ${PREFIX}, and patch strerr_sys.c to build on Mac OS X. DJB_RESTRICTED= YES +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews EGDIR= ${PREFIX}/share/examples/mess822 diff --git a/mail/mess822/distinfo b/mail/mess822/distinfo index 5fd32787692..4b8c53acd62 100644 --- a/mail/mess822/distinfo +++ b/mail/mess822/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2008/07/30 10:40:56 schmonz Exp $ +$NetBSD: distinfo,v 1.5 2010/03/15 17:30:02 schmonz Exp $ SHA1 (mess822-0.58.tar.gz) = ef3380c793c852d40688c108d164234ecf8a5362 RMD160 (mess822-0.58.tar.gz) = 40fbcb5af92882e133ab3653c6119022180caedb @@ -6,3 +6,4 @@ Size (mess822-0.58.tar.gz) = 64287 bytes SHA1 (patch-aa) = 62464e4d3afb31ad2ef38575cddbee969c8a82b3 SHA1 (patch-ab) = b947129046bbef7012208db39a341648c13ff68f SHA1 (patch-ac) = af02dc2acf416ae63f93de08bdafdad80faebc12 +SHA1 (patch-ad) = 2d3e489b2cac3fc580200f0ecc61f3987ffaebf0 diff --git a/mail/mess822/patches/patch-ad b/mail/mess822/patches/patch-ad new file mode 100644 index 00000000000..505a75e5ac9 --- /dev/null +++ b/mail/mess822/patches/patch-ad @@ -0,0 +1,43 @@ +$NetBSD: patch-ad,v 1.1 2010/03/15 17:30:02 schmonz Exp $ + +--- Makefile.orig 1998-09-05 02:33:37.000000000 +0000 ++++ Makefile +@@ -120,6 +120,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 +@@ -359,9 +367,9 @@ exit.h + ./compile iftocc.c + + install: \ +-load install.o hier.o auto_home.o strerr.a substdio.a stralloc.a \ ++load install.o hier.o auto_destdir.o strerr.a substdio.a stralloc.a \ + alloc.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 \ + stralloc.a alloc.a open.a error.a str.a + + install.o: \ +@@ -370,9 +378,9 @@ exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o hier.o auto_home.o strerr.a substdio.a stralloc.a \ ++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a stralloc.a \ + alloc.a error.a str.a +- ./load instcheck hier.o auto_home.o strerr.a substdio.a \ ++ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ + stralloc.a alloc.a error.a str.a + + instcheck.o: \ diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile index a319b87e049..4e9958c5db7 100644 --- a/mail/qmail-conf/Makefile +++ b/mail/qmail-conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:02 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2010/03/15 17:30:28 schmonz Exp $ # DISTNAME= qmail-conf-0.60 @@ -18,8 +18,10 @@ DEPENDS+= ucspi-tcp>=0.86:../../net/ucspi-tcp SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/ +PKG_DESTDIR_SUPPORT= user-destdir + DJB_RESTRICTED= NO -DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp +DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ucspi-tcp SUBST_FILES.djbware+= ../djbdns-1.05/error.h diff --git a/mail/qmail-conf/distinfo b/mail/qmail-conf/distinfo index 5009e6909ac..31e406065dd 100644 --- a/mail/qmail-conf/distinfo +++ b/mail/qmail-conf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/03/15 17:30:28 schmonz Exp $ SHA1 (qmail-conf-0.60.tar.gz) = d9a48e15394b0e7beaf5f7c64db4be101a71fb08 RMD160 (qmail-conf-0.60.tar.gz) = 41bb36cb644c3669be96abccce3b69a91aa44cd8 @@ -6,3 +6,4 @@ Size (qmail-conf-0.60.tar.gz) = 6332 bytes SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed Size (djbdns-1.05.tar.gz) = 85648 bytes +SHA1 (patch-aa) = f649a22f6b16ae1b84a21c2ae860b72af1121e13 diff --git a/mail/qmail-conf/patches/patch-aa b/mail/qmail-conf/patches/patch-aa new file mode 100644 index 00000000000..92b38e141d3 --- /dev/null +++ b/mail/qmail-conf/patches/patch-aa @@ -0,0 +1,36 @@ +$NetBSD: patch-aa,v 1.1 2010/03/15 17:30:28 schmonz Exp $ + +--- Makefile.ini.orig 2001-09-02 07:47:33.000000000 +0000 ++++ Makefile.ini +@@ -25,6 +25,14 @@ auto-str: \ + load auto-str.o djb.a + ./load auto-str djb.a + ++auto_destdir.c: \ ++auto-str conf-destdir ++ ./auto-str auto_qmail `sed 1q conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_qmail.c: \ + auto-str conf-qmail + ./auto-str auto_qmail `sed 1q conf-qmail` > auto_qmail.c +@@ -72,12 +80,12 @@ compile hier.c auto_qmail.h + ./compile hier.c + + install: \ +-load install.o hier.o auto_qmail.o djb.a +- ./load install hier.o auto_qmail.o djb.a ++load install.o hier.o auto_destdir.o djb.a ++ ./load install hier.o auto_destdir.o djb.a + + instcheck: \ +-load instcheck.o hier.o auto_qmail.o djb.a +- ./load instcheck hier.o auto_qmail.o djb.a ++load instcheck.o hier.o auto_destdir.o djb.a ++ ./load instcheck hier.o auto_destdir.o djb.a + + it: \ + djbdns.version prog install instcheck diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile index 273a57e5138..c2f982ec1e7 100644 --- a/mail/qmailanalog/Makefile +++ b/mail/qmailanalog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/01 19:40:13 tv Exp $ +# $NetBSD: Makefile,v 1.12 2010/03/15 17:30:45 schmonz Exp $ # DISTNAME= qmailanalog-0.70 @@ -9,6 +9,8 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/qmailanalog.html COMMENT= Collection of tools to help analyze qmail's activity +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= nroff DJB_RESTRICTED= YES diff --git a/mail/qmailanalog/distinfo b/mail/qmailanalog/distinfo index dbfc5b01ca5..69b01f44df6 100644 --- a/mail/qmailanalog/distinfo +++ b/mail/qmailanalog/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:28 agc Exp $ +$NetBSD: distinfo,v 1.3 2010/03/15 17:30:45 schmonz Exp $ SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0 Size (qmailanalog-0.70.tar.gz) = 28416 bytes +SHA1 (patch-aa) = be5c86804cb3ba9fcbff3bf58997ae7a2d87b84c diff --git a/mail/qmailanalog/patches/patch-aa b/mail/qmailanalog/patches/patch-aa new file mode 100644 index 00000000000..0d6a6c44d54 --- /dev/null +++ b/mail/qmailanalog/patches/patch-aa @@ -0,0 +1,42 @@ +$NetBSD: patch-aa,v 1.1 2010/03/15 17:30:45 schmonz Exp $ + +--- Makefile.orig 1998-08-30 21:39:26.000000000 +0000 ++++ Makefile +@@ -35,6 +35,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 +@@ -194,9 +202,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: \ +@@ -205,8 +213,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: \ diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile index 0d31660b609..50a271f38ae 100644 --- a/mail/qtools/Makefile +++ b/mail/qtools/Makefile @@ -1,19 +1,21 @@ -# $NetBSD: Makefile,v 1.15 2005/08/19 03:55:00 schmonz Exp $ +# $NetBSD: Makefile,v 1.16 2010/03/15 17:31:09 schmonz Exp $ # DISTNAME= qtools-0.56 CATEGORIES= mail -MASTER_SITES= http://www.superscript.com/qtools/ +MASTER_SITES= ${HOMEPAGE} MAINTAINER= schmonz@NetBSD.org -HOMEPAGE= http://www.superscript.com/qtools/intro.html +HOMEPAGE= http://www.superscript.com/qtools/ COMMENT= Utilities for filtering via .qmail +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= {ezmlm>=0.53,ezmlm-idx-[0-9]*}:../../mail/ezmlm DEPENDS+= qmail>=1.03:../../mail/qmail DJB_RESTRICTED= NO -DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ezmlm +DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ezmlm .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/qtools/distinfo b/mail/qtools/distinfo index bc478151173..4e414808e5f 100644 --- a/mail/qtools/distinfo +++ b/mail/qtools/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:59:28 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/03/15 17:31:09 schmonz Exp $ SHA1 (qtools-0.56.tar.gz) = 0c6daa8611ac38413e0e221bbc45ccf2b7396ebc RMD160 (qtools-0.56.tar.gz) = 0f040d18f02a9772291b1a1ddc55d4d899918684 Size (qtools-0.56.tar.gz) = 37748 bytes SHA1 (patch-aa) = 0c95897bb6ff75584231e39c26e79cee3a794439 +SHA1 (patch-ab) = bbb6bc4e19e806a16b1a07ba61bef003311b31a6 diff --git a/mail/qtools/patches/patch-ab b/mail/qtools/patches/patch-ab new file mode 100644 index 00000000000..343da5f9e70 --- /dev/null +++ b/mail/qtools/patches/patch-ab @@ -0,0 +1,42 @@ +$NetBSD: patch-ab,v 1.1 2010/03/15 17:31:09 schmonz Exp $ + +--- Makefile.orig 2001-11-08 13:07:57.000000000 +0000 ++++ Makefile +@@ -688,9 +688,9 @@ error.a alloc.a open.a auto_ezmlm.o auto + ./load replier-config strerr.a buffer.a stralloc.a str.a error.a alloc.a \ + open.a auto_ezmlm.o auto_home.o auto_qmail.o + +-instcheck: load instcheck.o hier.o auto_home.o strerr.a buffer.a error.a \ ++instcheck: load instcheck.o hier.o auto_destdir.o strerr.a buffer.a error.a \ + str.a +- ./load instcheck hier.o auto_home.o strerr.a buffer.a error.a str.a ++ ./load instcheck hier.o auto_destdir.o strerr.a buffer.a error.a str.a + + make-text: load make-text.o getln.a buffer.a stralloc.a alloc.a error.a \ + str.a +@@ -710,6 +710,13 @@ strerr.h buffer.h stralloc.h gen_alloc.h + auto_ezmlm.h auto_home.h auto_qmail.h str.h help.t + ./compile replier-config.c + ++auto_destdir.o: compile \ ++auto_destdir.c ++ ./compile auto_destdir.c ++ ++auto_destdir.c: auto-str conf-destdir ++ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c ++ + auto_ezmlm.o: compile \ + auto_ezmlm.c + ./compile auto_ezmlm.c +@@ -724,9 +731,9 @@ auto_home.c + auto_home.c: auto-str conf-home + ./auto-str auto_home `head -1 conf-home` > auto_home.c + +-install: load install.o hier.o auto_home.o stralloc.a alloc.a strerr.a \ ++install: load install.o hier.o auto_destdir.o stralloc.a alloc.a strerr.a \ + buffer.a open.a error.a str.a +- ./load install hier.o auto_home.o stralloc.a alloc.a strerr.a buffer.a \ ++ ./load install hier.o auto_destdir.o stralloc.a alloc.a strerr.a buffer.a \ + open.a error.a str.a + + install.o: compile \ diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index 447fb523360..7c5e171a48a 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/07/30 10:54:10 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2010/03/15 17:31:29 schmonz Exp $ # DISTNAME= serialmail-0.75 @@ -10,9 +10,12 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/serialmail.html COMMENT= Tools for passing mail across serial links +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= qmail>=1.03nb7:../../mail/qmail USE_TOOLS+= nroff +INSTALLATION_DIRS= share/doc/${PKGBASE} # We change conf-home from the default "/usr/local" and don't # provide compatibility symlinks. We also patch to install docs diff --git a/mail/serialmail/distinfo b/mail/serialmail/distinfo index f2eb9c55abc..89476c7b212 100644 --- a/mail/serialmail/distinfo +++ b/mail/serialmail/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2008/07/30 10:54:10 schmonz Exp $ +$NetBSD: distinfo,v 1.3 2010/03/15 17:31:29 schmonz Exp $ SHA1 (serialmail-0.75.tar.gz) = 76f8d5ae698cff25b3227e51cc99fff1f4a8b137 RMD160 (serialmail-0.75.tar.gz) = 2d12152b9c7d007f76b4d129c2795cd192ba9f83 Size (serialmail-0.75.tar.gz) = 55079 bytes SHA1 (patch-aa) = 0ccbe27149addddcd839ed71cc07b68d7473100b SHA1 (patch-ab) = af02dc2acf416ae63f93de08bdafdad80faebc12 +SHA1 (patch-ac) = 7802bf7b955883b274dcb9429e1bf12c34dd6bd9 diff --git a/mail/serialmail/patches/patch-ac b/mail/serialmail/patches/patch-ac new file mode 100644 index 00000000000..9b891d64fd6 --- /dev/null +++ b/mail/serialmail/patches/patch-ac @@ -0,0 +1,42 @@ +$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: \ -- cgit v1.2.3