From 659ec30d1c562053534a8ddeebaaa62ca03a2870 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 21 Feb 2006 22:40:47 +0000
Subject: Fix incomplete pkgsrc patch: defining LDSTATIC is not enough, it must
 be AC_SUBSTed too. Found by libtool update. Bump PKGREVISION.

---
 wm/afterstep1/Makefile         |  4 ++--
 wm/afterstep1/distinfo         |  4 ++--
 wm/afterstep1/patches/patch-ae | 16 ++++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'wm')

diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile
index 81333caeb13..9681e4aa1b4 100644
--- a/wm/afterstep1/Makefile
+++ b/wm/afterstep1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/21 22:40:47 wiz Exp $
 
 DISTNAME=	AfterStep-1.8.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/
diff --git a/wm/afterstep1/distinfo b/wm/afterstep1/distinfo
index ee0b9f54470..00554e31f5b 100644
--- a/wm/afterstep1/distinfo
+++ b/wm/afterstep1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/12/06 14:09:39 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/02/21 22:40:47 wiz Exp $
 
 SHA1 (AfterStep-1.8.11.tar.bz2) = 841655ff19df9c5361852a33950183ca6d67b6f0
 RMD160 (AfterStep-1.8.11.tar.bz2) = 450206a888e32d40ac0abeece0ffa0ce4909a54c
@@ -6,7 +6,7 @@ Size (AfterStep-1.8.11.tar.bz2) = 1162212 bytes
 SHA1 (patch-aa) = e7c308c37bb2c4c879d791adb8690aeef15d05a1
 SHA1 (patch-ab) = 24c9f8569c88ea661cc6eb79390b5ecc825500b4
 SHA1 (patch-ad) = e0e5cd8182bdf7b3b6ada61e58a2a2c0dd4e243c
-SHA1 (patch-ae) = 911c083e3bb941de6f384c0035978a576e17179c
+SHA1 (patch-ae) = b216b02cb4752697a2ec93dd8213c277c92c8fc5
 SHA1 (patch-af) = 7e1cd2b8e184fca8ee38cae2c02dc1520b899d37
 SHA1 (patch-ag) = 3fc5611c74b3f54f27ddb13ce2e9bfd86207b837
 SHA1 (patch-ah) = fa25e141548fff77ea1790a7e5ca22e39008f257
diff --git a/wm/afterstep1/patches/patch-ae b/wm/afterstep1/patches/patch-ae
index 0b4c7e007eb..8142b444685 100644
--- a/wm/afterstep1/patches/patch-ae
+++ b/wm/afterstep1/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2006/02/21 22:40:47 wiz Exp $
 
---- autoconf/configure.in.orig	Fri Mar  1 00:33:37 2002
+--- autoconf/configure.in.orig	2002-03-01 06:33:37.000000000 +0000
 +++ autoconf/configure.in
-@@ -84,6 +84,7 @@
+@@ -84,6 +84,7 @@ AC_PATH_PROG(MV, mv, mv)
  AC_PATH_PROG(CP, cp, cp)
  AC_PATH_PROG(MKDIR, mkdir, mkdir)
  AC_PATH_PROG(PERL, perl, perl)
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
  
  dnl# let's check for endiannes of our box
  AC_C_BIGENDIAN
-@@ -263,20 +264,16 @@
+@@ -263,20 +264,16 @@ LIBS=$saved_LIBS
  dnl# AFTERSTEP_LIB="-lafterstep"
  dnl# ASIMAGE_LIB="-lasimage"
  dnl# WIDGETS_LIB="-lWidgets"
@@ -39,3 +39,11 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/01/14 13:36:36 jmmv Exp $
  fi
  
  ASIMAGE_LIB="$ASIMAGE_LIB $LIB_MATH"
+@@ -331,6 +328,7 @@ AC_SUBST(AFTERSTEP_LIB)
+ AC_SUBST(ASIMAGE_LIB)
+ AC_SUBST(WIDGETS_LIB)
+ AC_SUBST(CONFIG_LIB)
++AC_SUBST(LDSTATIC)
+ AC_SUBST(LIBPROG)
+ AC_SUBST(LIBINSTALL)
+ AC_SUBST(DEFINE_XLOCALE)
-- 
cgit v1.2.3