Update to version 1.4--just a few bug fixes. While here, install README

and the examples into share/doc/${PKGBASE} and share/examples/${PKGBASE},
respectively.

4 files changed, 30 insertions, 21 deletions

diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile
index 4846d499c5c..5e74dfa7669 100644
--- a/devel/qconf/Makefile
+++ b/devel/qconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 11:02:24 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/08/23 00:24:53 bjs Exp $
 #
 
-DISTNAME=		qconf-1.3
+DISTNAME=		qconf-1.4
 CATEGORIES=		devel
 MASTER_SITES=		http://delta.affinix.com/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -10,10 +10,25 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://delta.affinix.com/qconf/
 COMMENT=		Configure script generator for qmake
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 USE_LANGUAGES=		c c++
 
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+MAKE_ENV+=		INSTALL_ROOT=${DESTDIR:Q}
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	for fn in ${WRKSRC}/examples/*.qc; do			\
+		${INSTALL_DATA} $${fn} ${DESTDIR}${EGDIR};	\
+	done
+
+
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/qconf/PLIST b/devel/qconf/PLIST
index 2867ff799a8..b2452d20192 100644
--- a/devel/qconf/PLIST
+++ b/devel/qconf/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2007/06/09 10:46:02 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/08/23 00:24:53 bjs Exp $
 bin/qconf
+share/doc/qconf/README
+share/examples/qconf/sample.qc
+share/examples/qconf/samplecustom.qc
+share/examples/qconf/sampledeps.qc
+share/examples/qconf/samplelib.qc
 share/qconf/conf/conf.cpp
 share/qconf/conf/conf.pro
 share/qconf/conf/conf4.cpp
@@ -10,3 +15,5 @@ share/qconf/modules/qt41.qcm
 @dirrm share/qconf/modules
 @dirrm share/qconf/conf
 @dirrm share/qconf
+@dirrm share/examples/qconf
+@dirrm share/doc/qconf
diff --git a/devel/qconf/distinfo b/devel/qconf/distinfo
index 0ff4424264d..4122669331c 100644
--- a/devel/qconf/distinfo
+++ b/devel/qconf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/10/07 00:12:27 rillig Exp $
+$NetBSD: distinfo,v 1.4 2008/08/23 00:24:53 bjs Exp $
 
-SHA1 (qconf-1.3.tar.bz2) = 8a70b46a098f63ee3fb97ba428dfda5f1587a149
-RMD160 (qconf-1.3.tar.bz2) = 60721c3fb46b84c341e3e87148189121d2e91dfa
-Size (qconf-1.3.tar.bz2) = 26772 bytes
+SHA1 (qconf-1.4.tar.bz2) = ebc3c505a1afc9308c306fca6a6c2c206b8aedf8
+RMD160 (qconf-1.4.tar.bz2) = d9bbcb027c9148414d03bfaca4557cf23f7b4748
+Size (qconf-1.4.tar.bz2) = 27344 bytes
 SHA1 (patch-aa) = 97df58dc70b8f7be2c2794d40f35a4a1f6e82a6d
diff --git a/devel/qconf/patches/patch-aa b/devel/qconf/patches/patch-aa
deleted file mode 100644
index 1369384d8f7..00000000000
--- a/devel/qconf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/10/07 00:12:27 rillig Exp $
-
---- qconf.pro.orig	2006-10-23 01:45:10.000000000 +0200
-+++ qconf.pro	2007-09-12 00:23:18.000000000 +0200
-@@ -8,7 +8,7 @@
- 
- include($$OUT_PWD/conf.pri)
- 
--contains($$list($$[QT_VERSION]), 4.2.*) {
-+contains($$list($$[QT_VERSION]), 4.[23].*) {
- 	DEFINES += DATADIR=\\\"$$DATADIR\\\"
- } else {
- 	DEFINES += DATADIR=\"$$DATADIR\"