Fix bulk build, while here convert to user-destdir.

This commit is contained in:
joerg 2009-06-29 22:40:28 +00:00
parent edf9180157
commit 19cefddf0e
4 changed files with 22 additions and 43 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.13 2008/03/11 18:47:40 tnn Exp $
# $NetBSD: Makefile,v 1.14 2009/06/29 22:40:28 joerg Exp $
DISTNAME= deliver-2.1.14
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=deliver/}
@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://deliver.sourceforge.net/
COMMENT= Local mail delivery agent with shell-script control
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= yacc
PKG_SYSCONFSUBDIR= deliver
@ -16,6 +18,9 @@ PKG_SYSCONFSUBDIR= deliver
PKG_OPTIONS_VAR= PKG_OPTIONS.deliver
PKG_SUPPORTED_OPTIONS= deliver-suid
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 \
share/doc/deliver share/examples/deliver
.include "../../mk/bsd.prefs.mk"
.if !empty(MACHINE_PLATFORM:MIRIX-5*)
@ -24,6 +29,10 @@ CPPFLAGS+= -DNO_SYS_TIMEB_H
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdeliver-suid)
SPECIAL_PERMS+= bin/deliver ${SETUID_ROOT_PERMS}
.endif
pre-configure:
cd ${WRKSRC}; \
for FILE in config.h deliver.8 conf/os-netbsd.h; do \
@ -34,25 +43,16 @@ pre-configure:
done; \
${MV} deliver.8 deliver.1
post-install:
cd ${WRKSRC}; \
for FILE in deliver.1 header.1; do \
CATFILE=`${BASENAME} $${FILE} .1`.0; \
nroff -man $${FILE} > $${CATFILE}; \
${INSTALL_MAN} $${FILE} ${PREFIX}/${PKGMANDIR}/man1; \
${INSTALL_MAN} $${CATFILE} ${PREFIX}/${PKGMANDIR}/cat1; \
done
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/deliver \
${PREFIX}/share/examples/deliver
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/deliver ${DESTDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/header ${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/deliver.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_MAN} ${WRKSRC}/header.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cd ${WRKSRC}; \
${INSTALL_DATA} INSTALL MMDF README SENDMAIL \
${PREFIX}/share/doc/deliver
${DESTDIR}${PREFIX}/share/doc/deliver
cd ${WRKSRC}/samples; \
${INSTALL_DATA} README p-aliases s-aliases u-chip u-notify u-vacation \
${PREFIX}/share/examples/deliver
.if !empty(PKG_OPTIONS:Mdeliver-suid)
${CHOWN} root ${PREFIX}/bin/deliver
${CHMOD} u+s ${PREFIX}/bin/deliver
.endif
${DESTDIR}${PREFIX}/share/examples/deliver
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,6 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:31 joerg Exp $
@comment $NetBSD: PLIST,v 1.3 2009/06/29 22:40:28 joerg Exp $
bin/deliver
bin/header
man/cat1/deliver.0
man/cat1/header.0
man/man1/deliver.1
man/man1/header.1
share/doc/deliver/INSTALL

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.9 2006/10/28 15:17:17 schwarz Exp $
$NetBSD: distinfo,v 1.10 2009/06/29 22:40:28 joerg Exp $
SHA1 (deliver-2.1.14.tar.gz) = 77d591f29b8829b3c347eb107a427ad826ffca99
RMD160 (deliver-2.1.14.tar.gz) = fb3857e952ea7b4b20f3e77b38a4f633434ce533
Size (deliver-2.1.14.tar.gz) = 80892 bytes
SHA1 (patch-aa) = 53e640ea5e5e5c92a29ffa4d49ac9d8c91e60b16
SHA1 (patch-aa) = 10f3d7d4d57e897066974e20c6b5017203983d18
SHA1 (patch-ab) = 719d400005844fe824bab7106c97f66e4c8867b3
SHA1 (patch-ac) = 2f47891e3bc46aec12c93a647fbd751397b7d9fe
SHA1 (patch-ad) = b497c475867bce9d9b9246aac14b5794b43b5877

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
$NetBSD: patch-aa,v 1.2 2009/06/29 22:40:28 joerg Exp $
--- Makefile.orig Wed Dec 1 20:53:49 1999
+++ Makefile Sat Jan 29 15:21:49 2000
@ -19,22 +19,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
#BIN = $(DELHOME)/bin
GROUP = root
@@ -154,16 +153,8 @@
chmod 755 $$d ) || exit 1; \
done ;; \
esac
- rm -f $(BIN)/deliver.O
- -mv $(BIN)/deliver $(BIN)/deliver.O
- $(COPY) deliver $(BIN)/deliver
- chgrp $(GROUP) $(BIN)/deliver
- chown root $(BIN)/deliver
- chmod 4711 $(BIN)/deliver
- rm -f $(BIN)/header.O
- -mv $(BIN)/header $(BIN)/header.O
- $(COPY) header $(BIN)/header
- chmod 755 $(BIN)/header
+ ${BSD_INSTALL_PROGRAM} -m 0511 deliver ${BIN}
+ ${BSD_INSTALL_PROGRAM} header ${BIN}
#
# How to compile and link the program.