Date: Sat, 12 Oct 2013 15:38:21 GMT From: Yamagi Burmeister <yamagi@yamagi.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182928: [PATCH] Add stagedir support to x11/tint and cleanup Message-ID: <201310121538.r9CFcLU5097718@oldred.freebsd.org> Resent-Message-ID: <201310121540.r9CFe0sr050915@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182928
>Category: ports
>Synopsis: [PATCH] Add stagedir support to x11/tint and cleanup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 12 15:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Yamagi Burmeister
>Release:
>Organization:
>Environment:
>Description:
This patch adds stagedir support to x11/tint. Additionally some crude regarding plist generation were removed. No version pump since it's a no-op change for all who have installed the port.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11/tint/Makefile tint/Makefile
--- /usr/ports/x11/tint/Makefile 2013-09-21 01:43:19.000000000 +0200
+++ tint/Makefile 2013-10-12 17:31:51.616864730 +0200
@@ -20,32 +20,23 @@
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
PYCONF_DESC= Configuration editing tool (req. python)
MAN1= tint2.1
-PORTDOCS= 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
+PLIST_SUB+= PYCONF=""
.else
CMAKE_ARGS+= -DENABLE_TINT2CONF:BOOL=OFF
+PLIST_SUB+= PYCONF="@comment "
.endif
.if ${PORT_OPTIONS:MPYCONF}
@@ -55,35 +46,29 @@
> ${PYCONF_SRC}/tintwizard.py
.endif
+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
+
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/tint2 ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/share/tint2
- @${INSTALL_DATA} ${WRKSRC}/default_icon.png ${PREFIX}/share/tint2
+ @${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 ${MANPREFIX}/man/man1
-.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}; \
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ @for f in ${DOCS}; do \
+ ${INSTALL_DATA} ${WRKSRC}/$${f} ${STAGEDIR}${DOCSDIR}; \
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}
+ @for f in ${EXAMPLES}; do \
+ ${INSTALL_DATA} ${WRKSRC}/sample/$${f} ${STAGEDIR}${EXAMPLESDIR}; \
+ done
+.if ${PORT_OPTIONS:MPYCONF}
+ @${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>
diff -ruN /usr/ports/x11/tint/pkg-plist tint/pkg-plist
--- /usr/ports/x11/tint/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ tint/pkg-plist 2013-10-12 17:28:00.838864046 +0200
@@ -0,0 +1,31 @@
+bin/tint2
+%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310121538.r9CFcLU5097718>