- Fix dependency.

- Fix a build breakage when -fno-common is specified.
- Regenerate patch files.
- Move the directory creation for DOCSDIR to pre-install.

5 files changed, 45 insertions, 9 deletions

diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index 4a9f1e0be650..9571997d17a2 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmCalClock
 PORTVERSION=	1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://jmpacquet.free.fr/wmcalclock/
 
@@ -14,16 +14,18 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 USES=		xorg
-USE_XORG=	xpm
+USE_XORG=	x11 xext xpm
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 PLIST_FILES=	bin/wmCalClock man/man1/${PORTNAME}.1.gz
 PORTDOCS=	BUGS CHANGES HINTS INSTALL README TODO
 
 OPTIONS_DEFINE=	DOCS
 
-post-install-DOCS-on:
+pre-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
 	cd ${WRKDIR}/${DISTNAME} && \
-		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	    ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/wmcalclock/files/patch-Makefile b/x11-clocks/wmcalclock/files/patch-Makefile
index ad95d47891af..d16bea2c32bd 100644
--- a/x11-clocks/wmcalclock/files/patch-Makefile
+++ b/x11-clocks/wmcalclock/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	1999-03-27 14:46:38.000000000 +0800
-+++ Makefile	2014-01-11 20:07:37.000000000 +0800
+--- Makefile.orig	1999-03-27 06:46:38 UTC
++++ Makefile
 @@ -1,8 +1,7 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
diff --git a/x11-clocks/wmcalclock/files/patch-wmCalClock.c b/x11-clocks/wmcalclock/files/patch-wmCalClock.c
index 227ac30c0ff4..2d34145b1e49 100644
--- a/x11-clocks/wmcalclock/files/patch-wmCalClock.c
+++ b/x11-clocks/wmcalclock/files/patch-wmCalClock.c
@@ -1,6 +1,6 @@
---- wmCalClock.c.orig	Wed May 21 03:34:04 2003
-+++ wmCalClock.c	Wed May 21 03:34:07 2003
-@@ -299,7 +299,7 @@
+--- wmCalClock.c.orig	2002-10-06 07:51:10 UTC
++++ wmCalClock.c
+@@ -330,7 +330,7 @@ int main(int argc, char *argv[]) {
      int			i, n, wid, extrady, extradx;
      int 		Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth;
      int			Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize;
diff --git a/x11-clocks/wmcalclock/files/patch-xutils.c b/x11-clocks/wmcalclock/files/patch-xutils.c
new file mode 100644
index 000000000000..3b2bcdff3556
--- /dev/null
+++ b/x11-clocks/wmcalclock/files/patch-xutils.c
@@ -0,0 +1,15 @@
+--- xutils.c.orig	1999-03-27 06:46:38 UTC
++++ xutils.c
+@@ -39,7 +39,11 @@
+ #include <X11/extensions/shape.h>
+ #include "xutils.h"
+ 
+-
++Display		*display;
++Window		Root;
++Window		iconwin, win;
++int		screen;
++int		DisplayDepth;
+ 
+ /*
+  *   X11 Variables 
diff --git a/x11-clocks/wmcalclock/files/patch-xutils.h b/x11-clocks/wmcalclock/files/patch-xutils.h
new file mode 100644
index 000000000000..29a7d79dc101
--- /dev/null
+++ b/x11-clocks/wmcalclock/files/patch-xutils.h
@@ -0,0 +1,19 @@
+--- xutils.h.orig	1999-03-27 06:46:38 UTC
++++ xutils.h
+@@ -18,11 +18,11 @@ typedef struct {
+ /*
+  *   Global variable
+  */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display		*display;
++extern Window          Root;
++extern Window          iconwin, win;
++extern int             screen; 
++extern int             DisplayDepth;
+ 
+ 
+