Attachment 55359 Details for Bug 83688 – qsstv.diff

[patch] qsstv.diff

qsstv.diff (text/plain), 6.66 KB, created by Andrej Zverev on 2005-07-18 20:40:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrej Zverev

Created: 2005-07-18 20:40:22 UTC

Size: 6.66 KB

patch

obsolete

>diff -Nru qsstv.orig/Makefile qsstv/Makefile
>--- qsstv.orig/Makefile	Fri Dec 17 13:08:50 2004
>+++ qsstv/Makefile	Mon Jul 18 23:27:48 2005
>@@ -6,28 +6,33 @@
> #
> 
> PORTNAME=	qsstv
>-PORTVERSION=	5.3b
>+PORTVERSION=	6.0a
> CATEGORIES=	comms
>-MASTER_SITES=	http://users.telenet.be/on4qz/download/
>+MASTER_SITES=	http://users.telenet.be/on4qz/snapshots/download/
>+EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	db@db.net
> COMMENT=	Amateur Radio SSTV/FAX reception program for unix
> 
>-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
>-		png:${PORTSDIR}/graphics/png
>-
>-GNU_CONFIGURE=	yes
>+HAS_CONFIGURE=	yes
> USE_GMAKE=	yes
>-USE_X_PREFIX=	yes
> USE_QT_VER=	3
>-CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include --with-extra-libs=${LOCALBASE}/lib --infodir=${DOCSDIR}
>+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
>+CONFIGURE_ARGS=	--qtdir=${X11BASE}
>+MAKE_ARGS+=	QTDIR=${X11BASE} \
>+		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
>+		DESTDIR="" TARGET="qsstv" DOCSDIR="${DOCSDIR}"
>+
>+do-configure:
>+	cd ${WRKSRC}; \
>+	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ ${PORTNAME}.pro; \
> 
> do-install:
>-	${INSTALL_PROGRAM} -m 755 ${WRKSRC}/qsstv/qsstv ${PREFIX}/bin
>+	${INSTALL_PROGRAM} -m 755 ${WRKSRC}/qsstv ${PREFIX}/bin
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/qsstv/docs/en/*.png ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/qsstv/docs/en/*.html ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -Nru qsstv.orig/distinfo qsstv/distinfo
>--- qsstv.orig/distinfo	Fri Dec 17 13:08:50 2004
>+++ qsstv/distinfo	Mon Jul 18 17:01:46 2005
>@@ -1,2 +1,2 @@
>-MD5 (qsstv-5.3b.tar.gz) = 139f9183b54a11a2ee9e81d6ff27020e
>-SIZE (qsstv-5.3b.tar.gz) = 1194440
>+MD5 (qsstv-6.0a.tgz) = 99ec6640c7b10d43cc69a7598ae6e3f9
>+SIZE (qsstv-6.0a.tgz) = 881154
>diff -Nru qsstv.orig/files/patch-qsstv.pro qsstv/files/patch-qsstv.pro
>--- qsstv.orig/files/patch-qsstv.pro	Thu Jan  1 03:00:00 1970
>+++ qsstv/files/patch-qsstv.pro	Mon Jul 18 19:21:38 2005
>@@ -0,0 +1,22 @@
>+--- qsstv.pro.orig	Tue May  3 23:41:56 2005
>++++ qsstv.pro	Mon Jul 18 19:21:35 2005
>+@@ -14,16 +14,13 @@
>+ target.path = /usr/local/bin 
>+ docfiles.files += doc/*.html \
>+                   doc/*.png 
>+-docfiles.path = /usr/share/doc/packages/qsstv 
>++docfiles.path = ${DOCSDIR}
>+ INCLUDEPATH += src 
>+ MOC_DIR = obj 
>+ UI_DIR = obj 
>+ OBJECTS_DIR = obj 
>+-QMAKE_CXXFLAGS_RELEASE += -O2 
>+-QMAKE_CXXFLAGS_DEBUG += -g3 \
>+-                        -O0 
>+-TARGET = ../bin/qsstv 
>+-DESTDIR = ../bin 
>++
>++TARGET = qsstv 
>+ CONFIG += release \
>+           warn_on \
>+           qt 
>diff -Nru qsstv.orig/files/patch-qsstv_configfile.cpp qsstv/files/patch-qsstv_configfile.cpp
>--- qsstv.orig/files/patch-qsstv_configfile.cpp	Thu Dec  9 04:05:13 2004
>+++ qsstv/files/patch-qsstv_configfile.cpp	Thu Jan  1 03:00:00 1970
>@@ -1,10 +0,0 @@
>---- qsstv/configfile.cpp.orig	Sun Feb  8 19:18:32 2004
>-+++ qsstv/configfile.cpp	Thu Dec  9 01:42:36 2004
>-@@ -17,6 +17,7 @@
>- #include "configfile.h"
>- #include "config.h"
>- #include <stdlib.h>
>-+#include <unistd.h>
>- #include <qtextstream.h>
>- #include "localtypes.h"
>- 
>diff -Nru qsstv.orig/files/patch-qsstv_sstvtx.cpp qsstv/files/patch-qsstv_sstvtx.cpp
>--- qsstv.orig/files/patch-qsstv_sstvtx.cpp	Fri Oct 29 02:35:36 2004
>+++ qsstv/files/patch-qsstv_sstvtx.cpp	Thu Jan  1 03:00:00 1970
>@@ -1,20 +0,0 @@
>---- qsstv/sstvtx.cpp.orig	Sat Aug 28 20:14:15 2004
>-+++ qsstv/sstvtx.cpp	Sat Aug 28 20:14:16 2004
>-@@ -187,7 +187,7 @@
>- 						{
>- 		  				struct tm *ltm=localtime(&t); //  to calculate timezone
>- 		  				ltzone="UTC";
>--		  				if(daylight && ltm->tm_isdst)
>-+		  				if(/*daylight &&*/ ltm->tm_isdst)
>- 		    				{
>- 							    dt=dt.addSecs((int)timezone-3600);
>- 		    				}
>-@@ -199,7 +199,7 @@
>- 	      	else
>- 						{
>- 		  				struct tm *ltm=gmtime(&t); // to set tzname correctly
>--		  				if(daylight && ltm->tm_isdst)
>-+		  				if(/*daylight &&*/ ltm->tm_isdst)
>- 		    				{
>- 		      				ltzone=tzname[2];
>- 		    				}
>diff -Nru qsstv.orig/pkg-plist qsstv/pkg-plist
>--- qsstv.orig/pkg-plist	Fri Oct 29 02:35:36 2004
>+++ qsstv/pkg-plist	Mon Jul 18 19:47:53 2005
>@@ -1,21 +1,33 @@
> bin/qsstv
> %%PORTDOCS%%%%DOCSDIR%%/arrow.png
>-%%PORTDOCS%%%%DOCSDIR%%/browser.png
>-%%PORTDOCS%%%%DOCSDIR%%/circle.png
>-%%PORTDOCS%%%%DOCSDIR%%/configoptions.png
>-%%PORTDOCS%%%%DOCSDIR%%/cw.png
>+%%PORTDOCS%%%%DOCSDIR%%/colorpicker.png
>+%%PORTDOCS%%%%DOCSDIR%%/colorselect.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_cust.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_cw.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_fax.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_ftp.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_gen.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_interf.png
>+%%PORTDOCS%%%%DOCSDIR%%/config_rep.png
> %%PORTDOCS%%%%DOCSDIR%%/edit.png
>+%%PORTDOCS%%%%DOCSDIR%%/editor.png
> %%PORTDOCS%%%%DOCSDIR%%/eraser.png
> %%PORTDOCS%%%%DOCSDIR%%/fcircle.png
>+%%PORTDOCS%%%%DOCSDIR%%/fgbgcolor.png
> %%PORTDOCS%%%%DOCSDIR%%/fileopen.png
> %%PORTDOCS%%%%DOCSDIR%%/fileprint.png
> %%PORTDOCS%%%%DOCSDIR%%/filesave.png
>+%%PORTDOCS%%%%DOCSDIR%%/font.png
> %%PORTDOCS%%%%DOCSDIR%%/frect.png
>-%%PORTDOCS%%%%DOCSDIR%%/greenled_on.png
>+%%PORTDOCS%%%%DOCSDIR%%/gallery.png
>+%%PORTDOCS%%%%DOCSDIR%%/help.png
>+%%PORTDOCS%%%%DOCSDIR%%/image.png
>+%%PORTDOCS%%%%DOCSDIR%%/imagesize.png
> %%PORTDOCS%%%%DOCSDIR%%/index-1.html
> %%PORTDOCS%%%%DOCSDIR%%/index-10.html
> %%PORTDOCS%%%%DOCSDIR%%/index-11.html
> %%PORTDOCS%%%%DOCSDIR%%/index-12.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-13.html
> %%PORTDOCS%%%%DOCSDIR%%/index-2.html
> %%PORTDOCS%%%%DOCSDIR%%/index-3.html
> %%PORTDOCS%%%%DOCSDIR%%/index-4.html
>@@ -25,23 +37,18 @@
> %%PORTDOCS%%%%DOCSDIR%%/index-8.html
> %%PORTDOCS%%%%DOCSDIR%%/index-9.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/insertim.png
>-%%PORTDOCS%%%%DOCSDIR%%/lines.png
>-%%PORTDOCS%%%%DOCSDIR%%/pos.png
>-%%PORTDOCS%%%%DOCSDIR%%/rect.png
>-%%PORTDOCS%%%%DOCSDIR%%/redled_on.png
>-%%PORTDOCS%%%%DOCSDIR%%/replay.png
>-%%PORTDOCS%%%%DOCSDIR%%/resync.png
>+%%PORTDOCS%%%%DOCSDIR%%/line.png
>+%%PORTDOCS%%%%DOCSDIR%%/penbox.png
>+%%PORTDOCS%%%%DOCSDIR%%/qsstv.png
>+%%PORTDOCS%%%%DOCSDIR%%/rot_shear.png
> %%PORTDOCS%%%%DOCSDIR%%/rxwindow.png
> %%PORTDOCS%%%%DOCSDIR%%/start.png
> %%PORTDOCS%%%%DOCSDIR%%/stop.png
>-%%PORTDOCS%%%%DOCSDIR%%/style.png
>+%%PORTDOCS%%%%DOCSDIR%%/testsignal.png
> %%PORTDOCS%%%%DOCSDIR%%/text.png
>-%%PORTDOCS%%%%DOCSDIR%%/tnwindow.png
> %%PORTDOCS%%%%DOCSDIR%%/tone.png
>-%%PORTDOCS%%%%DOCSDIR%%/top.png
>+%%PORTDOCS%%%%DOCSDIR%%/transparency.png
> %%PORTDOCS%%%%DOCSDIR%%/txwindow.png
> %%PORTDOCS%%%%DOCSDIR%%/whatsthis.png
>-%%PORTDOCS%%%%DOCSDIR%%/yellowled_on.png
>-%%PORTDOCS%%%%DOCSDIR%%/zoomin.png
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%PORTDOCS%%%%DOCSDIR%%/zoom.png
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%

Actions: View | Diff

Attachments on bug 83688: 55359