Convert to user-destdir.

4 files changed, 26 insertions, 10 deletions

diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index af354db079e..9aea2962976 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:10 sno Exp $
+# $NetBSD: Makefile,v 1.15 2009/08/29 13:31:04 wiz Exp $
 
 DISTNAME=	kiax-0.8.51-src
-PKGNAME=	kiax-0.8.51
-#PKGREVISION=	1
+PKGNAME=	${DISTNAME:S/-src//}
 PKGREVISION=	1
 CATEGORIES=	comms net audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kiax/}
@@ -12,12 +11,16 @@ HOMEPAGE=	http://www.kiax.org/
 COMMENT=	Open internet telephony system
 LICENSE=	gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	bin
+
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 HAS_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		no
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR:Q}
 
 do-configure:
 	(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qkiax.pro)
diff --git a/net/kiax/distinfo b/net/kiax/distinfo
index 424fcc46331..11e2674a688 100644
--- a/net/kiax/distinfo
+++ b/net/kiax/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2008/06/01 15:25:37 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/08/29 13:31:04 wiz Exp $
 
 SHA1 (kiax-0.8.51-src.tar.gz) = 5a67df17d478f4f1f5d802e126e6c38fb0834a6b
 RMD160 (kiax-0.8.51-src.tar.gz) = 8019d742867d0af339210363c42f1c46df422dd2
 Size (kiax-0.8.51-src.tar.gz) = 1493268 bytes
+SHA1 (patch-aa) = c310aa4a3edb242fa84f7e4c65ef5bd83885974d
 SHA1 (patch-ab) = 0c0ef51b9f4b0e26e354b15568359022a5cf7db0
 SHA1 (patch-ac) = f3f98e74209ab6a5a06e387cae494c08ad7e3238
 SHA1 (patch-ad) = 358978a9999d5ab268c65da5bee812d449dc2f92
diff --git a/net/kiax/patches/patch-aa b/net/kiax/patches/patch-aa
new file mode 100644
index 00000000000..6ab0ab85edc
--- /dev/null
+++ b/net/kiax/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.4 2009/08/29 13:31:04 wiz Exp $
+
+--- bin/Makefile.orig	2009-08-29 13:25:19.000000000 +0000
++++ bin/Makefile
+@@ -2,6 +2,6 @@ DEST_PATH=/usr/pkg/bin/
+ all:
+ 	echo 'none'
+ install:
+-	cp -f "kiax" $(DEST_PATH)
++	cp -f "kiax" $(INSTALL_ROOT)$(DEST_PATH)
+ clean:
+ 	rm -f kiax
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 67a09ca7439..192518eef7e 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:58:10 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/08/29 13:32:57 wiz Exp $
 
 DISTNAME=		kphone-4.2
 PKGREVISION=		6
@@ -11,8 +11,8 @@ COMMENT=		Graphical Voice Over Internet (VoIP) phone
 
 WRKSRC=			${WRKDIR}/kphone
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
@@ -32,12 +32,12 @@ CONFIGURE_ARGS+=	--enable-alsa=yes
 CONFIGURE_ARGS+=	--enable-alsa=no
 .endif
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/kphone/icons
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/kphone/kphone ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/kphone/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${PREFIX}/share/kphone/icons
+	${INSTALL_PROGRAM} ${WRKSRC}/kphone/kphone ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/icons/*.png \
+		${DESTDIR}${PREFIX}/share/kphone/icons
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"