summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2000-08-30 16:19:42 +0000
committerdmcmahill <dmcmahill>2000-08-30 16:19:42 +0000
commit7f1d753cb90f65587432e97f16d1531203d99a55 (patch)
tree98d17048391ebad601c45f2c342ba9ae4170c01c /cad
parentaa68b58e3027217db08d47b1de95fefe624a277c (diff)
downloadpkgsrc-7f1d753cb90f65587432e97f16d1531203d99a55.tar.gz
make sure that the configure script is able to correctly link the test
Qt program on ELF platforms.
Diffstat (limited to 'cad')
-rw-r--r--cad/vipec/Makefile7
-rw-r--r--cad/vipec/files/patch-sum4
-rw-r--r--cad/vipec/patches/patch-aa13
3 files changed, 17 insertions, 7 deletions
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index ed49aaa5460..ec023b7f141 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/28 19:52:33 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/30 16:19:42 dmcmahill Exp $
#
DISTNAME= vipec-2.0.4
@@ -16,8 +16,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_X11= yes
EVAL_PREFIX+= QT2DIR=qt21
+# make sure configure finds png
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= "QTDIR=${QT2DIR}/qt21" \
- all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
+ USER_LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" \
+ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= "--with-qt-dir=${QT2DIR}/qt21"
post-patch:
diff --git a/cad/vipec/files/patch-sum b/cad/vipec/files/patch-sum
index bf28a049a26..8ecb12b7d87 100644
--- a/cad/vipec/files/patch-sum
+++ b/cad/vipec/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.9 2000/08/28 19:52:34 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.10 2000/08/30 16:19:43 dmcmahill Exp $
-MD5 (patch-aa) = 07722f7965ca78c5bb96cf339eb7ddd8
+MD5 (patch-aa) = 25142bb09a67fdfb786075c2799253c8
MD5 (patch-ab) = 88aa4452920bdb56a25df5d902d05178
MD5 (patch-ac) = 232a978b2094cf9003a73e8c47460756
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 9c1b3775574..365016d1059 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2000/08/30 16:19:43 dmcmahill Exp $
--- configure.orig Mon May 22 14:34:07 2000
-+++ configure Mon Aug 28 14:15:03 2000
++++ configure Wed Aug 30 10:53:54 2000
@@ -4214,5 +4214,5 @@
x_libraries="/usr/lib"; else
x_libraries=$ac_x_libraries
@@ -9,6 +9,13 @@ $NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
+ X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries"
fi
all_includes="$X_INCLUDES"
+@@ -4408,5 +4408,5 @@
+ echo "configure:4409: checking for Qt" >&5
+
+-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
++LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
+ ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
+ qt_libraries=""
@@ -4501,5 +4501,5 @@
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
@@ -20,7 +27,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/28 19:52:34 dmcmahill Exp $
CXXFLAGS="$CXXFLAGS -I$qt_includes"
LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-+LIBS="-lqt -lXext -lX11 -lz -lpng -lSM $LIBSOCKET"
++LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
@@ -4737,5 +4737,5 @@