Index: head/misc/wmweather+/Makefile
===================================================================
--- head/misc/wmweather+/Makefile	(revision 532960)
+++ head/misc/wmweather+/Makefile	(revision 532961)
@@ -1,83 +1,82 @@
 # Created by: Harald Wille <harald.wille@students.jku.at>
 # $FreeBSD$
 
 PORTNAME=	wmweather+
-PORTVERSION=	2.17
-PORTREVISION=	1
+PORTVERSION=	2.18
 CATEGORIES=	misc windowmaker geography
 MASTER_SITES=	SF/wmweatherplus/wmweather%2B/ \
 		SF/nemysisfreebsdp/misc/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Displays current conditions and forecasts with icons and text
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
 		libtiff.so:graphics/tiff \
 		libHermes.so:graphics/Hermes \
 		libpng.so:graphics/png \
-		libgif.so:graphics/giflib
+		libgif.so:graphics/giflib \
+		libwraster.so:x11-wm/libwraster
 
-WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
-
 USES=		iconv jpeg xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwraster=${LOCALBASE} \
 		--with-libpcre=${LOCALBASE} \
 		--with-libcurl=${LOCALBASE} \
 		--with-xpm-includes=${LOCALBASE} \
 		--with-xpm-libraries=${LOCALBASE}
 USE_XORG=	x11 xext xpm sm ice
 LDFLAGS+=	-lm
 
+WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
+
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		share/pixmaps/${PORTNAME}.png
 
 PORTDOCS=	ChangeLog README
 PORTEXAMPLES=	HINTS example.conf
 
 DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \
 		"${PORTNAME}" "System;Monitor;" ""
 
 OPTIONS_DEFINE=	DOCS EXAMPLES WM
 WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
 
 WM_LIB_DEPENDS=		libWMaker.so:x11-wm/windowmaker
-WM_LIB_DEPENDS_OFF=	libwraster.so:x11-wm/libwraster
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's| __THROW __attribute__ ((__noreturn__))||' \
 		-e 's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
 		-e 's|"/etc/wmweather+.conf"|"${PREFIX}/etc/wmweather+.conf"|' \
 		${WRKSRC}/${PORTNAME}.c
 	@${REINPLACE_CMD} \
 		-e 's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
 		-e 's|/etc/wmweather+.conf|${PREFIX}/etc/wmweather+.conf|' \
-		${WRKSRC}/${PORTNAME}.1.in
+		${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/misc/wmweather+/distinfo
===================================================================
--- head/misc/wmweather+/distinfo	(revision 532960)
+++ head/misc/wmweather+/distinfo	(revision 532961)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1516689652
-SHA256 (wmweather+-2.17.tar.gz) = f547b7df482e086e8c917b69261595be2a73f39793e28826678ece96c07cc127
-SIZE (wmweather+-2.17.tar.gz) = 212763
+TIMESTAMP = 1587808570
+SHA256 (wmweather+-2.18.tar.gz) = c0ca451aa8cd9f4fb7701e393b7288b56fb8cb358737481a9472949909194b6d
+SIZE (wmweather+-2.18.tar.gz) = 206062
 SHA256 (wmweather+.png) = 4330af568e7b460882c6afeee9aadd2b71ec01cbbdc649819b96d049be48288b
 SIZE (wmweather+.png) = 5730