diff options
| author | snj <snj> | 2004-04-11 22:45:44 +0000 |
|---|---|---|
| committer | snj <snj> | 2004-04-11 22:45:44 +0000 |
| commit | b19681f1b9a5ed626a26b64881eac3d2440b1fb1 (patch) | |
| tree | 78d78626129079ebf60f6993e4206551bb305a2f /x11 | |
| parent | ee0e132fa0650307f3c606b4928117e8b84fff68 (diff) | |
| download | pkgsrc-b19681f1b9a5ed626a26b64881eac3d2440b1fb1.tar.gz | |
Convert to buildlink3 and remove some unnecessary CONFIGURE_ARGS.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt2-libs/Makefile | 23 | ||||
| -rw-r--r-- | x11/qt2-libs/buildlink3.mk | 34 |
2 files changed, 43 insertions, 14 deletions
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 2e4f896c7ee..8446024a70e 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -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 @@ do-install: ${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 --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk new file mode 100644 index 00000000000..e4e0275d998 --- /dev/null +++ b/x11/qt2-libs/buildlink3.mk @@ -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/+$//} |