Gentlemen,
I am submitting this update for the evilwm-0.99.18 port. This should
bring the version to the most recent.
It should also be noted that I am relinquishing the maintainership of
evilwm to Victor Sahlstedt (salan at legonet dot org). So, if there are
any objections to the patch, please contact him in regards to that.
David Snyder
Patch of evilwn-0.99.18 follows:
=================================
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 17 Dec 2004 15:18:32 -0000 1.7
+++ Makefile 20 Sep 2005 08:25:30 -0000
@@ -2,13 +2,12 @@
COMMENT= "minimalist window manager for the X Window System"
-V= 0.99.17
-DISTNAME= evilwm-${V}.orig
-PKGNAME= evilwm-${V}
+DISTNAME= evilwm-0.99.18
CATEGORIES= x11
-HOMEPAGE= http://evilwm.sourceforge.net/
-MAINTAINER= David Snyder <[EMAIL PROTECTED]>
+HOMEPAGE= http://www.6809.org.uk/evilwm/
+
+MAINTAINER= Victor Sahlstedt <[EMAIL PROTECTED]>
# 9wm license
PERMIT_PACKAGE_CDROM= Yes
@@ -17,11 +16,9 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=evilwm/}
-DISTFILES= evilwm_${V}.orig.tar.gz
+MASTER_SITES= ${HOMEPAGE}
USE_X11= Yes
-ALL_TARGET= allinone
MAKE_FLAGS= XROOT='${X11BASE}' CC='${CC}'
FAKE_FLAGS= prefix='${WRKINST}${PREFIX}'
@@ -34,6 +31,5 @@
${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.vdesk ${DOCDIR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/evilwm/distinfo,v
retrieving revision 1.5diff -u -r1.5 distinfo
--- distinfo 5 Jan 2005 17:53:53 -0000 1.5
+++ distinfo 20 Sep 2005 08:25:30 -0000
@@ -1,4 +1,4 @@
-MD5 (evilwm_0.99.17.orig.tar.gz) = 2d9ae76a172240a1ba7e359d9aae41aa
-RMD160 (evilwm_0.99.17.orig.tar.gz) =
b001d44860bd043bc2244d2bd641d3a712ffd4de
-SHA1 (evilwm_0.99.17.orig.tar.gz) =
3e5d4f8cf24cad800e8670f6c65c177c89304585
-SIZE (evilwm_0.99.17.orig.tar.gz) = 24147
+MD5 (evilwm-0.99.18.tar.gz) = af8a9d4bb1167fd546cde99ac6e1a820
+RMD160 (evilwm-0.99.18.tar.gz) = 16cb77abf6422b64ea3edee3781fc7623ed4f5d7
+SHA1 (evilwm-0.99.18.tar.gz) = a7f9f2acac87c182752050024bffc52e35aa9614
+SIZE (evilwm-0.99.18.tar.gz) = 25688
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- patches/patch-Makefile 5 Jul 2003 18:25:54 -0000 1.3
+++ patches/patch-Makefile 20 Sep 2005 08:25:30 -0000
@@ -1,21 +1,20 @@
-$OpenBSD: patch-Makefile,v 1.3 2003/07/05 18:25:54 sturm Exp $
---- Makefile.orig Thu Dec 5 15:35:00 2002
-+++ Makefile Thu Feb 20 21:48:10 2003
-@@ -22,7 +22,7 @@ DEFINES += -DINFOBANNER
+--- Makefile.orig Thu Sep 15 00:30:44 2005
++++ Makefile Tue Sep 20 11:06:18 2005
+@@ -25,7 +25,7 @@ DEFINES += -DINFOBANNER
# Use Motif hints to find if a window should be borderless.
# To use this option, you need to have the Motif development files
installed.
-DEFINES += -DMWM_HINTS
+#DEFINES += -DMWM_HINTS
- # To support virtual desktops, uncomment one or both of the following
2 lines.
+ # To support virtual desktops, uncomment the following line.
DEFINES += -DVWM
-@@ -66,7 +66,7 @@ disttar = evilwm_$(version).$(revision).
- #DEFINES += -DXDEBUG # show some X calls
+@@ -67,7 +67,7 @@ distname = evilwm-$(version)
+ DEFINES += -DXDEBUG # show some X calls
- DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN)
+ DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
-CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall
+CFLAGS += $(INCLUDES) $(DEFINES)
#CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall
+ CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align
-Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline
-Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes
-Wredundant-decls
LDFLAGS += $(LDPATH) $(LIBS)
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/evilwm/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 19:26:28 -0000 1.3
+++ pkg/PLIST 20 Sep 2005 08:25:30 -0000
@@ -3,4 +3,3 @@
@man man/man1/evilwm.1
share/doc/evilwm/
share/doc/evilwm/README
-share/doc/evilwm/README.vdesk
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 17 Dec 2004 15:18:32 -0000 1.7
+++ Makefile 20 Sep 2005 08:25:30 -0000
@@ -2,13 +2,12 @@
COMMENT= "minimalist window manager for the X Window System"
-V= 0.99.17
-DISTNAME= evilwm-${V}.orig
-PKGNAME= evilwm-${V}
+DISTNAME= evilwm-0.99.18
CATEGORIES= x11
-HOMEPAGE= http://evilwm.sourceforge.net/
-MAINTAINER= David Snyder <[EMAIL PROTECTED]>
+HOMEPAGE= http://www.6809.org.uk/evilwm/
+
+MAINTAINER= Victor Sahlstedt <[EMAIL PROTECTED]>
# 9wm license
PERMIT_PACKAGE_CDROM= Yes
@@ -17,11 +16,9 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=evilwm/}
-DISTFILES= evilwm_${V}.orig.tar.gz
+MASTER_SITES= ${HOMEPAGE}
USE_X11= Yes
-ALL_TARGET= allinone
MAKE_FLAGS= XROOT='${X11BASE}' CC='${CC}'
FAKE_FLAGS= prefix='${WRKINST}${PREFIX}'
@@ -34,6 +31,5 @@
${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.vdesk ${DOCDIR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/evilwm/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Jan 2005 17:53:53 -0000 1.5
+++ distinfo 20 Sep 2005 08:25:30 -0000
@@ -1,4 +1,4 @@
-MD5 (evilwm_0.99.17.orig.tar.gz) = 2d9ae76a172240a1ba7e359d9aae41aa
-RMD160 (evilwm_0.99.17.orig.tar.gz) = b001d44860bd043bc2244d2bd641d3a712ffd4de
-SHA1 (evilwm_0.99.17.orig.tar.gz) = 3e5d4f8cf24cad800e8670f6c65c177c89304585
-SIZE (evilwm_0.99.17.orig.tar.gz) = 24147
+MD5 (evilwm-0.99.18.tar.gz) = af8a9d4bb1167fd546cde99ac6e1a820
+RMD160 (evilwm-0.99.18.tar.gz) = 16cb77abf6422b64ea3edee3781fc7623ed4f5d7
+SHA1 (evilwm-0.99.18.tar.gz) = a7f9f2acac87c182752050024bffc52e35aa9614
+SIZE (evilwm-0.99.18.tar.gz) = 25688
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- patches/patch-Makefile 5 Jul 2003 18:25:54 -0000 1.3
+++ patches/patch-Makefile 20 Sep 2005 08:25:30 -0000
@@ -1,21 +1,20 @@
-$OpenBSD: patch-Makefile,v 1.3 2003/07/05 18:25:54 sturm Exp $
---- Makefile.orig Thu Dec 5 15:35:00 2002
-+++ Makefile Thu Feb 20 21:48:10 2003
-@@ -22,7 +22,7 @@ DEFINES += -DINFOBANNER
+--- Makefile.orig Thu Sep 15 00:30:44 2005
++++ Makefile Tue Sep 20 11:06:18 2005
+@@ -25,7 +25,7 @@ DEFINES += -DINFOBANNER
# Use Motif hints to find if a window should be borderless.
# To use this option, you need to have the Motif development files installed.
-DEFINES += -DMWM_HINTS
+#DEFINES += -DMWM_HINTS
- # To support virtual desktops, uncomment one or both of the following 2 lines.
+ # To support virtual desktops, uncomment the following line.
DEFINES += -DVWM
-@@ -66,7 +66,7 @@ disttar = evilwm_$(version).$(revision).
- #DEFINES += -DXDEBUG # show some X calls
+@@ -67,7 +67,7 @@ distname = evilwm-$(version)
+ DEFINES += -DXDEBUG # show some X calls
- DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN)
+ DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
-CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall
+CFLAGS += $(INCLUDES) $(DEFINES)
#CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall
+ CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual
-Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef
-Wsign-compare -Wmissing-prototypes -Wredundant-decls
LDFLAGS += $(LDPATH) $(LIBS)
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/evilwm/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 19:26:28 -0000 1.3
+++ pkg/PLIST 20 Sep 2005 08:25:30 -0000
@@ -3,4 +3,3 @@
@man man/man1/evilwm.1
share/doc/evilwm/
share/doc/evilwm/README
-share/doc/evilwm/README.vdesk