diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /x11/ebuilder | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'x11/ebuilder')
| -rw-r--r-- | x11/ebuilder/Makefile | 4 | ||||
| -rw-r--r-- | x11/ebuilder/distinfo | 4 | ||||
| -rw-r--r-- | x11/ebuilder/patches/patch-aa | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 693ab7ba1c6..c06a3806315 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/26 19:54:48 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:27 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,7 +11,6 @@ HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library USE_BUILDLINK_ONLY= yes -USE_X11= yes USE_GMAKE= yes MAKEFILE= GNUmakefile @@ -21,4 +20,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index da8e601e4a1..01949730a8c 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 19:54:48 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d +SHA1 (patch-aa) = e3c24bd15a8942b2ce3573ecb5560ecfe5e39174 SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index 0c6d17addfb..39217df8e4a 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ --- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz ++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(BUILDLINK_X11_DIR)/lib -lX11 -lXext -lSM -lpng -lz # Implicit rules needed to build .o files and Metaobject stuff (_m.o) .SUFFIXES: .cc .o .h _m.o |