From owner-svn-ports-head@FreeBSD.ORG Thu Apr 2 12:19:54 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A01E91FA; Thu, 2 Apr 2015 12:19:54 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80F00AAB; Thu, 2 Apr 2015 12:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t32CJs9J036908; Thu, 2 Apr 2015 12:19:54 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t32CJsbB036902; Thu, 2 Apr 2015 12:19:54 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201504021219.t32CJsbB036902@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Thu, 2 Apr 2015 12:19:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382997 - head/x11/tint 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2015 12:19:54 -0000 Author: xmj Date: Thu Apr 2 12:19:52 2015 New Revision: 382997 URL: https://svnweb.freebsd.org/changeset/ports/382997 Log: x11/tint: use options helpers and other goodies. - Use OPTIONS helpers, PORTDOCS, PORTEXAMPLES, and shorten pkg-plist. Approved by: Yamagi (maintainer) Modified: head/x11/tint/Makefile head/x11/tint/pkg-plist Modified: head/x11/tint/Makefile ============================================================================== --- head/x11/tint/Makefile Thu Apr 2 11:39:04 2015 (r382996) +++ head/x11/tint/Makefile Thu Apr 2 12:19:52 2015 (r382997) @@ -2,48 +2,48 @@ PORTNAME= tint2 PORTVERSION= 0.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE MAINTAINER= yamagi@yamagi.org COMMENT= Lightweight freedesktop-compliant panel/taskbar/systray/clock +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libImlib2.so:${PORTSDIR}/graphics/imlib2 PROJECTHOST= tint2 USES= alias cmake pkgconfig tar:bzip2 -USE_GNOME= pango glib20 -USE_XORG= xinerama xrandr xdamage xcomposite +USE_GNOME= glib20 pango +USE_XORG= xdamage xcomposite xinerama xrandr CMAKE_ARGS= -DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man -OPTIONS_DEFINE= PYCONF DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES PYCONF OPTIONS_DEFAULT= PYCONF OPTIONS_SUB= yes -PYCONF_DESC= Configuration editing tool (req. python) +PYCONF_DESC= Configuration editing tool (requires python) -EXAMPLES= icon_and_text_1.tint2rc icon_and_text_2.tint2rc \ +PORTEXAMPLES= icon_and_text_1.tint2rc icon_and_text_2.tint2rc \ icon_and_text_3.tint2rc icon_and_text_4.tint2rc \ icon_only_1.tint2rc icon_only_2.tint2rc icon_only_3.tint2rc \ icon_only_4.tint2rc icon_only_6.tint2rc icon_only_7.tint2rc \ text_only_1.tint2rc text_only_2.tint2rc text_only_3.tint2rc \ text_only_4.tint2rc text_only_5.tint2rc text_only_6.tint2rc tint2rc -DOCS= AUTHORS ChangeLog README +PORTDOCS= AUTHORS ChangeLog README + +PYCONF_USES= python +PYCONF_USE= gnome=gtk20,pygtk2 +PYCONF_CMAKE_ON= -DENABLE_TINT2CONF:BOOL=ON +PYCONF_CMAKE_OFF= -DENABLE_TINT2CONF:BOOL=OFF .include .if ${PORT_OPTIONS:MPYCONF} -USES+= python -USE_GNOME= gtk20 pygtk2 -CMAKE_ARGS+= -DENABLE_TINT2CONF:BOOL=ON PYCONF_SRC= ${WRKSRC}/src/tint2conf -.else -CMAKE_ARGS+= -DENABLE_TINT2CONF:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MPYCONF} post-patch: @${MV} ${PYCONF_SRC}/tintwizard.py ${PYCONF_SRC}/tintwizard.py.Dist @${SED} -e 's#pidof#pgrep#g' ${PYCONF_SRC}/tintwizard.py.Dist \ @@ -55,10 +55,6 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/tint2 ${INSTALL_DATA} ${WRKSRC}/default_icon.png ${STAGEDIR}${PREFIX}/share/tint2 ${INSTALL_MAN} ${WRKSRC}/doc/tint2.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/sample; ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MPYCONF} ${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${STAGEDIR}${PREFIX}/bin @@ -66,5 +62,9 @@ do-install: ${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${STAGEDIR}${PREFIX}/share/pixmaps .endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/sample/|} ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/x11/tint/pkg-plist ============================================================================== --- head/x11/tint/pkg-plist Thu Apr 2 11:39:04 2015 (r382996) +++ head/x11/tint/pkg-plist Thu Apr 2 12:19:52 2015 (r382997) @@ -1,25 +1,5 @@ bin/tint2 man/man1/tint2.1.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_1.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_2.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_3.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_4.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_1.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_2.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_3.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_4.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_6.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_7.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_1.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_2.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_3.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_4.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_5.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_6.tint2rc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tint2rc %%DATADIR%%/default_icon.png %%PYCONF%%bin/tint2conf %%PYCONF%%bin/tintwizard.py