Attachment #32261 for bug #53391

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




#

PORTNAME=	scribus
PORTVERSION=	0.9.11
CATEGORIES=	print editors
MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
		http://scribus.planetmirror.com/
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A comprehensive desktop publishing program

INSTALLS_SHLIB=	yes
LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
		%%PREFIX%%/lib/scribus/plugins

QTCFGLIBS+=	-lm

post-patch:
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure

Line 1 Link Here

(-)print/scribus/distinfo (-1 / +1 lines)
1	MD5 (scribus/scribus-0.9.9.tar.gz) = dc3cdd9c442e21d6c9eeb8939b2afb60	1	MD5 (scribus-0.9.11.tar.gz) = 4a0da6547129abfaa154147c18a54bac




--- scribus/scribus.cpp.orig	Sat Jun 14 04:35:07 2003
+++ scribus/scribus.cpp	Sun Jun 15 19:50:27 2003
@@ -3040,7 +3040,7 @@
 void ScribusApp::slotHelpAbout()
 {
 	void *mo;

 	typedef About* (*sdem)(QWidget *d);
 	sdem demo;
 	QString pfad = PREL;
@@ -4694,7 +4694,7 @@
 void ScribusApp::slotPrefsOrg()
 {
 	void *mo;

 	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
 	sdem demo;
 	QString pfad = PREL;
@@ -5153,7 +5153,7 @@
 
 PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
 {

 	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
 	sdem demo;
 	QString pfad = PREL;
@@ -5188,7 +5188,7 @@
 bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
 PDFlib* ScribusApp::getPDFDriver()
 {
 	bool ret = false;
-	char *error;
+	const char *error;
 	void *PDFDriver;
 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
 	sdem demo;
@@ -5734,7 +5734,7 @@
@@ -4646,7 +4646,7 @@
 
 void ScribusApp::FinalizePlugs()
 {

 	QMap<QString, PlugData>::Iterator it;
 	struct PlugData pda;
 	typedef void (*sdem2)();
@@ -5804,7 +5804,7 @@
 void ScribusApp::CallDLL(QString name)
 {
 	void *mo;

 	struct PlugData pda;
 	pda = PluginMap[name];
 	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
@@ -5838,7 +5838,7 @@
 bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
 {
 	void *mo;




include/scribus/scribuswin.h
include/scribus/seiten.h
include/scribus/spalette.h
include/scribus/splash.h
include/scribus/tree.h
include/scribus/vruler.h
include/scribus/werktoolb.h

lib/scribus/icons/RoundCap.png
lib/scribus/icons/RoundJoin.png
lib/scribus/icons/Spacing.xpm
lib/scribus/icons/Splash.png
lib/scribus/icons/Split.png
lib/scribus/icons/SquareCap.png
lib/scribus/icons/Stift.xpm

lib/scribus/icons/Winkel.xpm
lib/scribus/icons/Zeichen.xpm
lib/scribus/icons/acrobat.png
lib/scribus/icons/back.png
lib/scribus/icons/beziertool.png
lib/scribus/icons/bottom.png
lib/scribus/icons/charset.png

lib/scribus/icons/editdelete.png
lib/scribus/icons/editpaste.png
lib/scribus/icons/exit.png
lib/scribus/icons/finish.png
lib/scribus/icons/forward.png
lib/scribus/icons/gohome.png
lib/scribus/icons/goto.png
lib/scribus/icons/hmirror.png
lib/scribus/icons/image.png
lib/scribus/icons/irreg.png
lib/scribus/icons/listbox.png
lib/scribus/icons/ok.png
lib/scribus/icons/oval.png
lib/scribus/icons/pdf.png
lib/scribus/icons/penciladd.png
lib/scribus/icons/pencilsub.png
lib/scribus/icons/postscript.png
lib/scribus/icons/pushbutton.png
lib/scribus/icons/rect.png
lib/scribus/icons/scribus_logo.jpg
lib/scribus/icons/scribusicon.png
lib/scribus/icons/shear_down.png
lib/scribus/icons/shear_left.png
lib/scribus/icons/shear_right.png
lib/scribus/icons/shear_up.png
lib/scribus/icons/spline.png
lib/scribus/icons/start.png
lib/scribus/icons/text_block.png
lib/scribus/icons/text_center.png
lib/scribus/icons/text_force.png

lib/scribus/icons/triangle.png
lib/scribus/icons/txt.png
lib/scribus/icons/up.png
lib/scribus/icons/vmirror.png
lib/scribus/iso8859-10ps.enc
lib/scribus/iso8859-13.enc
lib/scribus/iso8859-13ps.enc

lib/scribus/libs/libpreferences.so.0
lib/scribus/plugins/charselect.da.qm
lib/scribus/plugins/charselect.de.qm
lib/scribus/plugins/charselect.no.qm
lib/scribus/plugins/charselect.sk.qm
lib/scribus/plugins/libcharselect.so
lib/scribus/plugins/libcharselect.so.0
lib/scribus/plugins/libpreview.so
lib/scribus/plugins/libpreview.so.0
lib/scribus/plugins/libsvgexplugin.so
lib/scribus/plugins/libsvgexplugin.so.0
lib/scribus/plugins/svgexport.de.qm
lib/scribus/plugins/svgexport.sk.qm
lib/scribus/profiles/ReadMe
lib/scribus/scribus.bg.qm
lib/scribus/scribus.da.qm

lib/scribus/scribus.es.qm
lib/scribus/scribus.fr.qm
lib/scribus/scribus.gl.qm
lib/scribus/scribus.hu.qm
lib/scribus/scribus.it.qm
lib/scribus/scribus.no.qm
lib/scribus/scribus.pl.qm
lib/scribus/scribus.sk.qm
lib/scribus/scribus.tr.qm

Return to bug 53391

Lines 7-17 Link Here

(-)print/scribus/Makefile (-2 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= scribus	9	PORTNAME= scribus
10	PORTVERSION= 0.9.9	10	PORTVERSION= 0.9.11
11	CATEGORIES= print editors	11	CATEGORIES= print editors
12	MASTER_SITES= http://web2.altmuehlnet.de/fschmid/ \	12	MASTER_SITES= http://web2.altmuehlnet.de/fschmid/ \
13	http://scribus.planetmirror.com/	13	http://scribus.planetmirror.com/
14	DIST_SUBDIR= ${PORTNAME}
15		14
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A comprehensive desktop publishing program	16	COMMENT= A comprehensive desktop publishing program
Lines 27-32 Link Here
27	INSTALLS_SHLIB= yes	26	INSTALLS_SHLIB= yes
28	LDCONFIG_DIRS= %%PREFIX%%/lib/scribus/libs \	27	LDCONFIG_DIRS= %%PREFIX%%/lib/scribus/libs \
29	%%PREFIX%%/lib/scribus/plugins	28	%%PREFIX%%/lib/scribus/plugins
		29
		30	QTCFGLIBS+= -lm
30		31
31	post-patch:	32	post-patch:
32	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure	33	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure

Lines 1-6 Link Here

(-)print/scribus/files/patch-scribus-scribus.cpp (-13 / +13 lines)
1	--- scribus/scribus.cpp.orig Wed Oct 30 14:03:20 2002	1	--- scribus/scribus.cpp.orig Sat Jun 14 04:35:07 2003
2	+++ scribus/scribus.cpp Wed Oct 30 16:08:14 2002	2	+++ scribus/scribus.cpp Sun Jun 15 19:50:27 2003
3	@@ -2357,7 +2357,7 @@	3	@@ -3040,7 +3040,7 @@
4	void ScribusApp::slotHelpAbout()	4	void ScribusApp::slotHelpAbout()
5	{	5	{
6	void *mo;	6	void *mo;
Lines 9-15 Link Here
9	typedef About* (sdem)(QWidget d);	9	typedef About* (sdem)(QWidget d);
10	sdem demo;	10	sdem demo;
11	QString pfad = PREL;	11	QString pfad = PREL;
12	@@ -3836,7 +3836,7 @@	12	@@ -4694,7 +4694,7 @@
13	void ScribusApp::slotPrefsOrg()	13	void ScribusApp::slotPrefsOrg()
14	{	14	{
15	void *mo;	15	void *mo;
Lines 18-24 Link Here
18	typedef Preferences* (sdem)(QWidget d, preV *Vor);	18	typedef Preferences* (sdem)(QWidget d, preV *Vor);
19	sdem demo;	19	sdem demo;
20	QString pfad = PREL;	20	QString pfad = PREL;
21	@@ -4246,7 +4246,7 @@	21	@@ -5153,7 +5153,7 @@
22		22
23	PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)	23	PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
24	{	24	{
Lines 27-42 Link Here
27	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);	27	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
28	sdem demo;	28	sdem demo;
29	QString pfad = PREL;	29	QString pfad = PREL;
30	@@ -4276,7 +4276,7 @@	30	@@ -5188,7 +5188,7 @@
31		31	bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
32	PDFlib* ScribusApp::getPDFDriver()
33	{	32	{
		33	bool ret = false;
34	- char *error;	34	- char *error;
35	+ const char *error;	35	+ const char *error;
36	typedef PDFlib* (*sdem)();	36	void *PDFDriver;
		37	typedef bool (sdem)(ScribusApp plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
37	sdem demo;	38	sdem demo;
38	QString pfad = PREL;	39	@@ -5734,7 +5734,7 @@
39	@@ -4646,7 +4646,7 @@
40		40
41	void ScribusApp::FinalizePlugs()	41	void ScribusApp::FinalizePlugs()
42	{	42	{
Lines 45-51 Link Here
45	QMap<QString, PlugData>::Iterator it;	45	QMap<QString, PlugData>::Iterator it;
46	struct PlugData pda;	46	struct PlugData pda;
47	typedef void (*sdem2)();	47	typedef void (*sdem2)();
48	@@ -4711,7 +4711,7 @@	48	@@ -5804,7 +5804,7 @@
49	void ScribusApp::CallDLL(QString name)	49	void ScribusApp::CallDLL(QString name)
50	{	50	{
51	void *mo;	51	void *mo;
Lines 54-60 Link Here
54	struct PlugData pda;	54	struct PlugData pda;
55	pda = PluginMap[name];	55	pda = PluginMap[name];
56	typedef void (sdem)(QWidget d, ScribusApp *plug);	56	typedef void (sdem)(QWidget d, ScribusApp *plug);
57	@@ -4745,7 +4745,7 @@	57	@@ -5838,7 +5838,7 @@
58	bool ScribusApp::DLLName(QString name, QString PName, int typ, void **Zeig)	58	bool ScribusApp::DLLName(QString name, QString PName, int typ, void **Zeig)
59	{	59	{
60	void *mo;	60	void *mo;

Lines 33-38 Link Here

(-)print/scribus/pkg-plist (+23 lines)
33	include/scribus/scribuswin.h	33	include/scribus/scribuswin.h
34	include/scribus/seiten.h	34	include/scribus/seiten.h
35	include/scribus/spalette.h	35	include/scribus/spalette.h
		36	include/scribus/splash.h
36	include/scribus/tree.h	37	include/scribus/tree.h
37	include/scribus/vruler.h	38	include/scribus/vruler.h
38	include/scribus/werktoolb.h	39	include/scribus/werktoolb.h
Lines 103-108 Link Here
103	lib/scribus/icons/RoundCap.png	104	lib/scribus/icons/RoundCap.png
104	lib/scribus/icons/RoundJoin.png	105	lib/scribus/icons/RoundJoin.png
105	lib/scribus/icons/Spacing.xpm	106	lib/scribus/icons/Spacing.xpm
		107	lib/scribus/icons/Splash.png
106	lib/scribus/icons/Split.png	108	lib/scribus/icons/Split.png
107	lib/scribus/icons/SquareCap.png	109	lib/scribus/icons/SquareCap.png
108	lib/scribus/icons/Stift.xpm	110	lib/scribus/icons/Stift.xpm
Lines 116-121 Link Here
116	lib/scribus/icons/Winkel.xpm	118	lib/scribus/icons/Winkel.xpm
117	lib/scribus/icons/Zeichen.xpm	119	lib/scribus/icons/Zeichen.xpm
118	lib/scribus/icons/acrobat.png	120	lib/scribus/icons/acrobat.png
		121	lib/scribus/icons/back.png
119	lib/scribus/icons/beziertool.png	122	lib/scribus/icons/beziertool.png
120	lib/scribus/icons/bottom.png	123	lib/scribus/icons/bottom.png
121	lib/scribus/icons/charset.png	124	lib/scribus/icons/charset.png
Lines 129-148 Link Here
129	lib/scribus/icons/editdelete.png	132	lib/scribus/icons/editdelete.png
130	lib/scribus/icons/editpaste.png	133	lib/scribus/icons/editpaste.png
131	lib/scribus/icons/exit.png	134	lib/scribus/icons/exit.png
		135	lib/scribus/icons/finish.png
		136	lib/scribus/icons/forward.png
132	lib/scribus/icons/gohome.png	137	lib/scribus/icons/gohome.png
133	lib/scribus/icons/goto.png	138	lib/scribus/icons/goto.png
		139	lib/scribus/icons/hmirror.png
134	lib/scribus/icons/image.png	140	lib/scribus/icons/image.png
135	lib/scribus/icons/irreg.png	141	lib/scribus/icons/irreg.png
136	lib/scribus/icons/listbox.png	142	lib/scribus/icons/listbox.png
137	lib/scribus/icons/ok.png	143	lib/scribus/icons/ok.png
138	lib/scribus/icons/oval.png	144	lib/scribus/icons/oval.png
139	lib/scribus/icons/pdf.png	145	lib/scribus/icons/pdf.png
		146	lib/scribus/icons/penciladd.png
		147	lib/scribus/icons/pencilsub.png
140	lib/scribus/icons/postscript.png	148	lib/scribus/icons/postscript.png
141	lib/scribus/icons/pushbutton.png	149	lib/scribus/icons/pushbutton.png
142	lib/scribus/icons/rect.png	150	lib/scribus/icons/rect.png
143	lib/scribus/icons/scribus_logo.jpg	151	lib/scribus/icons/scribus_logo.jpg
144	lib/scribus/icons/scribusicon.png	152	lib/scribus/icons/scribusicon.png
		153	lib/scribus/icons/shear_down.png
		154	lib/scribus/icons/shear_left.png
		155	lib/scribus/icons/shear_right.png
		156	lib/scribus/icons/shear_up.png
145	lib/scribus/icons/spline.png	157	lib/scribus/icons/spline.png
		158	lib/scribus/icons/start.png
146	lib/scribus/icons/text_block.png	159	lib/scribus/icons/text_block.png
147	lib/scribus/icons/text_center.png	160	lib/scribus/icons/text_center.png
148	lib/scribus/icons/text_force.png	161	lib/scribus/icons/text_force.png
Lines 155-160 Link Here
155	lib/scribus/icons/triangle.png	168	lib/scribus/icons/triangle.png
156	lib/scribus/icons/txt.png	169	lib/scribus/icons/txt.png
157	lib/scribus/icons/up.png	170	lib/scribus/icons/up.png
		171	lib/scribus/icons/vmirror.png
158	lib/scribus/iso8859-10ps.enc	172	lib/scribus/iso8859-10ps.enc
159	lib/scribus/iso8859-13.enc	173	lib/scribus/iso8859-13.enc
160	lib/scribus/iso8859-13ps.enc	174	lib/scribus/iso8859-13ps.enc
Lines 177-185 Link Here
177	lib/scribus/libs/libpreferences.so.0	191	lib/scribus/libs/libpreferences.so.0
178	lib/scribus/plugins/charselect.da.qm	192	lib/scribus/plugins/charselect.da.qm
179	lib/scribus/plugins/charselect.de.qm	193	lib/scribus/plugins/charselect.de.qm
		194	lib/scribus/plugins/charselect.no.qm
180	lib/scribus/plugins/charselect.sk.qm	195	lib/scribus/plugins/charselect.sk.qm
181	lib/scribus/plugins/libcharselect.so	196	lib/scribus/plugins/libcharselect.so
182	lib/scribus/plugins/libcharselect.so.0	197	lib/scribus/plugins/libcharselect.so.0
		198	lib/scribus/plugins/libpreview.so
		199	lib/scribus/plugins/libpreview.so.0
		200	lib/scribus/plugins/libsvgexplugin.so
		201	lib/scribus/plugins/libsvgexplugin.so.0
		202	lib/scribus/plugins/svgexport.de.qm
		203	lib/scribus/plugins/svgexport.sk.qm
183	lib/scribus/profiles/ReadMe	204	lib/scribus/profiles/ReadMe
184	lib/scribus/scribus.bg.qm	205	lib/scribus/scribus.bg.qm
185	lib/scribus/scribus.da.qm	206	lib/scribus/scribus.da.qm
Lines 188-194 Link Here
188	lib/scribus/scribus.es.qm	209	lib/scribus/scribus.es.qm
189	lib/scribus/scribus.fr.qm	210	lib/scribus/scribus.fr.qm
190	lib/scribus/scribus.gl.qm	211	lib/scribus/scribus.gl.qm
		212	lib/scribus/scribus.hu.qm
191	lib/scribus/scribus.it.qm	213	lib/scribus/scribus.it.qm
		214	lib/scribus/scribus.no.qm
192	lib/scribus/scribus.pl.qm	215	lib/scribus/scribus.pl.qm
193	lib/scribus/scribus.sk.qm	216	lib/scribus/scribus.sk.qm
194	lib/scribus/scribus.tr.qm	217	lib/scribus/scribus.tr.qm