From owner-svn-ports-all@FreeBSD.ORG Mon Feb 24 13:15:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E46FF7EB; Mon, 24 Feb 2014 13:15:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CEF6B14A4; Mon, 24 Feb 2014 13:15:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ODFtZS024650; Mon, 24 Feb 2014 13:15:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ODFtEH024648; Mon, 24 Feb 2014 13:15:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201402241315.s1ODFtEH024648@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 24 Feb 2014 13:15:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345836 - in head/x11-wm/wmanager: . files 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 13:15:56 -0000 Author: bapt Date: Mon Feb 24 13:15:55 2014 New Revision: 345836 URL: http://svnweb.freebsd.org/changeset/ports/345836 QAT: https://qat.redports.org/buildarchive/r345836/ Log: Support stage Properly support DOCS and EXAMPLES options Modernize Deleted: head/x11-wm/wmanager/files/pkg-message.in Modified: head/x11-wm/wmanager/Makefile head/x11-wm/wmanager/pkg-plist Modified: head/x11-wm/wmanager/Makefile ============================================================================== --- head/x11-wm/wmanager/Makefile Mon Feb 24 13:13:55 2014 (r345835) +++ head/x11-wm/wmanager/Makefile Mon Feb 24 13:15:55 2014 (r345836) @@ -3,7 +3,7 @@ PORTNAME= wmanager PORTVERSION= 0.2.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -11,42 +11,31 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.ori MAINTAINER= ports@FreeBSD.org COMMENT= X11 window manager selector -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message +USES= gmake USE_XORG= x11 xext USE_GL= gl -USE_GMAKE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -OPTIONS_DEFINE= ADDONS +OPTIONS_DEFINE= ADDONS DOCS EXAMPLES OPTIONS_DEFAULT=ADDONS ADDONS_DESC= Install the helper scripts and manpages +OPTIONS_SUB= yes -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MADDONS} -RUN_DEPENDS+= wmanager-loop:${PORTSDIR}/x11-wm/wmanager-addons -.endif +ADDONS_RUNDEPENDS= wmanager-loop:${PORTSDIR}/x11-wm/wmanager-addons do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${SED} -e "s@%%DOCSDIR%%@${DOCSDIR}@; s@%%EXAMPLESDIR%%@${EXAMPLESDIR}@" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${MKDIR} ${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in FAQ HISTORY INSTALL NEWS README TODO - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${EXAMPLESDIR}/wmanagerrc_sample - ${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample -.else - ${RM} -f ${PKGMESSAGE} -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${STAGEDIR}${EXAMPLESDIR}/wmanagerrc_sample + ${INSTALL_DATA} ${WRKSRC}/.xinitrc ${STAGEDIR}${EXAMPLESDIR}/xinitrc_sample -.include +.include Modified: head/x11-wm/wmanager/pkg-plist ============================================================================== --- head/x11-wm/wmanager/pkg-plist Mon Feb 24 13:13:55 2014 (r345835) +++ head/x11-wm/wmanager/pkg-plist Mon Feb 24 13:15:55 2014 (r345836) @@ -1,11 +1,11 @@ bin/wmanager -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/HISTORY -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%EXAMPLESDIR%%/wmanagerrc_sample -%%PORTDOCS%%%%EXAMPLESDIR%%/xinitrc_sample -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%DOCS%%%%DOCSDIR%%/FAQ +%%DOCS%%%%DOCSDIR%%/HISTORY +%%DOCS%%%%DOCSDIR%%/INSTALL +%%DOCS%%%%DOCSDIR%%/NEWS +%%DOCS%%%%DOCSDIR%%/README +%%DOCS%%%%DOCSDIR%%/TODO +%%EXAMPLES%%%%EXAMPLESDIR%%/wmanagerrc_sample +%%EXAMPLES%%%%EXAMPLESDIR%%/xinitrc_sample +%%EXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%DOCS%%@dirrm %%DOCSDIR%%