Update to version 1.0.14.

This release adds Croatian and Polish language files.
The day and week patches have been integrated, as has Debian's
nopolling patch.
Take ownership of the port since I now maintain the upstream code.

Discussed with: garga

5 files changed, 20 insertions, 47 deletions

diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 6666de03daf2..ffaa12b3c6d5 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	wmclock
-PORTVERSION=	1.0.12.2
-PORTREVISION=	3
+PORTVERSION=	1.0.14
 CATEGORIES=	x11-clocks windowmaker
-MASTER_SITES=	http://www.jmknoble.net/WindowMaker/wmclock/ \
+MASTER_SITES=	http://www.bluestop.org/wmclock/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 
-PATCH_SITES=	http://www.jmknoble.net/WindowMaker/wmclock/
-PATCHFILES=	wmclock_nopolling.patch.gz
-
-MAINTAINER=	garga@FreeBSD.org
+MAINTAINER=	brucec@FreeBSD.org
 COMMENT=	A dockable clock applet for Window Maker
 
 USE_IMAKE=	yes
@@ -24,7 +20,20 @@ MAKE_JOBS_SAFE=	yes
 USE_XORG=	xpm
 MAN1=		wmclock.1
 PLIST_FILES=	bin/wmclock
+WMCLOCK_LANG?=	english
 
-HAS_CONFIGURE=	yes
+pre-configure:
+	(cd ${WRKSRC}; \
+	${WRKSRC}/configure --lang ${WMCLOCK_LANG} > /dev/null )
+	@${ECHO_MSG} "You can choose which language to use by "
+	@${ECHO_MSG} "setting the WMCLOCK_LANG variable to one "
+	@${ECHO_MSG} "of the following values (default: english):"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "breton croatian czech danish dutch english"
+	@${ECHO_MSG} "french french2 german hungarian indonesian"
+	@${ECHO_MSG} "italian norwegian polish portuguese russian"
+	@${ECHO_MSG} "slovene spanish swedish ukrainian"
+	@${ECHO_MSG} "Example: \"make WMCLOCK_LANG=french\""
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/wmclock/distinfo b/x11-clocks/wmclock/distinfo
index 0041d71f2826..1649adc188e3 100644
--- a/x11-clocks/wmclock/distinfo
+++ b/x11-clocks/wmclock/distinfo
@@ -1,6 +1,2 @@
-MD5 (wmclock-1.0.12.2.tar.gz) = 97f6e82f55f216ba724859d4652586b4
-SHA256 (wmclock-1.0.12.2.tar.gz) = 08a9d9b9bca1d9d366f184d607025959d99253ab5ae274ae23689c7ea6593c30
-SIZE (wmclock-1.0.12.2.tar.gz) = 40395
-MD5 (wmclock_nopolling.patch.gz) = 058df910ce146090db4dcbc92c184ff5
-SHA256 (wmclock_nopolling.patch.gz) = 3736a3df2971fb4a275dd50554b65dad12a6c8549e6f2531fd61741c65d3fad3
-SIZE (wmclock_nopolling.patch.gz) = 930
+SHA256 (wmclock-1.0.14.tar.gz) = 4dac9985b60fa1a131743b64e2c5fd45dac23fb7405ce715c287f7e9c66bd250
+SIZE (wmclock-1.0.14.tar.gz) = 38383
diff --git a/x11-clocks/wmclock/files/patch-weekday.xpm b/x11-clocks/wmclock/files/patch-weekday.xpm
deleted file mode 100644
index 67c67f061af9..000000000000
--- a/x11-clocks/wmclock/files/patch-weekday.xpm
+++ /dev/null
@@ -1,16 +0,0 @@
---- lang.english/weekday.xpm.orig	Tue Mar  7 22:56:36 2000
-+++ lang.english/weekday.xpm
-@@ -27,11 +27,11 @@
- "b..bb..b.bbbbb.bbb.b",
- "b.bbbb.b.....b....bb",
- "bbbbbbbbbbbbbbbbbbbb",
--"b.....b.bbb.b.....bb",
-+"b.....b.bbb.b.bbbb.b",
- "bbb.bbb.bbb.b.bbbb.b",
--"bbb.bbb.....b.....bb",
--"bbb.bbb.bbb.b.bbb.bb",
-+"bbb.bbb.....b.bbbb.b",
- "bbb.bbb.bbb.b.bbbb.b",
-+"bbb.bbb.bbb.bb....bb",
- "bbbbbbbbbbbbbbbbbbbb",
- "b.....b.....bb.....b",
diff --git a/x11-clocks/wmclock/files/patch-wmclock.c b/x11-clocks/wmclock/files/patch-wmclock.c
deleted file mode 100644
index 1b5746a38570..000000000000
--- a/x11-clocks/wmclock/files/patch-wmclock.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- wmclock.c.orig	Tue Mar  7 23:31:33 2000
-+++ wmclock.c	
-@@ -470,11 +470,11 @@
-    XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
- 	     digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
- 	     xPos[DIGIT_1_X_POS], yPos[DIGIT_Y_POS]);
--   digitXOffset = LED_NUM_WIDTH * (year % 1000);
-+   digitXOffset = LED_NUM_WIDTH * ((year / 100) % 10);
-    XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
- 	     digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
- 	     xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
--   digitXOffset = LED_NUM_WIDTH * (year % 100);
-+   digitXOffset = LED_NUM_WIDTH * ((year / 10) % 10);
-    XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
- 	     digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
- 	     xPos[DIGIT_3_X_POS], yPos[DIGIT_Y_POS]);
diff --git a/x11-clocks/wmclock/pkg-descr b/x11-clocks/wmclock/pkg-descr
index d56afaf8991c..24cd460f5676 100644
--- a/x11-clocks/wmclock/pkg-descr
+++ b/x11-clocks/wmclock/pkg-descr
@@ -5,4 +5,4 @@ manager and features multiple language support, twenty-four-hour
 and twelve-hour (am/pm) time display, and, optionally, can run a
 user-specified program on a mouse click.
 
-WWW: http://www.jmknoble.net/WindowMaker/wmclock/
+WWW: http://www.bluestop.org/wmclock/