- Update to 0.46

PR:		119162
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 38 insertions, 26 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 82a5b0d002c4..1bcf88afe524 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.45
+PORTVERSION=	0.46
 CATEGORIES=	cad
 MASTER_SITES=	SF
 
@@ -19,22 +19,15 @@ USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-qtdir=${QT_PREFIX}
-MAKE_ARGS=	LDADD="-lqt-mt ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--with-qt-dir=${QT_PREFIX}
 
-post-extract:
-	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/qfsm.sh
-	@${ECHO_CMD} 'QFSMDIR=${DATADIR}' >> ${WRKSRC}/qfsm.sh
-	@${ECHO_CMD} 'export QFSMDIR' >> ${WRKSRC}/qfsm.sh
-	@${ECHO_CMD} '' >> ${WRKSRC}/qfsm.sh
-	@${ECHO_CMD} 'exec ${PREFIX}/bin/qfsm.exec "$$@"' >> ${WRKSRC}/qfsm.sh
+QTCPPFLAGS=	${PTHREAD_CFLAGS}
+QTCFGLIBS=	${PTHREAD_LIBS}
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/qfsm.sh ${PREFIX}/bin/qfsm
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin/qfsm.exec
-	@${MKDIR} ${DATADIR}/po
-	${INSTALL_DATA} ${WRKSRC}/po/*.qm ${DATADIR}/po
-	${INSTALL_DATA} ${WRKSRC}/po/*.ts ${DATADIR}/po
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s| doc/user||g' ${WRKSRC}/Makefile.in
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/user/*.docbook ${DOCSDIR}
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index 7742bfc4af3a..b662924b09fa 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (qfsm-0.45.tar.gz) = 235a0fdb7b8c98985a0db0acd0bf4762
-SHA256 (qfsm-0.45.tar.gz) = b06357eb35c924f2d63fa6f053206c9cd32d1f76682ad12082bd4f7eff91b222
-SIZE (qfsm-0.45.tar.gz) = 820425
+MD5 (qfsm-0.46.tar.gz) = aab30b51185d458112cc669dbeb879c6
+SHA256 (qfsm-0.46.tar.gz) = 6201cdf0dc1d56e01018677b90b8f544269dbd3e3fd142445d78106c730095f2
+SIZE (qfsm-0.46.tar.gz) = 821488
diff --git a/cad/qfsm/pkg-plist b/cad/qfsm/pkg-plist
index 6f2d897a0482..edd787ebcc25 100644
--- a/cad/qfsm/pkg-plist
+++ b/cad/qfsm/pkg-plist
@@ -1,5 +1,5 @@
 bin/qfsm
-bin/qfsm.exec
+share/applications/qfsm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/addstate.png
 %%PORTDOCS%%%%DOCSDIR%%/addtrans.png
 %%PORTDOCS%%%%DOCSDIR%%/copy.png
@@ -30,13 +30,32 @@ bin/qfsm.exec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example.fsm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example2.fsm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin_example.fsm
-%%DATADIR%%/po/English.qm
-%%DATADIR%%/po/English.ts
-%%DATADIR%%/po/French.qm
-%%DATADIR%%/po/French.ts
-%%DATADIR%%/po/German.qm
-%%DATADIR%%/po/German.ts
-@dirrm %%DATADIR%%/po
+share/icons/hicolor/32x32/apps/qfsm.png
+share/icons/hicolor/32x32/mimetypes/x-qfsm.png
+share/icons/hicolor/48x48/apps/qfsm.png
+share/icons/hicolor/48x48/mimetypes/x-qfsm.png
+share/icons/hicolor/64x64/apps/qfsm.png
+share/icons/hicolor/64x64/mimetypes/x-qfsm.png
+share/mimelnk/application/x-qfsm.desktop
+%%DATADIR%%/English.qm
+%%DATADIR%%/French.qm
+%%DATADIR%%/German.qm
 @dirrm %%DATADIR%%
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/icons/hicolor/64x64/mimetypes
+@dirrm share/icons/hicolor/64x64/apps
+@dirrm share/icons/hicolor/64x64
+@dirrm share/icons/hicolor/48x48/mimetypes
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/mimetypes
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor
+@dirrm 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