diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-26 19:54:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-26 19:54:48 +0000 |
| commit | 5df6c35daf7b8d201c677bed392859058d134589 (patch) | |
| tree | 6cc3e4a77d59d1c8c10e7862f1188404521dba7d /x11/ebuilder | |
| parent | 3e78114e4987412f584d47f0f1137e52d6f0ce3b (diff) | |
| download | pkgsrc-5df6c35daf7b8d201c677bed392859058d134589.tar.gz | |
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
Diffstat (limited to 'x11/ebuilder')
| -rw-r--r-- | x11/ebuilder/Makefile | 16 | ||||
| -rw-r--r-- | x11/ebuilder/distinfo | 5 | ||||
| -rw-r--r-- | x11/ebuilder/patches/patch-aa | 21 | ||||
| -rw-r--r-- | x11/ebuilder/patches/patch-ab | 13 |
4 files changed, 38 insertions, 17 deletions
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 776443449ee..693ab7ba1c6 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/05/22 09:32:27 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/26 19:54:48 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -10,17 +10,15 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library -DEPENDS+= qt2-libs-*:../../x11/qt2-libs -DEPENDS+= png>=1.0.11:../../graphics/png +USE_BUILDLINK_ONLY= yes +USE_X11= yes +USE_GMAKE= yes +MAKEFILE= GNUmakefile -USE_X11= yes -USE_GMAKE= yes -MAKEFILE= GNUmakefile - -EVAL_PREFIX+= QT2DIR=qt2-libs -MAKE_ENV= QTDIR=${QT2DIR}/qt2 +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin +.include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index 668b05953b9..da8e601e4a1 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:36 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/06/26 19:54:48 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = 7f780af128ba34f7ed0a828c3c458a875d1342f0 +SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d +SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index f706f7bb986..0c6d17addfb 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,15 +1,24 @@ -$NetBSD: patch-aa,v 1.2 2000/10/19 07:57:18 skrll Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $ ---- config.mk.orig Sat Mar 25 13:31:45 2000 +--- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk -@@ -12,7 +12,9 @@ +@@ -1,8 +1,8 @@ + # Your very own favorite C++ compiler +-CXX = g++ ++#CXX = g++ + + # Additional compiler flags for compiling for debugging/optimization +-DEBUG = -g ++#DEBUG = -g + + # The location of flex. Not all versions of flex seem to work. + FLEX = flex +@@ -12,7 +12,7 @@ #QTDIR = /usr/local/qt QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \ -+ -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \ -+ -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -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 diff --git a/x11/ebuilder/patches/patch-ab b/x11/ebuilder/patches/patch-ab new file mode 100644 index 00000000000..7557b3c0c29 --- /dev/null +++ b/x11/ebuilder/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/06/26 19:54:49 jlam Exp $ + +--- GNUmakefile.orig Sat Mar 25 08:30:53 2000 ++++ GNUmakefile +@@ -1,7 +1,7 @@ + # Include general flags + include config.mk + +-CXXFLAGS = $(QTINCL) $(DEBUG) -I. -I./inspect ++CXXFLAGS += $(QTINCL) $(DEBUG) -I. -I./inspect + + all: bin/ebuilder + |