Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2014 21:24:41 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338939 - head/x11/idesk
Message-ID:  <201401062124.s06LOfhw050203@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Jan  6 21:24:41 2014
New Revision: 338939
URL: http://svnweb.freebsd.org/changeset/ports/338939

Log:
  Support stage
  Use options helpers

Modified:
  head/x11/idesk/Makefile

Modified: head/x11/idesk/Makefile
==============================================================================
--- head/x11/idesk/Makefile	Mon Jan  6 21:23:31 2014	(r338938)
+++ head/x11/idesk/Makefile	Mon Jan  6 21:24:41 2014	(r338939)
@@ -10,48 +10,32 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
 
-LIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
-USES=		pkgconfig
+USES=		gmake pkgconfig
 
-OPTIONS_DEFINE=	SHAPE SN
+OPTIONS_DEFINE=	SHAPE SN DOCS
 SHAPE_DESC=	Support of XShape extension
 SN_DESC=	Startup notification support
 OPTIONS_DEFAULT=	SHAPE
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 CXXFLAGS+=	`imlib2-config --cflags` `freetype-config --cflags`
 MAKE_ARGS=	cc="${CXX}" cflags="${CXXFLAGS}"
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSHAPE}
-CONFIGURE_ARGS+=	--enable-shape
-.else
-CONFIGURE_ARGS+=	--disable-shape
-.endif
-
-.if ${PORT_OPTIONS:MSN}
-LIB_DEPENDS+=	startup-notification:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=	--enable-libsn
-.endif
+SHAPE_CONFIGURE_ENABLE=	shape
+SN_LIB_DEPENDS=	libstartup-notification.so:${PORTSDIR}/x11/startup-notification
+SN_CONFIGURE_ENABLE=	libsn
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${STAGEDIR}${PREFIX}/bin
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+		${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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