s/LTCONFIG_OVERRIDE/LIBTOOL_OVERRIDE/

remove dependency on automake

6 files changed, 32 insertions, 37 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 6a6c998a052..8e29ee44803 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/10/05 12:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/10/07 13:08:32 rh Exp $
 
 DISTNAME=		WindowMaker-0.70.0
 PKGNAME=		windowmaker-0.70.0
@@ -11,7 +11,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
 COMMENT=		GNUStep-compliant NEXTSTEP(tm) window manager clone
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK_ONLY=	YES
@@ -20,7 +19,7 @@ REPLACE_BUILDLINK+=	WINGs/get-wutil-flags
 REPLACE_BUILDLINK+=	wrlib/get-wraster-flags
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-usermenu \
@@ -69,10 +68,6 @@ post-extract:
 		${MV} $$f.new $$f; \
 	done
 
-pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf; \
-		${RM} doc/Makefile.in ; ${LOCALBASE}/bin/automake --no-force
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/SoundSets
 	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/Sounds
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 005fc9332b3..a66d172f034 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2001/10/05 12:18:58 wiz Exp $
+$NetBSD: distinfo,v 1.14 2001/10/07 13:08:32 rh Exp $
 
 SHA1 (WindowMaker-0.70.0.tar.bz2) = 3cea3598232c65beaf79f7825e1e3a00dc6fb032
 Size (WindowMaker-0.70.0.tar.bz2) = 2027797 bytes
-SHA1 (patch-aa) = 69d14c2f32b89c8dde871f4690cebf4b714f70e2
-SHA1 (patch-ab) = 11a3a88a81b8b9fad0456152ebe8da82b0c3c4ec
-SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591
+SHA1 (patch-aa) = 7c2d19caa3731f4ee863c1c668f9d77d4c1ea55b
+SHA1 (patch-ab) = 569410b0a14fa4c91506424dda9664438398bf9e
+SHA1 (patch-ac) = dc0cc6a7a4c8e4e72d000fafee939807a9290099
 SHA1 (patch-ad) = 040d603c789987f18c6622e12f6044cfae172e15
-SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0
+SHA1 (patch-ae) = 3ce77092f17f32c1de713dc81de87bab5c4e2dbd
 SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253
diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa
index 978e3f0a8e8..a29e006ab37 100644
--- a/wm/windowmaker/patches/patch-aa
+++ b/wm/windowmaker/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/10/05 12:18:58 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2001/10/07 13:08:32 rh Exp $
 
---- doc/Makefile.am.orig	Thu Sep 13 00:11:05 2001
-+++ doc/Makefile.am	Fri Oct  5 14:01:28 2001
-@@ -3,17 +3,17 @@
+--- doc/Makefile.in.orig	Fri Oct  5 02:52:33 2001
++++ doc/Makefile.in
+@@ -105,17 +105,17 @@
  SUBDIRS = sk
  
  man_MANS = \
@@ -29,5 +29,5 @@ $NetBSD: patch-aa,v 1.5 2001/10/05 12:18:58 wiz Exp $
 +	wxcopy.1 \
 +	wxpaste.1
  
- EXTRA_DIST = $(man_MANS)
  
+ EXTRA_DIST = $(man_MANS)
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 4c7df5606e6..91f4c9c3bed 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.8 2001/10/05 12:18:58 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2001/10/07 13:08:32 rh Exp $
 
---- configure.in.orig	Fri Oct  5 10:52:05 2001
-+++ configure.in	Fri Oct  5 13:59:51 2001
-@@ -244,43 +244,18 @@
+--- configure.orig	Fri Oct  5 02:52:29 2001
++++ configure
+@@ -8685,43 +8685,18 @@
+ 	PO=""
+ fi
  
- dnl List of supported locales
- dnl -------------------------
 -supported_locales="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
 +supported_locales="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_CN sk bg hu"
  supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg hu sk"
@@ -54,8 +54,8 @@ $NetBSD: patch-ab,v 1.8 2001/10/05 12:18:58 wiz Exp $
 +	WINGSMOFILES="$WINGSMOFILES $lang.mo"
  done
  
- 
-@@ -706,8 +681,8 @@
+ case $host_os in
+@@ -11752,8 +11727,8 @@
      fi
  fi
  
@@ -64,5 +64,5 @@ $NetBSD: patch-ab,v 1.8 2001/10/05 12:18:58 wiz Exp $
 +LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
 +HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
  
- AC_SUBST(LIBRARY_SEARCH_PATH)
- AC_SUBST(HEADER_SEARCH_PATH)
+ for ac_header in stdlib.h
+ do
diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac
index 222a814dffc..4b468edba04 100644
--- a/wm/windowmaker/patches/patch-ac
+++ b/wm/windowmaker/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/05/22 10:42:14 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2001/10/07 13:08:32 rh Exp $
 
---- wrlib/Makefile.am.orig	Sat Apr 21 09:12:35 2001
-+++ wrlib/Makefile.am
-@@ -4,7 +4,7 @@
+--- wrlib/Makefile.in.orig	Fri Oct  5 02:52:35 2001
++++ wrlib/Makefile.in
+@@ -106,7 +106,7 @@
  
  lib_LTLIBRARIES = libwraster.la
  
diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae
index 3eb205f8383..6b7988f238c 100644
--- a/wm/windowmaker/patches/patch-ae
+++ b/wm/windowmaker/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2001/08/18 18:13:28 tron Exp $
+$NetBSD: patch-ae,v 1.3 2001/10/07 13:08:32 rh Exp $
 
---- doc/sk/Makefile.am.orig	Wed Jun  6 22:22:55 2001
-+++ doc/sk/Makefile.am	Sat Aug 18 18:25:38 2001
-@@ -3,16 +3,16 @@
- mandir=@mandir@/sk
+--- doc/sk/Makefile.in.orig	Fri Oct  5 02:52:33 2001
++++ doc/sk/Makefile.in
+@@ -104,16 +104,16 @@
+ mandir = @mandir@/sk
  
  man_MANS = \
 -	geticonset.1x \
@@ -27,5 +27,5 @@ $NetBSD: patch-ae,v 1.2 2001/08/18 18:13:28 tron Exp $
 +	wmaker.1 \
 +	wxcopy.1
  
- EXTRA_DIST = $(man_MANS)
  
+ EXTRA_DIST = $(man_MANS)