diff options
| -rw-r--r-- | print/scribus-devel/Makefile | 5 | ||||
| -rw-r--r-- | print/scribus-devel/distinfo | 2 | ||||
| -rw-r--r-- | print/scribus-devel/files/patch-scribus-scribus.cpp | 26 | ||||
| -rw-r--r-- | print/scribus-devel/pkg-plist | 23 | ||||
| -rw-r--r-- | print/scribus/Makefile | 5 | ||||
| -rw-r--r-- | print/scribus/distinfo | 2 | ||||
| -rw-r--r-- | print/scribus/files/patch-scribus-scribus.cpp | 26 | ||||
| -rw-r--r-- | print/scribus/pkg-plist | 23 |
8 files changed, 80 insertions, 32 deletions
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 41bfba4dcc3f..21b29aad5b83 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -7,11 +7,10 @@ # PORTNAME= scribus -PORTVERSION= 0.9.9 +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 @@ -28,6 +27,8 @@ 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 diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo index 315e5319a364..e4abff15b94b 100644 --- a/print/scribus-devel/distinfo +++ b/print/scribus-devel/distinfo @@ -1 +1 @@ -MD5 (scribus/scribus-0.9.9.tar.gz) = dc3cdd9c442e21d6c9eeb8939b2afb60 +MD5 (scribus-0.9.11.tar.gz) = 4a0da6547129abfaa154147c18a54bac diff --git a/print/scribus-devel/files/patch-scribus-scribus.cpp b/print/scribus-devel/files/patch-scribus-scribus.cpp index 2ebaa73fa1c0..ed81ca283491 100644 --- a/print/scribus-devel/files/patch-scribus-scribus.cpp +++ b/print/scribus-devel/files/patch-scribus-scribus.cpp @@ -1,6 +1,6 @@ ---- scribus/scribus.cpp.orig Wed Oct 30 14:03:20 2002 -+++ scribus/scribus.cpp Wed Oct 30 16:08:14 2002 -@@ -2357,7 +2357,7 @@ +--- 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; @@ -9,7 +9,7 @@ typedef About* (*sdem)(QWidget *d); sdem demo; QString pfad = PREL; -@@ -3836,7 +3836,7 @@ +@@ -4694,7 +4694,7 @@ void ScribusApp::slotPrefsOrg() { void *mo; @@ -18,7 +18,7 @@ typedef Preferences* (*sdem)(QWidget *d, preV *Vor); sdem demo; QString pfad = PREL; -@@ -4246,7 +4246,7 @@ +@@ -5153,7 +5153,7 @@ PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf) { @@ -27,16 +27,16 @@ typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf); sdem demo; QString pfad = PREL; -@@ -4276,7 +4276,7 @@ - - PDFlib* ScribusApp::getPDFDriver() +@@ -5188,7 +5188,7 @@ + bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs) { + bool ret = false; - char *error; + const char *error; - typedef PDFlib* (*sdem)(); + void *PDFDriver; + typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs); sdem demo; - QString pfad = PREL; -@@ -4646,7 +4646,7 @@ +@@ -5734,7 +5734,7 @@ void ScribusApp::FinalizePlugs() { @@ -45,7 +45,7 @@ QMap<QString, PlugData>::Iterator it; struct PlugData pda; typedef void (*sdem2)(); -@@ -4711,7 +4711,7 @@ +@@ -5804,7 +5804,7 @@ void ScribusApp::CallDLL(QString name) { void *mo; @@ -54,7 +54,7 @@ struct PlugData pda; pda = PluginMap[name]; typedef void (*sdem)(QWidget *d, ScribusApp *plug); -@@ -4745,7 +4745,7 @@ +@@ -5838,7 +5838,7 @@ bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig) { void *mo; diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist index ac8aad5c749a..c2253011c905 100644 --- a/print/scribus-devel/pkg-plist +++ b/print/scribus-devel/pkg-plist @@ -33,6 +33,7 @@ include/scribus/scribusview.h 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 @@ -103,6 +104,7 @@ lib/scribus/icons/Rotieren2.xpm 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 @@ -116,6 +118,7 @@ lib/scribus/icons/Unter.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 @@ -129,20 +132,30 @@ lib/scribus/icons/editcut.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 @@ -155,6 +168,7 @@ lib/scribus/icons/trashcan2.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 @@ -177,9 +191,16 @@ lib/scribus/libs/libpreferences.so 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 @@ -188,7 +209,9 @@ lib/scribus/scribus.en_GB.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 diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 41bfba4dcc3f..21b29aad5b83 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -7,11 +7,10 @@ # PORTNAME= scribus -PORTVERSION= 0.9.9 +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 @@ -28,6 +27,8 @@ 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 diff --git a/print/scribus/distinfo b/print/scribus/distinfo index 315e5319a364..e4abff15b94b 100644 --- a/print/scribus/distinfo +++ b/print/scribus/distinfo @@ -1 +1 @@ -MD5 (scribus/scribus-0.9.9.tar.gz) = dc3cdd9c442e21d6c9eeb8939b2afb60 +MD5 (scribus-0.9.11.tar.gz) = 4a0da6547129abfaa154147c18a54bac diff --git a/print/scribus/files/patch-scribus-scribus.cpp b/print/scribus/files/patch-scribus-scribus.cpp index 2ebaa73fa1c0..ed81ca283491 100644 --- a/print/scribus/files/patch-scribus-scribus.cpp +++ b/print/scribus/files/patch-scribus-scribus.cpp @@ -1,6 +1,6 @@ ---- scribus/scribus.cpp.orig Wed Oct 30 14:03:20 2002 -+++ scribus/scribus.cpp Wed Oct 30 16:08:14 2002 -@@ -2357,7 +2357,7 @@ +--- 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; @@ -9,7 +9,7 @@ typedef About* (*sdem)(QWidget *d); sdem demo; QString pfad = PREL; -@@ -3836,7 +3836,7 @@ +@@ -4694,7 +4694,7 @@ void ScribusApp::slotPrefsOrg() { void *mo; @@ -18,7 +18,7 @@ typedef Preferences* (*sdem)(QWidget *d, preV *Vor); sdem demo; QString pfad = PREL; -@@ -4246,7 +4246,7 @@ +@@ -5153,7 +5153,7 @@ PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf) { @@ -27,16 +27,16 @@ typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf); sdem demo; QString pfad = PREL; -@@ -4276,7 +4276,7 @@ - - PDFlib* ScribusApp::getPDFDriver() +@@ -5188,7 +5188,7 @@ + bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs) { + bool ret = false; - char *error; + const char *error; - typedef PDFlib* (*sdem)(); + void *PDFDriver; + typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs); sdem demo; - QString pfad = PREL; -@@ -4646,7 +4646,7 @@ +@@ -5734,7 +5734,7 @@ void ScribusApp::FinalizePlugs() { @@ -45,7 +45,7 @@ QMap<QString, PlugData>::Iterator it; struct PlugData pda; typedef void (*sdem2)(); -@@ -4711,7 +4711,7 @@ +@@ -5804,7 +5804,7 @@ void ScribusApp::CallDLL(QString name) { void *mo; @@ -54,7 +54,7 @@ struct PlugData pda; pda = PluginMap[name]; typedef void (*sdem)(QWidget *d, ScribusApp *plug); -@@ -4745,7 +4745,7 @@ +@@ -5838,7 +5838,7 @@ bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig) { void *mo; diff --git a/print/scribus/pkg-plist b/print/scribus/pkg-plist index ac8aad5c749a..c2253011c905 100644 --- a/print/scribus/pkg-plist +++ b/print/scribus/pkg-plist @@ -33,6 +33,7 @@ include/scribus/scribusview.h 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 @@ -103,6 +104,7 @@ lib/scribus/icons/Rotieren2.xpm 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 @@ -116,6 +118,7 @@ lib/scribus/icons/Unter.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 @@ -129,20 +132,30 @@ lib/scribus/icons/editcut.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 @@ -155,6 +168,7 @@ lib/scribus/icons/trashcan2.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 @@ -177,9 +191,16 @@ lib/scribus/libs/libpreferences.so 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 @@ -188,7 +209,9 @@ lib/scribus/scribus.en_GB.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 |