From owner-svn-ports-head@freebsd.org  Thu Sep 17 11:04:08 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 E76299CE48C;
 Thu, 17 Sep 2015 11:04:08 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 D87A11568;
 Thu, 17 Sep 2015 11:04:08 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HB48le043058;
 Thu, 17 Sep 2015 11:04:08 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HB48QB043057;
 Thu, 17 Sep 2015 11:04:08 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509171104.t8HB48QB043057@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, 17 Sep 2015 11:04:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397106 - head/x11/fbdesk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 11:04:09 -0000

Author: amdmi3
Date: Thu Sep 17 11:04:07 2015
New Revision: 397106
URL: https://svnweb.freebsd.org/changeset/ports/397106

Log:
  - Switch to options helpers
  - Make imlib2 support non-optional, port doesn't build with it disabled

Modified:
  head/x11/fbdesk/Makefile

Modified: head/x11/fbdesk/Makefile
==============================================================================
--- head/x11/fbdesk/Makefile	Thu Sep 17 11:04:04 2015	(r397105)
+++ head/x11/fbdesk/Makefile	Thu Sep 17 11:04:07 2015	(r397106)
@@ -13,10 +13,8 @@ COMMENT=	Fluxbox utility to create and m
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-
-OPTIONS_DEFINE=	IMLIB2 DOCS
-OPTIONS_DEFAULT=	IMLIB2
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USE_XORG=	xext xft xpm xrender
 USES=		pkgconfig
@@ -25,18 +23,10 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	ChangeLog INSTALL README
 PLIST_FILES=	bin/fbdesk
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIMLIB2}
-LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
-.else
-CONFIGURE_ARGS+=	--disable-imlib2
-.endif
+OPTIONS_DEFINE=	DOCS
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>