- Update to 0.99.24

- Cleanup

PR:		95042
Submitted by:	Robert <robert@blacquiere.nl>

4 files changed, 20 insertions, 74 deletions

diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 7b674817c704..f2a627c60ef4 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -5,45 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=		evilwm
-PORTVERSION=		0.99.17
-CATEGORIES=		x11-wm
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
+PORTNAME=	evilwm
+PORTVERSION=	0.99.24
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Minimalist window manager based on 9wm
 
-DOCDIR=		share/doc/${PORTNAME}
-DOCS=		ChangeLog README README.vdesk TODO
-MAN1=		evilwm.1
-PLIST=		${WRKDIR}/pkg-plist
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
+USE_GCC=	3.4+
 
-do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include \
-		-DMOUSE -DSTDIO -DSOLIDDRAG -DCOLOURMAP -DVWM \
-		-DVERSION="\"${PORTVERSION}\"" \
-		-L${X11BASE}/lib -o evilwm *.c -lX11
+MAN1=		evilwm.1
+PLIST_FILES=	bin/evilwm
+PORTDOCS=	ChangeLog README TODO
 
-pre-install:
-	${ECHO_CMD} bin/evilwm > ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
+CFLAGS+=	-I${X11BASE}/include
+
+post-patch:
+	@${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-wm/evilwm/distinfo b/x11-wm/evilwm/distinfo
index 94fe21b9773a..88cf2457b4f3 100644
--- a/x11-wm/evilwm/distinfo
+++ b/x11-wm/evilwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (evilwm_0.99.17.orig.tar.gz) = 2d9ae76a172240a1ba7e359d9aae41aa
-SHA256 (evilwm_0.99.17.orig.tar.gz) = 7d1e2ddcddd7005ac62f2544a7a21159dacda7391feb251a8080fdffe882616d
-SIZE (evilwm_0.99.17.orig.tar.gz) = 24147
+MD5 (evilwm-0.99.24.tar.gz) = e8f32e5be669b751b66c32fb2b0c018b
+SHA256 (evilwm-0.99.24.tar.gz) = 15b5613dde5c8ffd7961b9f62941e3ac0f434a3c4a43dad9626788295e77102a
+SIZE (evilwm_0.99.17.orig.tar.gz) = 28148
diff --git a/x11-wm/evilwm/files/patch-Makefile b/x11-wm/evilwm/files/patch-Makefile
deleted file mode 100644
index e5db34f64331..000000000000
--- a/x11-wm/evilwm/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-$FreeBSD$
-
---- Makefile.orig	Wed Oct 15 11:48:23 2003
-+++ Makefile	Fri Oct 24 04:51:32 2003
-@@ -1,5 +1,5 @@
- # If you don't use CC 
--CC       = gcc
-+CC?       = gcc
- 
- # Edit this line if you don't want evilwm to install under /usr.
- # Note that $(DESTDIR) is used by the Debian build process.
-@@ -26,7 +26,7 @@
- 
- # To support virtual desktops, uncomment one or both of the following 2 lines.
- DEFINES += -DVWM
--#DEFINES += -DVDESK
-+DEFINES += -DVDESK
- # VWM enables the built-in virtual desktop code and VDESK allows the use
- # of the extern pager program "vdesk".
- #
diff --git a/x11-wm/evilwm/files/patch-main.c b/x11-wm/evilwm/files/patch-main.c
deleted file mode 100644
index c399d503e363..000000000000
--- a/x11-wm/evilwm/files/patch-main.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- main.c.orig	Wed Oct 15 13:48:23 2003
-+++ main.c	Sun Aug 22 22:32:26 2004
-@@ -37,9 +37,7 @@
- const char	*opt_fc = DEF_FC;
- int		vdesk = KEY_TO_VDESK(XK_1);
- #endif
--#ifdef SNAP
- int		opt_snap = 0;
--#endif
- #ifdef SHAPE
- int		have_shape, shape_event;
- #endif
-@@ -159,6 +157,7 @@
- 					handle_shape_event((XShapeEvent *)&ev);
- 				}
- #endif
-+			break;
- 		}
- 	}
- 	return 1;