diff options
author | dmcmahill <dmcmahill> | 2007-05-12 11:33:42 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2007-05-12 11:33:42 +0000 |
commit | 6ddeaf9a110d75c7ed19005f1606fd16f7057290 (patch) | |
tree | be74a7bd51e6a0ddc9878635569de75051a2cabc /cad | |
parent | acab952d728c63b08f8dbab1660c7015e9b4e90f (diff) | |
download | pkgsrc-6ddeaf9a110d75c7ed19005f1606fd16f7057290.tar.gz |
add missing lex/yacc to USE_TOOLS and fix a stupid
configure test that forces the name of LEX and YACC
to be "flex" and "bison -y". The old test doesn't even
allow a path name.
Diffstat (limited to 'cad')
-rw-r--r-- | cad/adms/Makefile | 4 | ||||
-rw-r--r-- | cad/adms/distinfo | 6 | ||||
-rw-r--r-- | cad/adms/patches/patch-aa | 29 | ||||
-rw-r--r-- | cad/adms/patches/patch-ab | 31 |
4 files changed, 63 insertions, 7 deletions
diff --git a/cad/adms/Makefile b/cad/adms/Makefile index 111623b85ae..4e07a6e1004 100644 --- a/cad/adms/Makefile +++ b/cad/adms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $ # DISTNAME= adms-2.2.5 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews AUTOMAKE_OVERRIDE= NO GNU_CONFIGURE= YES -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake lex pkg-config yacc USE_LIBTOOL= YES CONFIGURE_ENV+= PKGCONFIG_CONFIG=${PKG_CONFIG:Q} diff --git a/cad/adms/distinfo b/cad/adms/distinfo index 831ebf36746..94c9956eef8 100644 --- a/cad/adms/distinfo +++ b/cad/adms/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $ SHA1 (adms-2.2.5.tar.gz) = 03093643feee7ef759cf2f65b497155e2e0df791 RMD160 (adms-2.2.5.tar.gz) = 274f2330696e9e0825b77a3a3ca0a307e9f00bed Size (adms-2.2.5.tar.gz) = 706220 bytes -SHA1 (patch-aa) = 8a2d74b1f4ccec749e65a0ed6e2cc334050d7805 -SHA1 (patch-ab) = 4405750dda622a9ccc9063ca827a692f19279b9b +SHA1 (patch-aa) = d1aae5799925a164841b7905ef991d261a33867a +SHA1 (patch-ab) = fc6914555c5ccaa33c1b787f705ce6a205d83235 diff --git a/cad/adms/patches/patch-aa b/cad/adms/patches/patch-aa index 79e9d3b9ce9..05c9836f326 100644 --- a/cad/adms/patches/patch-aa +++ b/cad/adms/patches/patch-aa @@ -1,4 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $ + +- don't force the use of gcc. +- avoid a check for flex/bison which fail if you have specified + the full path. --- configure.ac.orig 2007-02-01 21:29:53.000000000 +0000 +++ configure.ac @@ -11,3 +15,26 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ # specific configuration. AC_CONFIG_AUX_DIR([auxconf]) +@@ -512,14 +512,14 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + + #force use of flex/bison +-if test "x$LEX" != "xflex"; then +- AC_MSG_WARN(Program flex not found (found $LEX)) +- AC_MSG_ERROR(Please install gnu flex from http://www.gnu.org/software/flex/) +-fi +-if test "x$YACC" != "xbison -y"; then +- AC_MSG_WARN(Program bison not found (found $YACC)) +- AC_MSG_ERROR(Please install gnu bison from http://www.gnu.org/software/bison/) +-fi ++#if test "x$LEX" != "xflex"; then ++# AC_MSG_WARN(Program flex not found (found $LEX)) ++# AC_MSG_ERROR(Please install gnu flex from http://www.gnu.org/software/flex/) ++#fi ++#if test "x$YACC" != "xbison -y"; then ++# AC_MSG_WARN(Program bison not found (found $YACC)) ++# AC_MSG_ERROR(Please install gnu bison from http://www.gnu.org/software/bison/) ++#fi + + #advice use of gcc + if test "x$GCC" = "xyes"; then diff --git a/cad/adms/patches/patch-ab b/cad/adms/patches/patch-ab index 8ad3077f0bf..31da2fd2440 100644 --- a/cad/adms/patches/patch-ab +++ b/cad/adms/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $ --- configure.orig 2007-02-05 12:21:02.000000000 +0000 +++ configure @@ -11,3 +11,32 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/05/09 02:40:18 dmcmahill Exp $ # specific configuration. ac_aux_dir= +@@ -4116,20 +4116,14 @@ fi + + + #force use of flex/bison +-if test "x$LEX" != "xflex"; then +- { echo "$as_me:$LINENO: WARNING: Program flex not found (found $LEX)" >&5 +-echo "$as_me: WARNING: Program flex not found (found $LEX)" >&2;} +- { { echo "$as_me:$LINENO: error: Please install gnu flex from http://www.gnu.org/software/flex/" >&5 +-echo "$as_me: error: Please install gnu flex from http://www.gnu.org/software/flex/" >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test "x$YACC" != "xbison -y"; then +- { echo "$as_me:$LINENO: WARNING: Program bison not found (found $YACC)" >&5 +-echo "$as_me: WARNING: Program bison not found (found $YACC)" >&2;} +- { { echo "$as_me:$LINENO: error: Please install gnu bison from http://www.gnu.org/software/bison/" >&5 +-echo "$as_me: error: Please install gnu bison from http://www.gnu.org/software/bison/" >&2;} +- { (exit 1); exit 1; }; } +-fi ++#if test "x$LEX" != "xflex"; then ++# AC_MSG_WARN(Program flex not found (found $LEX)) ++# AC_MSG_ERROR(Please install gnu flex from http://www.gnu.org/software/flex/) ++#fi ++#if test "x$YACC" != "xbison -y"; then ++# AC_MSG_WARN(Program bison not found (found $YACC)) ++# AC_MSG_ERROR(Please install gnu bison from http://www.gnu.org/software/bison/) ++#fi + + #advice use of gcc + if test "x$GCC" = "xyes"; then |