Create a Makefile.common so poppler-qt will use same.

Remove distinfo from poppler-qt.

Make sure that poppler-qt depends on at least same version of poppler.

Take maintainership for poppler-qt.

This updates poppler-qt to 0.4.4. (I didn't check to see if fixes
are related to "qt".)

4 files changed, 24 insertions, 23 deletions

diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 659f10e931b..f0ba4c603f0 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,21 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 00:35:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/11 17:49:35 reed Exp $
 #
 
-DISTNAME=		poppler-${POPPLER_VERS}
-PKGNAME=		poppler-qt-${POPPLER_VERS}
-CATEGORIES=		print
-MASTER_SITES=		http://poppler.freedesktop.org/
+.include "../../print/poppler/Makefile.common"
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://poppler.freedesktop.org/
+PKGNAME=		poppler-qt-${POPPLER_VERS}
 COMMENT=		PDF rendering library (QT wrapper)
 
-USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt.pc.in
 
 INCS=-I. `pkg-config poppler --cflags` -I${QTDIR}/include
-POPPLER_VERS=0.4.3
 
 do-build:
 	(cd ${WRKSRC}/qt; \
@@ -34,6 +27,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
 
+BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-qt/distinfo b/print/poppler-qt/distinfo
deleted file mode 100644
index 62cf4793c32..00000000000
--- a/print/poppler-qt/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/12/31 00:35:56 wiz Exp $
-
-SHA1 (poppler-0.4.3.tar.gz) = 1817e811e49fa58facc0df2c76a25e0876e44377
-RMD160 (poppler-0.4.3.tar.gz) = 4c6b0d5e70d55655fb65bdd26621bb11720543cb
-Size (poppler-0.4.3.tar.gz) = 779582 bytes
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index ab5846d4a8c..bd5c772f722 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2006/01/11 16:10:11 reed Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/11 17:49:35 reed Exp $
 #
 
-DISTNAME=		poppler-0.4.4
-CATEGORIES=		print
-MASTER_SITES=		http://poppler.freedesktop.org/
+.include "../../print/poppler/Makefile.common"
 
-MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://poppler.freedesktop.org/
 COMMENT=		PDF rendering library
 
-USE_TOOLS+=		gmake pkg-config
-USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 #PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-cairo.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-glib.pc.in
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
new file mode 100644
index 00000000000..2c0dd937701
--- /dev/null
+++ b/print/poppler/Makefile.common
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.common,v 1.1 2006/01/11 17:49:35 reed Exp $
+#
+
+POPPLER_VERS=		0.4.4
+DISTNAME=		poppler-${POPPLER_VERS}
+CATEGORIES=		print
+MASTER_SITES=		http://poppler.freedesktop.org/
+
+MAINTAINER=		reed@reedmedia.net
+HOMEPAGE=		http://poppler.freedesktop.org/
+
+DISTINFO_FILE=		${.CURDIR}/../../print/poppler/distinfo
+#PATCHDIR=		${.CURDIR}/../../print/poppler/patches
+
+USE_TOOLS+=		pkg-config
+USE_LIBTOOL=		yes