diff options
| author | wiz <wiz@pkgsrc.org> | 2000-10-15 13:33:27 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2000-10-15 13:33:27 +0000 |
| commit | a21cdf179544db8ec56b72c9c49a834168fc8757 (patch) | |
| tree | 983d68f2727f0f0816744ffef0d7bb92810979f2 /x11 | |
| parent | 29eb1afae5e0f0d324ab57adea643bb9d8fb354d (diff) | |
| download | pkgsrc-a21cdf179544db8ec56b72c9c49a834168fc8757.tar.gz | |
fix Makefile (broken by last commit, unresolved conflict)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdebase/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index beae6918045..a4849e8d927 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2000/10/15 12:06:43 rh Exp $ +# $NetBSD: Makefile,v 1.73 2000/10/15 13:33:27 wiz Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -19,20 +19,13 @@ DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs # DEPENDS+= libungif-*:../../graphics/libungif -<<<<<<< Makefile -USE_X11BASE= YES -USE_MESA= YES -USE_XPM= YES -USE_GMAKE= YES -GNU_CONFIGURE= YES -======= USE_X11BASE= YES +USE_MESA= YES USE_XPM= YES USE_GMAKE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig GNU_CONFIGURE= YES ->>>>>>> 1.70 EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ |