5 files changed, 35 insertions, 5 deletions

diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index 47730d7627f4..a043a0201465 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -6,16 +6,29 @@
 #
 
 PORTNAME=	golem
-PORTVERSION=	0.0.3
+PORTVERSION=	0.0.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	fracture@allusion.net
 
+.if defined(WANT_SOUND)
+LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
+CONFIGURE_ARGS= --enable-sound
+PLIST_SUB+=	NO_SOUND=""
+.else
+PLIST_SUB+=	NO_SOUND="@comment "
+.endif
+
+.if defined(WANT_XINERAMA)
+CONFIGURE_ARGS+=	--enable-xinerama
+.endif
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="-pipe -DNDEBUG -O2"
 
 MANCOMPRESSED=	yes
 MAN1=		golem.1
diff --git a/x11-wm/golem/distinfo b/x11-wm/golem/distinfo
index 50ec291163a6..465e2adb561f 100644
--- a/x11-wm/golem/distinfo
+++ b/x11-wm/golem/distinfo
@@ -1 +1 @@
-MD5 (golem-0.0.3.tar.gz) = 62d47b4258e6ba4aff7e01ec7ff25d58
+MD5 (golem-0.0.4.tar.gz) = 9bc81aaddd85923bce2df66aa4d0b55f
diff --git a/x11-wm/golem/pkg-comment b/x11-wm/golem/pkg-comment
index f5be2c1772a5..6cfb13918622 100644
--- a/x11-wm/golem/pkg-comment
+++ b/x11-wm/golem/pkg-comment
@@ -1 +1 @@
-Small window manager with theme and plugins
+Small window manager with themes and plugins
diff --git a/x11-wm/golem/pkg-descr b/x11-wm/golem/pkg-descr
index d62d58028f7c..027600d9f906 100644
--- a/x11-wm/golem/pkg-descr
+++ b/x11-wm/golem/pkg-descr
@@ -1,3 +1,8 @@
-Small window manager with theme and plugins
+Golem is an X11 Window Manager.  Design goals are that it be fast
+and lightweight, as well as customizable in any way that will not
+prevent the first goal from being realized.
 
 WWW: http://golem.sourceforge.net/
+
+- Jordan DeLong
+<fracture@allusion.net>
diff --git a/x11-wm/golem/pkg-plist b/x11-wm/golem/pkg-plist
index 8ba627a0d72e..869e1769ac3a 100644
--- a/x11-wm/golem/pkg-plist
+++ b/x11-wm/golem/pkg-plist
@@ -8,6 +8,7 @@ lib/golem/plugins/pager.so
 lib/golem/plugins/pier.so
 lib/golem/plugins/setroot.so
 lib/golem/plugins/simple_menus.so
+%%NO_SOUND%%lib/golem/plugins/sound.so
 lib/golem/plugins/start_slide.so
 lib/golem/plugins/wmclass_defs.so
 share/golem/golemrc
@@ -22,6 +23,7 @@ share/golem/plugins/pier/netscape.xpm
 share/golem/plugins/pier/rc
 share/golem/plugins/setroot/rc
 share/golem/plugins/simple_menus/rc
+%%NO_SOUND%%share/golem/plugins/sound/rc
 share/golem/plugins/start_slide/README
 share/golem/plugins/start_slide/rc
 share/golem/plugins/wmclass_defs/rc
@@ -31,7 +33,6 @@ share/golem/themes/AbsoluteE/bar_focused_near.xpm
 share/golem/themes/AbsoluteE/bar_normal_far.xpm
 share/golem/themes/AbsoluteE/bar_normal_mid.xpm
 share/golem/themes/AbsoluteE/bar_normal_near.xpm
-share/golem/themes/AbsoluteE/bevel_bg_normal.png
 share/golem/themes/AbsoluteE/border_horiz_far.xpm
 share/golem/themes/AbsoluteE/border_horiz_far_foc.xpm
 share/golem/themes/AbsoluteE/border_horiz_mid.xpm
@@ -50,6 +51,11 @@ share/golem/themes/AbsoluteE/forplug/setroot/bg_v.jpg
 share/golem/themes/AbsoluteE/forplug/setroot/rc
 share/golem/themes/AbsoluteE/rc
 share/golem/themes/MudGolem/README
+share/golem/themes/MudGolem/forplug/pager/focpagedwin.xpm
+share/golem/themes/MudGolem/forplug/pager/nonsel.xpm
+share/golem/themes/MudGolem/forplug/pager/sel.xpm
+share/golem/themes/MudGolem/forplug/pager/pagedwin.xpm
+share/golem/themes/MudGolem/forplug/pager/rc
 share/golem/themes/MudGolem/forplug/pier/rc
 share/golem/themes/MudGolem/forplug/pier/tile.xpm
 share/golem/themes/MudGolem/forplug/setroot/Enigmas-Oven-2.jpg
@@ -172,6 +178,9 @@ share/golem/themes/microGUI/bottom_near.xpm
 share/golem/themes/microGUI/close.xpm
 share/golem/themes/microGUI/close_clicked.xpm
 share/golem/themes/microGUI/close_unfoc.xpm
+share/golem/themes/microGUI/forplug/pager/rc
+share/golem/themes/microGUI/forplug/pager/focpagedwin.xpm
+share/golem/themes/microGUI/forplug/pager/pagedwin.xpm
 share/golem/themes/microGUI/forplug/pier/rc
 share/golem/themes/microGUI/forplug/pier/tile.xpm
 share/golem/themes/microGUI/forplug/start_slide/greybg.xpm
@@ -218,12 +227,14 @@ share/golem/themes/twm/topbar.xpm
 @dirrm share/golem/plugins/pier
 @dirrm share/golem/plugins/setroot
 @dirrm share/golem/plugins/simple_menus
+%%NO_SOUND%%@dirrm share/golem/plugins/sound
 @dirrm share/golem/plugins/start_slide
 @dirrm share/golem/plugins/wmclass_defs
 @dirrm share/golem/plugins
 @dirrm share/golem/themes/AbsoluteE/forplug/setroot
 @dirrm share/golem/themes/AbsoluteE/forplug
 @dirrm share/golem/themes/AbsoluteE
+@dirrm share/golem/themes/MudGolem/forplug/pager
 @dirrm share/golem/themes/MudGolem/forplug/pier
 @dirrm share/golem/themes/MudGolem/forplug/setroot
 @dirrm share/golem/themes/MudGolem/forplug/simple_menus
@@ -247,6 +258,7 @@ share/golem/themes/twm/topbar.xpm
 @dirrm share/golem/themes/eBlueSteel/images
 @dirrm share/golem/themes/eBlueSteel/styles
 @dirrm share/golem/themes/eBlueSteel
+@dirrm share/golem/themes/microGUI/forplug/pager
 @dirrm share/golem/themes/microGUI/forplug/pier
 @dirrm share/golem/themes/microGUI/forplug/start_slide
 @dirrm share/golem/themes/microGUI/forplug