Attachment 85739 Details for Bug 122024 – file.diff

[patch] file.diff

file.diff (text/plain), 5.42 KB, created by Max Brazhnikov on 2008-03-23 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2008-03-23 23:50:01 UTC

Size: 5.42 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/textproc/qstardict/Makefile /home/makc/porting/ports/textproc/qstardict/Makefile
>--- /usr/ports/textproc/qstardict/Makefile	2008-03-16 22:46:15.000000000 +0300
>+++ /home/makc/porting/ports/textproc/qstardict/Makefile	2008-03-24 02:18:03.000000000 +0300
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	qstardict
>-PORTVERSION=	0.08
>+PORTVERSION=	0.09
> CATEGORIES=	textproc
> MASTER_SITES=	http://qstardict.ylsoftware.com/files/ \
> 		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
>@@ -16,7 +16,8 @@
> 
> USE_BZIP2=	yes
> USE_QT_VER=	4
>-QT_COMPONENTS=	gui corelib qmake_build uic_build moc_build rcc_build
>+QT_COMPONENTS=	gui network xml qmake_build uic_build moc_build rcc_build
>+QMAKE_ARGS+=	 -recursive SEPARATE_TRANSLATIONS=1
> 
> DICPATH=	${PREFIX}/share/stardict/dic
> 
>@@ -25,30 +26,37 @@
> OPTIONS=	DBUS "Enable D-BUS support" on
> 
> .include <bsd.port.pre.mk>
>+
> .if defined(WITHOUT_NLS)
> QMAKE_ARGS+=	NO_TRANSLATIONS=1
>+PLIST_SUB+=	NLS="@comment "
>+.else
>+PLIST_SUB+=	NLS=""
> .endif
> 
> .if defined(WITHOUT_DBUS)
> QMAKE_ARGS+=	NO_DBUS=1
> .else
>-#QMAKE_ARGS+=	"CONFIG+=qdbus"
> LIB_DEPENDS+=	QtDBus.4:${PORTSDIR}/devel/dbus-qt4
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s|/usr|${PREFIX}|g" \
>-		${WRKSRC}/qstardict.pro
>+		${WRKSRC}/qstardict.pri
> 	@${REINPLACE_CMD} -e "s|/usr/share/stardict/dic|${DICPATH}|g" \
>-		${WRKSRC}/src/dictcore.cpp
>+		${WRKSRC}/plugins/stardict/stardict.cpp
> 
>-post-configure:
>+do-configure:
> 	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
> 
>+post-configure:
>+	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
>+
> post-install:
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for doc in AUTHORS COPYNG ChangeLog INSTALL README THANKS
>+.for doc in ${PORTDOCS}
> 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
> .endfor
> .endif
>diff -ruN --exclude=CVS /usr/ports/textproc/qstardict/distinfo /home/makc/porting/ports/textproc/qstardict/distinfo
>--- /usr/ports/textproc/qstardict/distinfo	2008-03-02 09:20:47.000000000 +0300
>+++ /home/makc/porting/ports/textproc/qstardict/distinfo	2008-03-24 01:26:13.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (qstardict-0.08.tar.bz2) = f3bbb1ab807a3558615fcb36e2824260
>-SHA256 (qstardict-0.08.tar.bz2) = b33a93f4c7b85997e50bd161035c783e134438bc741ead7325f762d737e96e1b
>-SIZE (qstardict-0.08.tar.bz2) = 184903
>+MD5 (qstardict-0.09.tar.bz2) = 4d30cb7a12b85a9e062405b75660d17a
>+SHA256 (qstardict-0.09.tar.bz2) = 8349e21cf2aeaa490f73e1d090ca356ceee62735d1c92c694e2e28a191f8434f
>+SIZE (qstardict-0.09.tar.bz2) = 292337
>diff -ruN --exclude=CVS /usr/ports/textproc/qstardict/files/patch-qstardict.pri /home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pri
>--- /usr/ports/textproc/qstardict/files/patch-qstardict.pri	1970-01-01 03:00:00.000000000 +0300
>+++ /home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pri	2008-03-24 02:31:58.000000000 +0300
>@@ -0,0 +1,17 @@
>+--- ./qstardict.pri.orig	2008-03-22 18:51:46.000000000 +0300
>++++ ./qstardict.pri	2008-03-24 01:40:52.000000000 +0300
>+@@ -37,13 +37,12 @@
>+ }
>+ 
>+ unix:DEFINES += HAVE_MMAP
>+-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
>+ unix:isEmpty(NO_DBUS):CONFIG += qdbus
>+ unix:isEmpty(NO_DBUS):DEFINES += QSTARDICT_WITH_DBUS
>+ isEmpty(NO_TRANSLATIONS):DEFINES += QSTARDICT_WITH_TRANSLATIONS
>+ 
>+ unix {
>+-    isEmpty(INSTALL_PREFIX):INSTALL_PREFIX=/usr
>++    isEmpty(INSTALL_PREFIX):INSTALL_PREFIX=$$(PREFIX)
>+     isEmpty(BIN_DIR):BIN_DIR=$$INSTALL_PREFIX/bin
>+     isEmpty(DATA_DIR):DATA_DIR=$$INSTALL_PREFIX/share/qstardict
>+     isEmpty(NO_TRANSLATIONS):isEmpty(TRANSLATIONS_DIR):TRANSLATIONS_DIR=$$DATA_DIR/translations
>diff -ruN --exclude=CVS /usr/ports/textproc/qstardict/files/patch-qstardict.pro /home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pro
>--- /usr/ports/textproc/qstardict/files/patch-qstardict.pro	2008-03-02 09:20:47.000000000 +0300
>+++ /home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pro	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- ./qstardict.pro.orig	2007-11-11 16:32:55.000000000 +0300
>-+++ ./qstardict.pro	2007-11-19 01:48:14.000000000 +0300
>-@@ -5,7 +5,6 @@
>- VERSION = 0.08
>- DEFINES += QSTARDICT_VERSION=\\\"$$VERSION\\\"
>- 
>--unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
>- 
>- QT = \
>-     gui \
>diff -ruN --exclude=CVS /usr/ports/textproc/qstardict/pkg-plist /home/makc/porting/ports/textproc/qstardict/pkg-plist
>--- /usr/ports/textproc/qstardict/pkg-plist	2007-07-30 22:14:06.000000000 +0400
>+++ /home/makc/porting/ports/textproc/qstardict/pkg-plist	2008-03-24 02:10:10.000000000 +0300
>@@ -1,4 +1,20 @@
> bin/qstardict
>+lib/qstardict/plugins/libstardict.so
>+lib/qstardict/plugins/libweb.so
> share/applications/qstardict.desktop
> share/pixmaps/qstardict.png
>+%%NLS%%share/qstardict/translations/qstardict-bg_BG.qm
>+%%NLS%%share/qstardict/translations/qstardict-cs_CZ.qm
>+%%NLS%%share/qstardict/translations/qstardict-de_DE.qm
>+%%NLS%%share/qstardict/translations/qstardict-it_IT.qm
>+%%NLS%%share/qstardict/translations/qstardict-pl_PL.qm
>+%%NLS%%share/qstardict/translations/qstardict-pt_BR.qm
>+%%NLS%%share/qstardict/translations/qstardict-ru_RU.qm
>+%%NLS%%share/qstardict/translations/qstardict-ua_UA.qm
>+%%NLS%%share/qstardict/translations/qstardict-zh_CN.qm
>+%%NLS%%share/qstardict/translations/qstardict-zh_TW.qm
>+%%NLS%%@dirrm share/qstardict/translations
>+@dirrm share/qstardict
> @dirrmtry share/applications
>+@dirrm lib/qstardict/plugins
>+@dirrm lib/qstardict

Actions: View | Diff

Attachments on bug 122024: 85739