Upgrade to 1.8.11.

Replace two patches with regex in Makefile.

PR:		36898
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 10 insertions, 30 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index be39bdcae88d..1499aee01870 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	1.8.9
+PORTVERSION=	1.8.11
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	stable
@@ -22,17 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4" CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-png-includes="${LOCALBASE}/include" \
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--enable-i18n \
+		--with-png-includes="${LOCALBASE}/include" \
 		--with-png-libs="${LOCALBASE}/lib" \
 		--with-jpeg-includes="${LOCALBASE}/include" \
 		--with-jpeg-libs="${LOCALBASE}/lib" \
 		--with-helpcommand="xterm -e man"
 
-.if defined(WITH_I18N)
-CONFIGURE_ARGS+=	--enable-i18n
-.endif
-
 .if defined(WITH_DIFFERENT_LOOKNFEELS)
 CONFIGURE_ARGS+=	--enable-different-looknfeels
 .endif
@@ -46,6 +44,10 @@ MAN1=	Animate.1x Audio.1x Banner.1x Cascade.1x Clean.1x Form.1x Gnome.1x \
 	WinList.1x Zharf.1x afterstep.1x asetroot.1x
 
 post-patch:
+.for file in wharf.in zharf.in
+	${PERL} -pi -e 's,linux_penguin,monitor_bsd,' \
+		${WRKSRC}/afterstep/${file}
+.endfor
 	${PERL} -pi.orig -e 's,/usr/X11/,${X11BASE}/,' \
 		${WRKSRC}/src/afterstep/afterstep.man
 
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index e71958376774..83dae5e245fe 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1 +1 @@
-MD5 (AfterStep-1.8.9.tar.bz2) = e745f5d7ac2923faba8e9c3c5d4425be
+MD5 (AfterStep-1.8.11.tar.bz2) = 6d8b41b7a642105b4cafc4d3d5f12a46
diff --git a/x11-wm/afterstep-stable/files/patch-aa b/x11-wm/afterstep-stable/files/patch-aa
deleted file mode 100644
index e03e6db0470e..000000000000
--- a/x11-wm/afterstep-stable/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- afterstep/wharf.in.orig	Wed Jul 11 22:00:23 2001
-+++ afterstep/wharf.in	Wed Jul 11 22:01:09 2001
-@@ -99,7 +99,7 @@
- #
- *Wharf Applications FileFolders.xpm,3_dots.xpm Folders
-  #*Wharf Files Computer.xpm Exec "-" Files &
-- *Wharf xterm linux-penguin.xpm Exec "-" (exec aterm) || (exec xterm) &
-+ *Wharf xterm monitor_bsd.xpm Exec "-" (exec aterm) || (exec xterm) &
- 
-  *Wharf Helpme Info.xpm,3_dots.xpm Folders
-         *Wharf xman Bookshelf.xpm Exec "-" xman &
diff --git a/x11-wm/afterstep-stable/files/patch-ab b/x11-wm/afterstep-stable/files/patch-ab
deleted file mode 100644
index 867109517a02..000000000000
--- a/x11-wm/afterstep-stable/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- afterstep/zharf.in.orig	Tue Jul 27 11:38:01 1999
-+++ afterstep/zharf.in	Mon Sep 27 12:11:45 1999
-@@ -26,7 +26,7 @@
- *Zharf Disk	-		Swallow "asfsm" asfsm_lite -bg Grey30 -fg Grey70 -bp None -pbg Grey30 -pfg Grey70 -pbp None
- *Zharf Start 	Start.xpm	Popup "0"
- *Zharf Swap	Install.xpm	WindowList
--*Zharf Xiterm	linux-penguin.xpm Exec "xiterm" xterm -fg wheat -bg black &
-+*Zharf Xterm	monitor_bsd.xpm Exec "xterm" xterm -fg wheat -bg black &
- *Zharf Netscape netscape.xpm    Exec "netscape" netscape &
- *Zharf(3x1) -	whatever	SwallowModule "Pager" Pager 0 @with_desktops_1@
- *Zharf Quit?	RedFire.xpm	Module "QuitForm" Form QuitForm