diff -urN /usr/ports/editors/pdfedit/Makefile editors/pdfedit/Makefile --- /usr/ports/editors/pdfedit/Makefile 2010-10-12 02:42:38.000000000 +0900 +++ editors/pdfedit/Makefile 2011-06-29 13:23:36.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= pdfedit -PORTVERSION= 0.4.1 -PORTREVISION= 5 +PORTVERSION= 0.4.5 CATEGORIES= editors MASTER_SITES= SF @@ -18,19 +17,40 @@ LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ t1.5:${PORTSDIR}/devel/t1lib +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/doc/LICENSE.GPL + USE_BZIP2= yes -USE_GMAKE= yes -USE_PERL5_BUILD=yes USE_QT_VER= 3 +USE_PERL5_BUILD=yes +USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" -MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${LOCALBASE}" -CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" +CONFIGURE_ARGS= --with-t1-library=${LOCALBASE}/lib \ + --with-t1-includes=${LOCALBASE}/include \ + --with-parallel-make=off +MAKE_ENV= ${CONFIGURE_ENV} +MAKE_JOBS_SAFE= yes MAN1= pdfedit.1 +post-patch: + @${REINPLACE_CMD} -e \ + 's|-pedantic||g ; \ + s| $$(OPTIM)||g ; \ + s| $$(ARCH)||g ; \ + s| -pipe.*$$||g ; \ + s|^CFLAGS =|CFLAGS +=|g ; \ + s|^CXXFLAGS =|CXXFLAGS +=|g' ${WRKSRC}/Makefile.flags.in + @${REINPLACE_CMD} -e \ + '/QMAKE/s| make| $$MAKE|g' ${WRKSRC}/src/qsa/configure + post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/gui/${PORTNAME} ${PREFIX}/bin +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in Changelog README doc/AUTHORS + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include diff -urN /usr/ports/editors/pdfedit/distinfo editors/pdfedit/distinfo --- /usr/ports/editors/pdfedit/distinfo 2011-03-21 02:44:05.000000000 +0900 +++ editors/pdfedit/distinfo 2011-03-14 04:47:25.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (pdfedit-0.4.1.tar.bz2) = e12c3cb0e12775d296983212f69d66381de0eee6b94cc9a7dc10c1196b719522 -SIZE (pdfedit-0.4.1.tar.bz2) = 2958137 +SHA256 (pdfedit-0.4.5.tar.bz2) = 33ad8d59f4e51d8befd2dc2c577516e16c0cd11ebd3d22fed38233a793c6a4b9 +SIZE (pdfedit-0.4.5.tar.bz2) = 3026130 diff -urN /usr/ports/editors/pdfedit/files/patch-Makefile.flags.in editors/pdfedit/files/patch-Makefile.flags.in --- /usr/ports/editors/pdfedit/files/patch-Makefile.flags.in 2008-03-11 01:06:34.000000000 +0900 +++ editors/pdfedit/files/patch-Makefile.flags.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,18 +0,0 @@ ---- ./Makefile.flags.in.orig 2008-02-20 14:45:18.000000000 -0300 -+++ ./Makefile.flags.in 2008-03-10 13:32:13.000000000 -0300 -@@ -107,11 +107,11 @@ - EXTRA_GUI_CXXFLAGS = -D CONFIG_DATA_PATH="$(DATA_PATH)" - - # same like for compiler stuff we also define 2 levels --CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) -pipe --CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe -+CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(WARN) $(C_EXTRA) -pipe -+CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe - --CFLAGS = $(CONFIG_CFLAGS) --CXXFLAGS = $(CONFIG_CXXFLAGS) -+CFLAGS += $(CONFIG_CFLAGS) -+CXXFLAGS += $(CONFIG_CXXFLAGS) - - ####################################### - # Absolute paths for all components diff -urN /usr/ports/editors/pdfedit/files/patch-configure editors/pdfedit/files/patch-configure --- /usr/ports/editors/pdfedit/files/patch-configure 2008-03-11 01:06:34.000000000 +0900 +++ editors/pdfedit/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,14 +0,0 @@ ---- ./configure.orig 2008-02-24 15:59:23.000000000 -0300 -+++ ./configure 2008-03-10 13:27:12.000000000 -0300 -@@ -5141,11 +5141,6 @@ - done - - fi -- if test "x$link_iostreams" != "xyes"; then -- { { echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 --echo "$as_me: error: Could not link against $ax_lib !" >&2;} -- { (exit 1); exit 1; }; } -- fi - fi - - CPPFLAGS="$CPPFLAGS_SAVED" diff -urN /usr/ports/editors/pdfedit/files/patch-doc__Makefile editors/pdfedit/files/patch-doc__Makefile --- /usr/ports/editors/pdfedit/files/patch-doc__Makefile 1970-01-01 09:00:00.000000000 +0900 +++ editors/pdfedit/files/patch-doc__Makefile 2011-03-21 20:35:23.000000000 +0900 @@ -0,0 +1,12 @@ +--- doc/Makefile.orig 2008-12-03 09:16:03.000000000 +0900 ++++ doc/Makefile 2011-03-21 20:34:48.000000000 +0900 +@@ -18,9 +18,6 @@ + $(USER_MANUAL_INSTALL_TARGET) \ + $(DOXYGEN_INSTALL_TARGET) \ + $(ADVANCED_DOC_INSTALL_TARGET) +- $(MKDIR) $(INSTALL_ROOT)$(DOC_PATH)/; +- $(COPY_FILE) LICENSE.GPL ../README ../Changelog AUTHORS README-* \ +- README.cygwin $(INSTALL_ROOT)$(DOC_PATH) + + # TODO maybe we should be less brutal here and delete only our files However we + # have no list of installed doc files. This list is probably too much effort diff -urN /usr/ports/editors/pdfedit/files/patch-src-kernel-cpdf.cc editors/pdfedit/files/patch-src-kernel-cpdf.cc --- /usr/ports/editors/pdfedit/files/patch-src-kernel-cpdf.cc 2009-03-01 05:22:16.000000000 +0900 +++ editors/pdfedit/files/patch-src-kernel-cpdf.cc 1970-01-01 09:00:00.000000000 +0900 @@ -1,29 +0,0 @@ ---- src/kernel/cpdf.cc.orig 2008-02-22 11:42:07.000000000 +0300 -+++ src/kernel/cpdf.cc 2009-02-28 05:38:20.000000000 +0300 -@@ -2347,7 +2347,7 @@ - instance->file = file; - kernelPrintDbg(debug::DBG_INFO, "Instance created successfully openMode=" << openMode); - return instance; -- }catch(exception &e) -+ }catch(std::exception &e) - { - kernelPrintDbg(DBG_CRIT, "Pdf instance creation failed. cause="<second->invalidate(); -- }catch(exception & e) -+ }catch(std::exception & e) - { - kernelPrintDbg(DBG_CRIT, "Unexpected error. cause="< pdf; ++ do { ++ try { ++ pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode); ++ }catch(PdfOpenException &e) { ++ // try to fallback to readonly mode ++ if (mode >= CPdf::ReadWrite) { ++ mode = CPdf::ReadOnly; ++ continue; ++ } ++ throw e; ++ } ++ }while(!pdf); ++ return pdf; + } + + /** \copydoc loadFromFile */ diff -urN /usr/ports/editors/pdfedit/files/patch-src__gui__pdfutil.cc editors/pdfedit/files/patch-src__gui__pdfutil.cc --- /usr/ports/editors/pdfedit/files/patch-src__gui__pdfutil.cc 1970-01-01 09:00:00.000000000 +0900 +++ editors/pdfedit/files/patch-src__gui__pdfutil.cc 2011-03-21 20:41:03.000000000 +0900 @@ -0,0 +1,24 @@ +--- src/gui/pdfutil.cc.orig 2009-04-07 00:24:47.000000000 +0900 ++++ src/gui/pdfutil.cc 2011-03-21 20:36:57.000000000 +0900 +@@ -451,7 +451,20 @@ + @param askPassword If true, password will be asked for if necessary + */ + boost::shared_ptr getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword) { +- boost::shared_ptr pdf=CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(), mode); ++ boost::shared_ptr pdf; ++ do { ++ try { ++ pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode); ++ }catch(PdfOpenException &e) { ++ // try to fallback to readonly mode ++ if (mode >= CPdf::ReadWrite) { ++ mode = CPdf::ReadOnly; ++ continue; ++ } ++ throw e; ++ } ++ }while(!pdf); ++ + if (askPassword && pdf->needsCredentials()) { + for(;;) { + //Ask for password until we either get the right one or user gets bored with retrying diff -urN /usr/ports/editors/pdfedit/files/patch-src__kernel__cpagecontents.cc editors/pdfedit/files/patch-src__kernel__cpagecontents.cc --- /usr/ports/editors/pdfedit/files/patch-src__kernel__cpagecontents.cc 1970-01-01 09:00:00.000000000 +0900 +++ editors/pdfedit/files/patch-src__kernel__cpagecontents.cc 2011-03-23 09:45:00.000000000 +0900 @@ -0,0 +1,34 @@ +--- src/kernel/cpagecontents.cc.orig 2010-04-30 21:44:30.000000000 +0900 ++++ src/kernel/cpagecontents.cc 2011-03-21 20:39:56.000000000 +0900 +@@ -379,6 +379,12 @@ + + // Get the text + libs::Rectangle rec = (rc)? *rc : _page->display()->getPageRect(); ++ // if we use rotation 90,270 then we must change the rectangle from which we want the text ++ // accordingly (TODO - verify for all rotations) ++ int rot = _page->getRotation (); ++ if (90 == rot || 270 == rot) ++ std::swap (rec.xright, rec.yright); ++ + scoped_ptr gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright)); + text = gtxt->getCString(); + } +@@ -540,10 +546,14 @@ + + + CDict image_dict; +- image_dict.addProperty ("W", CInt (image_size.x)); +- image_dict.addProperty ("H", CInt (image_size.y)); +- image_dict.addProperty ("CS", CName ("RGB")); +- image_dict.addProperty ("BPC", CInt (8)); ++ CInt x (image_size.x); ++ image_dict.addProperty ("W", x); ++ CInt y (image_size.y); ++ image_dict.addProperty ("H", y); ++ CName n ("RGB"); ++ image_dict.addProperty ("CS", n); ++ CInt i (8); ++ image_dict.addProperty ("BPC", i); + CInlineImage img (image_dict, what); + shared_ptr inline_image (new CInlineImage (image_dict, what)); + shared_ptr BI(new InlineImageCompositePdfOperator (inline_image)); diff -urN /usr/ports/editors/pdfedit/files/patch-src__qsa__configure editors/pdfedit/files/patch-src__qsa__configure --- /usr/ports/editors/pdfedit/files/patch-src__qsa__configure 2008-03-11 01:06:34.000000000 +0900 +++ editors/pdfedit/files/patch-src__qsa__configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./src/qsa/configure.orig 2008-01-16 10:50:31.000000000 -0300 -+++ ./src/qsa/configure 2008-03-10 13:36:40.000000000 -0300 -@@ -15,7 +15,7 @@ - # invoke 2nd stage - echo Building second stage2 configure - cd configure2 --$QMAKE && make > /dev/null -+$QMAKE && $MAKE > /dev/null - if [ $? -gt 0 -o ! -x configure2 ]; - then - echo Failed to build diff -urN /usr/ports/editors/pdfedit/files/patch-src__tools__pdf_to_text.cc editors/pdfedit/files/patch-src__tools__pdf_to_text.cc --- /usr/ports/editors/pdfedit/files/patch-src__tools__pdf_to_text.cc 1970-01-01 09:00:00.000000000 +0900 +++ editors/pdfedit/files/patch-src__tools__pdf_to_text.cc 2011-03-21 20:42:01.000000000 +0900 @@ -0,0 +1,17 @@ +--- src/tools/pdf_to_text.cc.orig 2010-04-23 15:58:36.000000000 +0900 ++++ src/tools/pdf_to_text.cc 2011-03-21 20:37:12.000000000 +0900 +@@ -47,6 +47,14 @@ + struct _textify { + string operator () (shared_ptr page) + { ++ // Update display params to use media box not default page rect (DEFAULT_PAGE_RX, DEFAULT_PAGE_RY) ++ // TODO upsidedown? get/set ++ DisplayParams dp; ++ dp.useMediaBox = gTrue; ++ dp.crop = gFalse; ++ dp.rotate = page->getRotation (); ++ page->setDisplayParams (dp); ++ + string text; + static const std::string encoding="UTF-8"; + page->getText (text, &encoding); diff -urN /usr/ports/editors/pdfedit/pkg-descr editors/pdfedit/pkg-descr --- /usr/ports/editors/pdfedit/pkg-descr 2007-12-21 11:41:03.000000000 +0900 +++ editors/pdfedit/pkg-descr 2011-06-29 13:22:29.000000000 +0900 @@ -7,4 +7,4 @@ Target platform are operating systems of Unix type (Linux, BSD, ...), we are using C++, XPDF, QT3 and QSA. -WWW: http://pdfedit.petricek.net/ +WWW: http://pdfedit.cz/ diff -urN /usr/ports/editors/pdfedit/pkg-plist editors/pdfedit/pkg-plist --- /usr/ports/editors/pdfedit/pkg-plist 2008-08-13 22:33:53.000000000 +0900 +++ editors/pdfedit/pkg-plist 2011-03-21 20:46:57.000000000 +0900 @@ -1,78 +1,12 @@ bin/pdfedit -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/Changelog -%%DOCSDIR%%/LICENSE.GPL -%%DOCSDIR%%/README -%%DOCSDIR%%/README-Tango -%%DOCSDIR%%/README.cygwin -%%DOCSDIR%%/gui/images/command_options_cmdedit.png -%%DOCSDIR%%/gui/images/options_commandline.png -%%DOCSDIR%%/gui/images/options_editor.png -%%DOCSDIR%%/gui/images/options_execute.png -%%DOCSDIR%%/gui/images/options_lookandfeel.png -%%DOCSDIR%%/gui/images/options_objecttree.png -%%DOCSDIR%%/gui/images/options_paths.png -%%DOCSDIR%%/gui/images/options_toolbars.png -%%DOCSDIR%%/gui/images/pagespace.png -%%DOCSDIR%%/gui/images/pdfedit.png -%%DOCSDIR%%/gui/images/propedit_all.png -%%DOCSDIR%%/gui/images/propedit_catalog.png -%%DOCSDIR%%/gui/images/propedit_edit.png -%%DOCSDIR%%/gui/images/propedit_edit_add.png -%%DOCSDIR%%/gui/images/propedit_edit_del.png -%%DOCSDIR%%/gui/images/propedit_edit_ref.png -%%DOCSDIR%%/gui/images/propedit_gfx_selection.png -%%DOCSDIR%%/gui/images/propedit_impor.png -%%DOCSDIR%%/gui/images/propedit_multiselection.png -%%DOCSDIR%%/gui/images/propedit_op_desc.png -%%DOCSDIR%%/gui/images/propedit_op_modes.png -%%DOCSDIR%%/gui/images/propedit_opt_editor.png -%%DOCSDIR%%/gui/images/propedit_opt_objtree.png -%%DOCSDIR%%/gui/images/propedit_outlines.png -%%DOCSDIR%%/gui/images/propedit_pages.png -%%DOCSDIR%%/gui/images/propedit_rclick.png -%%DOCSDIR%%/gui/images/propedit_stream.png -%%DOCSDIR%%/gui/images/propedit_text_selection.png -%%DOCSDIR%%/gui/images/theme1.png -%%DOCSDIR%%/gui/images/theme2.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_addFont.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_dashpattern.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_editPageMetrics.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_extractedText.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_findText.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/insert_pages.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_edit.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_file.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_help.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_page.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_tools.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_view.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_draw.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_dynamic.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_main.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_operator.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_page.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_revision.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_selectionmode.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_text.png -%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_treeview.png -%%DOCSDIR%%/images/filedialog.png -%%DOCSDIR%%/images/inputitem.png -%%DOCSDIR%%/images/inputtext.png -%%DOCSDIR%%/images/messageb1.png -%%DOCSDIR%%/images/pdfedit.png -%%DOCSDIR%%/images/qchkbox-w.png -%%DOCSDIR%%/images/qcombo1-w.png -%%DOCSDIR%%/images/qgrpbox-w.png -%%DOCSDIR%%/images/qlined-w.png -%%DOCSDIR%%/images/qradiobt-w.png -%%DOCSDIR%%/images/qsdateed.png -%%DOCSDIR%%/images/qspinbox-w.png -%%DOCSDIR%%/images/qstimeed.png +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/Changelog +%%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/callback.qs %%DATADIR%%/delinearize.qs %%DATADIR%%/dialog_lib.qs %%DATADIR%%/dialogs.qs +%%DATADIR%%/flatten.qs %%DATADIR%%/help/cs/index.html %%DATADIR%%/help/cs/keyboard.html %%DATADIR%%/help/images/filedialog.png @@ -165,6 +99,7 @@ %%DATADIR%%/icon/draw_rect.png %%DATADIR%%/icon/expand.png %%DATADIR%%/icon/first.png +%%DATADIR%%/icon/flatten.png %%DATADIR%%/icon/help.png %%DATADIR%%/icon/hicolor/about.png %%DATADIR%%/icon/hicolor/add_text.png @@ -290,8 +225,10 @@ %%DATADIR%%/lang/pdfedit_cs.qm %%DATADIR%%/lang/pdfedit_de.qm %%DATADIR%%/lang/pdfedit_es.qm +%%DATADIR%%/lang/pdfedit_fr.qm %%DATADIR%%/lang/pdfedit_ru.qm %%DATADIR%%/lang/pdfedit_sk.qm +%%DATADIR%%/lang/pdfedit_zh_TW.qm %%DATADIR%%/menu.qs %%DATADIR%%/mode.conf %%DATADIR%%/operator.hint @@ -299,6 +236,7 @@ %%DATADIR%%/pdfeditrc %%DATADIR%%/pdfoperator.qs %%DATADIR%%/scripts/delinearize.qs +%%DATADIR%%/scripts/flatten.qs %%DATADIR%%/scripts/pdftoxml.qs %%DATADIR%%/scripts/update.qs %%DATADIR%%/test.qs @@ -311,9 +249,4 @@ @dirrm %%DATADIR%%/help/cs @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%%/images -@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun/images -@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun -@dirrm %%DOCSDIR%%/gui/images -@dirrm %%DOCSDIR%%/gui -@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%