Bug 182928
| Summary: | [PATCH] Add stagedir support to x11/tint and cleanup | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | yamagi | ||||
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
yamagi
2013-10-12 16:40:00 UTC
Author: bapt Date: Mon Oct 21 11:31:36 2013 New Revision: 331125 URL: http://svnweb.freebsd.org/changeset/ports/331125 Log: Enable stage[1] Use new LIB_DEPENDS format Unsilent the install process Use pkg-plist[1] Use OPTIONS_SUB PR: ports/182928 Submitted by: Yamagi Burmeister <yamagi@yamagi.org> (maintainer) Added: head/x11/tint/pkg-plist (contents, props changed) Modified: head/x11/tint/Makefile Modified: head/x11/tint/Makefile ============================================================================== --- head/x11/tint/Makefile Mon Oct 21 11:23:56 2013 (r331124) +++ head/x11/tint/Makefile Mon Oct 21 11:31:36 2013 (r331125) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= yamagi@yamagi.org COMMENT= Lightweight freedesktop-compliant panel/taskbar/systray/clock -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo PROJECTHOST= tint2 USE_BZIP2= yes @@ -20,29 +20,25 @@ USE_EFL= imlib2 CMAKE_ARGS= -DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man -PLIST_FILES= bin/tint2 \ - share/tint2/default_icon.png -PLIST_DIRS= share/tint2 - OPTIONS_DEFINE= PYCONF DOCS EXAMPLES OPTIONS_DEFAULT= PYCONF +OPTIONS_SUB= yes PYCONF_DESC= Configuration editing tool (req. python) -MAN1= tint2.1 - -PORTDOCS= AUTHORS ChangeLog README +EXAMPLES= 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 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPYCONF} USE_PYTHON= yes USE_GNOME= gtk20 pygtk2 CMAKE_ARGS+= -DENABLE_TINT2CONF:BOOL=ON -PLIST_FILES+= bin/tint2conf bin/tintwizard.py \ - share/applications/tint2conf.desktop \ - share/pixmaps/tint2conf.png share/pixmaps/tint2conf.svg -PLIST_DIRSTRY= share/applications PYCONF_SRC= ${WRKSRC}/src/tint2conf .else CMAKE_ARGS+= -DENABLE_TINT2CONF:BOOL=OFF @@ -56,34 +52,21 @@ post-patch: .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/tint2 ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/tint2 - @${INSTALL_DATA} ${WRKSRC}/default_icon.png ${PREFIX}/share/tint2 - @${INSTALL_MAN} ${WRKSRC}/doc/tint2.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/tint2 ${STAGEDIR}${PREFIX}/bin + ${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 ${PREFIX}/bin - @${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/applications - @${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.desktop ${PREFIX}/share/applications - @${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${PREFIX}/share/pixmaps - @${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${PREFIX}/share/pixmaps -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @for f in ${RCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/sample/$${f} ${EXAMPLESDIR}; \ - done -RCS= 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 -.for f in ${RCS} -PLIST_FILES+= ${EXAMPLESDIR_REL}/${f} -.endfor -PLIST_DIRS+= ${EXAMPLESDIR_REL} + ${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${STAGEDIR}${PREFIX}/share/pixmaps .endif .include <bsd.port.mk> Added: head/x11/tint/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/tint/pkg-plist Mon Oct 21 11:31:36 2013 (r331125) @@ -0,0 +1,32 @@ +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 +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% +@dirrmtry %%DATADIR%% +%%PYCONF%%bin/tint2conf +%%PYCONF%%bin/tintwizard.py +%%PYCONF%%share/applications/tint2conf.desktop +%%PYCONF%%share/pixmaps/tint2conf.png +%%PYCONF%%share/pixmaps/tint2conf.svg +%%PYCONF%%@dirrmtry share/applications _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed, with minor changes. Thanks! |
