diff options
| author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
| commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/ebuilder | |
| parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
| download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/ebuilder')
| -rw-r--r-- | x11/ebuilder/Makefile | 14 | ||||
| -rw-r--r-- | x11/ebuilder/distinfo | 4 | ||||
| -rw-r--r-- | x11/ebuilder/patches/patch-aa | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 65db4701e62..5b83c468056 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/17 15:36:35 fredb Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/25 21:52:34 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,15 +11,15 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library -USE_BUILDLINK_ONLY= yes -USE_GMAKE= yes -MAKEFILE= GNUmakefile +USE_BUILDLINK2= yes +USE_X11= yes +USE_GMAKE= yes +MAKEFILE= GNUmakefile -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index 01949730a8c..a160b7bbd8d 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:52:34 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = e3c24bd15a8942b2ce3573ecb5560ecfe5e39174 +SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index 39217df8e4a..842a39d81e3 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/25 21:52:35 jlam Exp $ --- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(BUILDLINK_X11_DIR)/lib -lX11 -lXext -lSM -lpng -lz ++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz # Implicit rules needed to build .o files and Metaobject stuff (_m.o) .SUFFIXES: .cc .o .h _m.o |