From owner-svn-ports-all@freebsd.org  Thu Aug  4 09:01:06 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CCAEBAD4BB;
 Thu,  4 Aug 2016 09:01:06 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0705C17BD;
 Thu,  4 Aug 2016 09:01:05 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74915JV037330;
 Thu, 4 Aug 2016 09:01:05 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74915Wb037329;
 Thu, 4 Aug 2016 09:01:05 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201608040901.u74915Wb037329@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 4 Aug 2016 09:01:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419602 - head/misc/wmweather+
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Aug 2016 09:01:06 -0000

Author: amdmi3
Date: Thu Aug  4 09:01:05 2016
New Revision: 419602
URL: https://svnweb.freebsd.org/changeset/ports/419602

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Add missing X11 depends
  - Cosmetic fixes
  - Switch to options helpers

Modified:
  head/misc/wmweather+/Makefile

Modified: head/misc/wmweather+/Makefile
==============================================================================
--- head/misc/wmweather+/Makefile	Thu Aug  4 08:58:17 2016	(r419601)
+++ head/misc/wmweather+/Makefile	Thu Aug  4 09:01:05 2016	(r419602)
@@ -14,7 +14,8 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays current conditions and forecasts with icons and text
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
@@ -26,14 +27,14 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
 
 USES=		iconv jpeg
-USE_XORG=	xpm
 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
-CONFIGURE_ARGS+=	--with-libwraster=${LOCALBASE} \
-			--with-libpcre=${LOCALBASE} \
-			--with-libcurl=${LOCALBASE} \
-			--with-xpm-includes=${LOCALBASE} \
-			--with-xpm-libraries=${LOCALBASE}
 
 SUB_FILES=	pkg-message
 
@@ -44,19 +45,14 @@ PLIST_FILES=	bin/${PORTNAME} \
 PORTDOCS=	ChangeLog README
 PORTEXAMPLES=	HINTS example.conf
 
-OPTIONS_DEFINE=	DOCS EXAMPLES WM
-WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
-
 DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \
 		"${PORTNAME}" "System;Monitor;" ""
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES WM
+WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
 
-.if ${PORT_OPTIONS:MWM}
-LIB_DEPENDS+=	libWMaker.so:x11-wm/windowmaker
-.else
-LIB_DEPENDS+=	libwraster.so:x11-wm/libwraster
-.endif
+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__))|| ; \
@@ -73,9 +69,11 @@ do-install:
 	${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}