summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2000-05-11 12:15:17 +0000
committerdrochner <drochner@pkgsrc.org>2000-05-11 12:15:17 +0000
commitb9bdfa01f038ff0f0b019e3ba3acc7d93ecbc047 (patch)
tree33035e0c0458b4d82509dbbf077bf59387f5532b
parentaac426a67bfd35481b1b78bc1025383def514b6e (diff)
downloadpkgsrc-b9bdfa01f038ff0f0b019e3ba3acc7d93ecbc047.tar.gz
minor fixes from Berndt Josef Wulf <wulf@ping.net.au>:
-defuzz a patch -remove superfluous backslash
-rw-r--r--x11/qt21/Makefile4
-rw-r--r--x11/qt21/files/patch-sum4
-rw-r--r--x11/qt21/patches/patch-ab14
3 files changed, 11 insertions, 11 deletions
diff --git a/x11/qt21/Makefile b/x11/qt21/Makefile
index 89c0c17df92..eeb8edfec32 100644
--- a/x11/qt21/Makefile
+++ b/x11/qt21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/10 12:04:54 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/11 12:15:17 drochner Exp $
#
DISTNAME= qt-x11-2.1.0
@@ -24,7 +24,7 @@ USE_LIBTOOL= yes
CONFIGURE_ENV+= QTDIR=${WRKSRC}
CONFIGURE_ARGS+= -static -sm -system-zlib \
-system-libpng -system-jpeg \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib
MAKE_ENV+= QTDIR=${WRKSRC}
ALL_TARGET= src
diff --git a/x11/qt21/files/patch-sum b/x11/qt21/files/patch-sum
index d255cbb26cb..17e60f6479b 100644
--- a/x11/qt21/files/patch-sum
+++ b/x11/qt21/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/04/28 17:18:22 drochner Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/11 12:15:17 drochner Exp $
MD5 (patch-aa) = e5f74faca4ba8334410e036e60dfb424
-MD5 (patch-ab) = 4f045be0e4e9df89dce9316ff1f2e6b7
+MD5 (patch-ab) = fbd4d45ad5ffe0c217aef66265deb920
MD5 (patch-ac) = d33d498a09eec7fd2f8769efc90a2827
diff --git a/x11/qt21/patches/patch-ab b/x11/qt21/patches/patch-ab
index 9fe1aa085d2..fa054572d36 100644
--- a/x11/qt21/patches/patch-ab
+++ b/x11/qt21/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/28 17:18:23 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2000/05/11 12:15:18 drochner Exp $
---- src/Makefile.in.orig Tue Jul 20 04:45:37 1999
-+++ src/Makefile.in Thu Oct 21 19:23:16 1999
+--- src/Makefile.in.orig Wed Apr 12 15:27:06 2000
++++ src/Makefile.in Thu May 11 10:32:08 2000
@@ -2,7 +2,7 @@
####### Compiler, tools and options
@@ -16,11 +16,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/04/28 17:18:23 drochner Exp $
####### Target
-DESTDIR = ../lib/
-+DESTDIR =
++DESTDIR =
VER_MAJ = 2
- VER_MIN = 0
- VER_PATCH = 2
-@@ -694,22 +694,10 @@
+ VER_MIN = 1
+ VER_PATCH = 0
+@@ -760,22 +760,10 @@
####### Implicit rules