. Update to 2.2.8.

. Fix handling of the GNOME desktop files in the packing list.
. Remove BROKEN since this release fixes the problems with doc generation
  crashing or timing out.

4 files changed, 26 insertions, 53 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 7e4793d8c719..e96b64fc29f0 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	2.2.7
-PORTREVISION=	1
+PORTVERSION=	2.2.8
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -43,20 +42,16 @@ CONFIGURE_ARGS+=--disable-ascp \
 		--with-png-includes="${LOCALBASE}/include" \
 		--with-png-libs="${LOCALBASE}/lib" \
 		--with-ungif
-MAKE_ENV=	INCS_PRIVATE="${CPPFLAGS}" LIBS_PRIVATE="${LDFLAGS}"
 
 MAN1=		ASDatabase.1x ASDatabaseEntry.1x AfterStep.1x Align.1x \
-		Animate.1x AnimateTypes.1x Arrange.1x Audio.1x AudioEvents.1x \
-		AutoExec.1x BalloonContents.1x Base.1x Bevel.1x ColorScheme.1x \
+		Animate.1x AnimateTypes.1x Arrange.1x AutoExec.1x \
+		BalloonContents.1x Base.1x Bevel.1x ColorScheme.1x \
 		Feel.1x FeelWindowBox.1x Functions.1x Gravity.1x Look.1x \
 		MyBackground.1x MyFrame.1x MyStyle.1x Pager.1x \
-		PagerDecorations.1x Placement.1x SupportedHints.1x \
-		TbarLayout.1x Wharf.1x WharfFolders.1x WharfSounds.1x \
-		WinCommand.1x WinList.1x WinTabs.1x afterstep_faq.1x \
-		asimagexml.1x
-
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+		PagerDecorations.1x Placement.1x Sound.1x SoundEvents.1x \
+		SupportedHints.1x TbarLayout.1x Wharf.1x WharfFolders.1x \
+		WharfSounds.1x WinCommand.1x WinList.1x WinTabs.1x \
+		afterstep_faq.1x asimagexml.1x
 
 .if defined(WITH_DIFFERENT_LOOKNFEELS)
 CONFIGURE_ARGS+=	--enable-different-looknfeels
@@ -66,15 +61,14 @@ CONFIGURE_ARGS+=	--enable-different-looknfeels
 CONFIGURE_ARGS+=	--disable-savewindows
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700000
-BROKEN=		Does not build on FreeBSD 7.x and higher
-.endif
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not build on sparc64
+.if exists(${PREFIX}/share/gnome/wm-properties)
+PLIST_SUB+=	GNOME:=""
+.else
+PLIST_SUB+=	GNOME:="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	${CP} ${FILESDIR}/monitor_bsd.xpm \
 		${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm
@@ -101,14 +95,4 @@ post-patch:
 		${WRKSRC}/${file}
 .endfor
 
-post-build:
-	${MV} "${WRKSRC}/src/ASDocGen/man/Balloon Contents.man" \
-		"${WRKSRC}/src/ASDocGen/man/BalloonContents.man"
-	${MV} "${WRKSRC}/src/ASDocGen/html/Balloon Contents.html" \
-		"${WRKSRC}/src/ASDocGen/html/BalloonContents.html"
-	${MV} "${WRKSRC}/src/ASDocGen/man/Wharf Folders.man" \
-		"${WRKSRC}/src/ASDocGen/man/WharfFolders.man"
-	${MV} "${WRKSRC}/src/ASDocGen/html/Wharf Folders.html" \
-		"${WRKSRC}/src/ASDocGen/html/WharfFolders.html"
-
 .include <bsd.port.post.mk>
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index 9afb15586d12..f852555305e4 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1,3 +1,3 @@
-MD5 (AfterStep-2.2.7.tar.bz2) = 0a6018f7afd8aa7ac1555e9ff3944e3a
-SHA256 (AfterStep-2.2.7.tar.bz2) = 36a988205b01d6c082ea8e9c8b9b0a2cbc4da2c73e9eb52490578a359a04d7ff
-SIZE (AfterStep-2.2.7.tar.bz2) = 5935259
+MD5 (AfterStep-2.2.8.tar.bz2) = 8734622c9cb549f5baa8b3262312db70
+SHA256 (AfterStep-2.2.8.tar.bz2) = 59afbcdbaab3069e3d77973fcae1d870360ac21a981e4fcd45ca62121635c92d
+SIZE (AfterStep-2.2.8.tar.bz2) = 6101824
diff --git a/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in b/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in
index 546d86e36f53..3edb02a498eb 100644
--- a/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in
+++ b/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in
@@ -1,33 +1,20 @@
 $FreeBSD$
 
---- src/ASDocGen/Makefile.in.orig	Tue Dec 13 14:48:33 2005
-+++ src/ASDocGen/Makefile.in	Mon Jun 26 08:53:46 2006
-@@ -50,19 +50,19 @@
- 
- install.man:	$(PROG)
- 		@cd man; echo "Installing application man pages using command - " ; \
--		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_DIR)/html/<name>.1x\""; \
-+		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_DIR)/<name>.1x\""; \
+--- src/ASDocGen/Makefile.in.orig	2008-03-24 23:58:23.000000000 -0700
++++ src/ASDocGen/Makefile.in	2008-03-25 00:01:05.000000000 -0700
+@@ -55,14 +55,7 @@
  		for f in `ls *.man`; do \
  			page_name=`echo $$f| awk -F . '{print $$1}'`; \
  	  		echo -n "$$f "; \
 -	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
 -		done; echo "Done"; \
 -		cd API; echo "Installing API man pages using command - " ; \
--		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/html/<name>.3x\""; \
+-		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/<name>.3x\""; \
 -		for f in `ls *.man`; do \
 -			page_name=`echo $$f| awk -F . '{print $$1}'`; \
 -	  		echo -n "$$f "; \
 -	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
 +	  		$(INSTALL_DATA) "$$page_name.man" $(AFTER_MAN_DIR)/$$page_name.1x; \
  		done; echo "Done"; \
-+#		cd API; echo "Installing API man pages using command - " ; \
-+#		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/html/<name>.3x\""; \
-+#		for f in `ls *.man`; do \
-+#			page_name=`echo $$f| awk -F . '{print $$1}'`; \
-+#	  		echo -n "$$f "; \
-+#	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
-+#		done; echo "Done"; \
  		cd ../..
  
- install.data_html:  do_compile
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 724f7ae6b880..9610f75465d7 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1142,8 +1142,6 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/Animate.html
 %%DATADIR%%/doc/html/AnimateTypes.html
 %%DATADIR%%/doc/html/Arrange.html
-%%DATADIR%%/doc/html/Audio.html
-%%DATADIR%%/doc/html/AudioEvents.html
 %%DATADIR%%/doc/html/AutoExec.html
 %%DATADIR%%/doc/html/BalloonContents.html
 %%DATADIR%%/doc/html/Base.html
@@ -1161,6 +1159,8 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/Pager.html
 %%DATADIR%%/doc/html/PagerDecorations.html
 %%DATADIR%%/doc/html/Placement.html
+%%DATADIR%%/doc/html/Sound.html
+%%DATADIR%%/doc/html/SoundEvents.html
 %%DATADIR%%/doc/html/SupportedHints.html
 %%DATADIR%%/doc/html/TbarLayout.html
 %%DATADIR%%/doc/html/Wharf.html
@@ -1263,6 +1263,7 @@ lib/libAfterStep.a
 %%DATADIR%%/scripts/ScreenDump
 %%DATADIR%%/scripts/ScreenSetup
 %%DATADIR%%/scripts/ScreenSetup2
+%%DATADIR%%/sound
 %%DATADIR%%/standard_categories
 %%DATADIR%%/start/.include
 %%DATADIR%%/start/0_Applications/.include
@@ -1364,9 +1365,10 @@ lib/libAfterStep.a
 %%DATADIR%%/wharf
 %%DATADIR%%/winlist
 %%DATADIR%%/wintabs
-share/gnome/wm-properties/AfterStep.desktop
+%%GNOME:%%share/gnome/wm-properties/AfterStep.desktop
 share/xsessions/AfterStep.desktop
-@dirrm share/xsessions
+@dirrmtry share/xsessions
+%%GNOME:%%@dirrmtry share/gnome/wm-properties
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/start/7_About_AfterStep
 @dirrm %%DATADIR%%/start/5_Quit