Date: Tue, 01 Jan 2013 00:36:11 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174870: [PATCH] cad/qfsm: Changed comment, options, do-install, post-install, take maintainership Message-ID: <20121231233620.47B16A77@hub.freebsd.org> Resent-Message-ID: <201212312340.qBVNe0rc017017@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174870
>Category: ports
>Synopsis: [PATCH] cad/qfsm: Changed comment, options, do-install, post-install, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 31 23:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Take maintainership
Makefile changed:
+COMMENT= <-- without A
-OPTIONS_DEFINE= DOCS EXAMPLES <-- is default defined
+ICON_SIZES= 32x32 48x48 64x64
+OPTIONS_DEFINE= GRAPHVIZ DOXYGEN HTML LATEX <-- new Options
+OPTIONS_SINGLE= PAPER
Changed and refined:
do-install:
+post-install:
pkg-plist
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
>Fix:
--- qfsm-0.53.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/qfsm/Makefile ./Makefile
--- /usr/ports/cad/qfsm/Makefile 2012-12-05 00:44:25.000000000 +0100
+++ ./Makefile 2013-01-01 00:25:35.000000000 +0100
@@ -12,27 +12,47 @@
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A graphical tool for designing finite state machines
+MAINTAINER= nemysis@gmx.ch
+COMMENT= Graphical tool for designing finite state machines
LICENSE= GPLv3 # (or later)
-OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES
-
USE_BZIP2= yes
USE_XORG= xi
USE_QT4= corelib gui qt3support svg xml \
moc_build qmake_build rcc_build uic_build
USE_GNOME= desktopfileutils
USE_CMAKE= yes
-INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
+INSTALLS_ICONS= yes
+ICON_SIZES= 32x32 48x48 64x64
+
+PORTDOCS= *
+
+DOCSRCDIR1= ${WRKSRC}
+DOC_FILES1= AUTHORS ChangeLog README TODO
+
+OPTIONS_DEFINE= GRAPHVIZ DOXYGEN HTML LATEX
+
+OPTIONS_SINGLE= PAPER
+OPTIONS_SINGLE_PAPER= A4 A4WIDE LETTER LEGAL EXECUTIVE
+
+OPTIONS_DEFAULT= A4
+
+HTML_DESC= Install HTML Doxygen files
+LATEX_DESC= Install LaTeX Doxygen files
+A4_DESC= Use paper type A4
+A4WIDE_DESC= Use paper type A4wide
+LETTER_DESC= Use paper type Letter
+LEGAL_DESC= Use paper type Legal
+EXECUTIVE_DESC= Use paper type Executive
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGRAPHVIZ}
-BULID_DEPENDS+= graphviz>=2.22:${PORTSDIR}/graphics/graphviz
-RUN_DEPENDS+= graphviz>=2.22:${PORTSDIR}/graphics/graphviz
+BULID_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
.else
CMAKE_ARGS+= -DQFSM_AVOID_GRAPHVIZ:BOOL=ON
.endif
@@ -42,31 +62,78 @@
'/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake
do-install:
- (cd ${WRKSRC} && ${INSTALL_PROGRAM} qfsm ${PREFIX}/bin)
+ ${INSTALL_PROGRAM} ${WRKSRC}/qfsm ${PREFIX}/bin
+
@${MKDIR} ${PREFIX}/share/applications
- (cd ${WRKSRC}/desktop && ${INSTALL_DATA} qfsm.desktop \
- ${PREFIX}/share/applications)
-.for i in 32x32 48x48 64x64
- @${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/apps
- (cd ${WRKSRC}/desktop/${i}/apps && ${INSTALL_DATA} qfsm.png \
- ${PREFIX}/share/icons/hicolor/${i}/apps)
- @${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/mimetypes
- (cd ${WRKSRC}/desktop/${i}/mimetypes && ${INSTALL_DATA} x-qfsm.png \
- ${PREFIX}/share/icons/hicolor/${i}/mimetypes)
+ @${INSTALL_DATA} ${WRKSRC}/desktop/qfsm.desktop \
+ ${PREFIX}/share/applications
+
+.for s in ${ICON_SIZES}
+ @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+ @${INSTALL_DATA} ${WRKSRC}/desktop/${s}/apps/${PORTNAME}.png \
+ ${PREFIX}/share/icons/hicolor/${s}/apps
+.endfor
+
+.for s in ${ICON_SIZES}
+ @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/mimetypes
+ @${INSTALL_DATA} ${WRKSRC}/desktop/${s}/mimetypes/x-${PORTNAME}.png \
+ ${PREFIX}/share/icons/hicolor/${s}/mimetypes
.endfor
+
@${MKDIR} ${PREFIX}/share/mimelnk/application
- (cd ${WRKSRC}/desktop && ${INSTALL_DATA} x-qfsm.desktop \
- ${PREFIX}/share/mimelnk/application)
+ @${INSTALL_DATA} ${WRKSRC}/desktop/x-${PORTNAME}.desktop \
+ ${PREFIX}/share/mimelnk/application
+
@${MKDIR} ${DATADIR}
- (cd ${WRKSRC}/po && ${INSTALL_DATA} *.qm ${DATADIR})
+ @${INSTALL_DATA} ${WRKSRC}/po/*.qm ${DATADIR}
+
+post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC}/doc/user && ${COPYTREE_SHARE} . ${DOCSDIR})
+ @${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+ @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} user ${DOCSDIR}
.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MA4}
+ @(${REINPLACE_CMD} -e 's|PAPER_TYPE = a4wide|PAPER_TYPE = a4|' \
+ ${WRKSRC}/Doxyfile)
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MLETTER}
+ @(${REINPLACE_CMD} -e 's|PAPER_TYPE = a4wide|PAPER_TYPE = letter|' \
+ ${WRKSRC}/Doxyfile)
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MLEGAL}
+ @(${REINPLACE_CMD} -e 's|PAPER_TYPE = a4wide|PAPER_TYPE = legal|' \
+ ${WRKSRC}/Doxyfile)
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MEXECUTIVE}
+ @(${REINPLACE_CMD} -e 's|PAPER_TYPE = a4wide|PAPER_TYPE = executive|' \
+ ${WRKSRC}/Doxyfile)
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
+ @${REINPLACE_CMD} -e 's|GENERATE_LATEX = NO|GENERATE_LATEX = YES|' \
+ -e 's|PDF_HYPERLINKS = NO|PDF_HYPERLINKS = YES|' \
+ -e 's|USE_PDFLATEX = NO|USE_PDFLATEX = YES|' \
+ ${WRKSRC}/Doxyfile
+ @cd ${WRKSRC} && doxygen . > /dev/null 2>&1
+.endif
+
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MHTML}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} html ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MLATEX}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${DOCSDIR}
+.endif
+
.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+ @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
.endif
- @-update-desktop-database
+
+ @-update-desktop-database > /dev/null 2>&1
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/cad/qfsm/pkg-plist ./pkg-plist
--- /usr/ports/cad/qfsm/pkg-plist 2012-12-05 00:44:25.000000000 +0100
+++ ./pkg-plist 2013-01-01 00:28:05.000000000 +0100
@@ -1,43 +1,5 @@
bin/qfsm
share/applications/qfsm.desktop
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/addstate.png
-%%PORTDOCS%%%%DOCSDIR%%/addtrans.png
-%%PORTDOCS%%%%DOCSDIR%%/copy.png
-%%PORTDOCS%%%%DOCSDIR%%/cut.png
-%%PORTDOCS%%%%DOCSDIR%%/doc_Makefile
-%%PORTDOCS%%%%DOCSDIR%%/fo_stylesheet.xsl
-%%PORTDOCS%%%%DOCSDIR%%/html_stylesheet.xsl
-%%PORTDOCS%%%%DOCSDIR%%/integrity_check.png
-%%PORTDOCS%%%%DOCSDIR%%/machine_properties.png
-%%PORTDOCS%%%%DOCSDIR%%/new.png
-%%PORTDOCS%%%%DOCSDIR%%/open.png
-%%PORTDOCS%%%%DOCSDIR%%/pan.png
-%%PORTDOCS%%%%DOCSDIR%%/paste.png
-%%PORTDOCS%%%%DOCSDIR%%/print.png
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.docbook
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.fo
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.html
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.log
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.pdf
-%%PORTDOCS%%%%DOCSDIR%%/qfsm.rtf
-%%PORTDOCS%%%%DOCSDIR%%/save.png
-%%PORTDOCS%%%%DOCSDIR%%/select.png
-%%PORTDOCS%%%%DOCSDIR%%/simulate.png
-%%PORTDOCS%%%%DOCSDIR%%/simulation.png
-%%PORTDOCS%%%%DOCSDIR%%/state_properties.png
-%%PORTDOCS%%%%DOCSDIR%%/straighten.png
-%%PORTDOCS%%%%DOCSDIR%%/toolbar.png
-%%PORTDOCS%%%%DOCSDIR%%/toolbar2.png
-%%PORTDOCS%%%%DOCSDIR%%/toolbar3.png
-%%PORTDOCS%%%%DOCSDIR%%/transition_properties.png
-%%PORTDOCS%%%%DOCSDIR%%/undo.png
-%%PORTDOCS%%%%DOCSDIR%%/working_area.png
-%%PORTDOCS%%%%DOCSDIR%%/working_area.xcf
-%%PORTDOCS%%%%DOCSDIR%%/working_area2.png
-%%PORTDOCS%%%%DOCSDIR%%/zoom.png
-%%PORTDOCS%%%%DOCSDIR%%/zoomin.png
-%%PORTDOCS%%%%DOCSDIR%%/zoomout.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii.gv
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example.fsm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin.gv
@@ -73,7 +35,6 @@
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null 2>&1 || /usr/bin/true
--- qfsm-0.53.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121231233620.47B16A77>