Attachment #87824 for bug #124508

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

Lines 6-13 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/Makefile (-3 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= qstardict	8	PORTNAME= qstardict
9	PORTVERSION= 0.12.7	9	PORTVERSION= 0.12.9
10	PORTREVISION= 1
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://qstardict.ylsoftware.com/files/ \	11	MASTER_SITES= http://qstardict.ylsoftware.com/files/ \
13	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/	12	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
Lines 19-28 Link Here
19	USE_QT_VER= 4	18	USE_QT_VER= 4
20	QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build	19	QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build
21	QMAKE_ARGS+= -recursive SEPARATE_TRANSLATIONS=1	20	QMAKE_ARGS+= -recursive SEPARATE_TRANSLATIONS=1
		21	USE_DOS2UNIX= qstardict.pri
22		22
23	DICPATH= ${PREFIX}/share/stardict/dic	23	DICPATH= ${PREFIX}/share/stardict/dic
24		24
25	PORTDOCS= AUTHORS COPYNG ChangeLog INSTALL README THANKS	25	PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README THANKS
26		26
27	OPTIONS= DBUS "Enable D-BUS support" on	27	OPTIONS= DBUS "Enable D-BUS support" on
28		28
Lines 44-49 Link Here
44	post-patch:	44	post-patch:
45	@${REINPLACE_CMD} -e "s\|/usr\|${PREFIX}\|g" \	45	@${REINPLACE_CMD} -e "s\|/usr\|${PREFIX}\|g" \
46	${WRKSRC}/qstardict.pri	46	${WRKSRC}/qstardict.pri
		47	@${REINPLACE_CMD} -e "/^INSTALLS/s\|docs\|\|g" \
		48	${WRKSRC}/qstardict.pro
47	@${REINPLACE_CMD} -e "s\|/usr/share/stardict/dic\|${DICPATH}\|g" \	49	@${REINPLACE_CMD} -e "s\|/usr/share/stardict/dic\|${DICPATH}\|g" \
48	${WRKSRC}/plugins/stardict/stardict.cpp	50	${WRKSRC}/plugins/stardict/stardict.cpp
49		51

Lines 1-3 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/distinfo (-3 / +3 lines)
1	MD5 (qstardict-0.12.7.tar.bz2) = 9ff267de17bbaa36abaf21e0cb79b7a7	1	MD5 (qstardict-0.12.9.tar.bz2) = 229f29065fd3831b7b678e85cf3ef2c9
2	SHA256 (qstardict-0.12.7.tar.bz2) = 962770c9708edbc3660c4a2ae66990cc66b33a8fbd585eecf93d3f47d1339026	2	SHA256 (qstardict-0.12.9.tar.bz2) = f903d6960dd18b54a7442b573bce1f441aff198930380f23ca75c24d09fb673b
3	SIZE (qstardict-0.12.7.tar.bz2) = 303136	3	SIZE (qstardict-0.12.9.tar.bz2) = 311769




--- ./qstardict.pri.orig	2008-06-12 12:55:49.000000000 +0400
+++ ./qstardict.pri	2008-06-12 12:56:16.000000000 +0400
@@ -36,7 +36,6 @@
 windows:LIBS += -lzdll
 
 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

Return to bug 124508

Lines 1-17 Link Here

(-)/home/makc/porting/ports/textproc/qstardict/files/patch-qstardict.pri (-11 / +4 lines)
1	--- ./qstardict.pri.orig 2008-03-22 18:51:46.000000000 +0300	1	--- ./qstardict.pri.orig 2008-06-12 12:55:49.000000000 +0400
2	+++ ./qstardict.pri 2008-03-24 01:40:52.000000000 +0300	2	+++ ./qstardict.pri 2008-06-12 12:56:16.000000000 +0400
3	@@ -37,13 +37,12 @@	3	@@ -36,7 +36,6 @@
4	}	4	windows:LIBS += -lzdll
5		5
6	unix:DEFINES += HAVE_MMAP	6	unix:DEFINES += HAVE_MMAP
7	-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1	7	-unix:isEmpty(NO_DBUS):!contains(QT_CONFIG, qdbus): NO_DBUS = 1
8	unix:isEmpty(NO_DBUS):CONFIG += qdbus	8	unix:isEmpty(NO_DBUS):CONFIG += qdbus
9	unix:isEmpty(NO_DBUS):DEFINES += QSTARDICT_WITH_DBUS	9	unix:isEmpty(NO_DBUS):DEFINES += QSTARDICT_WITH_DBUS
10	isEmpty(NO_TRANSLATIONS):DEFINES += QSTARDICT_WITH_TRANSLATIONS	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