DESTDIR support.

1 files changed, 16 insertions, 8 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 5dd00a3fb03..ee83499b5fb 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2009/01/29 06:40:50 ghen Exp $
+# $NetBSD: Makefile,v 1.147 2009/05/06 11:04:18 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	2
@@ -9,6 +9,8 @@ COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 #		http://mirrors.isc.org/pub/kde/security_patches/
 #PATCHFILES=	post-3.5.7-kdebase-konqueror-2.diff post-3.5.7-kdebase-kdm.diff
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
@@ -137,21 +139,27 @@ SUBST_FILES.xkb=	kxkb/x11helper.cpp
 SUBST_SED.xkb=		-e 's:XLIBDIR:"${X11BASE}/lib/X11/", "${X11BASE}/share/X11/", XLIBDIR:'
 SUBST_STAGE.xkb=	post-patch
 
+# genkdmconf wont install faces if using destdir so do it ourselves
+INSTALLATION_DIRS+= share/kde/apps/kdm/faces share/kde/templates/.source/emptydir
+
 pre-configure:
 	cd ${WRKSRC}/ksysguard/ksysguardd && rm -f DragonFly && ln -s FreeBSD DragonFly
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
-	${INSTALL_DATA} ${DISTDIR}/NetBSD-flag-1.0.png ${PREFIX}/${ICONDIR}/NetBSD-flag.png
-	${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/${ICONDIR}
+	${INSTALL_DATA} ${WRKSRC}/kdm/kfrontend/pics/default1.png \
+		${DESTDIR}${PREFIX}/share/kde/apps/kdm/faces/.default.face.icon
+	${INSTALL_DATA} ${WRKSRC}/kdm/kfrontend/pics/root1.png \
+		${DESTDIR}${PREFIX}/share/kde/apps/kdm/faces/root.face.icon
+	${INSTALL_DATA} ${DISTDIR}/NetBSD-flag-1.0.png ${DESTDIR}${PREFIX}/${ICONDIR}/NetBSD-flag.png
+	${INSTALL_DATA} ${DISTDIR}/Daemon.png ${DESTDIR}${PREFIX}/${ICONDIR}
 	${INSTALL_DATA} ${DISTDIR}/Daemon.README			\
-		${PREFIX}/share/doc/kde/HTML/en/kdm
+		${DESTDIR}${PREFIX}/share/doc/kde/HTML/en/kdm
 
 	@# The global desktop template files need to be user-writeable, or
 	@# else users won't be able to alter them after copying them to
 	@# their local directories.
 	@#
-	${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/*
+	${CHMOD} u+w ${DESTDIR}${PREFIX}/share/kde/templates/.source/*
 
 	@# On some systems, the Xdpms routines aren't available in a shared
 	@# library, and some libraries aren't created as a result.
@@ -161,7 +169,7 @@ post-install:
 		lib/kde3/libkcm_screensaver.so				\
 	  ";								\
 	  for file in $${files}; do					\
-		if [ -f ${PREFIX}/$${file} ]; then			\
+		if [ -f ${DESTDIR}${PREFIX}/$${file} ]; then		\
 			${ECHO} "$${file}";				\
 		fi;							\
 	  done;								\
@@ -169,7 +177,7 @@ post-install:
 
 .if ${OPSYS} == "NetBSD"
 	@# NetBSD Advertisement O:-)
-	cd ${PREFIX}/share/kde/config/kdm;				\
+	cd ${DESTDIR}${PREFIX}/share/kde/config/kdm;			\
 	${SED} -e 's|^\(LogoPixmap\)=.*|\1=${PREFIX}/${ICONDIR}/NetBSD-flag.png|' \
 		kdmrc > ${WRKDIR}/kdmrc.ad;				\
 	${CP} -f ${WRKDIR}/kdmrc.ad kdmrc