- Fix build with gcc4

- Support USE_BDB

PR:		114078
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 42 insertions, 21 deletions

diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index 687f344..593c5bd 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -14,34 +14,19 @@ MASTER_SITES=	http://www.nongnu.org/epiwm/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another fast, small, configurable window manager
 
-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif
-
-CONFIG=		icons key menu start style window workspace
-DOCS=		AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \
-		README TODO
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
 
 post-patch:
-	${REINPLACE_CMD} 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
-	    ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for ii in ${DOCS}
+	@${MKDIR} ${DOCSDIR}
+.for ii in AUTHORS BUGS ChangeLog EPIwm-0.5.6.lsm COPYING INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c b/x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c
new file mode 100644
index 0000000..af15733
--- /dev/null
+++ b/x11-wm/epiwm/files/patch-modules__logoepiwm__logoEPIwm.c
@@ -0,0 +1,10 @@
+--- modules/logoepiwm/logoEPIwm.c.orig	Sat Feb  3 08:53:20 2001
++++ modules/logoepiwm/logoEPIwm.c	Sun Jun 24 01:06:40 2007
+@@ -1,6 +1,7 @@
+ /* This is logoEPIwm */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
diff --git a/x11-wm/epiwm/files/patch-src__key.c b/x11-wm/epiwm/files/patch-src__key.c
new file mode 100644
index 0000000..86c1d61
--- /dev/null
+++ b/x11-wm/epiwm/files/patch-src__key.c
@@ -0,0 +1,13 @@
+--- src/key.c.orig	Sat Feb  3 08:53:20 2001
++++ src/key.c	Sun Jun 24 01:04:43 2007
+@@ -50,8 +50,8 @@
+     tokens[i] = NULL;
+   i = 0;
+   strncpy(tmpstring, line, 100);
+-  (char *) tokens[i] = (char *) strtok(tmpstring, "+");
+-  while (((char *) tokens[++i] = (char *) strtok(NULL, "+")));
++  tokens[i] = (char *) strtok(tmpstring, "+");
++  while ((tokens[++i] = (char *) strtok(NULL, "+")));
+   tokens[i] = NULL;
+   return (tokens[index]);
+ }
diff --git a/x11-wm/epiwm/files/patch-src__style_init.c b/x11-wm/epiwm/files/patch-src__style_init.c
new file mode 100644
index 0000000..a40c399
--- /dev/null
+++ b/x11-wm/epiwm/files/patch-src__style_init.c
@@ -0,0 +1,13 @@
+--- src/style_init.c.orig	Sat Feb  3 08:53:20 2001
++++ src/style_init.c	Sun Jun 24 01:05:45 2007
+@@ -77,8 +77,8 @@
+     tokens[i] = NULL;
+   i = 0;
+   strncpy(tmpstring, line, 100);
+-  (char *) tokens[i] = (char *) strtok(tmpstring, "\"");
+-  while (((char *) tokens[++i] = (char *) strtok(NULL, "\"")));
++  tokens[i] = (char *) strtok(tmpstring, "\"");
++  while ((tokens[++i] = (char *) strtok(NULL, "\"")));
+   tokens[i] = NULL;
+   return (tokens[index]);
+ }