- Update to version 2.3.0

PR:		54900
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
Approved by:	fjoe (mentor) (implicit)

5 files changed, 17 insertions, 52 deletions

diff --git a/graphics/flip/Makefile b/graphics/flip/Makefile
index d738018a1e24..0e7a5dec9095 100644
--- a/graphics/flip/Makefile
+++ b/graphics/flip/Makefile
@@ -7,30 +7,32 @@
 #
 
 PORTNAME=	flip
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.reptilelabour.com/software/files/flip/
 
-MAINTAINER=	ports@freebsd.org
-COMMENT=	"Load a sequence of TIFF files and play them back at a target frame rate"
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Load a sequence of TIFF files and play them back at a target frame rate
 
-LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode
 
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
+
 USE_QT_VER=	3
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:R}
-CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV=	MOC="${MOC}" QTDIR="${X11BASE}"
+MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CXX,#CXX,g ; \
-		s,-O2,${CFLAGS} ${PTHREAD_CFLAGS},g ; \
-		s,^MOC,#MOC,g ; s,lqt,lqt-mt ${PTHREAD_LIBS},g ; \
-		s,/usr/X11R6,${X11BASE},g ; \
-		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Config.cpp
+	@${REINPLACE_CMD} -e  's|warn_on release|warn_on thread release|g ; \
+		 s|/usr/X11R6/include|$${LOCALBASE}/include|g ; \
+		 s|= -ltiff|= -L$${LOCALBASE}/lib -ltiff|g' ${WRKSRC}/FLIP.pro
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin|${LOCALBASE}/bin|g' ${WRKSRC}/Config.cpp
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ FLIP.pro
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flip ${PREFIX}/bin
diff --git a/graphics/flip/distinfo b/graphics/flip/distinfo
index 42e17f9afd38..ec657d9424b7 100644
--- a/graphics/flip/distinfo
+++ b/graphics/flip/distinfo
@@ -1 +1 @@
-MD5 (flip-2.2.0.tar.gz) = f38bc69b794ae722e8b775f4c846a314
+MD5 (flip-2.3.0.tar.gz) = 8cb1c99109c0114272236fdcc7ae70b5
diff --git a/graphics/flip/files/patch-Config.cpp b/graphics/flip/files/patch-Config.cpp
deleted file mode 100644
index a7c4b7472270..000000000000
--- a/graphics/flip/files/patch-Config.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.cpp.orig	Tue Mar  5 16:15:53 2002
-+++ Config.cpp	Tue Mar  5 16:16:50 2002
-@@ -16,7 +16,7 @@
- 	flipFPS = MainWindow::F30;
- 	loadFrames = 100;
- 	
--	mpegExec	= "/usr/bin/mpeg_encode";
-+	mpegExec	= "%%LOCALBASE%%/bin/mpeg_encode";
- 	mpegPattern	= "IBBPBBPBBPBB";
- 	mpegPSearch	= 0;
- 	mpegBSearch = 1;
diff --git a/graphics/flip/files/patch-FileDialog.cpp b/graphics/flip/files/patch-FileDialog.cpp
deleted file mode 100644
index 6ecf17cfa79f..000000000000
--- a/graphics/flip/files/patch-FileDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- FileDialog.cpp.orig	Sun Feb 23 01:23:20 2003
-+++ FileDialog.cpp	Sun Feb 23 01:25:40 2003
-@@ -199,8 +199,6 @@
- 	int	wHeight = 25;
- 	int	wWidth = 90;
- 	setFrameStyle(QFrame::Panel | QFrame::Sunken);
--	setFontPropagation(NoChildren);
--	setPalettePropagation(NoChildren);
- 	
- 	resizeCombo = new QComboBox(this);
- 	resizeCombo->setFixedSize(wWidth, wHeight);
diff --git a/graphics/flip/files/patch-Makefile b/graphics/flip/files/patch-Makefile
deleted file mode 100644
index 38705f71b34d..000000000000
--- a/graphics/flip/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Sun Jun  3 08:46:32 2001
-+++ Makefile	Tue Mar  5 16:07:48 2002
-@@ -11,10 +11,10 @@
- CXX	=	g++
- CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
- CXXFLAGS=	-pipe -Wall -W -O2 -DNO_DEBUG
--INCPATH	=	-I/usr/X11R6/include -I$(QTDIR)/include
-+INCPATH	=	-I/usr/X11R6/include -I$(QTDIR)/include
- LINK	=	g++
- LFLAGS	=	
--LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -ltiff -lqt -lXext -lX11 -lm
-+LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L%%LOCALBASE%%/lib -ltiff -lqt -lXext -lX11 -lm
- MOC	=	$(QTDIR)/bin/moc
- UIC	=	$(QTDIR)/bin/uic
-