[pkgsrc/trunk]: pkgsrc/x11/qt2-libs Convert to buildlink3 and remove some unn...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b398a86aedc
branches:  trunk
changeset: 472699:9b398a86aedc
user:      snj <snj%pkgsrc.org@localhost>
date:      Sun Apr 11 22:45:44 2004 +0000

description:
Convert to buildlink3 and remove some unnecessary CONFIGURE_ARGS.

diffstat:

 x11/qt2-libs/Makefile      |  23 +++++++++--------------
 x11/qt2-libs/buildlink3.mk |  34 ++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r 80f486b34a74 -r 9b398a86aedc x11/qt2-libs/Makefile
--- a/x11/qt2-libs/Makefile     Sun Apr 11 22:44:48 2004 +0000
+++ b/x11/qt2-libs/Makefile     Sun Apr 11 22:45:44 2004 +0000
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/11 22:45:44 snj Exp $
 
 PKGNAME=       qt2-libs-${QTVERSION}
 PKGREVISION=   5
 COMMENT=       C++ X GUI toolkit
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
 .include "../qt2-libs/Makefile.common"
 
-CONFIGURE_ARGS+=       -I${LOCALBASE}/include -I${X11BASE}/include
-CONFIGURE_ARGS+=       -I${LOCALBASE}/include/freetype2
-CONFIGURE_ARGS+=       -I${X11BASE}/include/freetype2
-CONFIGURE_ARGS+=       -L${LOCALBASE}/lib -L${X11BASE}/lib
-
 CONFIGURE_ENV+=                QTDIR="${WRKSRC}"
 MAKE_ENV+=             QTDIR="${WRKSRC}"
 MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH}
@@ -28,12 +23,12 @@
        ${INSTALL_DATA_DIR} ${QTPREFIX}/include
        ${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 80f486b34a74 -r 9b398a86aedc x11/qt2-libs/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt2-libs/buildlink3.mk        Sun Apr 11 22:45:44 2004 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 22:45:44 snj Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+QT2_LIBS_BUILDLINK3_MK:=       ${QT2_LIBS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    qt2-libs
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nqt2-libs}
+BUILDLINK_PACKAGES+=   qt2-libs
+
+.if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.qt2-libs+=   qt2-libs>=2.3.1nb2
+BUILDLINK_PKGSRCDIR.qt2-libs?= ../../x11/qt2-libs
+BUILDLINK_INCDIRS.qt2-libs=    qt2/include
+BUILDLINK_LIBDIRS.qt2-libs=     qt2/lib
+.endif # QT2_LIBS_BUILDLINK3_MK
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
+QTDIR=          ${BUILDLINK_PREFIX.qt2-libs}/qt2
+CONFIGURE_ENV+=         QTDIR="${QTDIR}"
+CONFIGURE_ENV+=         MOC="${QTDIR}/bin/moc"
+MAKE_ENV+=              QTDIR="${QTDIR}"
+MAKE_ENV+=              MOC="${QTDIR}/bin/moc"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}