diff options
| author | dmcmahill <dmcmahill> | 2003-02-07 02:10:40 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2003-02-07 02:10:40 +0000 |
| commit | 96ae1183905b80546a58841d2697e159158951f8 (patch) | |
| tree | 3813767121ec824acc9b3ddb73d5fe177834d529 /x11 | |
| parent | c299e9f9e00cb7a35a25b8a94d112bfe8a685af5 (diff) | |
| download | pkgsrc-96ae1183905b80546a58841d2697e159158951f8.tar.gz | |
fix a bug created by last fix. We need to use gmake for the configure
step as well as the build instead of only the build. Should fix problems
noted in Hubert's recent bulk builds.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt2-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt2-libs/patches/patch-ad | 25 |
2 files changed, 21 insertions, 8 deletions
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo index 3db55c104e9..215fe17458e 100644 --- a/x11/qt2-libs/distinfo +++ b/x11/qt2-libs/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.10 2003/02/05 23:17:26 dmcmahill Exp $ +$NetBSD: distinfo,v 1.11 2003/02/07 02:10:40 dmcmahill Exp $ SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538 SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794 SHA1 (patch-ac) = 0d94197bd40994b0c658e466d3ebb81fabfbf30c -SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c +SHA1 (patch-ad) = eead0ed591c575ef542052bd233981dda954eb67 SHA1 (patch-ae) = e1ef4bde84473d6b84dbd226dbd7f8802abc6b4b SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b SHA1 (patch-ag) = 85a6376bc780c7aad88879c70fb86542f7e738ae diff --git a/x11/qt2-libs/patches/patch-ad b/x11/qt2-libs/patches/patch-ad index d5ebcb45688..2256f062759 100644 --- a/x11/qt2-libs/patches/patch-ad +++ b/x11/qt2-libs/patches/patch-ad @@ -1,9 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2001/03/28 09:27:51 skrll Exp $ +$NetBSD: patch-ad,v 1.3 2003/02/07 02:10:41 dmcmahill Exp $ ---- configure.orig Mon Mar 5 18:12:49 2001 +--- configure.orig Wed Jun 13 04:57:02 2001 +++ configure -@@ -17,25 +17,6 @@ - HELP=yes +@@ -18,37 +18,13 @@ else -touch .test.qt. @@ -26,5 +25,19 @@ $NetBSD: patch-ad,v 1.2 2001/03/28 09:27:51 skrll Exp $ -rm .test.qt. - # Find a make command - if ( make /dev/null ) >/dev/null 2>/dev/null - then +-if ( make /dev/null ) >/dev/null 2>/dev/null +-then +- MAKE=make +-else + if ( gmake /dev/null ) >/dev/null 2>/dev/null + then + MAKE=gmake + else +- echo "You don't seem to have 'make' or 'gmake' in your PATH." ++ echo "You don't seem to have 'gmake' in your PATH." + echo "Cannot proceed." + exit 1 + fi +-fi + + # Check licensed modules |