Fix library dependencies for libwraster.

USE_LIBTOOL instead of USE_PKGLIBTOOL.
Depend on automake, too, since it's used.
Handle weird man page extension (.1x) differently.

5 files changed, 54 insertions, 40 deletions

diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 323626ffa6b..b8df44d0380 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2000/06/01 11:23:48 rh Exp $
+# $NetBSD: Makefile,v 1.50 2000/06/04 00:30:33 wiz Exp $
 
 DISTNAME=		WindowMaker-0.62.1
 PKGNAME=		windowmaker-0.62.1
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 DEPENDS+=		gettext-0.10.*:../../devel/gettext
 DEPENDS+=		libproplist-0.10.*:../../devel/libproplist
 DEPENDS+=		libungif-*:../../graphics/libungif
@@ -19,7 +19,8 @@ DEPENDS+=		png>=1.0.6:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-usermenu \
@@ -54,9 +55,14 @@ post-extract:
 	${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
 		 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
 		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker
+	for manfile in ${WRKSRC}/doc/*.1x; \
+	do \
+		${MV} $${manfile} `${ECHO} $${manfile} | ${SED} "s/1x$$/1/"`; \
+	done;
 
 pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf; \
+		${LOCALBASE}/bin/automake --no-force
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/SoundSets
diff --git a/x11/windowmaker/files/patch-sum b/x11/windowmaker/files/patch-sum
index 042f094d779..8724721f611 100644
--- a/x11/windowmaker/files/patch-sum
+++ b/x11/windowmaker/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/04/08 06:46:40 tron Exp $
+$NetBSD: patch-sum,v 1.7 2000/06/04 00:30:34 wiz Exp $
 
-MD5 (patch-aa) = 3f5b71a606eac91124110089f417e6b4
+MD5 (patch-aa) = 5c8487e3336d479ac46e42ad3fd54676
 MD5 (patch-ab) = 21c8f42d0dc6949d321779b16c6f4ec7
-MD5 (patch-ac) = e9998a917f4ea4bd26eb95adab88e2a8
+MD5 (patch-ac) = a0c441e25d1063f0c04060fd9d24defc
 MD5 (patch-ad) = 5357725a353a8a95ed77e7e2548ff6a6
diff --git a/x11/windowmaker/patches/patch-aa b/x11/windowmaker/patches/patch-aa
index d74bdc96b64..98cfc3ab480 100644
--- a/x11/windowmaker/patches/patch-aa
+++ b/x11/windowmaker/patches/patch-aa
@@ -1,13 +1,31 @@
-$NetBSD: patch-aa,v 1.7 1999/06/21 04:46:53 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2000/06/04 00:30:34 wiz Exp $
 
---- doc/Makefile.in.orig	Thu Jun  3 07:56:15 1999
-+++ doc/Makefile.in	Thu Jun 10 23:13:47 1999
-@@ -131,7 +131,7 @@
- 	for i in $$list; do \
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//; s/[a-z]*$$//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+--- doc/Makefile.am.orig	Sun May  2 23:23:10 1999
++++ doc/Makefile.am	Sun Jun  4 02:00:27 2000
+@@ -1,16 +1,16 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ man_MANS = \
+-	geticonset.1x \
+-	setstyle.1x \
+-	wxpaste.1x \
+-	getstyle.1x \
+-	wdwrite.1x \
+-	wmsetbg.1x \
+-	wsetfont.1x \
+-	seticons.1x \
+-	wmaker.1x \
+-	wxcopy.1x
++	geticonset.1 \
++	setstyle.1 \
++	wxpaste.1 \
++	getstyle.1 \
++	wdwrite.1 \
++	wmsetbg.1 \
++	wsetfont.1 \
++	seticons.1 \
++	wmaker.1 \
++	wxcopy.1
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
diff --git a/x11/windowmaker/patches/patch-ac b/x11/windowmaker/patches/patch-ac
index 8755d1e43e8..54f1735dfbb 100644
--- a/x11/windowmaker/patches/patch-ac
+++ b/x11/windowmaker/patches/patch-ac
@@ -1,24 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2000/04/06 22:38:19 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2000/06/04 00:30:35 wiz Exp $
 
---- aclocal.m4.orig	Fri Mar 31 06:37:09 2000
-+++ aclocal.m4	Sun Apr  2 11:59:58 2000
-@@ -366,7 +366,10 @@
+--- wrlib/Makefile.am.orig	Fri Mar 24 02:16:03 2000
++++ wrlib/Makefile.am	Sun Jun  4 01:22:53 2000
+@@ -4,7 +4,7 @@
  
- # serial 40 AC_PROG_LIBTOOL
- AC_DEFUN(AC_PROG_LIBTOOL,
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+[
-+dnl Always use NetBSD's libtool
-+if false; then
-+AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ lib_LTLIBRARIES = libwraster.la
  
- # Save cache, so that ltconfig can load it
- AC_CACHE_SAVE
-@@ -393,6 +396,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
- ])
+-libwraster_la_LDFLAGS = -version-info 2:0:0
++libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info 2:0:0
+ 
+ bin_SCRIPTS = get-wraster-flags
  
- AC_DEFUN(AC_LIBTOOL_SETUP,
diff --git a/x11/windowmaker/pkg/PLIST b/x11/windowmaker/pkg/PLIST
index 3fa982d2d4d..b203220a782 100644
--- a/x11/windowmaker/pkg/PLIST
+++ b/x11/windowmaker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/04/08 06:46:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/06/04 00:30:35 wiz Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -97,6 +97,7 @@ lib/libWINGs.a
 lib/libWMaker.a
 lib/libWUtil.a
 lib/libwraster.a
+lib/libwraster.la
 lib/libwraster.so.2.0
 man/man1/geticonset.1
 man/man1/getstyle.1