diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /x11/qt2-designer | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'x11/qt2-designer')
| -rw-r--r-- | x11/qt2-designer/Makefile | 21 | ||||
| -rw-r--r-- | x11/qt2-designer/buildlink2.mk | 26 |
2 files changed, 38 insertions, 9 deletions
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 8e55a32f581..98c9e278b27 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:01 fredb Exp $ -# - -.include "../qt2-libs/Makefile.common" +# $NetBSD: Makefile,v 1.17 2002/08/25 18:40:41 jlam Exp $ PKGNAME= qt2-designer-${QTVERSION} PKGREVISION= 2 @@ -9,15 +6,21 @@ COMMENT= Visual (WYSIWYG) QT GUI builder CONFLICTS+= qt2-designer-kde-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + ALL_TARGET= sub-tools do-install: - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin + +.include "../../x11/qt2-libs/buildlink2.mk" -.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer/buildlink2.mk b/x11/qt2-designer/buildlink2.mk new file mode 100644 index 00000000000..7f7f743e1d2 --- /dev/null +++ b/x11/qt2-designer/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:41 jlam Exp $ + +.if !defined(QT2_DESIGNER_BUILDLINK2_MK) +QT2_DESIGNER_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= qt2-designer +BUILDLINK_DEPENDS.qt2-designer?= \ + {qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2} +BUILDLINK_PKGSRCDIR.qt2-designer?= ../../x11/qt2-designer + +EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-designer=qt2-designer +BUILDLINK_PREFIX.qt2-designer_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.qt2-designer= qt2/bin/designer +BUILDLINK_FILES.qt2-designer+= qt2/bin/uic +BUILDLINK_FILES.qt2-designer+= qt2/lib/libqutil.* + +.include "../../x11/qt2-libs/buildlink2.mk" + +CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" +MAKE_ENV+= UIC="${QTDIR}/bin/uic" + +BUILDLINK_TARGETS+= qt2-designer-buildlink + +qt2-designer-buildlink: _BUILDLINK_USE + +.endif # QT2_DESIGNER_BUILDLINK2_MK |