Attachment #178235 for bug #214287




# $FreeBSD$

PORTNAME=	ansifilter
PORTVERSION=	2.3
CATEGORIES=	textproc
MASTER_SITES=	http://www.andre-simon.de/zip/


LICENSE=	GPLv3+
LICENSE_FILE=	${WRKSRC}/COPYING

WRKSRC=		${WRKDIR}/${PORTNAME}

USES=		gmake tar:bzip2
MAKEFILE=	makefile


OPTIONS_DEFINE=		DOCS QT4

QT4_USES=		qmake:norecursive
QT4_USE=		QT4=gui,moc_build,rcc_build
QT4_ALL_TARGET=		all all-gui
QT4_PLIST_FILES=	bin/${PORTNAME}-gui
QT4_DESKTOP_ENTRIES=	"ANSIFilter" "" "" "${PORTNAME}-gui" \

		 s|$$(CFLAGS)|$$(CXXFLAGS)|' ${WRKSRC}/src/${MAKEFILE}

pre-build:
	@${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \

Lines 1-2 Link Here

(-)textproc/ansifilter/distinfo (-2 / +3 lines)
1	SHA256 (ansifilter-1.7.tar.bz2) = a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c	1	TIMESTAMP = 1478471406
2	SIZE (ansifilter-1.7.tar.bz2) = 133803	2	SHA256 (ansifilter-2.3.tar.bz2) = 26d5ccd21a05e66a1cf836efd24eaf088243d14c3bf322a26cf635a3dd6a5e48
		3	SIZE (ansifilter-2.3.tar.bz2) = 89746




--- src/qt-gui/mydialog.cpp.orig	2016-12-23 18:53:19 UTC
+++ src/qt-gui/mydialog.cpp
@@ -27,13 +27,13 @@ along with ANSIFilter.  If not, see <htt
 #include <QtGlobal>
 
 #if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QFileDialog>
+#include <QMessageBox>
+#include <QFileDialog>
 #include <QScrollBar>
 #else
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QScrollBar>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QScrollBar>
 #endif
 
 #include "../version.h"




--- src/qt-gui/ui_ansifilter.h.orig	2016-12-23 18:53:28 UTC
+++ src/qt-gui/ui_ansifilter.h
@@ -10,26 +10,28 @@
 #define UI_ANSIFILTER_H
 
 #include <QtCore/QVariant>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QFontComboBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QTextEdit>
-#include <QtWidgets/QVBoxLayout>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialog>
+#include <QFontComboBox>
+#include <QFrame>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QTextEdit>
+#include <QVBoxLayout>
+
+#define QStringLiteral QLatin1String
 
 QT_BEGIN_NAMESPACE
 

Return to bug 214287

Lines 2-8 Link Here

(-)textproc/ansifilter/Makefile (-5 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ansifilter	4	PORTNAME= ansifilter
5	PORTVERSION= 1.7	5	PORTVERSION= 2.3
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7	MASTER_SITES= http://www.andre-simon.de/zip/	7	MASTER_SITES= http://www.andre-simon.de/zip/
8		8
Lines 12-19 Link Here
12	LICENSE= GPLv3+	12	LICENSE= GPLv3+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	WRKSRC= ${WRKDIR}/${PORTNAME}
16
17	USES= gmake tar:bzip2	15	USES= gmake tar:bzip2
18	MAKEFILE= makefile	16	MAKEFILE= makefile
19		17
Lines 23-29 Link Here
23	OPTIONS_DEFINE= DOCS QT4	21	OPTIONS_DEFINE= DOCS QT4
24		22
25	QT4_USES= qmake:norecursive	23	QT4_USES= qmake:norecursive
26	QT4_USE= QT4=gui,moc_build	24	QT4_USE= QT4=gui,moc_build,rcc_build
27	QT4_ALL_TARGET= all all-gui	25	QT4_ALL_TARGET= all all-gui
28	QT4_PLIST_FILES= bin/${PORTNAME}-gui	26	QT4_PLIST_FILES= bin/${PORTNAME}-gui
29	QT4_DESKTOP_ENTRIES= "ANSIFilter" "" "" "${PORTNAME}-gui" \	27	QT4_DESKTOP_ENTRIES= "ANSIFilter" "" "" "${PORTNAME}-gui" \
Lines 47-53 Link Here
47	s\|$$(CFLAGS)\|$$(CXXFLAGS)\|' ${WRKSRC}/src/${MAKEFILE}	45	s\|$$(CFLAGS)\|$$(CXXFLAGS)\|' ${WRKSRC}/src/${MAKEFILE}
48		46
49	pre-build:	47	pre-build:
50	@${RM} ${WRKSRC}/src/qt-gui/moc_*.cpp	48	@${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp
51		49
52	do-install:	50	do-install:
53	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \	51	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \

Added Link Here

(-)textproc/ansifilter/files/patch-src_qt-gui_mydialog.cpp (+21 lines)
1	--- src/qt-gui/mydialog.cpp.orig 2016-12-23 18:53:19 UTC
2	+++ src/qt-gui/mydialog.cpp
3	@@ -27,13 +27,13 @@ along with ANSIFilter. If not, see <htt
4	#include <QtGlobal>
5
6	#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
7	-#include <QtWidgets/QMessageBox>
8	-#include <QtWidgets/QFileDialog>
9	+#include <QMessageBox>
10	+#include <QFileDialog>
11	#include <QScrollBar>
12	#else
13	-#include <QtWidgets/QMessageBox>
14	-#include <QtWidgets/QFileDialog>
15	-#include <QtWidgets/QScrollBar>
16	+#include <QMessageBox>
17	+#include <QFileDialog>
18	+#include <QScrollBar>
19	#endif
20
21	#include "../version.h"

Added Link Here

(-)textproc/ansifilter/files/patch-src_qt-gui_ui__ansifilter.h (+51 lines)
1	--- src/qt-gui/ui_ansifilter.h.orig 2016-12-23 18:53:28 UTC
2	+++ src/qt-gui/ui_ansifilter.h
3	@@ -10,26 +10,28 @@
4	#define UI_ANSIFILTER_H
5
6	#include <QtCore/QVariant>
7	-#include <QtWidgets/QAction>
8	-#include <QtWidgets/QApplication>
9	-#include <QtWidgets/QButtonGroup>
10	-#include <QtWidgets/QCheckBox>
11	-#include <QtWidgets/QComboBox>
12	-#include <QtWidgets/QDialog>
13	-#include <QtWidgets/QFontComboBox>
14	-#include <QtWidgets/QFrame>
15	-#include <QtWidgets/QGridLayout>
16	-#include <QtWidgets/QGroupBox>
17	-#include <QtWidgets/QHBoxLayout>
18	-#include <QtWidgets/QHeaderView>
19	-#include <QtWidgets/QLabel>
20	-#include <QtWidgets/QLineEdit>
21	-#include <QtWidgets/QPushButton>
22	-#include <QtWidgets/QRadioButton>
23	-#include <QtWidgets/QSpacerItem>
24	-#include <QtWidgets/QSpinBox>
25	-#include <QtWidgets/QTextEdit>
26	-#include <QtWidgets/QVBoxLayout>
27	+#include <QAction>
28	+#include <QApplication>
29	+#include <QButtonGroup>
30	+#include <QCheckBox>
31	+#include <QComboBox>
32	+#include <QDialog>
33	+#include <QFontComboBox>
34	+#include <QFrame>
35	+#include <QGridLayout>
36	+#include <QGroupBox>
37	+#include <QHBoxLayout>
38	+#include <QHeaderView>
39	+#include <QLabel>
40	+#include <QLineEdit>
41	+#include <QPushButton>
42	+#include <QRadioButton>
43	+#include <QSpacerItem>
44	+#include <QSpinBox>
45	+#include <QTextEdit>
46	+#include <QVBoxLayout>
47	+
48	+#define QStringLiteral QLatin1String
49
50	QT_BEGIN_NAMESPACE
51