Use bg-installer to install, as in upstream git, to provide DESTDIR support.

4 files changed, 58 insertions, 8 deletions

diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index e4ebe7a9ec8..86501520e7f 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/15 04:34:05 schmonz Exp $
 #
 
 DISTNAME=	relay-ctrl-3.1.1
@@ -9,11 +9,16 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://untroubled.org/relay-ctrl/
 COMMENT=	Allows relaying via POP/IMAP-before-SMTP
 
+PKG_DESTDIR_SUPPORT=	destdir
+
+BUILD_DEPENDS+=		bglibs-[0-9]*:../../devel/bglibs
+
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
 
 DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${DOCDIR}
+INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
 OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR} ${ROOT_USER} ${ROOT_GROUP} 700
 OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR}/allow ${ROOT_USER} ${ROOT_GROUP} 777
 MESSAGE_SUBST+=		RELAY_CTRL_DIR=${RELAY_CTRL_DIR:Q} DOCDIR=${DOCDIR:Q}
@@ -35,15 +40,15 @@ post-extract:
 		${CP} ${FILESDIR}/$$f.sh ${WRKSRC}/$$f;			\
 	done
 
-do-install:
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};			\
-	./installer;							\
-	./instcheck
+post-install:
+	${RUN}cd ${WRKSRC};						\
 	for f in ANNOUNCEMENT COPYING NEWS README TODO packet.html; do	\
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR};	\
+		${INSTALL_DATA} ${WRKSRC}/$${f}				\
+			${DESTDIR}${PREFIX}/${DOCDIR};			\
 	done
 	for f in ${ADDON_SCRIPTS}; do					\
-		${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/bin;	\
+		${INSTALL_SCRIPT} ${WRKSRC}/$${f}			\
+			${DESTDIR}${PREFIX}/bin;			\
 	done
 
 .include "../../mk/djbware.mk"
diff --git a/mail/relay-ctrl/distinfo b/mail/relay-ctrl/distinfo
index eddf03c8e96..fd5216205be 100644
--- a/mail/relay-ctrl/distinfo
+++ b/mail/relay-ctrl/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/28 14:12:40 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2010/03/15 04:34:05 schmonz Exp $
 
 SHA1 (relay-ctrl-3.1.1.tar.gz) = 01ae6eba6fff3b93761ce0bdd5ca7059a999d2d1
 RMD160 (relay-ctrl-3.1.1.tar.gz) = 48fa830f08b1ea3b37ca07d62cde05dc35388287
 Size (relay-ctrl-3.1.1.tar.gz) = 35046 bytes
+SHA1 (patch-aa) = 0f1e7c51ad5a36d42d3abbeb82a160f337cd61bb
+SHA1 (patch-ab) = 8ba3ab5acb4a3493a56a4f26e56b2dac6c391378
diff --git a/mail/relay-ctrl/patches/patch-aa b/mail/relay-ctrl/patches/patch-aa
new file mode 100644
index 00000000000..598828b2514
--- /dev/null
+++ b/mail/relay-ctrl/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2010/03/15 04:34:05 schmonz Exp $
+
+--- INSTHIER.orig	2010-03-15 04:21:36.000000000 +0000
++++ INSTHIER
+@@ -0,0 +1,14 @@
++>bin
++c:::755::relay-ctrl-allow
++c:::755::relay-ctrl-age
++c:::755::relay-ctrl-chdir
++c:::755::relay-ctrl-check
++c:::755::relay-ctrl-send
++c:::755::relay-ctrl-udp
++
++>man
++c:::644:man8:relay-ctrl-allow.8
++c:::644:man8:relay-ctrl-age.8
++c:::644:man8:relay-ctrl-check.8
++c:::644:man8:relay-ctrl-send.8
++c:::644:man8:relay-ctrl-udp.8
diff --git a/mail/relay-ctrl/patches/patch-ab b/mail/relay-ctrl/patches/patch-ab
new file mode 100644
index 00000000000..fce22ed4ad4
--- /dev/null
+++ b/mail/relay-ctrl/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1 2010/03/15 04:34:05 schmonz Exp $
+
+--- Makefile.orig	2002-04-26 16:07:38.000000000 +0000
++++ Makefile
+@@ -6,7 +6,7 @@ SHELL=/bin/sh
+ 
+ DEFAULT: all
+ 
+-all: programs installer instcheck instshow
++all: programs
+ 
+ authenticated.o: compile authenticated.c relay-ctrl.h net/socket.h net/ipv4.h
+ 	./compile authenticated.c
+@@ -54,6 +54,10 @@ fork.h: compile load fork.h1 fork.h2 try
+ 	  && cat fork.h2 || cat fork.h1 ) > fork.h
+ 	rm -f tryvfork.o tryvfork
+ 
++install: INSTHIER conf-bin conf-man
++	bg-installer -v <INSTHIER
++	bg-installer -c <INSTHIER
++
+ installer: load installer.o insthier.o
+ 	./load installer insthier.o
+