Patch "configure" rather than "aclocal.m4".

3 files changed, 30 insertions, 35 deletions

diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 17f0c832d01..f367dcb90c5 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/14 21:43:46 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2001/04/21 01:10:58 jtb Exp $
 
 DISTNAME=		cim-3.30
 CATEGORIES=		lang
@@ -8,16 +8,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/cim/cim.html
 COMMENT=		Simula compiler based on the C programming language
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_PERL5=		YES
+USE_PERL5=		yes
 
 INFO_FILES=		cim.info
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cim/distinfo b/lang/cim/distinfo
index 1ef4aad6fe2..ba84eb8a424 100644
--- a/lang/cim/distinfo
+++ b/lang/cim/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/21 01:10:58 jtb Exp $
 
 SHA1 (cim-3.30.tar.gz) = 8636ac8d1eaee793769051af60140af80b82b22f
 Size (cim-3.30.tar.gz) = 416809 bytes
-SHA1 (patch-aa) = f6995cc0d1207e6f26825579a04714a07c2791d2
+SHA1 (patch-aa) = f05149918e1a47017f9dbdcf0a3adaec6033a2b2
diff --git a/lang/cim/patches/patch-aa b/lang/cim/patches/patch-aa
index 352f7907264..e7ef09bc876 100644
--- a/lang/cim/patches/patch-aa
+++ b/lang/cim/patches/patch-aa
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.1 2001/02/16 05:44:05 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/21 01:10:58 jtb Exp $
 
---- aclocal.m4.orig	Fri Feb 16 05:23:28 2001
-+++ aclocal.m4
-@@ -30,7 +30,7 @@
- [
- AC_MSG_CHECKING(grepping libtool to find link_static_flag)
- AC_CACHE_VAL(cim_cv_link_static_flag,[
+--- configure.orig	Fri Nov  5 21:07:44 1999
++++ configure
+@@ -3285,7 +3285,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-eval `grep wl= libtool`
++eval `grep ^wl libtool`
+ cim_cv_wl_flag=$pic_flag
+ 
+ fi
+@@ -3303,7 +3303,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
 -eval `grep link_static_flag libtool`
 +eval `grep ^link_static_flag libtool`
  cim_cv_link_static_flag=$link_static_flag
- ])
- AC_MSG_RESULT($cim_cv_link_static_flag)
-@@ -41,7 +41,7 @@
- [
- AC_MSG_CHECKING(grepping libtool to find pic_flag)
- AC_CACHE_VAL(cim_cv_pic_flag,[
+ 
+ fi
+@@ -3321,7 +3321,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
 -eval `grep pic_flag libtool`
 +eval `grep ^pic_flag libtool`
  cim_cv_pic_flag=$pic_flag
- ])
- AC_MSG_RESULT($cim_cv_pic_flag)
-@@ -52,7 +52,7 @@
- [
- AC_MSG_CHECKING(grepping libtool to find wl_flag)
- AC_CACHE_VAL(cim_cv_wl_flag,[
--eval `grep wl= libtool`
-+eval `grep ^wl= libtool`
- cim_cv_wl_flag=$pic_flag
- ])
- AC_MSG_RESULT($cim_cv_wl_flag)
+ 
+ fi