From 597a0388573534bc6539241b296fb16b11aeac48 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 7 Mar 2007 04:41:56 +0000
Subject: Made the package work for me (bin/GWCommand was missing), added the
 missing dependencies to GTK2 and Bash. PKGREVISION++

---
 wm/afterstep/Makefile         | 10 ++++++----
 wm/afterstep/PLIST            | 15 ++++++++++++++-
 wm/afterstep/distinfo         |  3 ++-
 wm/afterstep/patches/patch-ac | 17 +++++++++++++++++
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 wm/afterstep/patches/patch-ac

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index e1976066832..e7b6a74e7ef 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2007/02/01 21:51:55 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/03/07 04:41:56 rillig Exp $
 
 DISTNAME=	AfterStep-2.1.2
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,16 +14,18 @@ COMMENT=	Window manager based on the look and feel of the NeXTStep interface
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		bash:run gmake perl:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-send-postcard-to-developer
-REPLACE_PERL+=		tools/ascommand.pl tools/installastheme.pl tools/makeastheme.pl
+REPLACE_PERL+=		tools/ascommand.pl tools/installastheme.pl.in tools/makeastheme.pl.in
+REPLACE_BASH+=		tools/importasmenu
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/wm/afterstep/PLIST b/wm/afterstep/PLIST
index 75041963171..225a33a053a 100644
--- a/wm/afterstep/PLIST
+++ b/wm/afterstep/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2005/09/22 01:24:39 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/03/07 04:41:57 rillig Exp $
+bin/ASWallpaper
 bin/Animate
 bin/Arrange
 bin/Banner
+bin/GWCommand
 bin/Ident
 bin/MonitorWharf
 bin/Pager
@@ -20,6 +22,7 @@ bin/ascommand.pl
 bin/ascompose
 bin/asflip
 bin/asgrad
+bin/asgtk-config
 bin/asi18n
 bin/asmerge
 bin/asscale
@@ -31,6 +34,15 @@ bin/importasmenu
 bin/installastheme.pl
 bin/makeastheme.pl
 bin/postcard.sh
+include/libASGTK/asgtk.h
+include/libASGTK/asgtkai.h
+include/libASGTK/asgtkapp.h
+include/libASGTK/asgtkcolorsel.h
+include/libASGTK/asgtkgradient.h
+include/libASGTK/asgtkimagebrowser.h
+include/libASGTK/asgtkimagedir.h
+include/libASGTK/asgtkimageview.h
+include/libASGTK/asgtkxmleditor.h
 include/libAfterBase/afterbase_config.h
 include/libAfterBase/ashash.h
 include/libAfterBase/aslist.h
@@ -103,6 +115,7 @@ include/libAfterStep/screen.h
 include/libAfterStep/session.h
 include/libAfterStep/shape.h
 include/libAfterStep/wmprops.h
+lib/libASGTK.a
 lib/libAfterBase.a
 lib/libAfterConf.a
 lib/libAfterImage.a
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index 2e3dcc395fd..ac8970598d4 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2006/10/02 23:52:51 rillig Exp $
+$NetBSD: distinfo,v 1.12 2007/03/07 04:41:57 rillig Exp $
 
 SHA1 (AfterStep-2.1.2.tar.bz2) = c367e7c73561ddf03b3725f80d2f39f50d2b45bd
 RMD160 (AfterStep-2.1.2.tar.bz2) = f891ded642b9190bd261f3e3f92cb595da2d785b
 Size (AfterStep-2.1.2.tar.bz2) = 5079333 bytes
 SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8
 SHA1 (patch-ab) = b513b41f5be32170c3e7027d53e44625cbb4958a
+SHA1 (patch-ac) = bbf8b111e335941f5cf8f3fab28c1e1dcc884713
diff --git a/wm/afterstep/patches/patch-ac b/wm/afterstep/patches/patch-ac
new file mode 100644
index 00000000000..f5d8487c3bf
--- /dev/null
+++ b/wm/afterstep/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.4 2007/03/07 04:41:57 rillig Exp $
+
+--- Makefile.in.orig	2005-07-13 16:58:20.000000000 +0200
++++ Makefile.in	2007-03-07 05:24:32.000000000 +0100
+@@ -40,10 +40,10 @@ subdirs		= libAfterBase libAfterImage li
+ #		  src/Sound @SCRIPT_DIR@
+ 
+ all:	AfterStep.desktop.final
+-	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} $@ || exit 1); fi; done
++	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I && ${MAKE} $@) || exit 1; fi; done
+ 
+ libs:	AfterStep.desktop.final
+-	@for I in ${libdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} $@ || exit 1); fi; done
++	@for I in ${libdirs} ; do if [ -d $$I ]; then (cd $$I && ${MAKE} $@) || exit 1; fi; done
+ 
+ AfterStep.desktop.final:
+ 	@$(CP) AfterStep.desktop AfterStep.desktop.final; \
-- 
cgit v1.2.3