- Update to version 0.4.1.

9 files changed, 111 insertions, 83 deletions

diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
index 3b1e07e46509..c2fe1514aff0 100644
--- a/editors/pdfedit/Makefile
+++ b/editors/pdfedit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pdfedit
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.1
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/pdfedit/distinfo b/editors/pdfedit/distinfo
index 97f7898ee03c..fbfa3bb8dec0 100644
--- a/editors/pdfedit/distinfo
+++ b/editors/pdfedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdfedit-0.3.2.tar.bz2) = e4ed098f70a4c5675b16b22641f5a182
-SHA256 (pdfedit-0.3.2.tar.bz2) = 17df8fdecb3e3df03ea78eea98b716fe04ac84b61242d680ac4792b4edb7a751
-SIZE (pdfedit-0.3.2.tar.bz2) = 2978196
+MD5 (pdfedit-0.4.1.tar.bz2) = 05fdd1d995b863709b7130ca8ed5b431
+SHA256 (pdfedit-0.4.1.tar.bz2) = e12c3cb0e12775d296983212f69d66381de0eee6b94cc9a7dc10c1196b719522
+SIZE (pdfedit-0.4.1.tar.bz2) = 2958137
diff --git a/editors/pdfedit/files/patch-Makefile.flags.in b/editors/pdfedit/files/patch-Makefile.flags.in
new file mode 100644
index 000000000000..4bb4dbfb8fcd
--- /dev/null
+++ b/editors/pdfedit/files/patch-Makefile.flags.in
@@ -0,0 +1,18 @@
+--- ./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 --git a/editors/pdfedit/files/patch-config.pro.in.in b/editors/pdfedit/files/patch-config.pro.in.in
deleted file mode 100644
index 50f6c0765019..000000000000
--- a/editors/pdfedit/files/patch-config.pro.in.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./config.pro.in.in.orig	Mon Apr 23 13:36:32 2007
-+++ ./config.pro.in.in	Thu May  3 14:32:03 2007
-@@ -4,6 +4,8 @@
- DATA_PATH   = @datadir@/pdfedit
- DOC_PATH    = @datadir@/doc/pdfedit
- MAN_PATH    = @mandir@/man1
--BIN_PATH    = @bindir@
-+E_RELEASE = @enable_release@
-+
-+include($$QMAKESPEC/qmake.conf)
- E_RELEASE   = @enable_release@
- QTVERSION   = qt3
diff --git a/editors/pdfedit/files/patch-configure b/editors/pdfedit/files/patch-configure
new file mode 100644
index 000000000000..b54e0a1c561d
--- /dev/null
+++ b/editors/pdfedit/files/patch-configure
@@ -0,0 +1,14 @@
+--- ./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 --git a/editors/pdfedit/files/patch-src__gui__pdfedit.pro b/editors/pdfedit/files/patch-src__gui__pdfedit.pro
deleted file mode 100644
index 72ea27a3362d..000000000000
--- a/editors/pdfedit/files/patch-src__gui__pdfedit.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gui/pdfedit.pro.orig	Sun Apr 29 14:28:52 2007
-+++ ./src/gui/pdfedit.pro	Thu May  3 15:00:01 2007
-@@ -240,7 +240,7 @@
- }
- 
- #OutputDevice
--LIBS += -lqoutputdevices -L../kpdf-kde-3.3.2
-+LIBS += -lqoutputdevices -L../kpdf-kde-3.3.2 -L$$LOCALBASE/lib -lt1
- 
- include(../kernel/kernel-obj.pro)
- 
diff --git a/editors/pdfedit/files/patch-src__qsa__configure b/editors/pdfedit/files/patch-src__qsa__configure
new file mode 100644
index 000000000000..abf1e2751cd7
--- /dev/null
+++ b/editors/pdfedit/files/patch-src__qsa__configure
@@ -0,0 +1,11 @@
+--- ./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 --git a/editors/pdfedit/files/patch-src__utils__Makefile b/editors/pdfedit/files/patch-src__utils__Makefile
deleted file mode 100644
index 86f3ea7039c1..000000000000
--- a/editors/pdfedit/files/patch-src__utils__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/utils/Makefile.orig	Fri Apr 13 12:08:02 2007
-+++ ./src/utils/Makefile	Thu May  3 14:32:03 2007
-@@ -18,10 +18,10 @@
- 
- AR       = ar cqs
- DEL_FILE = rm -f
--CXX      = g++
-+CXX      ?= g++
- LEX      = flex
- YACC     = yacc
--CXXFLAGS = -pipe -Wall -W -Wconversion -Wcast-qual -Wwrite-strings -ansi -pedantic -Wno-unused-variable -Wunused-function -D_REENTRANT $(UTIL_CXXFLAGS)
-+CXXFLAGS += -pipe -Wall -W -Wconversion -Wcast-qual -Wwrite-strings -ansi -pedantic -Wno-unused-variable -Wunused-function -D_REENTRANT $(UTIL_CXXFLAGS)
- INCPATH	 = -I./ -I../ -I../xpdf/ -I../xpdf/xpdf -I../xpdf/goo -I../xpdf/splash -I../xpdf/fofi 
- 
- .SUFFIXES: .o .cc
diff --git a/editors/pdfedit/pkg-plist b/editors/pdfedit/pkg-plist
index 04af271c828e..4d0294a96fbd 100644
--- a/editors/pdfedit/pkg-plist
+++ b/editors/pdfedit/pkg-plist
@@ -3,42 +3,8 @@ bin/pdfedit
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/appendix.html
-%%PORTDOCS%%%%DOCSDIR%%/design/design_doc.html
-%%PORTDOCS%%%%DOCSDIR%%/design/images/compositepattern.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/confparser.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/decaratorpattern.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/delinearizator.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/facadepattern.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/factorymethodpattern.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/iterator.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/iteratorpattern.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/kernel.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/layers.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/objectadapter.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/observer_classes.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/observer_cooperation.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/page_tree.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/parser.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/rulesmanager.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/scripting.png
-%%PORTDOCS%%%%DOCSDIR%%/design/images/xpdf_streams.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/boost_streams_pdfedit.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/cannotation.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/ccontentstream_operator.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/cobjectsexample.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/cpdf_facade.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/cxref.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/iproperty.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/modecontroller.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/pdfoperator.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/pdfoperatorexample.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/pdfoperatoriterator.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/pdfoperators.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/progressobserver.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/stateupdater.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/xpdf_streams_simple.png
-%%PORTDOCS%%%%DOCSDIR%%/design/kernel/images/xref_layer_diagram.png
+%%PORTDOCS%%%%DOCSDIR%%/README-Tango
+%%PORTDOCS%%%%DOCSDIR%%/README.cygwin
 %%PORTDOCS%%%%DOCSDIR%%/gui/images/command_options_cmdedit.png
 %%PORTDOCS%%%%DOCSDIR%%/gui/images/options_commandline.png
 %%PORTDOCS%%%%DOCSDIR%%/gui/images/options_editor.png
@@ -103,7 +69,6 @@ bin/pdfedit
 %%PORTDOCS%%%%DOCSDIR%%/images/qsdateed.png
 %%PORTDOCS%%%%DOCSDIR%%/images/qspinbox-w.png
 %%PORTDOCS%%%%DOCSDIR%%/images/qstimeed.png
-%%PORTDOCS%%%%DOCSDIR%%/user_doc.html
 %%DATADIR%%/callback.qs
 %%DATADIR%%/delinearize.qs
 %%DATADIR%%/dialog_lib.qs
@@ -129,6 +94,67 @@ bin/pdfedit
 %%DATADIR%%/help/qsa-inputdialog.html
 %%DATADIR%%/help/qsa-util.html
 %%DATADIR%%/help/scripting.html
+%%DATADIR%%/icon/Tango/about.png
+%%DATADIR%%/icon/Tango/add_text.png
+%%DATADIR%%/icon/Tango/close.png
+%%DATADIR%%/icon/Tango/close_widget.png
+%%DATADIR%%/icon/Tango/delin.png
+%%DATADIR%%/icon/Tango/draw_arrow.png
+%%DATADIR%%/icon/Tango/draw_line.png
+%%DATADIR%%/icon/Tango/draw_rect.png
+%%DATADIR%%/icon/Tango/expand.png
+%%DATADIR%%/icon/Tango/first.png
+%%DATADIR%%/icon/Tango/help.png
+%%DATADIR%%/icon/Tango/hide_cmdline.png
+%%DATADIR%%/icon/Tango/hide_propedit.png
+%%DATADIR%%/icon/Tango/hide_statusbar.png
+%%DATADIR%%/icon/Tango/hide_tree.png
+%%DATADIR%%/icon/Tango/insert_pages.png
+%%DATADIR%%/icon/Tango/item_add.png
+%%DATADIR%%/icon/Tango/item_delete.png
+%%DATADIR%%/icon/Tango/item_edit.png
+%%DATADIR%%/icon/Tango/item_type.png
+%%DATADIR%%/icon/Tango/last.png
+%%DATADIR%%/icon/Tango/load.png
+%%DATADIR%%/icon/Tango/new.png
+%%DATADIR%%/icon/Tango/new_window.png
+%%DATADIR%%/icon/Tango/next.png
+%%DATADIR%%/icon/Tango/operator_dashpattern.png
+%%DATADIR%%/icon/Tango/operator_editfont.png
+%%DATADIR%%/icon/Tango/operator_linewidth.png
+%%DATADIR%%/icon/Tango/operator_setcolor.png
+%%DATADIR%%/icon/Tango/operator_setrelpos.png
+%%DATADIR%%/icon/Tango/operator_setrelposop.png
+%%DATADIR%%/icon/Tango/options.png
+%%DATADIR%%/icon/Tango/page_add_font.png
+%%DATADIR%%/icon/Tango/page_delete.png
+%%DATADIR%%/icon/Tango/page_edit_metrics.png
+%%DATADIR%%/icon/Tango/page_move_down.png
+%%DATADIR%%/icon/Tango/page_move_up.png
+%%DATADIR%%/icon/Tango/page_rotate_-90.png
+%%DATADIR%%/icon/Tango/page_rotate_90.png
+%%DATADIR%%/icon/Tango/page_settm.png
+%%DATADIR%%/icon/Tango/page_text.png
+%%DATADIR%%/icon/Tango/pdftoxml.png
+%%DATADIR%%/icon/Tango/prev.png
+%%DATADIR%%/icon/Tango/reload.png
+%%DATADIR%%/icon/Tango/save.png
+%%DATADIR%%/icon/Tango/save_page_as_image.png
+%%DATADIR%%/icon/Tango/searchText.png
+%%DATADIR%%/icon/Tango/selectmode_all.png
+%%DATADIR%%/icon/Tango/selectmode_all_gfx.png
+%%DATADIR%%/icon/Tango/selectmode_allobjects.png
+%%DATADIR%%/icon/Tango/selectmode_hilite.png
+%%DATADIR%%/icon/Tango/selectmode_strike.png
+%%DATADIR%%/icon/Tango/selectmode_text.png
+%%DATADIR%%/icon/Tango/stream_mode_all.png
+%%DATADIR%%/icon/Tango/stream_mode_font.png
+%%DATADIR%%/icon/Tango/stream_mode_gfx.png
+%%DATADIR%%/icon/Tango/stream_mode_text.png
+%%DATADIR%%/icon/Tango/string_representation.png
+%%DATADIR%%/icon/Tango/tree_childs.png
+%%DATADIR%%/icon/Tango/zoom_in.png
+%%DATADIR%%/icon/Tango/zoom_out.png
 %%DATADIR%%/icon/about.png
 %%DATADIR%%/icon/add_text.png
 %%DATADIR%%/icon/close.png
@@ -279,6 +305,7 @@ bin/pdfedit
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%/icon/hicolor
+@dirrm %%DATADIR%%/icon/Tango
 @dirrm %%DATADIR%%/icon
 @dirrm %%DATADIR%%/help/images
 @dirrm %%DATADIR%%/help/cs
@@ -289,8 +316,4 @@ bin/pdfedit
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/gui/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/gui
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design/kernel/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design/kernel
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design
 %%PORTDOCS%%@dirrm %%DOCSDIR%%