Attachment #85739 for bug #122024

View | Details | Raw Unified | Return to bug 122024
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/Makefile (-7 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= qstardict	8	PORTNAME= qstardict
9	PORTVERSION= 0.08	9	PORTVERSION= 0.09
10	CATEGORIES= textproc	10	CATEGORIES= textproc
11	MASTER_SITES= http://qstardict.ylsoftware.com/files/ \	11	MASTER_SITES= http://qstardict.ylsoftware.com/files/ \
12	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/	12	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
Lines 16-22 Link Here
16		16
17	USE_BZIP2= yes	17	USE_BZIP2= yes
18	USE_QT_VER= 4	18	USE_QT_VER= 4
19	QT_COMPONENTS= gui corelib qmake_build uic_build moc_build rcc_build	19	QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build
		20	QMAKE_ARGS+= -recursive SEPARATE_TRANSLATIONS=1
20		21
21	DICPATH= ${PREFIX}/share/stardict/dic	22	DICPATH= ${PREFIX}/share/stardict/dic
22		23
Lines 25-54 Link Here
25	OPTIONS= DBUS "Enable D-BUS support" on	26	OPTIONS= DBUS "Enable D-BUS support" on
26		27
27	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
		29
28	.if defined(WITHOUT_NLS)	30	.if defined(WITHOUT_NLS)
29	QMAKE_ARGS+= NO_TRANSLATIONS=1	31	QMAKE_ARGS+= NO_TRANSLATIONS=1
		32	PLIST_SUB+= NLS="@comment "
		33	.else
		34	PLIST_SUB+= NLS=""
30	.endif	35	.endif
31		36
32	.if defined(WITHOUT_DBUS)	37	.if defined(WITHOUT_DBUS)
33	QMAKE_ARGS+= NO_DBUS=1	38	QMAKE_ARGS+= NO_DBUS=1
34	.else	39	.else
35	#QMAKE_ARGS+= "CONFIG+=qdbus"
36	LIB_DEPENDS+= QtDBus.4:${PORTSDIR}/devel/dbus-qt4	40	LIB_DEPENDS+= QtDBus.4:${PORTSDIR}/devel/dbus-qt4
37	.endif	41	.endif
38		42
39	post-patch:	43	post-patch:
40	@${REINPLACE_CMD} -e "s\|/usr\|${PREFIX}\|g" \	44	@${REINPLACE_CMD} -e "s\|/usr\|${PREFIX}\|g" \
41	${WRKSRC}/qstardict.pro	45	${WRKSRC}/qstardict.pri
42	@${REINPLACE_CMD} -e "s\|/usr/share/stardict/dic\|${DICPATH}\|g" \	46	@${REINPLACE_CMD} -e "s\|/usr/share/stardict/dic\|${DICPATH}\|g" \
43	${WRKSRC}/src/dictcore.cpp	47	${WRKSRC}/plugins/stardict/stardict.cpp
44		48
45	post-configure:	49	do-configure:
46	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS}	50	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
47		51
		52	post-configure:
		53	${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -e \
		54	's\|^CC .\|CC=${CC}\|; s\|^CXX .\|CXX=${CXX}\|; s\|^LINK .*\|LINK=${CXX}\|'
		55
48	post-install:	56	post-install:
49	.if !defined(NOPORTDOCS)	57	.if !defined(NOPORTDOCS)
50	@${MKDIR} ${DOCSDIR}	58	@${MKDIR} ${DOCSDIR}
51	.for doc in AUTHORS COPYNG ChangeLog INSTALL README THANKS	59	.for doc in ${PORTDOCS}
52	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}	60	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
53	.endfor	61	.endfor
54	.endif	62	.endif

Lines 1-3 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/distinfo (-3 / +3 lines)
1	MD5 (qstardict-0.08.tar.bz2) = f3bbb1ab807a3558615fcb36e2824260	1	MD5 (qstardict-0.09.tar.bz2) = 4d30cb7a12b85a9e062405b75660d17a
2	SHA256 (qstardict-0.08.tar.bz2) = b33a93f4c7b85997e50bd161035c783e134438bc741ead7325f762d737e96e1b	2	SHA256 (qstardict-0.09.tar.bz2) = 8349e21cf2aeaa490f73e1d090ca356ceee62735d1c92c694e2e28a191f8434f
3	SIZE (qstardict-0.08.tar.bz2) = 184903	3	SIZE (qstardict-0.09.tar.bz2) = 292337




--- ./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

Lines 1-10 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pro (-10 lines)
1	--- ./qstardict.pro.orig 2007-11-11 16:32:55.000000000 +0300
2	+++ ./qstardict.pro 2007-11-19 01:48:14.000000000 +0300
3	@@ -5,7 +5,6 @@
4	VERSION = 0.08
5	DEFINES += QSTARDICT_VERSION=\\\"$$VERSION\\\"
6
7	-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
8
9	QT = \
10	gui \

Lines 1-4 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/pkg-plist (+16 lines)
1	bin/qstardict	1	bin/qstardict
		2	lib/qstardict/plugins/libstardict.so
		3	lib/qstardict/plugins/libweb.so
2	share/applications/qstardict.desktop	4	share/applications/qstardict.desktop
3	share/pixmaps/qstardict.png	5	share/pixmaps/qstardict.png
		6	%%NLS%%share/qstardict/translations/qstardict-bg_BG.qm
		7	%%NLS%%share/qstardict/translations/qstardict-cs_CZ.qm
		8	%%NLS%%share/qstardict/translations/qstardict-de_DE.qm
		9	%%NLS%%share/qstardict/translations/qstardict-it_IT.qm
		10	%%NLS%%share/qstardict/translations/qstardict-pl_PL.qm
		11	%%NLS%%share/qstardict/translations/qstardict-pt_BR.qm
		12	%%NLS%%share/qstardict/translations/qstardict-ru_RU.qm
		13	%%NLS%%share/qstardict/translations/qstardict-ua_UA.qm
		14	%%NLS%%share/qstardict/translations/qstardict-zh_CN.qm
		15	%%NLS%%share/qstardict/translations/qstardict-zh_TW.qm
		16	%%NLS%%@dirrm share/qstardict/translations
		17	@dirrm share/qstardict
4	@dirrmtry share/applications	18	@dirrmtry share/applications
		19	@dirrm lib/qstardict/plugins
		20	@dirrm lib/qstardict

Return to bug 122024

Line 0 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pri (+17 lines)
	1	--- ./qstardict.pri.orig 2008-03-22 18:51:46.000000000 +0300
	2	+++ ./qstardict.pri 2008-03-24 01:40:52.000000000 +0300
	3	@@ -37,13 +37,12 @@
	4	}
	5
	6	unix:DEFINES += HAVE_MMAP
	7	-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
	8	unix:isEmpty(NO_DBUS):CONFIG += qdbus
	9	unix:isEmpty(NO_DBUS):DEFINES += QSTARDICT_WITH_DBUS
	10	isEmpty(NO_TRANSLATIONS):DEFINES += QSTARDICT_WITH_TRANSLATIONS
	11
	12	unix {
	13	- isEmpty(INSTALL_PREFIX):INSTALL_PREFIX=/usr
	14	+ isEmpty(INSTALL_PREFIX):INSTALL_PREFIX=$$(PREFIX)
	15	isEmpty(BIN_DIR):BIN_DIR=$$INSTALL_PREFIX/bin
	16	isEmpty(DATA_DIR):DATA_DIR=$$INSTALL_PREFIX/share/qstardict
	17	isEmpty(NO_TRANSLATIONS):isEmpty(TRANSLATIONS_DIR):TRANSLATIONS_DIR=$$DATA_DIR/translations