pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ddd Fix unportable shell code in "configure" whi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d99752488874
branches:  trunk
changeset: 461224:d99752488874
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Sep 12 21:02:10 2003 +0000

description:
Fix unportable shell code in "configure" which breaks configuration on
systems where the "compfaces" program from the "faces" package is
installed. A dependence on the "faces" package isn't necessary because
the "compfaces" program isn't really used. This fix the first part
of PR pkg/22762 by myself.

diffstat:

 devel/ddd/Makefile         |   3 ++-
 devel/ddd/distinfo         |   3 ++-
 devel/ddd/patches/patch-ac |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r e7e238051aa8 -r d99752488874 devel/ddd/Makefile
--- a/devel/ddd/Makefile        Fri Sep 12 20:48:47 2003 +0000
+++ b/devel/ddd/Makefile        Fri Sep 12 21:02:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/09/12 20:07:12 grant Exp $
+# $NetBSD: Makefile,v 1.53 2003/09/12 21:02:10 tron Exp $
 #
 
 DISTNAME=      ddd-3.3.7
@@ -19,6 +19,7 @@
 USE_GCC3=              # defined
 
 CONFIGURE_ARGS+=       --with-ncurses=no
+CONFIGURE_ENV+=                COMPFACE="${FALSE}"
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r e7e238051aa8 -r d99752488874 devel/ddd/distinfo
--- a/devel/ddd/distinfo        Fri Sep 12 20:48:47 2003 +0000
+++ b/devel/ddd/distinfo        Fri Sep 12 21:02:10 2003 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/09/11 06:45:34 martti Exp $
+$NetBSD: distinfo,v 1.9 2003/09/12 21:02:11 tron Exp $
 
 SHA1 (ddd-3.3.7.tar.gz) = d2a4fcf2bace28ef7d7dfef6903251822345cc21
 Size (ddd-3.3.7.tar.gz) = 14840534 bytes
 SHA1 (patch-aa) = 6f8ce32d8aafd06cfa72e1dcb19d516183098a41
 SHA1 (patch-ab) = fcf7b99706479ea27d95649aa228efeb3eb042ff
+SHA1 (patch-ac) = 027ca5635790be9cd50f28dad541bc790087b456
diff -r e7e238051aa8 -r d99752488874 devel/ddd/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ddd/patches/patch-ac        Fri Sep 12 21:02:10 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2003/09/12 21:02:11 tron Exp $
+
+--- configure.old      Tue Jun  3 13:35:36 2003
++++ configure  Fri Sep 12 22:56:55 2003
+@@ -3466,7 +3466,7 @@
+ if test "${ddd_cv_compface_xbm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if $COMPFACE ${srcdir}/icons/ddd.xbm >&/dev/null; then
++  if $COMPFACE ${srcdir}/icons/ddd.xbm >/dev/null 2>&1; then
+        ddd_cv_compface_xbm=yes; else ddd_cv_compface_xbm=no; fi
+ fi
+ echo "$as_me:$LINENO: result: $ddd_cv_compface_xbm" >&5



Home | Main Index | Thread Index | Old Index