cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 1.2.2.1.

Browse Source 
PR:		83161
Submitted by:	KATO Tsuguru <tkato432 (at) yahoo.com>
This commit is contained in:
Thierry Thomas 2005-07-16 21:30:30 +00:00
parent e7f4a42762
commit a5851fa5fe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=139365
24 changed files with 238 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print/scribus-devel/Makefile
View File

@ -7,7 +7,7 @@
#
PORTNAME= scribus
PORTVERSION= 1.2.1
PORTVERSION= 1.2.2.1
CATEGORIES= print editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scribus.org.uk/downloads/${PORTVERSION}/
@ -20,7 +20,6 @@ LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \
tiff.4:${PORTSDIR}/graphics/tiff \
cups.2:${PORTSDIR}/print/cups-base \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
USE_BZIP2= yes
@ -52,10 +51,11 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \
s|-O2||g ; \
s|-O2 ||g ; \
s|="-lc"|=""|g ; \
s|2\.3|${PYTHON_VERSION:S/^python//}|g ; \
s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|/share/man|/man|g' ${WRKSRC}/scribus/manpages/Makefile.in
@${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \
${WRKSRC}/scribus/icons/Makefile.in
.include <bsd.port.post.mk>

4
print/scribus-devel/distinfo
View File

@ -1,2 +1,2 @@
MD5 (scribus-1.2.1.tar.bz2) = 002cb629e817722f4123df7a41fc824b
SIZE (scribus-1.2.1.tar.bz2) = 6436083
MD5 (scribus-1.2.2.1.tar.bz2) = 8c2eac0a358b04c39252586d9d85ab24
SIZE (scribus-1.2.2.1.tar.bz2) = 7718632

11
print/scribus-devel/files/patch-export.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/pixmapexport/export.cpp.orig Mon Jun 7 01:15:14 2004
+++ scribus/plugins/pixmapexport/export.cpp Mon Jun 7 01:18:23 2004
@@ -116,7 +116,7 @@
QObject::tr("No"),
QObject::tr("Yes"),
// hack for multiple overwritting (petr)
- (single==TRUE) ? 0 : QObject::tr("Yes all"),
+ (single==TRUE) ? QString::null : QObject::tr("Yes all"),
0, 0);
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
if (over == 1)

11
print/scribus-devel/files/patch-scribus::helpbrowser.cpp
View File

@ -1,11 +0,0 @@
--- scribus/helpbrowser.cpp.orig Fri Jan 7 05:18:30 2005
+++ scribus/helpbrowser.cpp Mon Jan 10 22:11:45 2005
@@ -58,7 +58,7 @@
QString fileName;
mHistory.clear();
struct histd his;
- language = guiLanguage=="" ? "en" : guiLanguage.left(2);
+ language = guiLanguage=="" ? QString( "en" ) : guiLanguage.left(2);
helpBrowsermainLayout = new QVBoxLayout( this);
buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing( 6 );

11
print/scribus-devel/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/fileloader/oodraw/sxwunzip.cpp.orig Fri Dec 17 10:17:03 2004
+++ scribus/plugins/fileloader/oodraw/sxwunzip.cpp Mon Jan 10 20:43:53 2005
@@ -24,6 +24,8 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
# include <unistd.h>
# include <utime.h>

11
print/scribus-devel/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/gettext/sxwim/sxwunzip.cpp.orig Wed Dec 15 05:46:22 2004
+++ scribus/plugins/gettext/sxwim/sxwunzip.cpp Mon Jan 10 20:34:50 2005
@@ -26,6 +26,8 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <utime.h>

56
print/scribus-devel/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
View File

@ -1,56 +0,0 @@
--- scribus/plugins/scriptplugin/scriptplugin.cpp.orig Tue Jan 4 07:45:50 2005
+++ scribus/plugins/scriptplugin/scriptplugin.cpp Mon Jan 10 21:21:27 2005
@@ -52,6 +52,27 @@
#include <qtextstream.h>
#include <cstdlib>
+// XXX Implement strndup for FreeBSD.
+#ifdef __FreeBSD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+static char *
+mystrndup(const char *str, int len) {
+ char *ret;
+
+ if ((str == NULL || len < 0)) return(NULL);
+ ret = (char *)malloc(len + 1);
+ if (ret == NULL) return(NULL);
+ memcpy(ret, str, len);
+ ret[len] = '\0';
+ return(ret);
+}
+#ifdef __cplusplus
+}
+#endif
+#endif
+
// Exceptions; visible from cmdvar.h, set up in initscribus()
PyObject* ScribusException;
PyObject* NoDocOpenError;
@@ -499,8 +520,13 @@
{
/* Work around the braindead Python/C API not using 'const' for
* strings it won't change. */
+#ifdef __FreeBSD__
+ char* newNameTemp = mystrndup(newName, strlen(newName));
+ char* oldNameTemp = mystrndup(oldName, strlen(oldName));
+#else
char* newNameTemp = strndup(newName, strlen(newName));
char* oldNameTemp = strndup(oldName, strlen(oldName));
+#endif
assert(newNameTemp != NULL);
assert(oldNameTemp != NULL);
/* We use PyMapping_GetItemString because unlike PyDict_GetItemString it
@@ -563,7 +589,11 @@
*/
QCString utfTranslated = translated.utf8();
const char* trch = utfTranslated.data();
+#ifdef __FreeBSD__
+ return mystrndup(trch, strlen(trch));
+#else
return strndup(trch, strlen(trch));
+#endif
}
/* Now we're using the more pythonic convention for names:

11
print/scribus-devel/files/patch-scribus::scribus.h
View File

@ -1,11 +0,0 @@
--- scribus/scribus.h.orig Wed Aug 18 04:58:31 2004
+++ scribus/scribus.h Sun Aug 29 19:34:45 2004
@@ -565,7 +565,7 @@
QPopupMenu *toolbarMenu;
double mm2pts(int mm);
double pts2mm(double pts);
- void addNewPages(int wo, int where, int numPages, QString based1 = tr("Normal"), QString based2 = tr("Normal"));
+ void addNewPages(int wo, int where, int numPages, QString based1 = QObject::tr("Normal"), QString based2 = QObject::tr("Normal"));
QMap<int,QString> FontID;
int HaveGS;
void *PSDriver;

10
print/scribus-devel/files/patch-scribus::utils.cpp
View File

@ -1,10 +0,0 @@
--- scribus/util.cpp.orig Fri Jan 7 04:04:34 2005
+++ scribus/util.cpp Mon Jan 10 22:03:01 2005
@@ -29,6 +29,7 @@
#include <qdir.h>
#include <qpointarray.h>
#include <qmessagebox.h>
+#include <algorithm>
#include <cstdlib>
#include <cmath>
#include <unistd.h>

20
print/scribus-devel/files/patch-scribus_plugins_scriptplugin_macro.cpp Normal file
View File

@ -0,0 +1,20 @@
--- scribus/plugins/scriptplugin/macro.cpp.orig Sun Jul 3 16:34:04 2005
+++ scribus/plugins/scriptplugin/macro.cpp Mon Jul 4 13:10:49 2005
@@ -53,7 +53,7 @@
{
assert(!PyErr_Occurred());
- if ((newName == QString::null) or (newName == ""))
+ if ((newName == QString::null) || (newName == ""))
qDebug("Macro::Macro() called with NULL or '' name");
// set the macro name
@@ -344,7 +344,7 @@
// Must not return with an exception set
void Macro::setMacroName(QString newName)
{
- if ((newName == QString::null) or (newName == ""))
+ if ((newName == QString::null) || (newName == ""))
{
qDebug("Macro::setMacroName(): called with NULL or '' name");
return;

11
print/scribus-devel/files/patch-scribus_plugins_short-words_vlnadialog.cpp Normal file
View File

@ -0,0 +1,11 @@
--- scribus/plugins/short-words/vlnadialog.cpp.orig Wed Feb 2 05:02:38 2005
+++ scribus/plugins/short-words/vlnadialog.cpp Mon Jul 4 13:18:50 2005
@@ -159,7 +159,7 @@
void VlnaDialog::selectAction(int aAction)
{
- if (aAction!=0 and aAction!=1 and aAction!=2) {
+ if (aAction!=0 && aAction!=1 && aAction!=2) {
aAction = 0;
}
buttonGroup->setButton(aAction);

88
print/scribus-devel/pkg-plist
View File

@ -57,6 +57,26 @@ include/scribus/tree.h
include/scribus/vgradient.h
include/scribus/vruler.h
include/scribus/werktoolb.h
lib/scribus/dicts/README_ca_ES.txt
lib/scribus/dicts/README_cs_CZ.txt
lib/scribus/dicts/README_cy_GB.txt
lib/scribus/dicts/README_da_DK.txt
lib/scribus/dicts/README_de_DE.txt
lib/scribus/dicts/README_en_EN.txt
lib/scribus/dicts/README_en_GB.txt
lib/scribus/dicts/README_es_ES.txt
lib/scribus/dicts/README_fi_FI.txt
lib/scribus/dicts/README_hu_HU.txt
lib/scribus/dicts/README_lt_LT.txt
lib/scribus/dicts/README_no_NO.txt
lib/scribus/dicts/README_pl_PL.txt
lib/scribus/dicts/README_pt_BR.txt
lib/scribus/dicts/README_pt_PT.txt
lib/scribus/dicts/README_ru_RU_0.txt
lib/scribus/dicts/README_sk_SK.txt
lib/scribus/dicts/README_sl_SI.txt
lib/scribus/dicts/README_sv_SE.txt
lib/scribus/dicts/README_uk_UA.txt
lib/scribus/dicts/hyph_af.dic
lib/scribus/dicts/hyph_ca.dic
lib/scribus/dicts/hyph_cs.dic
@ -68,12 +88,14 @@ lib/scribus/dicts/hyph_es.dic
lib/scribus/dicts/hyph_fi.dic
lib/scribus/dicts/hyph_fr.dic
lib/scribus/dicts/hyph_ga.dic
lib/scribus/dicts/hyph_hr.dic
lib/scribus/dicts/hyph_hu.dic
lib/scribus/dicts/hyph_it.dic
lib/scribus/dicts/hyph_lt.dic
lib/scribus/dicts/hyph_nl.dic
lib/scribus/dicts/hyph_pl.dic
lib/scribus/dicts/hyph_pt.dic
lib/scribus/dicts/hyph_pt_BR.dic
lib/scribus/dicts/hyph_ru.dic
lib/scribus/dicts/hyph_sk.dic
lib/scribus/dicts/hyph_sl.dic
@ -98,6 +120,9 @@ lib/scribus/plugins/gettext/libcsvim.so.0
lib/scribus/plugins/gettext/libhtmlim.a
lib/scribus/plugins/gettext/libhtmlim.so
lib/scribus/plugins/gettext/libhtmlim.so.0
lib/scribus/plugins/gettext/libodtimplugin.a
lib/scribus/plugins/gettext/libodtimplugin.so
lib/scribus/plugins/gettext/libodtimplugin.so.0
lib/scribus/plugins/gettext/libsxwimplugin.a
lib/scribus/plugins/gettext/libsxwimplugin.so
lib/scribus/plugins/gettext/libsxwimplugin.so.0
@ -131,6 +156,9 @@ lib/scribus/plugins/libsaveastemplateplugin.so.0
lib/scribus/plugins/libscribusexportpixmap.a
lib/scribus/plugins/libscribusexportpixmap.so
lib/scribus/plugins/libscribusexportpixmap.so.0
lib/scribus/plugins/libscribusshortwords.a
lib/scribus/plugins/libscribusshortwords.so
lib/scribus/plugins/libscribusshortwords.so.0
lib/scribus/plugins/libscriptplugin.a
lib/scribus/plugins/libscriptplugin.so
lib/scribus/plugins/libscriptplugin.so.0
@ -147,7 +175,6 @@ lib/scribus/rgbscribusgreys.txt
lib/scribus/rgbsvg.txt
lib/scribus/scribus.af.qm
lib/scribus/scribus.bg.qm
lib/scribus/scribus.br.qm
lib/scribus/scribus.ca.qm
lib/scribus/scribus.cs.qm
lib/scribus/scribus.cy.qm
@ -168,6 +195,7 @@ lib/scribus/scribus.lt.qm
lib/scribus/scribus.nb.qm
lib/scribus/scribus.nl.qm
lib/scribus/scribus.pl.qm
lib/scribus/scribus.pt_BR.qm
lib/scribus/scribus.ru.qm
lib/scribus/scribus.se.qm
lib/scribus/scribus.sk.qm
@ -177,17 +205,24 @@ lib/scribus/scribus.sr.qm
lib/scribus/scribus.tr.qm
lib/scribus/scribus.uk.qm
lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/doc/en/about1.html
%%DATADIR%%/doc/en/about2.html
%%DATADIR%%/doc/en/acroreader.html
%%DATADIR%%/doc/en/cms.html
%%DATADIR%%/doc/en/cms2.html
%%DATADIR%%/doc/en/cms3.html
%%DATADIR%%/doc/en/cms4.html
%%DATADIR%%/doc/en/codingstandards.html
%%DATADIR%%/doc/en/contributions.html
%%DATADIR%%/doc/en/cross-platform.html
%%DATADIR%%/doc/en/cups.html
%%DATADIR%%/doc/en/cygwin.html
%%DATADIR%%/doc/en/developers.html
%%DATADIR%%/doc/en/docchanges.html
%%DATADIR%%/doc/en/doccopyright.html
%%DATADIR%%/doc/en/docinfo.html
%%DATADIR%%/doc/en/documentation.html
@ -198,19 +233,26 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/fonts1.html
%%DATADIR%%/doc/en/fonts2.html
%%DATADIR%%/doc/en/fonts3.html
%%DATADIR%%/doc/en/fonts4.html
%%DATADIR%%/doc/en/fonts5.html
%%DATADIR%%/doc/en/gettexthowto.html
%%DATADIR%%/doc/en/gsadv.html
%%DATADIR%%/doc/en/gsfont.html
%%DATADIR%%/doc/en/gsview.html
%%DATADIR%%/doc/en/hyphenator.html
%%DATADIR%%/doc/en/images/RDF.png
%%DATADIR%%/doc/en/images/Scripter.png
%%DATADIR%%/doc/en/images/Scripter_error_string.png
%%DATADIR%%/doc/en/images/acro1.png
%%DATADIR%%/doc/en/images/acro2.png
%%DATADIR%%/doc/en/images/acro3.png
%%DATADIR%%/doc/en/images/acroinfo.png
%%DATADIR%%/doc/en/images/acropass.png
%%DATADIR%%/doc/en/images/acroreader5.1.png
%%DATADIR%%/doc/en/images/acrosec.png
%%DATADIR%%/doc/en/images/after_short_words.png
%%DATADIR%%/doc/en/images/batik1.png
%%DATADIR%%/doc/en/images/before_short_words.png
%%DATADIR%%/doc/en/images/cmsmodify1.png
%%DATADIR%%/doc/en/images/cmspanel.png
%%DATADIR%%/doc/en/images/colormanager2.png
@ -224,6 +266,11 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/fontpref3.png
%%DATADIR%%/doc/en/images/fontprev.png
%%DATADIR%%/doc/en/images/fonts.png
%%DATADIR%%/doc/en/images/fonts2.png
%%DATADIR%%/doc/en/images/fonts3.png
%%DATADIR%%/doc/en/images/fonts4.png
%%DATADIR%%/doc/en/images/fontsampler.png
%%DATADIR%%/doc/en/images/fontsampler2.png
%%DATADIR%%/doc/en/images/formularz_export_PDF.png
%%DATADIR%%/doc/en/images/formularz_js_skrypt.png
%%DATADIR%%/doc/en/images/formularz_js_sprawdzanie.png
@ -258,7 +305,6 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/prefspanel5.png
%%DATADIR%%/doc/en/images/printer1.png
%%DATADIR%%/doc/en/images/printer2.png
%%DATADIR%%/doc/en/images/printer3.png
%%DATADIR%%/doc/en/images/printpreview.png
%%DATADIR%%/doc/en/images/printseps.png
%%DATADIR%%/doc/en/images/pstoedit1.png
@ -270,6 +316,8 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/siatka_menu.png
%%DATADIR%%/doc/en/images/spinbox1.png
%%DATADIR%%/doc/en/images/svg1.png
%%DATADIR%%/doc/en/images/swdialog.png
%%DATADIR%%/doc/en/images/swmenu.png
%%DATADIR%%/doc/en/images/symbole.png
%%DATADIR%%/doc/en/images/ulica.png
%%DATADIR%%/doc/en/images/wlasciwosci_pola.png
@ -291,6 +339,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/machints2.html
%%DATADIR%%/doc/en/menu.xml
%%DATADIR%%/doc/en/moncal.html
%%DATADIR%%/doc/en/mouse.html
%%DATADIR%%/doc/en/otherinfo.html
%%DATADIR%%/doc/en/parallel-install.html
%%DATADIR%%/doc/en/pdf_form.html
@ -304,13 +353,15 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/print1.html
%%DATADIR%%/doc/en/print2.html
%%DATADIR%%/doc/en/print3.html
%%DATADIR%%/doc/en/readme.html
%%DATADIR%%/doc/en/resources.html
%%DATADIR%%/doc/en/screenshots.html
%%DATADIR%%/doc/en/scribus-svg.html
%%DATADIR%%/doc/en/scribuscopyright.html
%%DATADIR%%/doc/en/scribusfileformat.html
%%DATADIR%%/doc/en/scripter-extensions.html
%%DATADIR%%/doc/en/scripter-faq.html
%%DATADIR%%/doc/en/scripter1.html
%%DATADIR%%/doc/en/scripterapi-ImageExport.html
%%DATADIR%%/doc/en/scripterapi-PDFfile.html
%%DATADIR%%/doc/en/scripterapi-Printer.html
%%DATADIR%%/doc/en/scripterapi-color.html
@ -329,6 +380,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/scripterapi-textframes.html
%%DATADIR%%/doc/en/scripterapi.html
%%DATADIR%%/doc/en/settings1.html
%%DATADIR%%/doc/en/short-words.html
%%DATADIR%%/doc/en/specs.html
%%DATADIR%%/doc/en/toolbox.html
%%DATADIR%%/doc/en/toolbox1.html
@ -347,7 +399,18 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/topten.html
%%DATADIR%%/doc/en/translation_howto.html
%%DATADIR%%/doc/en/tutorials.html
%%DATADIR%%/doc/en/wine.html
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/icons/AddNode.png
%%DATADIR%%/icons/AddPoint.png
%%DATADIR%%/icons/AppIcon.png
@ -503,6 +566,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/icons/vectorgfx.png
%%DATADIR%%/icons/view.png
%%DATADIR%%/icons/vmirror.png
%%DATADIR%%/plugins/scribus-short-words.rc
%%DATADIR%%/samples/3columnA4.py
%%DATADIR%%/samples/3columnUSLTR.py
%%DATADIR%%/samples/Calendar.py
@ -517,9 +581,9 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/samples/plus_10_pourcent_group.py
%%DATADIR%%/samples/pochette_cd.py
%%DATADIR%%/samples/quote.py
%%DATADIR%%/samples/sample_db_usage.py
%%DATADIR%%/samples/trait_de_coupe.py
%%DATADIR%%/samples/wordcount.py
%%DATADIR%%/scripts/COPYING
%%DATADIR%%/scripts/ChangeLog
%%DATADIR%%/scripts/FontSample.py
%%DATADIR%%/scripts/NEWS
@ -554,9 +618,19 @@ lib/scribus/scribus.zh.qm
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/doc/pl/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/pl/tutorials
@dirrm %%DATADIR%%/doc/pl
@dirrm %%DATADIR%%/doc/fr/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/fr/tutorials
@dirrm %%DATADIR%%/doc/fr
@dirrm %%DATADIR%%/doc/en/images
@dirrm %%DATADIR%%/doc/en
@dirrm %%DATADIR%%/doc/cs/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/cs/tutorials
@dirrm %%DATADIR%%/doc/cs
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
@dirrm lib/scribus/profiles

10
print/scribus/Makefile
View File

@ -7,7 +7,7 @@
#
PORTNAME= scribus
PORTVERSION= 1.2.1
PORTVERSION= 1.2.2.1
CATEGORIES= print editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scribus.org.uk/downloads/${PORTVERSION}/
@ -20,7 +20,6 @@ LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \
tiff.4:${PORTSDIR}/graphics/tiff \
cups.2:${PORTSDIR}/print/cups-base \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
USE_BZIP2= yes
@ -52,10 +51,11 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \
s|-O2||g ; \
s|-O2 ||g ; \
s|="-lc"|=""|g ; \
s|2\.3|${PYTHON_VERSION:S/^python//}|g ; \
s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|/share/man|/man|g' ${WRKSRC}/scribus/manpages/Makefile.in
@${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \
${WRKSRC}/scribus/icons/Makefile.in
.include <bsd.port.post.mk>

4
print/scribus/distinfo
View File

@ -1,2 +1,2 @@
MD5 (scribus-1.2.1.tar.bz2) = 002cb629e817722f4123df7a41fc824b
SIZE (scribus-1.2.1.tar.bz2) = 6436083
MD5 (scribus-1.2.2.1.tar.bz2) = 8c2eac0a358b04c39252586d9d85ab24
SIZE (scribus-1.2.2.1.tar.bz2) = 7718632

11
print/scribus/files/patch-export.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/pixmapexport/export.cpp.orig Mon Jun 7 01:15:14 2004
+++ scribus/plugins/pixmapexport/export.cpp Mon Jun 7 01:18:23 2004
@@ -116,7 +116,7 @@
QObject::tr("No"),
QObject::tr("Yes"),
// hack for multiple overwritting (petr)
- (single==TRUE) ? 0 : QObject::tr("Yes all"),
+ (single==TRUE) ? QString::null : QObject::tr("Yes all"),
0, 0);
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
if (over == 1)

11
print/scribus/files/patch-scribus::helpbrowser.cpp
View File

@ -1,11 +0,0 @@
--- scribus/helpbrowser.cpp.orig Fri Jan 7 05:18:30 2005
+++ scribus/helpbrowser.cpp Mon Jan 10 22:11:45 2005
@@ -58,7 +58,7 @@
QString fileName;
mHistory.clear();
struct histd his;
- language = guiLanguage=="" ? "en" : guiLanguage.left(2);
+ language = guiLanguage=="" ? QString( "en" ) : guiLanguage.left(2);
helpBrowsermainLayout = new QVBoxLayout( this);
buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing( 6 );

11
print/scribus/files/patch-scribus::plugins::fileloader::oodraw::sxwunzip.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/fileloader/oodraw/sxwunzip.cpp.orig Fri Dec 17 10:17:03 2004
+++ scribus/plugins/fileloader/oodraw/sxwunzip.cpp Mon Jan 10 20:43:53 2005
@@ -24,6 +24,8 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
# include <unistd.h>
# include <utime.h>

11
print/scribus/files/patch-scribus::plugins::gettext::sxwim::sxwunzip.cpp
View File

@ -1,11 +0,0 @@
--- scribus/plugins/gettext/sxwim/sxwunzip.cpp.orig Wed Dec 15 05:46:22 2004
+++ scribus/plugins/gettext/sxwim/sxwunzip.cpp Mon Jan 10 20:34:50 2005
@@ -26,6 +26,8 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <utime.h>

56
print/scribus/files/patch-scribus::plugins::scriptplugin::scriptplugin.cpp
View File

@ -1,56 +0,0 @@
--- scribus/plugins/scriptplugin/scriptplugin.cpp.orig Tue Jan 4 07:45:50 2005
+++ scribus/plugins/scriptplugin/scriptplugin.cpp Mon Jan 10 21:21:27 2005
@@ -52,6 +52,27 @@
#include <qtextstream.h>
#include <cstdlib>
+// XXX Implement strndup for FreeBSD.
+#ifdef __FreeBSD__
+#ifdef __cplusplus
+extern "C" {
+#endif
+static char *
+mystrndup(const char *str, int len) {
+ char *ret;
+
+ if ((str == NULL || len < 0)) return(NULL);
+ ret = (char *)malloc(len + 1);
+ if (ret == NULL) return(NULL);
+ memcpy(ret, str, len);
+ ret[len] = '\0';
+ return(ret);
+}
+#ifdef __cplusplus
+}
+#endif
+#endif
+
// Exceptions; visible from cmdvar.h, set up in initscribus()
PyObject* ScribusException;
PyObject* NoDocOpenError;
@@ -499,8 +520,13 @@
{
/* Work around the braindead Python/C API not using 'const' for
* strings it won't change. */
+#ifdef __FreeBSD__
+ char* newNameTemp = mystrndup(newName, strlen(newName));
+ char* oldNameTemp = mystrndup(oldName, strlen(oldName));
+#else
char* newNameTemp = strndup(newName, strlen(newName));
char* oldNameTemp = strndup(oldName, strlen(oldName));
+#endif
assert(newNameTemp != NULL);
assert(oldNameTemp != NULL);
/* We use PyMapping_GetItemString because unlike PyDict_GetItemString it
@@ -563,7 +589,11 @@
*/
QCString utfTranslated = translated.utf8();
const char* trch = utfTranslated.data();
+#ifdef __FreeBSD__
+ return mystrndup(trch, strlen(trch));
+#else
return strndup(trch, strlen(trch));
+#endif
}
/* Now we're using the more pythonic convention for names:

11
print/scribus/files/patch-scribus::scribus.h
View File

@ -1,11 +0,0 @@
--- scribus/scribus.h.orig Wed Aug 18 04:58:31 2004
+++ scribus/scribus.h Sun Aug 29 19:34:45 2004
@@ -565,7 +565,7 @@
QPopupMenu *toolbarMenu;
double mm2pts(int mm);
double pts2mm(double pts);
- void addNewPages(int wo, int where, int numPages, QString based1 = tr("Normal"), QString based2 = tr("Normal"));
+ void addNewPages(int wo, int where, int numPages, QString based1 = QObject::tr("Normal"), QString based2 = QObject::tr("Normal"));
QMap<int,QString> FontID;
int HaveGS;
void *PSDriver;

10
print/scribus/files/patch-scribus::utils.cpp
View File

@ -1,10 +0,0 @@
--- scribus/util.cpp.orig Fri Jan 7 04:04:34 2005
+++ scribus/util.cpp Mon Jan 10 22:03:01 2005
@@ -29,6 +29,7 @@
#include <qdir.h>
#include <qpointarray.h>
#include <qmessagebox.h>
+#include <algorithm>
#include <cstdlib>
#include <cmath>
#include <unistd.h>

20
print/scribus/files/patch-scribus_plugins_scriptplugin_macro.cpp Normal file
View File

@ -0,0 +1,20 @@
--- scribus/plugins/scriptplugin/macro.cpp.orig Sun Jul 3 16:34:04 2005
+++ scribus/plugins/scriptplugin/macro.cpp Mon Jul 4 13:10:49 2005
@@ -53,7 +53,7 @@
{
assert(!PyErr_Occurred());
- if ((newName == QString::null) or (newName == ""))
+ if ((newName == QString::null) || (newName == ""))
qDebug("Macro::Macro() called with NULL or '' name");
// set the macro name
@@ -344,7 +344,7 @@
// Must not return with an exception set
void Macro::setMacroName(QString newName)
{
- if ((newName == QString::null) or (newName == ""))
+ if ((newName == QString::null) || (newName == ""))
{
qDebug("Macro::setMacroName(): called with NULL or '' name");
return;

11
print/scribus/files/patch-scribus_plugins_short-words_vlnadialog.cpp Normal file
View File

@ -0,0 +1,11 @@
--- scribus/plugins/short-words/vlnadialog.cpp.orig Wed Feb 2 05:02:38 2005
+++ scribus/plugins/short-words/vlnadialog.cpp Mon Jul 4 13:18:50 2005
@@ -159,7 +159,7 @@
void VlnaDialog::selectAction(int aAction)
{
- if (aAction!=0 and aAction!=1 and aAction!=2) {
+ if (aAction!=0 && aAction!=1 && aAction!=2) {
aAction = 0;
}
buttonGroup->setButton(aAction);

88
print/scribus/pkg-plist
View File

@ -57,6 +57,26 @@ include/scribus/tree.h
include/scribus/vgradient.h
include/scribus/vruler.h
include/scribus/werktoolb.h
lib/scribus/dicts/README_ca_ES.txt
lib/scribus/dicts/README_cs_CZ.txt
lib/scribus/dicts/README_cy_GB.txt
lib/scribus/dicts/README_da_DK.txt
lib/scribus/dicts/README_de_DE.txt
lib/scribus/dicts/README_en_EN.txt
lib/scribus/dicts/README_en_GB.txt
lib/scribus/dicts/README_es_ES.txt
lib/scribus/dicts/README_fi_FI.txt
lib/scribus/dicts/README_hu_HU.txt
lib/scribus/dicts/README_lt_LT.txt
lib/scribus/dicts/README_no_NO.txt
lib/scribus/dicts/README_pl_PL.txt
lib/scribus/dicts/README_pt_BR.txt
lib/scribus/dicts/README_pt_PT.txt
lib/scribus/dicts/README_ru_RU_0.txt
lib/scribus/dicts/README_sk_SK.txt
lib/scribus/dicts/README_sl_SI.txt
lib/scribus/dicts/README_sv_SE.txt
lib/scribus/dicts/README_uk_UA.txt
lib/scribus/dicts/hyph_af.dic
lib/scribus/dicts/hyph_ca.dic
lib/scribus/dicts/hyph_cs.dic
@ -68,12 +88,14 @@ lib/scribus/dicts/hyph_es.dic
lib/scribus/dicts/hyph_fi.dic
lib/scribus/dicts/hyph_fr.dic
lib/scribus/dicts/hyph_ga.dic
lib/scribus/dicts/hyph_hr.dic
lib/scribus/dicts/hyph_hu.dic
lib/scribus/dicts/hyph_it.dic
lib/scribus/dicts/hyph_lt.dic
lib/scribus/dicts/hyph_nl.dic
lib/scribus/dicts/hyph_pl.dic
lib/scribus/dicts/hyph_pt.dic
lib/scribus/dicts/hyph_pt_BR.dic
lib/scribus/dicts/hyph_ru.dic
lib/scribus/dicts/hyph_sk.dic
lib/scribus/dicts/hyph_sl.dic
@ -98,6 +120,9 @@ lib/scribus/plugins/gettext/libcsvim.so.0
lib/scribus/plugins/gettext/libhtmlim.a
lib/scribus/plugins/gettext/libhtmlim.so
lib/scribus/plugins/gettext/libhtmlim.so.0
lib/scribus/plugins/gettext/libodtimplugin.a
lib/scribus/plugins/gettext/libodtimplugin.so
lib/scribus/plugins/gettext/libodtimplugin.so.0
lib/scribus/plugins/gettext/libsxwimplugin.a
lib/scribus/plugins/gettext/libsxwimplugin.so
lib/scribus/plugins/gettext/libsxwimplugin.so.0
@ -131,6 +156,9 @@ lib/scribus/plugins/libsaveastemplateplugin.so.0
lib/scribus/plugins/libscribusexportpixmap.a
lib/scribus/plugins/libscribusexportpixmap.so
lib/scribus/plugins/libscribusexportpixmap.so.0
lib/scribus/plugins/libscribusshortwords.a
lib/scribus/plugins/libscribusshortwords.so
lib/scribus/plugins/libscribusshortwords.so.0
lib/scribus/plugins/libscriptplugin.a
lib/scribus/plugins/libscriptplugin.so
lib/scribus/plugins/libscriptplugin.so.0
@ -147,7 +175,6 @@ lib/scribus/rgbscribusgreys.txt
lib/scribus/rgbsvg.txt
lib/scribus/scribus.af.qm
lib/scribus/scribus.bg.qm
lib/scribus/scribus.br.qm
lib/scribus/scribus.ca.qm
lib/scribus/scribus.cs.qm
lib/scribus/scribus.cy.qm
@ -168,6 +195,7 @@ lib/scribus/scribus.lt.qm
lib/scribus/scribus.nb.qm
lib/scribus/scribus.nl.qm
lib/scribus/scribus.pl.qm
lib/scribus/scribus.pt_BR.qm
lib/scribus/scribus.ru.qm
lib/scribus/scribus.se.qm
lib/scribus/scribus.sk.qm
@ -177,17 +205,24 @@ lib/scribus/scribus.sr.qm
lib/scribus/scribus.tr.qm
lib/scribus/scribus.uk.qm
lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/cs/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/doc/en/about1.html
%%DATADIR%%/doc/en/about2.html
%%DATADIR%%/doc/en/acroreader.html
%%DATADIR%%/doc/en/cms.html
%%DATADIR%%/doc/en/cms2.html
%%DATADIR%%/doc/en/cms3.html
%%DATADIR%%/doc/en/cms4.html
%%DATADIR%%/doc/en/codingstandards.html
%%DATADIR%%/doc/en/contributions.html
%%DATADIR%%/doc/en/cross-platform.html
%%DATADIR%%/doc/en/cups.html
%%DATADIR%%/doc/en/cygwin.html
%%DATADIR%%/doc/en/developers.html
%%DATADIR%%/doc/en/docchanges.html
%%DATADIR%%/doc/en/doccopyright.html
%%DATADIR%%/doc/en/docinfo.html
%%DATADIR%%/doc/en/documentation.html
@ -198,19 +233,26 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/fonts1.html
%%DATADIR%%/doc/en/fonts2.html
%%DATADIR%%/doc/en/fonts3.html
%%DATADIR%%/doc/en/fonts4.html
%%DATADIR%%/doc/en/fonts5.html
%%DATADIR%%/doc/en/gettexthowto.html
%%DATADIR%%/doc/en/gsadv.html
%%DATADIR%%/doc/en/gsfont.html
%%DATADIR%%/doc/en/gsview.html
%%DATADIR%%/doc/en/hyphenator.html
%%DATADIR%%/doc/en/images/RDF.png
%%DATADIR%%/doc/en/images/Scripter.png
%%DATADIR%%/doc/en/images/Scripter_error_string.png
%%DATADIR%%/doc/en/images/acro1.png
%%DATADIR%%/doc/en/images/acro2.png
%%DATADIR%%/doc/en/images/acro3.png
%%DATADIR%%/doc/en/images/acroinfo.png
%%DATADIR%%/doc/en/images/acropass.png
%%DATADIR%%/doc/en/images/acroreader5.1.png
%%DATADIR%%/doc/en/images/acrosec.png
%%DATADIR%%/doc/en/images/after_short_words.png
%%DATADIR%%/doc/en/images/batik1.png
%%DATADIR%%/doc/en/images/before_short_words.png
%%DATADIR%%/doc/en/images/cmsmodify1.png
%%DATADIR%%/doc/en/images/cmspanel.png
%%DATADIR%%/doc/en/images/colormanager2.png
@ -224,6 +266,11 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/fontpref3.png
%%DATADIR%%/doc/en/images/fontprev.png
%%DATADIR%%/doc/en/images/fonts.png
%%DATADIR%%/doc/en/images/fonts2.png
%%DATADIR%%/doc/en/images/fonts3.png
%%DATADIR%%/doc/en/images/fonts4.png
%%DATADIR%%/doc/en/images/fontsampler.png
%%DATADIR%%/doc/en/images/fontsampler2.png
%%DATADIR%%/doc/en/images/formularz_export_PDF.png
%%DATADIR%%/doc/en/images/formularz_js_skrypt.png
%%DATADIR%%/doc/en/images/formularz_js_sprawdzanie.png
@ -258,7 +305,6 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/prefspanel5.png
%%DATADIR%%/doc/en/images/printer1.png
%%DATADIR%%/doc/en/images/printer2.png
%%DATADIR%%/doc/en/images/printer3.png
%%DATADIR%%/doc/en/images/printpreview.png
%%DATADIR%%/doc/en/images/printseps.png
%%DATADIR%%/doc/en/images/pstoedit1.png
@ -270,6 +316,8 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/images/siatka_menu.png
%%DATADIR%%/doc/en/images/spinbox1.png
%%DATADIR%%/doc/en/images/svg1.png
%%DATADIR%%/doc/en/images/swdialog.png
%%DATADIR%%/doc/en/images/swmenu.png
%%DATADIR%%/doc/en/images/symbole.png
%%DATADIR%%/doc/en/images/ulica.png
%%DATADIR%%/doc/en/images/wlasciwosci_pola.png
@ -291,6 +339,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/machints2.html
%%DATADIR%%/doc/en/menu.xml
%%DATADIR%%/doc/en/moncal.html
%%DATADIR%%/doc/en/mouse.html
%%DATADIR%%/doc/en/otherinfo.html
%%DATADIR%%/doc/en/parallel-install.html
%%DATADIR%%/doc/en/pdf_form.html
@ -304,13 +353,15 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/print1.html
%%DATADIR%%/doc/en/print2.html
%%DATADIR%%/doc/en/print3.html
%%DATADIR%%/doc/en/readme.html
%%DATADIR%%/doc/en/resources.html
%%DATADIR%%/doc/en/screenshots.html
%%DATADIR%%/doc/en/scribus-svg.html
%%DATADIR%%/doc/en/scribuscopyright.html
%%DATADIR%%/doc/en/scribusfileformat.html
%%DATADIR%%/doc/en/scripter-extensions.html
%%DATADIR%%/doc/en/scripter-faq.html
%%DATADIR%%/doc/en/scripter1.html
%%DATADIR%%/doc/en/scripterapi-ImageExport.html
%%DATADIR%%/doc/en/scripterapi-PDFfile.html
%%DATADIR%%/doc/en/scripterapi-Printer.html
%%DATADIR%%/doc/en/scripterapi-color.html
@ -329,6 +380,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/scripterapi-textframes.html
%%DATADIR%%/doc/en/scripterapi.html
%%DATADIR%%/doc/en/settings1.html
%%DATADIR%%/doc/en/short-words.html
%%DATADIR%%/doc/en/specs.html
%%DATADIR%%/doc/en/toolbox.html
%%DATADIR%%/doc/en/toolbox1.html
@ -347,7 +399,18 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/doc/en/topten.html
%%DATADIR%%/doc/en/translation_howto.html
%%DATADIR%%/doc/en/tutorials.html
%%DATADIR%%/doc/en/wine.html
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/fr/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/after_short_words.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/before_short_words.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/dialog.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/menu.png
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/menu.xml
%%DATADIR%%/doc/pl/tutorials/scribus-short-words/short-words-manual.html
%%DATADIR%%/icons/AddNode.png
%%DATADIR%%/icons/AddPoint.png
%%DATADIR%%/icons/AppIcon.png
@ -503,6 +566,7 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/icons/vectorgfx.png
%%DATADIR%%/icons/view.png
%%DATADIR%%/icons/vmirror.png
%%DATADIR%%/plugins/scribus-short-words.rc
%%DATADIR%%/samples/3columnA4.py
%%DATADIR%%/samples/3columnUSLTR.py
%%DATADIR%%/samples/Calendar.py
@ -517,9 +581,9 @@ lib/scribus/scribus.zh.qm
%%DATADIR%%/samples/plus_10_pourcent_group.py
%%DATADIR%%/samples/pochette_cd.py
%%DATADIR%%/samples/quote.py
%%DATADIR%%/samples/sample_db_usage.py
%%DATADIR%%/samples/trait_de_coupe.py
%%DATADIR%%/samples/wordcount.py
%%DATADIR%%/scripts/COPYING
%%DATADIR%%/scripts/ChangeLog
%%DATADIR%%/scripts/FontSample.py
%%DATADIR%%/scripts/NEWS
@ -554,9 +618,19 @@ lib/scribus/scribus.zh.qm
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/doc/pl/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/pl/tutorials
@dirrm %%DATADIR%%/doc/pl
@dirrm %%DATADIR%%/doc/fr/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/fr/tutorials
@dirrm %%DATADIR%%/doc/fr
@dirrm %%DATADIR%%/doc/en/images
@dirrm %%DATADIR%%/doc/en
@dirrm %%DATADIR%%/doc/cs/tutorials/scribus-short-words
@dirrm %%DATADIR%%/doc/cs/tutorials
@dirrm %%DATADIR%%/doc/cs
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
@dirrm lib/scribus/profiles