Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Sep 2015 11:04:08 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397106 - head/x11/fbdesk
Message-ID:  <201509171104.t8HB48QB043057@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509171104.t8HB48QB043057>