1: Upgrade to 1.0.15.

2: set language as config options.

PR:		197461
Submitted by:	Ports Fury.

2 files changed, 50 insertions, 23 deletions

diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index ac2c6e1f4d82..1fa90c189c6f 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -2,32 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	wmclock
-PORTVERSION=	1.0.14
+PORTVERSION=	1.0.15
 CATEGORIES=	x11-clocks windowmaker
-MASTER_SITES=	http://www.bluestop.org/wmclock/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	DEBIAN
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockable clock applet for Window Maker
 
-USES=		imake
+LICENSE=	GPLv2 # (or later)
+
+WRKSRC=		${WRKDIR}/dockapps
+
+USES=		pkgconfig
 USE_XORG=	xpm
-PLIST_FILES=	bin/wmclock man/man1/${PORTNAME}.1.gz
-WMCLOCK_LANG?=	english
-
-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}
+USE_AUTOTOOLS=	aclocal automake autoconf
+AUTOMAKE_ARGS=	--add-missing --copy
+
+OPTIONS_SINGLE=		NLS
+OPTIONS_SINGLE_NLS=	LANG_BR LANG_CS LANG_DA LANG_DE LANG_ES \
+			LANG_FR LANG_FR_ALT LANG_HR LANG_HU LANG_ID \
+			LANG_IT LANG_NB LANG_NL LANG_PL LANG_PT \
+			LANG_RU LANG_SL LANG_SV LANG_US LANG_UK
+OPTIONS_DEFAULT=	LANG_US
+
+LANG_BR_CONFIGURE_ON=	--with-lang=breton
+LANG_CS_CONFIGURE_ON=	--with-lang=czech
+LANG_DA_CONFIGURE_ON=	--with-lang=danish
+LANG_DE_CONFIGURE_ON=	--with-lang=german
+LANG_ES_CONFIGURE_ON=	--with-lang=spanish
+LANG_FR_CONFIGURE_ON=	--with-lang=french
+LANG_FR_ALT_DESC=	French (alternative) language support
+LANG_FR_ALT_CONFIGURE_ON=	--with-lang=french2
+LANG_HR_CONFIGURE_ON=	--with-lang=croatian
+LANG_HU_CONFIGURE_ON=	--with-lang=hungarian
+LANG_ID_CONFIGURE_ON=	--with-lang=indonesian
+LANG_IT_CONFIGURE_ON=	--with-lang=italian
+LANG_NB_CONFIGURE_ON=	--with-lang=norwegian
+LANG_NL_CONFIGURE_ON=	--with-lang=dutch
+LANG_PL_CONFIGURE_ON=	--with-lang=polish
+LANG_PT_CONFIGURE_ON=	--with-lang=portuguese
+LANG_RU_CONFIGURE_ON=	--with-lang=russian
+LANG_SL_CONFIGURE_ON=	--with-lang=slovene
+LANG_SV_CONFIGURE_ON=	--with-lang=swedish
+LANG_US_CONFIGURE_ON=	--with-lang=english
+LANG_UK_CONFIGURE_ON=	--with-lang=ukrainian
+
+PORTDATA=	*
+PLIST_FILES=	bin/wmclock man/man1/wmclock.1.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|mois_xpm|month_xpm|' ${WRKSRC}/lang.french2/month.xpm
+	@${REINPLACE_CMD} -e \
+		's|jours|weekday_xpm|' ${WRKSRC}/lang.french2/weekday.xpm
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/wmclock/distinfo b/x11-clocks/wmclock/distinfo
index 6d15c3de3462..227acab95a52 100644
--- a/x11-clocks/wmclock/distinfo
+++ b/x11-clocks/wmclock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wmclock-1.0.14.tar.gz) = 9a05bd547bb1f855ea75374cfada9f14ef90592246362a91dcb2c580550db64d
-SIZE (wmclock-1.0.14.tar.gz) = 38311
+SHA256 (wmclock_1.0.15.orig.tar.gz) = 16c9c604d8185f3359147001f945037ea50cea9e95a9126862f8de1036abd45c
+SIZE (wmclock_1.0.15.orig.tar.gz) = 35246