===================================================================
RCS file: /cvs/ports/textproc/goldendict/patches/Attic/patch-goldendict_pro,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ports/textproc/goldendict/patches/Attic/patch-goldendict_pro	2010/06/04 18:18:32	1.1
+++ ports/textproc/goldendict/patches/Attic/patch-goldendict_pro	2011/04/03 19:30:11	1.2
@@ -1,36 +1,48 @@
-$OpenBSD: patch-goldendict_pro,v 1.1 2010/06/04 17:18:32 yason Exp $
---- goldendict.pro.orig	Sun May 24 23:28:51 2009
-+++ goldendict.pro	Fri Jun  4 13:43:14 2010
-@@ -35,24 +35,20 @@ unix { 
-     LIBS += -lXtst
+$OpenBSD: patch-goldendict_pro,v 1.2 2011/04/03 19:30:11 yason Exp $
+--- goldendict.pro.orig	Sat Dec  4 00:12:46 2010
++++ goldendict.pro	Mon Apr  4 00:13:38 2011
+@@ -58,12 +58,12 @@ unix {
+ 	ogg \
+ 	hunspell
+     LIBS += -lX11 \
+-        -lXtst
++        -lXtst -lexecinfo
      PREFIX = $$(PREFIX)
      isEmpty( PREFIX ):PREFIX = /usr/local
 -    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+    isEmpty( DESKTOPDIR ):DESKTOPDIR = $$PREFIX/share/applications
-+    isEmpty( ICONDIR ):ICONDIR = $$PREFIX/share/pixmaps
 +    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
      target.path = $$PREFIX/bin/
 -    locale.path = $$PREFIX/share/apps/goldendict/locale/
-+    locale.path = $$PREFIX/share/goldendict
++    locale.path = $$PREFIX/share/goldendict/locale/
      locale.files = locale/*.qm
      INSTALLS += target \
          locale
--    icons.path = /usr/share/pixmaps
--    icons.files = redist/icons/*.*
-+    icons.path = $$ICONDIR
-+    icons.files = redist/icons/goldendict.png
+@@ -72,13 +72,13 @@ unix {
      INSTALLS += icons
--    icons2.path = /usr/share/app-install/icons
--    icons2.files = redist/icons/*.*
+     icons2.path = $$PREFIX/share/app-install/icons
+     icons2.files = redist/icons/*.*
 -    INSTALLS += icons2
--    desktops.path = /usr/share/applications
--    desktops.files = redist/*.desktop
-+    desktops.path = $$DESKTOPDIR
-+    desktops.files = redist/goldendict.desktop
++    #INSTALLS += icons2
+     desktops.path = $$PREFIX/share/applications
+     desktops.files = redist/*.desktop
      INSTALLS += desktops
--    desktops2.path = /usr/share/app-install/desktop
--    desktops2.files = redist/*.desktop
+     desktops2.path = $$PREFIX/share/app-install/desktop
+     desktops2.files = redist/*.desktop
 -    INSTALLS += desktops2
++    #INSTALLS += desktops2
  }
  DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
  
+@@ -267,9 +267,9 @@ TRANSLATIONS += locale/ru_RU.ts \
+ }
+ 
+ # This makes qmake generate translations
+-win32:# Windows doesn't seem to have *-qt4 symlinks
+-isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+-isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4
++# XXX
++isEmpty(QMAKE_LRELEASE):QMAKE_LRELEASE = /usr/local/bin/lrelease4
++# XXX
+ updateqm.input = TRANSLATIONS
+ updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+ updateqm.commands = $$QMAKE_LRELEASE \