Attachment 70661 Details for Bug 103050 – file.diff

[patch] file.diff

file.diff (text/plain), 4.59 KB, created by Max Brazhnikov on 2006-09-08 22:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2006-09-08 22:30:22 UTC

Size: 4.59 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/Makefile /home/makc/porting/ports/math/qtiplot/Makefile
>--- /usr/ports/math/qtiplot/Makefile	Tue Sep  5 11:25:59 2006
>+++ /home/makc/porting/ports/math/qtiplot/Makefile	Fri Sep  8 23:09:26 2006
>@@ -6,24 +6,24 @@
> #
> 
> PORTNAME=	qtiplot
>-PORTVERSION=	0.8.6.2
>+PORTVERSION=	0.8.7.2
> CATEGORIES=	math science
> MASTER_SITES=	http://soft.proindependent.com/src/
>-DISTNAME=	${PORTNAME}-0.8.6-2
>+DISTNAME=	${PORTNAME}-0.8.7-2
> 
> MAINTAINER=	makc@issp.ac.ru
> COMMENT=	An Origin clone for data analysis and scientific plotting
> 
>-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
>+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
>+		sip:${PORTSDIR}/devel/py-sip \
>+		pylupdate:${PORTSDIR}/x11-toolkits/py-qt
> LIB_DEPENDS=	gsl.9:${PORTSDIR}/math/gsl \
> 		origin.0:${PORTSDIR}/math/liborigin \
> 		qwtplot3d:${PORTSDIR}/math/qwtplot3d
> 
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>-
>-PLIST_FILES=	bin/qtiplot
>-#PORTDOCS=	faq.html help.html
>+USE_PYTHON=	2.4
> 
> USE_QT_VER=	3
> MAKE_ENV=	QTDIR=${QT_PREFIX}
>@@ -34,6 +34,14 @@
> IGNORE=		does not compile on FreeBSD 4.x
> .endif
> 
>+.if !defined(WITHOUT_NLS)
>+QTI_LANG=	de es fr ru sv
>+PLIST_SUB+=     NLS=""
>+.else
>+PLIST_SUB+=     NLS="@comment "
>+.endif
>+
>+
> QMAKE=		qmake
> QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
> 
>@@ -49,7 +57,9 @@
> 		"s:../3rdparty/liborigin/include:${LOCALBASE}/include:" \
> 		-e "s:/usr/include/qwtplot3d:${X11BASE}/include:" \
> 		-e "/^unix:LIBS/s:-L /usr/lib:-L${LOCALBASE}/lib:" \
>-		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DOCSDIR}:" \
>+		-e "/^unix:documentation.path/s:/usr/share/doc/qtiplot:${DATADIR}/manual:" \
>+		-e "s:/usr/include/python2.4:/usr/local/include/python2.4:" \
>+		-e "s:/usr/share/sip:/usr/local/share/py-sip/:" \
> 		${WRKSRC}/${d}/*.pro
> .endfor
> 
>@@ -71,12 +81,16 @@
> .endfor
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${PREFIX}/bin
>-#.if !defined(NOPORTDOCS)
>-#	${MKDIR} ${DOCSDIR}
>-#.for DOCFN in ${PORTDOCS}
>-#	${INSTALL_MAN} ${WRKSRC}/doc/${DOCFN} ${DOCSDIR}
>-#.endfor
>-#.endif
>+	${MKDIR} ${DATADIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot
>+	${LN} -fs ${DATADIR}/qtiplot ${PREFIX}/bin/qtiplot
>+	${INSTALL_DATA} ${WRKSRC}/qtiplot/qtiplotrc.py ${DATADIR}/qtiplotrc.py
>+.if !defined(WITHOUT_NLS)
>+.for i in ${QTI_LANG}
>+	${MKDIR} ${DATADIR}/translations/
>+	${INSTALL_DATA}	${WRKSRC}/qtiplot/translations/qtiplot_${i}.qm \
>+	${DATADIR}/translations/
>+.endfor
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/distinfo /home/makc/porting/ports/math/qtiplot/distinfo
>--- /usr/ports/math/qtiplot/distinfo	Tue Sep  5 11:25:59 2006
>+++ /home/makc/porting/ports/math/qtiplot/distinfo	Fri Sep  8 15:27:13 2006
>@@ -1,3 +1,3 @@
>-MD5 (qtiplot-0.8.6-2.tar.bz2) = 6025c050b291671ffcfcac7949e97c4e
>-SHA256 (qtiplot-0.8.6-2.tar.bz2) = 64342a9c19ab7fff8dd1ea7e1dafe331709393a6ad892ffda8138ec07c3df657
>-SIZE (qtiplot-0.8.6-2.tar.bz2) = 655993
>+MD5 (qtiplot-0.8.7-2.tar.bz2) = 948cc4922eea51abb7016c6ca2d070d1
>+SHA256 (qtiplot-0.8.7-2.tar.bz2) = 70be0f8b5f137542a5d1d62c78a8a1d38f657ac69e33e483ff1546baa400ced7
>+SIZE (qtiplot-0.8.7-2.tar.bz2) = 736394
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp
>--- /usr/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp	Thu Jan  1 03:00:00 1970
>+++ /home/makc/porting/ports/math/qtiplot/files/patch-qtiplot_src_application.cpp	Fri Sep  8 22:24:22 2006
>@@ -0,0 +1,11 @@
>+--- qtiplot/src/application.cpp.orig	Wed Sep  6 01:26:14 2006
>++++ qtiplot/src/application.cpp	Fri Sep  8 22:21:43 2006
>+@@ -4240,7 +4240,7 @@
>+ 		workingDir = settings.readEntry("/WorkingDir", qApp->applicationDirPath());
>+ 		templatesDir = settings.readEntry("/TemplatesDir", qApp->applicationDirPath());
>+ 
>+-		helpFilePath="/usr/share/doc/qtiplot/index.html";
>++		helpFilePath=qApp->applicationDirPath()+"/manual/index.html";
>+ 		#ifdef Q_OS_WIN // Windows systems
>+ 			helpFilePath=qApp->applicationDirPath()+"/index.html";
>+ 		#endif
>diff -ruN --exclude=CVS /usr/ports/math/qtiplot/pkg-plist /home/makc/porting/ports/math/qtiplot/pkg-plist
>--- /usr/ports/math/qtiplot/pkg-plist	Thu Jan  1 03:00:00 1970
>+++ /home/makc/porting/ports/math/qtiplot/pkg-plist	Fri Sep  8 23:15:10 2006
>@@ -0,0 +1,10 @@
>+bin/qtiplot
>+%%DATADIR%%/qtiplot
>+%%DATADIR%%/qtiplotrc.py
>+%%NLS%%%%DATADIR%%/translations/qtiplot_de.qm
>+%%NLS%%%%DATADIR%%/translations/qtiplot_es.qm
>+%%NLS%%%%DATADIR%%/translations/qtiplot_fr.qm
>+%%NLS%%%%DATADIR%%/translations/qtiplot_ru.qm
>+%%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm
>+%%NLS%%@dirrm %%DATADIR%%/translations
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 103050: 70661