Add DESTDIR support.

3 files changed, 13 insertions, 11 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 8c7d54c4f95..54f4700fb84 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2008/04/28 08:28:05 sborrill Exp $
+# $NetBSD: Makefile,v 1.58 2008/06/20 01:09:35 joerg Exp $
 
 DISTNAME=		apcupsd-3.14.3
 CATEGORIES=		sysutils
@@ -8,6 +8,8 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.apcupsd.org/
 COMMENT=		UPS power management for APCC Products
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		msgfmt sh makedepend
 USE_LANGUAGES=		c c++
 
@@ -68,7 +70,8 @@ EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
     etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
 MANFILES= apcupsd apctest
 
-INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d
+INSTALLATION_DIRS=	share/examples/apcupsd share/examples/rc.d \
+			share/doc/html/apcupsd
 
 SUBST_CLASSES+=		strip
 SUBST_STAGE.strip=	pre-configure
@@ -93,17 +96,16 @@ HTMLDOCS= apcupsd.gif bclogo.gif bugs.html bugs.wml index.html index.wml \
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/platforms/etc/apcupsd.conf \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 	${INSTALL_DATA} ${WRKSRC}/src/cgi/apcupsd.css \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 .for file in ${EGFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/platforms/${file} \
-		${PREFIX}/share/examples/apcupsd
+		${DESTDIR}${PREFIX}/share/examples/apcupsd
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/apcupsd
 .for file in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/home-page/${file} \
-		${PREFIX}/share/doc/html/apcupsd
+		${DESTDIR}${PREFIX}/share/doc/html/apcupsd
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 3a7016ed76c..788c5d76c33 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/04/28 08:28:05 sborrill Exp $
+$NetBSD: distinfo,v 1.14 2008/06/20 01:09:35 joerg Exp $
 
 SHA1 (apcupsd-3.14.3.tar.gz) = b9f75732752cdee9792a5be526656c153c2d1274
 RMD160 (apcupsd-3.14.3.tar.gz) = 092726b2076e56368cdb7e3c790ee8d5e2a7d2f9
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 3db85accf1b05c8723dd7625278dfac02909dc34
 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517
 SHA1 (patch-ad) = 48818f95966f5c9f742e333614b0ab5387886e62
 SHA1 (patch-ae) = 5e2ded84436b1da8b0eec6577065e0630ce00e78
-SHA1 (patch-af) = c4a52226d83ac50adcd9296afd786b42867a7a6d
+SHA1 (patch-af) = 68e1bdc56a435dbd21551a86848e93491034b4f7
 SHA1 (patch-ag) = 2b77e969d6cbe8ed06797cd753eb443bd6a3881b
 SHA1 (patch-ah) = 738b93b481310aa92ee16d0fbf91b5723b8cabb8
 SHA1 (patch-ai) = be802d4ea438ac991f7e0ebd1c086699aade0b2b
diff --git a/sysutils/apcupsd/patches/patch-af b/sysutils/apcupsd/patches/patch-af
index f67c48d2484..764ec2f0065 100644
--- a/sysutils/apcupsd/patches/patch-af
+++ b/sysutils/apcupsd/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2006/11/15 21:46:25 bouyer Exp $
+$NetBSD: patch-af,v 1.6 2008/06/20 01:09:35 joerg Exp $
 
 --- Makefile.in.orig	2004-02-07 11:04:05.000000000 +0100
 +++ Makefile.in	2006-11-15 17:48:50.000000000 +0100
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.5 2006/11/15 21:46:25 bouyer Exp $
  install-directories: install-dir@CGI@
  	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)	
  	$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)  
-+	$(SHELL) $(MKINSTALLDIRS) $(prefix)/share/examples/apcupsd
++	$(SHELL) $(MKINSTALLDIRS) ${DESTDIR}$(prefix)/share/examples/apcupsd
  	@if [ ! -d $(DESTDIR)$(sysconfdir) ] ; then \
  	      $(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir); \
  	      chmod 755 $(DESTDIR)$(sysconfdir); \