* Don't use LTCONFIG_OVERRIDE and let pkgsrc automatically use the

  pkgsrc-installed libtool.  Modify the configure script to grep the
  libtool we're using for the values of various libtool-derived
  variables.  While here, fix the name of the variable that contains
  the flags to pass linker options to the compiler.

* Drop the use of SUBST_FILES to directly substitute into cimcomp.c
  and just patch the Makefile to pass the proper flags when compilng.

4 files changed, 36 insertions, 34 deletions

diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 08ad410beaf..15cb4872575 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/04 16:53:59 jlam Exp $
 
 DISTNAME=		cim-3.30
 PKGREVISION=		1
@@ -10,19 +10,9 @@ HOMEPAGE=		http://www.gnu.org/software/cim/cim.html
 COMMENT=		Simula compiler based on the C programming language
 
 GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		libtool_path=${PKG_LIBTOOL:Q}
 USE_TOOLS+=		perl:run
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
 INFO_FILES=		cim.info
 
-SUBST_CLASSES+=	x
-SUBST_STAGE.x=	post-patch
-SUBST_FILES.x=	src/cimcomp.c
-SUBST_SED.x=	-e "s|SCC|\"${CC}\"|"
-SUBST_SED.x+=	-e "s|SCFLAGS|\"${CFLAGS} -I${PREFIX}/include\"|"
-SUBST_SED.x+=	-e "s|SLDFLAGS|\"-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib\"|"
-SUBST_SED.x+=	-e "s|= LIBDIR|= \"${PREFIX}/lib\"|"
-SUBST_SED.x+=	-e "s|= INCLUDEDIR|= \"${PREFIX}/include\"|"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cim/distinfo b/lang/cim/distinfo
index de8b3849cf5..47c78aaf182 100644
--- a/lang/cim/distinfo
+++ b/lang/cim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/04/04 16:53:59 jlam Exp $
 
 SHA1 (cim-3.30.tar.gz) = 8636ac8d1eaee793769051af60140af80b82b22f
 RMD160 (cim-3.30.tar.gz) = d5c07046799dec8840c7c7d9f5c88e552a4c6432
 Size (cim-3.30.tar.gz) = 416809 bytes
-SHA1 (patch-aa) = f05149918e1a47017f9dbdcf0a3adaec6033a2b2
-SHA1 (patch-ab) = 247f63ecbcccbafa84f1ae8b97a616d24591275d
+SHA1 (patch-aa) = 6e20870f7bf0c2befdc0a73d00827606958e2931
+SHA1 (patch-ab) = e5d14212cbc4fbf956ade6c8b68f1dcc92a0841a
diff --git a/lang/cim/patches/patch-aa b/lang/cim/patches/patch-aa
index e7ef09bc876..4f1fd8abe19 100644
--- a/lang/cim/patches/patch-aa
+++ b/lang/cim/patches/patch-aa
@@ -1,31 +1,41 @@
-$NetBSD: patch-aa,v 1.2 2001/04/21 01:10:58 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2006/04/04 16:53:59 jlam Exp $
 
---- configure.orig	Fri Nov  5 21:07:44 1999
+--- configure.orig	1999-11-05 16:07:44.000000000 -0500
 +++ configure
-@@ -3285,7 +3285,7 @@
+@@ -3279,14 +3279,16 @@ EOF
+ 
+ 
+ 
++test -z "$libtool_path" || libtool_path="./libtool"
++
+ echo $ac_n "checking grepping libtool to find wl_flag""... $ac_c" 1>&6
+ echo "configure:3284: checking grepping libtool to find wl_flag" >&5
+ if eval "test \"`echo '$''{'cim_cv_wl_flag'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
 -eval `grep wl= libtool`
-+eval `grep ^wl libtool`
- cim_cv_wl_flag=$pic_flag
+-cim_cv_wl_flag=$pic_flag
++eval `grep ^wl= $libtool_path`
++cim_cv_wl_flag=$wl
  
  fi
-@@ -3303,7 +3303,7 @@
+ 
+@@ -3303,7 +3305,7 @@ if eval "test \"`echo '$''{'cim_cv_link_
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
 -eval `grep link_static_flag libtool`
-+eval `grep ^link_static_flag libtool`
++eval `grep ^link_static_flag= $libtool_path`
  cim_cv_link_static_flag=$link_static_flag
  
  fi
-@@ -3321,7 +3321,7 @@
+@@ -3321,7 +3323,7 @@ if eval "test \"`echo '$''{'cim_cv_pic_f
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
 -eval `grep pic_flag libtool`
-+eval `grep ^pic_flag libtool`
++eval `grep ^pic_flag= $libtool_path`
  cim_cv_pic_flag=$pic_flag
  
  fi
diff --git a/lang/cim/patches/patch-ab b/lang/cim/patches/patch-ab
index 0c2ef7a1b4f..be84752893e 100644
--- a/lang/cim/patches/patch-ab
+++ b/lang/cim/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2004/05/11 03:33:57 snj Exp $
+$NetBSD: patch-ab,v 1.2 2006/04/04 16:53:59 jlam Exp $
 
---- src/Makefile.in.orig	2004-05-10 19:45:42.000000000 -0700
-+++ src/Makefile.in	2004-05-10 19:46:20.000000000 -0700
-@@ -355,7 +355,7 @@ maintainer-clean-generic clean mostlycle
+--- src/Makefile.in.orig	1999-11-05 16:07:54.000000000 -0500
++++ src/Makefile.in
+@@ -109,8 +109,8 @@ YFLAGS = -d
  
+ # Variables controlling compilation of the generated C-code
+ SCC = $(CC)
+-SCFLAGS = $(CFLAGS)
+-SLDFLAGS = $(LDFLAGS)
++SCFLAGS = $(CFLAGS) -I$(includedir)
++SLDFLAGS = -L$(libdir) $(LDFLAGS)
+ SLIBS = $(LIBS)
  
- cimcomp.o: cimcomp.c Makefile
--	$(COMPILE) '-DSCC="$(SCC)"' '-DSCFLAGS="$(SCFLAGS)"' '-DSLDFLAGS="$(SLDFLAGS)"' '-DSLIBS="$(SLIBS)"' '-DLIBDIR="$(libdir)"' '-DINCLUDEDIR="$(includedir)"' -c $(srcdir)/cimcomp.c
-+	$(COMPILE) '-DSLIBS="$(SLIBS)"' -c $(srcdir)/cimcomp.c
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ INCLUDES = -I$(top_srcdir)