aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/gnome-mag/Makefile13
-rw-r--r--accessibility/gnome-mag/distinfo6
-rw-r--r--accessibility/gnome-mag/pkg-plist85
-rw-r--r--arabic/katoob/Makefile7
-rw-r--r--arabic/katoob/pkg-plist2
-rw-r--r--astro/celestia/Makefile3
-rw-r--r--astro/celestia/pkg-plist7
-rw-r--r--astro/glunarclock/Makefile6
-rw-r--r--astro/glunarclock/pkg-plist18
-rw-r--r--astro/nightfall/Makefile3
-rw-r--r--audio/beast/Makefile4
-rw-r--r--audio/beast/pkg-plist14
-rw-r--r--audio/cantus/Makefile4
-rw-r--r--audio/cantus/pkg-plist3
-rw-r--r--audio/cantus_3/Makefile4
-rw-r--r--audio/cantus_3/pkg-plist2
-rw-r--r--audio/easytag-devel/Makefile3
-rw-r--r--audio/easytag-devel/pkg-plist10
-rw-r--r--audio/extace/Makefile4
-rw-r--r--audio/gai-album/Makefile4
-rw-r--r--audio/gai-visual-audio/pkg-plist3
-rw-r--r--audio/gaim-festival/Makefile5
-rw-r--r--audio/gdesklets-cornerxmms/Makefile4
-rw-r--r--audio/gdesklets-xmms/Makefile4
-rw-r--r--audio/glame/Makefile4
-rw-r--r--audio/gnomoradio/Makefile4
-rw-r--r--audio/gnomoradio/pkg-plist1
-rw-r--r--audio/gnowavcut/Makefile4
-rw-r--r--audio/goobox/Makefile6
-rw-r--r--audio/goobox/pkg-plist22
-rw-r--r--audio/gqradio/Makefile4
-rw-r--r--audio/grip/Makefile4
-rw-r--r--audio/grip/pkg-plist14
-rw-r--r--audio/gspeakers/Makefile4
-rw-r--r--audio/jamboree/Makefile6
-rw-r--r--audio/jamboree/pkg-plist12
-rw-r--r--audio/lindele/Makefile4
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/liteamp/pkg-plist2
-rw-r--r--audio/marlin/Makefile6
-rw-r--r--audio/marlin/pkg-plist18
-rw-r--r--audio/muine/Makefile3
-rw-r--r--audio/musicbox-tag-editor/Makefile4
-rw-r--r--audio/paman/Makefile4
-rw-r--r--audio/rhythmbox-devel/Makefile39
-rw-r--r--audio/rhythmbox-devel/distinfo6
-rw-r--r--audio/rhythmbox-devel/pkg-plist113
-rw-r--r--audio/rhythmbox/Makefile39
-rw-r--r--audio/rhythmbox/distinfo6
-rw-r--r--audio/rhythmbox/pkg-plist113
-rw-r--r--audio/streamtuner/Makefile6
-rw-r--r--audio/streamtuner/pkg-plist2
-rw-r--r--audio/sweep/Makefile1
-rw-r--r--audio/sweep/pkg-plist6
-rw-r--r--audio/tagtool/Makefile8
-rw-r--r--audio/tagtool/pkg-plist6
-rw-r--r--audio/terminatorx/Makefile6
-rw-r--r--audio/terminatorx/files/patch-src::main.cc2
-rw-r--r--audio/xfce4-mixer/Makefile3
-rw-r--r--audio/xfce4-mixer/pkg-plist38
-rw-r--r--benchmarks/gtkperf/Makefile1
-rw-r--r--benchmarks/gtkperf/pkg-plist1
-rw-r--r--biology/gperiodic/Makefile10
-rw-r--r--biology/gperiodic/pkg-plist2
-rw-r--r--cad/oregano/Makefile5
-rw-r--r--cad/oregano/pkg-plist7
-rw-r--r--chinese/chinput3/Makefile9
-rw-r--r--chinese/chinput3/pkg-plist2
-rw-r--r--chinese/gcin-devel/Makefile9
-rw-r--r--chinese/gcin-devel/files/patch-menu11
-rw-r--r--chinese/gcin-devel/pkg-plist4
-rw-r--r--chinese/gcin/Makefile9
-rw-r--r--chinese/gcin/files/patch-menu11
-rw-r--r--chinese/gcin/pkg-plist4
-rw-r--r--chinese/oxim/Makefile4
-rw-r--r--chinese/scim-chewing/Makefile2
-rw-r--r--chinese/scim-chewing/pkg-plist2
-rw-r--r--chinese/scim-pinyin/Makefile3
-rw-r--r--chinese/scim-pinyin/pkg-plist6
-rw-r--r--chinese/scim-tables/Makefile3
-rw-r--r--chinese/stardict-dict-zh_CN/Makefile3
-rw-r--r--chinese/stardict2-dict-zh_CN/Makefile3
-rw-r--r--chinese/stardict2-dict-zh_TW/Makefile3
-rw-r--r--chinese/wenju/Makefile4
-rw-r--r--chinese/wenju/pkg-plist6
-rw-r--r--chinese/xttmgr/files/patch-xttmgr.c57
-rw-r--r--comms/efax-gtk/Makefile5
-rw-r--r--comms/gmfsk/Makefile7
-rw-r--r--comms/gmfsk/pkg-plist5
-rw-r--r--databases/glom/Makefile7
-rw-r--r--databases/glom/pkg-plist6
-rw-r--r--databases/gnome-db/Makefile7
-rw-r--r--databases/gnome-db/pkg-plist26
-rw-r--r--databases/libgda/Makefile7
-rw-r--r--databases/libgda/pkg-plist22
-rw-r--r--databases/libgda3/Makefile8
-rw-r--r--databases/libgda3/pkg-plist40
-rw-r--r--databases/libgdamm/Makefile5
-rw-r--r--databases/libgnomedb/Makefile8
-rw-r--r--databases/libgnomedb/pkg-plist42
-rw-r--r--databases/mdbtools/Makefile17
-rw-r--r--databases/mergeant/Makefile10
-rw-r--r--databases/mergeant/pkg-plist26
-rw-r--r--deskutils/alexandria/Makefile19
-rw-r--r--deskutils/alexandria/pkg-plist131
-rw-r--r--deskutils/buoh/Makefile9
-rw-r--r--deskutils/buoh/pkg-plist1
-rw-r--r--deskutils/contacts/Makefile1
-rw-r--r--deskutils/contacts/files/patch-src_constacts-utils.c44
-rw-r--r--deskutils/drivel/Makefile3
-rw-r--r--deskutils/drivel/pkg-plist20
-rw-r--r--deskutils/gdeskcal-skins/Makefile6
-rw-r--r--deskutils/gdeskcal/Makefile5
-rw-r--r--deskutils/gdeskcal/pkg-plist22
-rw-r--r--deskutils/gdesklets-recentlyused/Makefile4
-rw-r--r--deskutils/gdesklets-sensor-displayconstraints/Makefile4
-rw-r--r--deskutils/gdesklets-starterbar/Makefile4
-rw-r--r--deskutils/gdesklets/Makefile3
-rw-r--r--deskutils/gdesklets/pkg-plist25
-rw-r--r--deskutils/gnome-menu-editor/Makefile7
-rw-r--r--deskutils/gnome-menu-editor/pkg-plist20
-rw-r--r--deskutils/lightning-thunderbird/Makefile37
-rw-r--r--deskutils/lightning-thunderbird/distinfo6
-rw-r--r--deskutils/lightning-thunderbird/files/patch-Makefile.in22
-rw-r--r--deskutils/lightning-thunderbird/files/patch-config_rules.mk11
-rw-r--r--deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h20
-rw-r--r--deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp23
-rw-r--r--deskutils/lightning-thunderbird/files/patch-libm25
-rw-r--r--deskutils/lightning-thunderbird/files/patch-nothreads-sqlite (renamed from www/firefox-devel/files/patch-nothreads-sqlite3)0
-rw-r--r--deskutils/lightning-thunderbird/files/patch-sysnss221
-rw-r--r--deskutils/lightning/Makefile37
-rw-r--r--deskutils/lightning/distinfo6
-rw-r--r--deskutils/lightning/files/patch-Makefile.in22
-rw-r--r--deskutils/lightning/files/patch-config_rules.mk11
-rw-r--r--deskutils/lightning/files/patch-content_xslt_public_txDouble.h20
-rw-r--r--deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp23
-rw-r--r--deskutils/lightning/files/patch-libm25
-rw-r--r--deskutils/lightning/files/patch-nothreads-sqlite (renamed from www/firefox3-devel/files/patch-nothreads-sqlite3)0
-rw-r--r--deskutils/lightning/files/patch-sysnss221
-rw-r--r--deskutils/mcatalog/Makefile4
-rw-r--r--deskutils/nautilus-actions/Makefile21
-rw-r--r--deskutils/nautilus-actions/distinfo6
-rw-r--r--deskutils/nautilus-actions/pkg-plist53
-rw-r--r--deskutils/nautilus-locked-folder/Makefile7
-rw-r--r--deskutils/nautilus-open-terminal/Makefile9
-rw-r--r--deskutils/nautilus-open-terminal/distinfo6
-rw-r--r--deskutils/nautilus-open-terminal/pkg-plist34
-rw-r--r--deskutils/nautilus-sendto/Makefile14
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--deskutils/nautilus-sendto/pkg-plist80
-rw-r--r--deskutils/notification-daemon/Makefile8
-rw-r--r--deskutils/sunbird/Makefile37
-rw-r--r--deskutils/sunbird/distinfo6
-rw-r--r--deskutils/sunbird/files/patch-Makefile.in22
-rw-r--r--deskutils/sunbird/files/patch-config_rules.mk11
-rw-r--r--deskutils/sunbird/files/patch-content_xslt_public_txDouble.h20
-rw-r--r--deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp23
-rw-r--r--deskutils/sunbird/files/patch-libm25
-rw-r--r--deskutils/sunbird/files/patch-nothreads-sqlite (renamed from www/firefox35/files/patch-nothreads-sqlite3)0
-rw-r--r--deskutils/sunbird/files/patch-sysnss221
-rw-r--r--deskutils/timer-applet/Makefile7
-rw-r--r--deskutils/timer-applet/pkg-plist6
-rw-r--r--deskutils/xfce4-calendar/Makefile3
-rw-r--r--deskutils/xfce4-calendar/pkg-plist36
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile3
-rw-r--r--deskutils/xfce4-taskbar-plugin/Makefile5
-rw-r--r--deskutils/xfce4-windowlist-plugin/Makefile5
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile2
-rw-r--r--deskutils/xpad/Makefile6
-rw-r--r--deskutils/xpad/pkg-plist11
-rw-r--r--devel/alleyoop/Makefile6
-rw-r--r--devel/alleyoop/pkg-plist20
-rw-r--r--devel/bonobo/Makefile7
-rw-r--r--devel/bonobo/pkg-plist28
-rw-r--r--devel/devhelp/Makefile10
-rw-r--r--devel/devhelp/pkg-plist28
-rw-r--r--devel/gconf/Makefile7
-rw-r--r--devel/gconf/pkg-plist28
-rw-r--r--devel/gconfmm26/Makefile10
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/gcvs/Makefile9
-rw-r--r--devel/glib-java/Makefile6
-rw-r--r--devel/glib-java/distinfo6
-rw-r--r--devel/glibmm/Makefile6
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/gnome-vfsmm/Makefile7
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/lasi/Makefile3
-rw-r--r--devel/lasi/files/patch-src_drawGlyph.cpp34
-rw-r--r--devel/libglademm/Makefile4
-rw-r--r--devel/libglademm24/Makefile5
-rw-r--r--devel/libnotify/Makefile4
-rw-r--r--devel/libunicode/Makefile8
-rw-r--r--devel/maketool/Makefile2
-rw-r--r--devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c50
-rw-r--r--devel/oaf/Makefile7
-rw-r--r--devel/oaf/pkg-plist28
-rw-r--r--devel/p5-Glib2/Makefile1
-rw-r--r--devel/p5-Glib2/pkg-plist1
-rw-r--r--devel/preps-gui/Makefile10
-rw-r--r--devel/preps-gui/pkg-plist56
-rw-r--r--devel/py-xdg/Makefile5
-rw-r--r--devel/py-xdg/files/patch-xdg::BaseDirectory.py2
-rw-r--r--devel/py-xdg/files/patch-xdg::IconTheme.py2
-rw-r--r--devel/py-xdg/files/patch-xdg_Menu.py13
-rw-r--r--devel/regexxer/Makefile6
-rw-r--r--devel/regexxer/pkg-plist7
-rw-r--r--devel/sdl_sge/Makefile2
-rw-r--r--devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp19
-rw-r--r--devel/sge/Makefile2
-rw-r--r--devel/sge/files/patch-sge030809-sge_tt_text.cpp19
-rw-r--r--devel/titano/Makefile3
-rw-r--r--devel/titano/pkg-plist1
-rw-r--r--devel/xfc/Makefile3
-rw-r--r--editors/abiword-plugins/Makefile4
-rw-r--r--editors/abiword/Makefile25
-rw-r--r--editors/abiword/files/patch-ar4
-rw-r--r--editors/abiword/pkg-plist1
-rw-r--r--editors/elvis/Makefile4
-rw-r--r--editors/leafpad/Makefile10
-rw-r--r--editors/leafpad/pkg-plist24
-rw-r--r--editors/mlview/Makefile6
-rw-r--r--editors/mlview/pkg-plist12
-rw-r--r--editors/poedit/Makefile4
-rw-r--r--editors/poedit/pkg-plist81
-rw-r--r--editors/winefish/Makefile5
-rw-r--r--editors/winefish/pkg-plist4
-rw-r--r--editors/xemacs/Makefile5
-rw-r--r--editors/xemacs/pkg-plist2
-rw-r--r--emulators/gxmame/Makefile6
-rw-r--r--emulators/mupen64-sdlinput/files/patch-SDL_ttf.c20
-rw-r--r--emulators/raine/Makefile3
-rw-r--r--finance/gnucash/Makefile9
-rw-r--r--finance/gnucash/pkg-plist26
-rw-r--r--finance/mybudget/Makefile6
-rw-r--r--french/alphabet_sounds_fr/Makefile5
-rw-r--r--french/mozilla-flp/Makefile2
-rw-r--r--ftp/gwget/Makefile5
-rw-r--r--ftp/gwget/pkg-plist26
-rw-r--r--ftp/pureadmin/Makefile1
-rw-r--r--ftp/pureadmin/pkg-plist2
-rw-r--r--ftp/wzdftpd/Makefile4
-rw-r--r--games/adonthell/Makefile4
-rw-r--r--games/adonthell/files/patch-src_SDL_ttf.c20
-rw-r--r--games/childsplay/Makefile3
-rw-r--r--games/childsplay_plugins/Makefile3
-rw-r--r--games/childsplay_plugins/files/patch-Makefile2
-rw-r--r--games/gnomesudoku/Makefile2
-rw-r--r--games/gnomesudoku/pkg-plist11
-rw-r--r--games/wesnoth-devel/Makefile6
-rw-r--r--games/wesnoth-devel/files/patch-src_sdl_ttf_SDL_ttf.c19
-rw-r--r--games/wesnoth-devel/pkg-plist6
-rw-r--r--games/wesnoth/Makefile6
-rw-r--r--games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c19
-rw-r--r--games/wesnoth/pkg-plist6
-rw-r--r--games/xfce4-toys/Makefile3
-rw-r--r--games/xfce4-toys/pkg-plist36
-rw-r--r--games/xteddy/Makefile9
-rw-r--r--german/bsdforen-firefox-searchplugin/Makefile2
-rw-r--r--graphics/cairo-java/Makefile9
-rw-r--r--graphics/cairo-java/distinfo6
-rw-r--r--graphics/cairomm/Makefile10
-rw-r--r--graphics/cairomm/distinfo6
-rw-r--r--graphics/cairomm/files/patch-docs_reference_Makefile.in11
-rw-r--r--graphics/cairomm/pkg-plist351
-rw-r--r--graphics/comix/Makefile6
-rw-r--r--graphics/comix/pkg-plist11
-rw-r--r--graphics/crystalspace-devel/files/patch-configure18
-rw-r--r--graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp214
-rw-r--r--graphics/crystalspace/files/patch-configure18
-rw-r--r--graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp215
-rw-r--r--graphics/diacanvas2/Makefile10
-rw-r--r--graphics/diacanvas2/distinfo6
-rw-r--r--graphics/diacanvas2/files/patch-python_diacanvas.override58
-rw-r--r--graphics/diacanvas2/pkg-plist42
-rw-r--r--graphics/djvulibre/Makefile6
-rw-r--r--graphics/djvulibre/pkg-plist8
-rw-r--r--graphics/fyre/Makefile13
-rw-r--r--graphics/fyre/pkg-plist29
-rw-r--r--graphics/gdk-pixbuf/Makefile7
-rw-r--r--graphics/gdk-pixbuf/files/patch-ad3
-rw-r--r--graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S3
-rw-r--r--graphics/gdk-pixbuf/files/patch-ltmain.sh3
-rw-r--r--graphics/gimageview/Makefile3
-rw-r--r--graphics/gimageview/pkg-plist1
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-app/files/patch-gimptool-2.0.in3
-rw-r--r--graphics/gimp-app/pkg-plist32
-rw-r--r--graphics/gimp-greycstoration/Makefile2
-rw-r--r--graphics/gimp-help/Makefile5
-rw-r--r--graphics/gimp-pmosaic/Makefile3
-rw-r--r--graphics/gimp/Makefile6
-rw-r--r--graphics/gimp/files/patch-gimptool-2.0.in3
-rw-r--r--graphics/gimp/pkg-plist32
-rw-r--r--graphics/gimp1/Makefile4
-rw-r--r--graphics/gimp1/pkg-plist32
-rw-r--r--graphics/gimpshop/Makefile5
-rw-r--r--graphics/gimpshop/pkg-plist32
-rw-r--r--graphics/gqview-devel/Makefile3
-rw-r--r--graphics/gqview-devel/pkg-plist18
-rw-r--r--graphics/gqview/Makefile3
-rw-r--r--graphics/gsculpt/Makefile7
-rw-r--r--graphics/gtkam/Makefile6
-rw-r--r--graphics/gtkam/pkg-plist8
-rw-r--r--graphics/imagesort/Makefile6
-rw-r--r--graphics/imlib/Makefile7
-rw-r--r--graphics/isreal/Makefile5
-rw-r--r--graphics/jumpgis/Makefile6
-rw-r--r--graphics/jumpgis/pkg-plist5
-rw-r--r--graphics/libgnomecanvasmm26/Makefile8
-rw-r--r--graphics/libgnomecanvasmm26/distinfo6
-rw-r--r--graphics/librsvg/Makefile8
-rw-r--r--graphics/librsvg/files/patch-Makefile.in3
-rw-r--r--graphics/librsvg/files/patch-librsvg-config.in3
-rw-r--r--graphics/p5-Cairo/Makefile4
-rw-r--r--graphics/p5-Cairo/distinfo6
-rw-r--r--graphics/passepartout/Makefile11
-rw-r--r--graphics/passepartout/pkg-plist1
-rw-r--r--graphics/pixelize/Makefile4
-rw-r--r--graphics/ruby-cairo/Makefile4
-rw-r--r--graphics/ruby-cairo/distinfo6
-rw-r--r--graphics/ruby-cairo/pkg-plist8
-rw-r--r--graphics/sdl_ttf/Makefile1
-rw-r--r--graphics/sdl_ttf/files/patch-SDL_ttf.c19
-rw-r--r--graphics/swfdec/Makefile6
-rw-r--r--graphics/swfdec/pkg-plist6
-rw-r--r--graphics/ufraw/Makefile3
-rw-r--r--graphics/ufraw/pkg-plist1
-rw-r--r--graphics/vertex/Makefile4
-rw-r--r--graphics/vertex/files/patch-platforms.ini29
-rw-r--r--graphics/vertex/files/patch-vmahelp.c2
-rw-r--r--graphics/wxsvg/Makefile5
-rw-r--r--graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp49
-rw-r--r--graphics/xpdf/files/patch-splash_SplashFTFont.cc77
-rw-r--r--irc/gaim-irchelper/Makefile4
-rw-r--r--irc/gdesklets-irc/Makefile4
-rw-r--r--irc/xchat-fish/Makefile6
-rw-r--r--irc/xchat-gnome/Makefile7
-rw-r--r--irc/xchat-gnome/pkg-plist116
-rw-r--r--irc/xchat-mircryption/Makefile3
-rw-r--r--irc/xchat-systray-plugin/Makefile3
-rw-r--r--irc/xchat/Makefile8
-rw-r--r--irc/xchat/pkg-plist13
-rw-r--r--irc/xchat1/Makefile4
-rw-r--r--japanese/firefox-ja/Makefile2
-rw-r--r--japanese/im-ja/Makefile7
-rw-r--r--japanese/im-ja/pkg-plist6
-rw-r--r--japanese/mozilla-jlp/Makefile5
-rw-r--r--japanese/scim-anthy/Makefile4
-rw-r--r--japanese/scim-canna/Makefile4
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile5
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile10
-rw-r--r--japanese/scim-honoka/Makefile3
-rw-r--r--japanese/scim-prime/Makefile4
-rw-r--r--japanese/scim-skk/Makefile5
-rw-r--r--japanese/scim-tables/Makefile4
-rw-r--r--japanese/scim-tomoe/Makefile4
-rw-r--r--japanese/scim-uim/Makefile4
-rw-r--r--japanese/stardict-dict-ja/Makefile3
-rw-r--r--japanese/stardict2-dict-ja/Makefile3
-rw-r--r--japanese/uim-anthy/Makefile4
-rw-r--r--japanese/uim-canna/Makefile4
-rw-r--r--japanese/uim-prime/Makefile4
-rw-r--r--java/eclipse/Makefile27
-rw-r--r--java/eclipse/files/eclipse.in2
-rw-r--r--java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh6
-rw-r--r--java/jdk13/Makefile6
-rw-r--r--java/jdk15/Makefile4
-rw-r--r--java/jdk15/files/pkg-deinstall.in2
-rw-r--r--java/jdk15/files/pkg-install.in2
-rw-r--r--java/jdk16/Makefile4
-rw-r--r--java/jdk16/files/pkg-deinstall.in2
-rw-r--r--java/jdk16/files/pkg-install.in2
-rw-r--r--korean/ami/Makefile5
-rw-r--r--korean/ami/pkg-plist2
-rw-r--r--korean/gdick/Makefile4
-rw-r--r--korean/gdick/pkg-plist3
-rw-r--r--korean/imhangul/Makefile4
-rw-r--r--korean/scim-hangul/Makefile3
-rw-r--r--korean/scim-hangul/pkg-plist4
-rw-r--r--korean/scim-tables/Makefile5
-rw-r--r--lang/librep/Makefile20
-rw-r--r--lang/librep/files/patch-aa3
-rw-r--r--mail/balsa/Makefile10
-rw-r--r--mail/balsa/pkg-plist40
-rw-r--r--mail/contact-lookup-applet/Makefile3
-rw-r--r--mail/contact-lookup-applet/files/patch-src_contact-dialog.c11
-rw-r--r--mail/contact-lookup-applet/files/patch-src_e-contact-entry.c13
-rw-r--r--mail/contact-lookup-applet/pkg-plist22
-rw-r--r--mail/enigmail-thunderbird/Makefile4
-rw-r--r--mail/enigmail/Makefile3
-rw-r--r--mail/evolution-sharp/Makefile6
-rw-r--r--mail/gnubiff/Makefile2
-rw-r--r--mail/gnubiff/pkg-plist7
-rw-r--r--mail/mail-notification/Makefile9
-rw-r--r--mail/mail-notification/pkg-plist10
-rw-r--r--mail/mboxcheck-applet/Makefile16
-rw-r--r--mail/moztraybiff/Makefile8
-rw-r--r--mail/thunderbird-dictionaries/Makefile4
-rw-r--r--mail/thunderbird-esr/Makefile10
-rw-r--r--mail/thunderbird/Makefile10
-rw-r--r--mail/thunderbird3/Makefile10
-rw-r--r--math/gdcalc/Makefile6
-rw-r--r--math/gdcalc/pkg-plist3
-rw-r--r--math/geg/Makefile4
-rw-r--r--math/guppi/Makefile6
-rw-r--r--math/guppi/pkg-plist14
-rw-r--r--misc/gnomesword/Makefile8
-rw-r--r--misc/gnomesword/pkg-plist6
-rw-r--r--misc/xfce4-appfinder/Makefile3
-rw-r--r--misc/xfce4-appfinder/pkg-plist2
-rw-r--r--misc/xfce4-artwork/Makefile5
-rw-r--r--misc/xfce4-iconbox/Makefile3
-rw-r--r--misc/xfce4-iconbox/pkg-plist36
-rw-r--r--misc/xfce4-weather-plugin/Makefile3
-rw-r--r--misc/xfce4-wm-themes/Makefile2
-rw-r--r--misc/xiphos/Makefile8
-rw-r--r--misc/xiphos/pkg-plist6
-rw-r--r--multimedia/bmpx/Makefile6
-rw-r--r--multimedia/camserv/Makefile7
-rw-r--r--multimedia/gaim-xmms-remote/Makefile6
-rw-r--r--multimedia/gxine/Makefile2
-rw-r--r--multimedia/kaffeine-mozilla/Makefile7
-rw-r--r--multimedia/kaffeine-mozilla/pkg-plist1
-rw-r--r--multimedia/linux-realplayer/Makefile30
-rw-r--r--multimedia/linux-realplayer/pkg-plist2
-rw-r--r--multimedia/ogle-gui/Makefile6
-rw-r--r--multimedia/ogle-gui/pkg-plist14
-rw-r--r--multimedia/ogmrip/Makefile9
-rw-r--r--multimedia/ogmrip/pkg-plist27
-rw-r--r--multimedia/vlc-devel/Makefile54
-rw-r--r--multimedia/vlc-devel/Makefile.inc21
-rw-r--r--multimedia/vlc-devel/distinfo6
-rw-r--r--multimedia/vlc-devel/files/patch-modules_codec_x264.c11
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--multimedia/vlc/Makefile.inc4
-rw-r--r--multimedia/xfce4-media/Makefile2
-rw-r--r--multimedia/xfce4-media/pkg-plist16
-rw-r--r--multimedia/xfce4-xmms-controller-plugin/Makefile3
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/pkg-plist2
-rw-r--r--multimedia/xmps-win32-plugin/Makefile6
-rw-r--r--net-im/gaim-assistant/Makefile6
-rw-r--r--net-im/gaim-bangexec/Makefile3
-rw-r--r--net-im/gaim-extprefs/Makefile6
-rw-r--r--net-im/gaim-guifications/Makefile6
-rw-r--r--net-im/gaim-ignorance/Makefile3
-rw-r--r--net-im/gaim-latex/Makefile6
-rw-r--r--net-im/gaim-openq/Makefile6
-rw-r--r--net-im/gaim-openq/pkg-plist2
-rw-r--r--net-im/gaim-rss-reader/Makefile8
-rw-r--r--net-im/gaim-slashexec/Makefile3
-rw-r--r--net-im/gaim/Makefile8
-rw-r--r--net-im/gaim/pkg-plist50
-rw-r--r--net-im/gossip/Makefile5
-rw-r--r--net-im/gossip/pkg-plist24
-rw-r--r--net-im/ickle/Makefile6
-rw-r--r--net-im/meanwhile-gaim/Makefile6
-rw-r--r--net-im/pidgin-guifications/Makefile6
-rw-r--r--net-im/pidgin-latex/Makefile6
-rw-r--r--net-im/skype-devel/Makefile15
-rw-r--r--net-im/skype-devel/pkg-plist5
-rw-r--r--net-im/skype/Makefile16
-rw-r--r--net-im/skype/pkg-plist5
-rw-r--r--net-im/skype20/Makefile16
-rw-r--r--net-im/skype20/pkg-plist5
-rw-r--r--net-mgmt/etherape/Makefile8
-rw-r--r--net-mgmt/etherape/pkg-plist53
-rw-r--r--net-p2p/amule1/Makefile5
-rw-r--r--net-p2p/amule1/pkg-plist8
-rw-r--r--net-p2p/dctc-gui/Makefile6
-rw-r--r--net-p2p/edonkey-gui-gtk/Makefile10
-rw-r--r--net-p2p/edonkey-gui-gtk/pkg-plist9
-rw-r--r--net-p2p/giftui/Makefile13
-rw-r--r--net-p2p/giftui/pkg-plist41
-rw-r--r--net-p2p/gtorrentviewer/Makefile6
-rw-r--r--net-p2p/xmule/Makefile6
-rw-r--r--net-p2p/xmule/pkg-plist7
-rw-r--r--net/crescendo/Makefile7
-rw-r--r--net/diradmin/Makefile3
-rw-r--r--net/liferea/Makefile5
-rw-r--r--net/liferea/pkg-plist18
-rw-r--r--net/penguintv/Makefile10
-rw-r--r--net/penguintv/pkg-plist7
-rw-r--r--net/service-discovery-applet/Makefile13
-rw-r--r--net/service-discovery-applet/files/patch-servers_Makefile.in0
-rw-r--r--net/service-discovery-applet/pkg-plist2
-rw-r--r--net/silky/Makefile3
-rw-r--r--net/silky/pkg-plist8
-rw-r--r--net/skype-devel/Makefile15
-rw-r--r--net/skype-devel/pkg-plist5
-rw-r--r--net/skype/Makefile16
-rw-r--r--net/skype/pkg-plist5
-rw-r--r--net/straw/Makefile8
-rw-r--r--net/straw/pkg-plist10
-rw-r--r--net/tapidbus/Makefile4
-rw-r--r--news/pan/Makefile25
-rw-r--r--news/pan/distinfo6
-rw-r--r--news/pan/files/patch-Makefile.in11
-rw-r--r--news/pan/files/patch-pan.desktop.in7
-rw-r--r--news/pan/files/patch-pan_base_text-massager.c36
-rw-r--r--news/pan/pkg-descr8
-rw-r--r--news/pan/pkg-plist45
-rw-r--r--palm/jpilot/pkg-plist2
-rw-r--r--palm/synce-multisync/Makefile6
-rw-r--r--palm/synce-trayicon/Makefile8
-rw-r--r--palm/synce-trayicon/pkg-plist1
-rw-r--r--polish/gnugadu2/Makefile10
-rw-r--r--polish/gnugadu2/pkg-plist5
-rw-r--r--print/ft2demos/Makefile5
-rw-r--r--print/ft2demos/distinfo6
-rw-r--r--print/ft2demos/pkg-plist1
-rw-r--r--print/gnome-print/Makefile7
-rw-r--r--print/gnome-print/pkg-plist30
-rw-r--r--print/xfce4-print/Makefile3
-rw-r--r--print/xfce4-print/pkg-plist36
-rw-r--r--science/gramps/Makefile4
-rw-r--r--science/gramps/pkg-plist45
-rw-r--r--science/v_sim/Makefile2
-rw-r--r--security/gaim-encryption/Makefile6
-rw-r--r--security/gaim-otr/Makefile8
-rw-r--r--security/gcipher/Makefile4
-rw-r--r--security/gnome-password-generator/Makefile3
-rw-r--r--security/gpass/Makefile15
-rw-r--r--security/gpass/pkg-plist19
-rw-r--r--security/gtkpasman/Makefile3
-rw-r--r--security/lsh/Makefile2
-rw-r--r--security/nofgpg/Makefile4
-rw-r--r--security/pidgin-encryption/Makefile6
-rw-r--r--security/pidgin-otr/Makefile8
-rw-r--r--security/seahorse/Makefile8
-rw-r--r--security/seahorse/pkg-plist26
-rw-r--r--security/yersinia/Makefile7
-rw-r--r--sysutils/cdrdao/Makefile16
-rw-r--r--sysutils/conky-awesome/Makefile4
-rw-r--r--sysutils/conky/Makefile4
-rw-r--r--sysutils/eroaster/Makefile3
-rw-r--r--sysutils/eroaster/pkg-plist1
-rw-r--r--sysutils/gcdmaster/Makefile2
-rw-r--r--sysutils/gcdmaster/pkg-plist4
-rw-r--r--sysutils/gnome-schedule/Makefile10
-rw-r--r--sysutils/gnome-system-tools/Makefile8
-rw-r--r--sysutils/gnome-system-tools/pkg-plist46
-rw-r--r--sysutils/gnomebaker/Makefile3
-rw-r--r--sysutils/gnomebaker/pkg-plist108
-rw-r--r--sysutils/gtk-imonc/Makefile4
-rw-r--r--sysutils/gtk-imonc/pkg-plist1
-rw-r--r--sysutils/gupsc/Makefile6
-rw-r--r--sysutils/gupsc/pkg-plist2
-rw-r--r--sysutils/serpentine/Makefile7
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile3
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile3
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile5
-rw-r--r--sysutils/xfce4-mcs-manager/Makefile3
-rw-r--r--sysutils/xfce4-mcs-manager/pkg-plist40
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile3
-rw-r--r--sysutils/xfce4-mcs-plugins/pkg-plist36
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile4
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile3
-rw-r--r--sysutils/xfce4-showdesktop-plugin/Makefile3
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile3
-rw-r--r--sysutils/xfce4-utils/Makefile3
-rw-r--r--sysutils/xfce4-utils/pkg-plist38
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile5
-rw-r--r--textproc/aiksaurus/Makefile7
-rw-r--r--textproc/gnome-translate/Makefile2
-rw-r--r--textproc/gnome-translate/pkg-plist2
-rw-r--r--textproc/gtkspell/Makefile7
-rw-r--r--textproc/gtkspell/pkg-plist18
-rw-r--r--textproc/gxmlviewer/Makefile8
-rw-r--r--textproc/gxmlviewer/pkg-plist8
-rw-r--r--textproc/iiimf-gnome-im-switcher/Makefile9
-rw-r--r--textproc/iiimf-gnome-im-switcher/pkg-plist68
-rw-r--r--textproc/iiimf-gtk/Makefile9
-rw-r--r--textproc/iiimf-gtk/pkg-plist12
-rw-r--r--textproc/meld/Makefile3
-rw-r--r--textproc/meld/pkg-plist13
-rw-r--r--textproc/openvanilla-modules/Makefile4
-rw-r--r--textproc/scim-input-pad/Makefile3
-rw-r--r--textproc/scim-openvanilla/Makefile2
-rw-r--r--textproc/scim-table-imengine/Makefile3
-rw-r--r--textproc/scim-table-imengine/pkg-plist7
-rw-r--r--textproc/scim/Makefile6
-rw-r--r--textproc/scim/pkg-plist8
-rw-r--r--textproc/skim/Makefile1
-rw-r--r--textproc/skim/pkg-plist8
-rw-r--r--textproc/stardict2-dictd_mova/Makefile3
-rw-r--r--textproc/stardict2-quick/Makefile3
-rw-r--r--textproc/uim-gtk/Makefile1
-rw-r--r--textproc/uim-gtk/pkg-plist6
-rw-r--r--textproc/uim-m17nlib/Makefile4
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/uim/pkg-plist2
-rw-r--r--www/adblock/Makefile4
-rw-r--r--www/bluefish/Makefile5
-rw-r--r--www/bluefish/pkg-plist18
-rw-r--r--www/bugmenot/Makefile3
-rw-r--r--www/bugmenot/distinfo6
-rw-r--r--www/firefox-devel/Makefile2
-rw-r--r--www/firefox-devel/files/patch-nothreads-sqlite12
-rw-r--r--www/firefox-remote/Makefile14
-rw-r--r--www/firefox-remote/pkg-plist9
-rw-r--r--www/firefox3-devel/Makefile2
-rw-r--r--www/firefox3-devel/files/patch-nothreads-sqlite12
-rw-r--r--www/firefox35/Makefile2
-rw-r--r--www/firefox35/files/patch-nothreads-sqlite12
-rw-r--r--www/flock/Makefile11
-rw-r--r--www/galeon/Makefile7
-rw-r--r--www/galeon/pkg-plist44
-rw-r--r--www/glibwww/Makefile5
-rw-r--r--www/gnome-web-photo/Makefile7
-rw-r--r--www/gnome-web-photo/pkg-plist6
-rw-r--r--www/gtkhtml/Makefile6
-rw-r--r--www/gtkhtml/files/gtkhtmlConf.sh2
-rw-r--r--www/gtkhtml/pkg-plist30
-rw-r--r--www/gtkhtml3/Makefile8
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/pkg-plist62
-rw-r--r--www/gtkhtml38/Makefile8
-rw-r--r--www/gtkhtml38/distinfo6
-rw-r--r--www/gtkhtml38/pkg-plist62
-rw-r--r--www/kompozer/Makefile8
-rw-r--r--www/libgtkhtml/Makefile8
-rw-r--r--www/mozex/Makefile5
-rw-r--r--www/mozex/Makefile.xpi6
-rw-r--r--www/mozex/pkg-install.xpi2
-rw-r--r--www/mplayer-plugin/Makefile2
-rw-r--r--www/mplayer-plugin/pkg-plist10
-rw-r--r--www/nscache/Makefile5
-rw-r--r--www/nscache/pkg-plist2
-rw-r--r--www/nvu/Makefile8
-rw-r--r--www/openvrml/Makefile11
-rw-r--r--www/openvrml/files/lookat.sh.in2
-rw-r--r--www/openvrml/files/patch-030_freetype_prototypes50
-rw-r--r--www/openvrml/pkg-plist1
-rw-r--r--www/plugger-plugins-hubbe/Makefile4
-rw-r--r--www/plugger/Makefile4
-rw-r--r--www/preferential/Makefile4
-rw-r--r--www/ruby-gtkmozembed/Makefile5
-rw-r--r--www/screem-devel/Makefile4
-rw-r--r--www/screem-devel/pkg-plist16
-rw-r--r--www/screem/Makefile4
-rw-r--r--www/screem/pkg-plist16
-rw-r--r--www/seamonkey/Makefile11
-rw-r--r--www/seamonkey2/Makefile11
-rw-r--r--www/swfdec-plugin/Makefile15
-rw-r--r--www/syndigator/Makefile4
-rw-r--r--www/xulrunner/Makefile11
-rw-r--r--www/xulrunner/files/patch-xulrunner_app_mozilla.in18
-rw-r--r--x11-clocks/gdesklets-clock/Makefile4
-rw-r--r--x11-clocks/gdesklets-countdown/Makefile4
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile5
-rw-r--r--x11-fm/velocity/Makefile3
-rw-r--r--x11-fm/workplace/Makefile4
-rw-r--r--x11-fm/xfce4-fm/Makefile3
-rw-r--r--x11-fm/xfce4-fm/pkg-plist34
-rw-r--r--x11-fonts/dejavu/Makefile4
-rw-r--r--x11-fonts/dejavu/distinfo6
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile5
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile5
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c238
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h12
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c12
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile5
-rw-r--r--x11-servers/xorg-server-snap/Makefile1
-rw-r--r--x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c231
-rw-r--r--x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h12
-rw-r--r--x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c12
-rw-r--r--x11-servers/xorg-server/Makefile.inc5
-rw-r--r--x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c231
-rw-r--r--x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h12
-rw-r--r--x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c12
-rw-r--r--x11-themes/beastie/Makefile31
-rw-r--r--x11-themes/beastie/distinfo6
-rw-r--r--x11-themes/bluecurve-themes/Makefile5
-rw-r--r--x11-themes/buffy/Makefile4
-rw-r--r--x11-themes/clean-theme-gtk/Makefile5
-rw-r--r--x11-themes/clearlooks-themes-extras/Makefile9
-rw-r--r--x11-themes/clearlooks/Makefile11
-rw-r--r--x11-themes/colorstep/Makefile5
-rw-r--r--x11-themes/cursor-bluecurve-theme/Makefile5
-rw-r--r--x11-themes/engradient/Makefile5
-rw-r--r--x11-themes/geramik/Makefile4
-rw-r--r--x11-themes/gnome-bluecurve-theme/Makefile8
-rw-r--r--x11-themes/gnome-icons/Makefile33
-rw-r--r--x11-themes/gnome-icons/bsd.gnome-icons.mk2
-rw-r--r--x11-themes/gnome-industrial-theme/Makefile7
-rw-r--r--x11-themes/gnome-look/Makefile7
-rw-r--r--x11-themes/gnome-splashscreen-manager/Makefile4
-rw-r--r--x11-themes/gtk-Mac2-theme/Makefile5
-rw-r--r--x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile2
-rw-r--r--x11-themes/gtk-ana-theme/Makefile5
-rw-r--r--x11-themes/gtk-aquaextremesunken-theme/Makefile2
-rw-r--r--x11-themes/gtk-aqualightblue-theme/Makefile3
-rw-r--r--x11-themes/gtk-bluecurve-theme/Makefile8
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile3
-rw-r--r--x11-themes/gtk-digital-cream-theme/Makefile2
-rw-r--r--x11-themes/gtk-digital-harmony-theme/Makefile2
-rw-r--r--x11-themes/gtk-engines-collection/Makefile4
-rw-r--r--x11-themes/gtk-engines/Makefile6
-rw-r--r--x11-themes/gtk-envy-theme/Makefile4
-rw-r--r--x11-themes/gtk-flat-theme/Makefile5
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile3
-rw-r--r--x11-themes/gtk-gray-theme/Makefile4
-rw-r--r--x11-themes/gtk-industrial-theme/Makefile3
-rw-r--r--x11-themes/gtk-lila-theme-extras/Makefile3
-rw-r--r--x11-themes/gtk-lila-theme/Makefile7
-rw-r--r--x11-themes/gtk-longhorninspirat-theme/Makefile3
-rw-r--r--x11-themes/gtk-milk-theme/Makefile3
-rw-r--r--x11-themes/gtk-qn-x11-theme/Makefile3
-rw-r--r--x11-themes/gtk-qnxtheme/Makefile15
-rw-r--r--x11-themes/gtk-qt-engine/Makefile6
-rw-r--r--x11-themes/gtk-qt-engine/pkg-plist4
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile6
-rw-r--r--x11-themes/gtk-qt4-engine/pkg-plist4
-rw-r--r--x11-themes/gtk-smooth-engine/Makefile2
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile3
-rw-r--r--x11-themes/gtk-zenith-theme/Makefile3
-rw-r--r--x11-themes/gtkbe/Makefile3
-rw-r--r--x11-themes/gtkstep-pastel/Makefile5
-rw-r--r--x11-themes/gtkstep/Makefile5
-rw-r--r--x11-themes/icegradient/Makefile5
-rw-r--r--x11-themes/icons-human-azul/Makefile2
-rw-r--r--x11-themes/icons-tango/Makefile3
-rw-r--r--x11-themes/icons-tango/pkg-plist272
-rw-r--r--x11-themes/indubstrial/Makefile8
-rw-r--r--x11-themes/kdeartwork3/Makefile9
-rw-r--r--x11-themes/kdeartwork4/Makefile9
-rw-r--r--x11-themes/lila-xfwm4/Makefile4
-rw-r--r--x11-themes/linux-f10-hicolor-icon-theme/Makefile5
-rw-r--r--x11-themes/linux-f8-hicolor-icon-theme/Makefile5
-rw-r--r--x11-themes/linux-hicolor-icon-theme/Makefile5
-rw-r--r--x11-themes/metacity-themes/Makefile2
-rw-r--r--x11-themes/metacity-themes/Makefile.metacity1
-rw-r--r--x11-themes/notif2/Makefile5
-rw-r--r--x11-themes/qt-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/rezlooks/Makefile2
-rw-r--r--x11-themes/sawfish-themes/Makefile5
-rw-r--r--x11-themes/thinice/Makefile3
-rw-r--r--x11-themes/ubuntulooks/Makefile9
-rw-r--r--x11-themes/ubuntulooks/distinfo6
-rw-r--r--x11-themes/whistlerk/Makefile5
-rw-r--r--x11-themes/xenophilia/Makefile3
-rw-r--r--x11-themes/xenostep/Makefile5
-rw-r--r--x11-themes/xenostep/files/patch-XenoStep_theme_draw.c3
-rw-r--r--x11-themes/xfce4-icon-theme/Makefile3
-rw-r--r--x11-themes/xmms-bluecurve-theme/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile6
-rw-r--r--x11-toolkits/bakery/pkg-plist20
-rw-r--r--x11-toolkits/easygtk/Makefile2
-rw-r--r--x11-toolkits/easygtk/files/patch-Makefile4
-rw-r--r--x11-toolkits/gdl/Makefile6
-rw-r--r--x11-toolkits/gdl/pkg-plist22
-rw-r--r--x11-toolkits/gtk12/Makefile8
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk+.pc.in3
-rw-r--r--x11-toolkits/gtkglarea2/Makefile6
-rw-r--r--x11-toolkits/gtkmm12/Makefile7
-rw-r--r--x11-toolkits/gtkmm20-reference/Makefile4
-rw-r--r--x11-toolkits/gtkmm20/Makefile7
-rw-r--r--x11-toolkits/gtkmm24-reference/Makefile4
-rw-r--r--x11-toolkits/gtkmm24/Makefile14
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in12
-rw-r--r--x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in12
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist48
-rw-r--r--x11-toolkits/gtkmm30-reference/Makefile4
-rw-r--r--x11-toolkits/gtkmm30/Makefile7
-rw-r--r--x11-toolkits/gtkscintilla/Makefile5
-rw-r--r--x11-toolkits/guile-gtk/Makefile8
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile4
-rw-r--r--x11-toolkits/inti/Makefile6
-rw-r--r--x11-toolkits/libxfce4gui/Makefile3
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile16
-rw-r--r--x11-toolkits/py-gnome/Makefile4
-rw-r--r--x11-toolkits/py-gtkscintilla/Makefile4
-rw-r--r--x11-toolkits/py-gtkscintilla/files/patch-aa2
-rw-r--r--x11-toolkits/qtpixmap/Makefile5
-rw-r--r--x11-toolkits/qtpixmap/pkg-plist4
-rw-r--r--x11-toolkits/rep-gtk/Makefile5
-rw-r--r--x11-toolkits/rep-gtk2/Makefile6
-rw-r--r--x11-toolkits/scintilla/Makefile5
-rw-r--r--x11-toolkits/swt31/Makefile15
-rw-r--r--x11-toolkits/swt31/files/patch-build.sh14
-rw-r--r--x11-toolkits/wxgtk24/Makefile2
-rw-r--r--x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp44
-rw-r--r--x11-wm/icewm/Makefile7
-rw-r--r--x11-wm/pager/Makefile10
-rw-r--r--x11-wm/sawfish/Makefile10
-rw-r--r--x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl3
-rw-r--r--x11-wm/sawfish/pkg-plist34
-rw-r--r--x11-wm/wmakerconf/Makefile10
-rw-r--r--x11-wm/wmakerconf/pkg-plist3
-rw-r--r--x11-wm/xfce/Makefile7
-rw-r--r--x11-wm/xfce/pkg-plist20
-rw-r--r--x11-wm/xfce4-desktop/Makefile3
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist39
-rw-r--r--x11-wm/xfce4-panel/Makefile3
-rw-r--r--x11-wm/xfce4-panel/pkg-plist38
-rw-r--r--x11-wm/xfce4-session/Makefile3
-rw-r--r--x11-wm/xfce4-session/pkg-plist38
-rw-r--r--x11-wm/xfce4-systray/Makefile3
-rw-r--r--x11-wm/xfce4-wm/Makefile3
-rw-r--r--x11-wm/xfce4-wm/pkg-plist40
-rw-r--r--x11-wm/xfce4/Makefile28
-rw-r--r--x11-wm/xfce4/pkg-plist8
-rw-r--r--x11/Terminal/Makefile4
-rw-r--r--x11/Terminal/pkg-plist1
-rw-r--r--x11/alltray/Makefile5
-rw-r--r--x11/fireflies/Makefile6
-rw-r--r--x11/gcb/Makefile2
-rw-r--r--x11/gcb/pkg-plist4
-rw-r--r--x11/gcursor/Makefile8
-rw-r--r--x11/gcursor/files/patch-src::gcursor.c11
-rw-r--r--x11/gdesklets-tasklist/Makefile4
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gnome-launch-box/files/patch-src_lb-module-evolution.c13
-rw-r--r--x11/gnome-libs/Makefile7
-rw-r--r--x11/gnome-libs/pkg-plist36
-rw-r--r--x11/gsynaptics/Makefile4
-rw-r--r--x11/gsynaptics/pkg-plist5
-rw-r--r--x11/libcapplet/Makefile9
-rw-r--r--x11/libcapplet/files/patch-Makefile16
-rw-r--r--x11/libcapplet/files/patch-cappletConf.sh.in10
-rw-r--r--x11/libexo/Makefile5
-rw-r--r--x11/libgnomemm26/Makefile8
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxfce4mcs/Makefile4
-rw-r--r--x11/libxfce4util/Makefile3
-rw-r--r--x11/libxfce4util/pkg-plist1
-rw-r--r--x11/libxklavier/Makefile20
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier.c18
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config.c15
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c20
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c22
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_props.c28
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c12
-rw-r--r--x11/libxklavier/pkg-plist24
-rw-r--r--x11/multi-gnome-terminal/Makefile5
-rw-r--r--x11/multi-gnome-terminal/pkg-plist1
-rw-r--r--x11/powershell/Makefile9
-rw-r--r--x11/xfce4-clipman-plugin/Makefile3
-rw-r--r--x11/xfce4-trigger-launcher/Makefile3
-rw-r--r--x11/xscreensaver-kde/Makefile9
-rw-r--r--x11/xscreensaver/Makefile4
-rw-r--r--x11/xscreensaver/pkg-plist4
847 files changed, 7600 insertions, 3547 deletions
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 884f0348527e..d09cc1ccf923 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/gnomemag/Makefile,v 1.1 2006/03/13 23:49:23 mezz Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.22 2006/09/10 00:51:05 mezz Exp $
#
PORTNAME= gnome-mag
-PORTVERSION= 0.12.6
+PORTVERSION= 0.13.1
+PORTREVISION= 1
CATEGORIES= accessibility gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,12 +18,12 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen magnifier
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack
+USE_XLIB= yes
+USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
USE_GMAKE= yes
USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index e0f87378a3a7..80cd46043389 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.12.6.tar.bz2) = c402b06408d3b40843720ae09ad74234
-SHA256 (gnome2/gnome-mag-0.12.6.tar.bz2) = 8b2f6ff5c9f74398c41f72c7bb554327f6df01a0408c67d6ce2f14862d38e6eb
-SIZE (gnome2/gnome-mag-0.12.6.tar.bz2) = 608859
+MD5 (gnome2/gnome-mag-0.13.1.tar.bz2) = 4b16b95fd978640c103a6f9cf452c579
+SHA256 (gnome2/gnome-mag-0.13.1.tar.bz2) = ee253e12750f241e2c299fa990032965458ad7a5adf1bc708604b4efff34571e
+SIZE (gnome2/gnome-mag-0.13.1.tar.bz2) = 466020
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index 797aebdcf46b..297e75a89b79 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -1,19 +1,16 @@
bin/magnifier
include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
+lib/libgnome-mag.a
lib/libgnome-mag.la
lib/libgnome-mag.so
lib/libgnome-mag.so.2
+lib/orbit-2.0/GNOME_Magnifier_module.a
lib/orbit-2.0/GNOME_Magnifier_module.la
lib/orbit-2.0/GNOME_Magnifier_module.so
libdata/bonobo/servers/GNOME_Magnifier.server
libdata/pkgconfig/gnome-mag-1.0.pc
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c-source.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c-source.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c-source.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h-source.html
%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h.html
@@ -22,7 +19,6 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/annotated.html
%%DOCSDIR%%/reference/html/classGNOME_1_1Magnifier_1_1Magnifier.html
%%DOCSDIR%%/reference/html/classGNOME_1_1Magnifier_1_1ZoomRegion.html
-%%DOCSDIR%%/reference/html/damage-client_8c-source.html
%%DOCSDIR%%/reference/html/damage-client_8c.html
%%DOCSDIR%%/reference/html/damage-client_8h-source.html
%%DOCSDIR%%/reference/html/damage-client_8h.html
@@ -84,23 +80,18 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/functions_vars_0x79.html
%%DOCSDIR%%/reference/html/functions_vars_0x7a.html
%%DOCSDIR%%/reference/html/globals.html
-%%DOCSDIR%%/reference/html/globals_0x61.html
%%DOCSDIR%%/reference/html/globals_0x62.html
%%DOCSDIR%%/reference/html/globals_0x63.html
%%DOCSDIR%%/reference/html/globals_0x64.html
%%DOCSDIR%%/reference/html/globals_0x65.html
-%%DOCSDIR%%/reference/html/globals_0x66.html
%%DOCSDIR%%/reference/html/globals_0x67.html
%%DOCSDIR%%/reference/html/globals_0x69.html
-%%DOCSDIR%%/reference/html/globals_0x6c.html
%%DOCSDIR%%/reference/html/globals_0x6d.html
-%%DOCSDIR%%/reference/html/globals_0x6e.html
%%DOCSDIR%%/reference/html/globals_0x6f.html
%%DOCSDIR%%/reference/html/globals_0x70.html
%%DOCSDIR%%/reference/html/globals_0x72.html
%%DOCSDIR%%/reference/html/globals_0x73.html
%%DOCSDIR%%/reference/html/globals_0x74.html
-%%DOCSDIR%%/reference/html/globals_0x75.html
%%DOCSDIR%%/reference/html/globals_0x7a.html
%%DOCSDIR%%/reference/html/globals_defs.html
%%DOCSDIR%%/reference/html/globals_defs_0x62.html
@@ -117,23 +108,12 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/globals_enum.html
%%DOCSDIR%%/reference/html/globals_eval.html
%%DOCSDIR%%/reference/html/globals_func.html
-%%DOCSDIR%%/reference/html/globals_func_0x62.html
-%%DOCSDIR%%/reference/html/globals_func_0x63.html
-%%DOCSDIR%%/reference/html/globals_func_0x67.html
-%%DOCSDIR%%/reference/html/globals_func_0x69.html
-%%DOCSDIR%%/reference/html/globals_func_0x6d.html
-%%DOCSDIR%%/reference/html/globals_func_0x70.html
-%%DOCSDIR%%/reference/html/globals_func_0x72.html
-%%DOCSDIR%%/reference/html/globals_func_0x74.html
-%%DOCSDIR%%/reference/html/globals_func_0x7a.html
%%DOCSDIR%%/reference/html/globals_type.html
%%DOCSDIR%%/reference/html/globals_vars.html
%%DOCSDIR%%/reference/html/index.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c-source.html
%%DOCSDIR%%/reference/html/magnifier-main_8c.html
%%DOCSDIR%%/reference/html/magnifier-private_8h-source.html
%%DOCSDIR%%/reference/html/magnifier-private_8h.html
-%%DOCSDIR%%/reference/html/magnifier_8c-source.html
%%DOCSDIR%%/reference/html/magnifier_8c.html
%%DOCSDIR%%/reference/html/magnifier_8h-source.html
%%DOCSDIR%%/reference/html/magnifier_8h.html
@@ -186,7 +166,6 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DOCSDIR%%/reference/html/structtiming.html
%%DOCSDIR%%/reference/html/zoom-region-private_8h-source.html
%%DOCSDIR%%/reference/html/zoom-region-private_8h.html
-%%DOCSDIR%%/reference/html/zoom-region_8c-source.html
%%DOCSDIR%%/reference/html/zoom-region_8c.html
%%DOCSDIR%%/reference/html/zoom-region_8h-source.html
%%DOCSDIR%%/reference/html/zoom-region_8h.html
@@ -285,25 +264,69 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
+@dirrm share/gnome/idl/gnome-mag-1.0
+@dirrm share/gnome/gnome-mag/1_32
+@dirrm share/gnome/gnome-mag
+@dirrm %%DOCSDIR%%/reference/html
+@dirrm %%DOCSDIR%%/reference
+@dirrm %%DOCSDIR%%
+@dirrm include/gnome-mag-1.0/magnifier
+@dirrm include/gnome-mag-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
-@dirrm share/gnome/idl/gnome-mag-1.0
-@dirrm share/gnome/gnome-mag/1_32
-@dirrm share/gnome/gnome-mag
-@dirrm %%DOCSDIR%%/reference/html
-@dirrm %%DOCSDIR%%/reference
-@dirrm %%DOCSDIR%%
-@dirrm include/gnome-mag-1.0/magnifier
-@dirrm include/gnome-mag-1.0
diff --git a/arabic/katoob/Makefile b/arabic/katoob/Makefile
index da1902f2c728..7c2ea48e9452 100644
--- a/arabic/katoob/Makefile
+++ b/arabic/katoob/Makefile
@@ -7,7 +7,7 @@
PORTNAME= katoob
PORTVERSION= 0.3.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= arabic
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arabeyes
@@ -18,15 +18,16 @@ COMMENT= Light-weight, bidirectional editor for arabic texts
MAN1= katoob.1
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack gtk20
+WANT_GNOME= yes
USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.pre.mk>
-.if defined(WITH_HIGHLIGHTING) || exists(${X11BASE}/libdata/pkgconfig/gtksourceview-1.0.pc)
+.if ${HAVE_GNOME:Mgtksourceview}!="" || defined(WITH_HIGHLIGHTING)
CONFIGURE_ARGS+= "--enable-highlight"
USE_GNOME+= gtksourceview
.endif
diff --git a/arabic/katoob/pkg-plist b/arabic/katoob/pkg-plist
index 875bec3b7e43..21f8e7d1dd9c 100644
--- a/arabic/katoob/pkg-plist
+++ b/arabic/katoob/pkg-plist
@@ -14,3 +14,5 @@ share/locale/pl/LC_MESSAGES/katoob.mo
share/locale/sv/LC_MESSAGES/katoob.mo
@dirrm share/gnome/katoob/emulator
@dirrm share/gnome/katoob
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 7dd2e7b31608..c66cb682bedd 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= celestia
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= celestia
@@ -23,7 +24,6 @@ USE_GMAKE= yes
USE_GL= yes
USE_GETTEXT= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
CONFIGURE_ARGS= --program-prefix=""
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -90,6 +90,7 @@ pre-patch:
@${REINPLACE_CMD} -e 's|COPYING||g' ${WRKSRC}/Makefile.in
post-install:
+ ${MKDIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/src/celestia/gtk/data/celestia.png \
${PREFIX}/share/pixmaps
.if !defined(NOPORTDOCS)
diff --git a/astro/celestia/pkg-plist b/astro/celestia/pkg-plist
index 032c80dd26ed..016119805d9b 100644
--- a/astro/celestia/pkg-plist
+++ b/astro/celestia/pkg-plist
@@ -309,6 +309,7 @@ share/locale/pt_br/LC_MESSAGES/celestia.mo
share/locale/ru/LC_MESSAGES/celestia.mo
share/pixmaps/celestia.png
@exec mkdir -p %D/share/celestia/textures/hires
+@dirrmtry share/pixmaps
@dirrm share/celestia/textures/medres
@dirrm share/celestia/textures/lores
@dirrm share/celestia/textures/hires
@@ -322,3 +323,9 @@ share/pixmaps/celestia.png
@dirrm share/celestia
@dirrmtry share/locale/pt_br/LC_MESSAGES
@dirrmtry share/locale/pt_br
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index fd325d1aa81a..e682a46cb8f0 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glunarclock
PORTVERSION= 0.32.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME applet that displays the current phase of the Moon
-LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gail gnomehack gnomepanel gnomeprefix gnometarget intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index ef4ba67da76f..6081838f728e 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -38,9 +38,19 @@ share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo
@dirrm share/gnome/help/glunarclock-applet-2/C
@dirrm share/gnome/help/glunarclock-applet-2
@dirrm share/gnome/glunarclock
-@dirrmtry share/locale/ast_ES/LC_MESSAGES
-@dirrmtry share/locale/ast_ES
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/ast_ES/LC_MESSAGES
+@dirrmtry share/locale/ast_ES
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 457d9a618caa..f2d4312038f4 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nightfall
PORTVERSION= 1.52
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= http://www.la-samhna.de/nightfall/
@@ -15,7 +16,7 @@ COMMENT= An interactive binary star application
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_X_PREFIX= yes
+USE_XLIB= yes
WANT_GNOME= yes
USE_GNOME= gnomehack gnomehier gnometarget gtk20
USE_PERL5= yes
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 213d420c6e83..d22569949142 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beast
PORTVERSION= 0.6.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ftp://beast.gtk.org/pub/beast/v0.6/ \
http://beast.gtk.org/beast-ftp/v0.6/
@@ -19,7 +19,7 @@ LIB_DEPENDS= vorbisfile:${PORTSDIR}/audio/libvorbis \
mad:${PORTSDIR}/audio/libmad \
guile:${PORTSDIR}/lang/guile
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomecanvas
GNU_CONFIGURE= yes
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index 696f909eb950..ab736b4e986f 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -303,7 +303,17 @@ share/mime/packages/beast.xml
@dirrm share/gnome/bse/v0.6.6/scripts
@dirrm share/gnome/bse/v0.6.6
@dirrm share/gnome/bse
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/cantus/Makefile b/audio/cantus/Makefile
index 7c1ba3a57d80..f7157e6f44c8 100644
--- a/audio/cantus/Makefile
+++ b/audio/cantus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cantus
PORTVERSION= 1.07
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://web222.mis02.de/releases/cantus/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
@@ -17,7 +17,7 @@ COMMENT= Tool for tagging and renaming MP3 and OGG/Vorbis files
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomelibs gnomehack
+USE_GNOME= gnomelibs gnomehack gnomehier
WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist
index 6d416d64b759..4c2ba75104d6 100644
--- a/audio/cantus/pkg-plist
+++ b/audio/cantus/pkg-plist
@@ -23,8 +23,5 @@ share/pixmaps/cantus/addrecursive.xpm
share/gnome/apps/Applications/cantus.desktop
@dirrm share/pixmaps/cantus
@dirrmtry share/pixmaps
-@dirrmtry share/gnome/apps/Applications
-@dirrmtry share/gnome/apps
-@dirrmtry share/gnome
@dirrm doc/Cantus
@dirrm doc
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index d6efb22d39cb..296c0330491a 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cantus_3
PORTVERSION= 3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ftp://ftp.gascom.ru/pub/asa/ \
http://web222.mis02.de/releases/cantus_3/
@@ -24,7 +24,7 @@ LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20 \
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2
-USE_X_PREFIX= yes
+USE_XLIB= yes
.include <bsd.port.pre.mk>
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index 4e47af908f52..08dc71f8ccdb 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -21,3 +21,5 @@ share/locale/pl/LC_MESSAGES/cantus_3.mo
@dirrm share/gnome/help/cantus_3/
@dirrm share/doc/cantus_3
@dirrm lib/cantus_3/
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index a1284f7a8ab3..fe10fe0c45be 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= easytag
PORTVERSION= 1.99.12
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +25,7 @@ MAN1= easytag.1
CONFLICTS= easytag-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index d747a6cfc540..62f44284c78c 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -23,3 +23,13 @@ share/locale/uk/LC_MESSAGES/easytag.mo
@dirrm share/gnome/easytag
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index f36d1ec79ca0..ed48f88b4a42 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= extace
PORTVERSION= 1.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT= An Audio Visualization plugin for the X Window System
LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= esound imlib gnomehack gnometarget gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gai-album/Makefile b/audio/gai-album/Makefile
index c62b5afa75a4..a9d8fdbc2e74 100644
--- a/audio/gai-album/Makefile
+++ b/audio/gai-album/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-album
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gai
@@ -19,7 +19,7 @@ LIB_DEPENDS= gai:${PORTSDIR}/x11-toolkits/gai \
xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/audio/gai-visual-audio/pkg-plist b/audio/gai-visual-audio/pkg-plist
index 2208232bf6ae..d0a51e6a551d 100644
--- a/audio/gai-visual-audio/pkg-plist
+++ b/audio/gai-visual-audio/pkg-plist
@@ -2,5 +2,6 @@ bin/gai-va
libdata/bonobo/servers/GNOME_gai-vaApplet.server
share/gnome/pixmaps/gai-va-icon.png
share/gnome/pixmaps/gai-va/va.png
-lib/xmms/Visualization/spec_plugin.so
@dirrm share/gnome/pixmaps/gai-va
+@cwd %%X11BASE%%
+lib/xmms/Visualization/spec_plugin.so
diff --git a/audio/gaim-festival/Makefile b/audio/gaim-festival/Makefile
index 237c54fa2af5..6ec7c02c41bf 100644
--- a/audio/gaim-festival/Makefile
+++ b/audio/gaim-festival/Makefile
@@ -3,11 +3,11 @@
# Whom: Bruce M Simpson <bms@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/audio/gaim-festival/Makefile,v 1.1 2006/10/04 22:31:17 ahze Exp $
PORTNAME= festival
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= festival-gaim
@@ -23,7 +23,6 @@ RUN_DEPENDS= festival:${PORTSDIR}/audio/festival \
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15:env
MAKE_ENV= LOCALBASE=${LOCALBASE}
diff --git a/audio/gdesklets-cornerxmms/Makefile b/audio/gdesklets-cornerxmms/Makefile
index b87df4b472d1..b55ce531d904 100644
--- a/audio/gdesklets-cornerxmms/Makefile
+++ b/audio/gdesklets-cornerxmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cornerxmms
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -23,7 +23,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
${PYTHON_SITELIBDIR}/xmms/__init__.py:${PORTSDIR}/audio/py-xmms
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= CornerXMMS
DATADIR= ${PREFIX}/share/gnome
diff --git a/audio/gdesklets-xmms/Makefile b/audio/gdesklets-xmms/Makefile
index 91a37da7dec3..75d087fc58e6 100644
--- a/audio/gdesklets-xmms/Makefile
+++ b/audio/gdesklets-xmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms
PORTVERSION= 2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
@@ -22,7 +22,7 @@ DEPRECATED= Disappeared from the internet
EXPIRATION_DATE=2006-12-07
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= XMMS
WRKSRC= ${WRKDIR}/${NAME}
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index d8395c4bd7d0..5ffba4fd727c 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glame
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,7 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
vorbis.3:${PORTSDIR}/audio/libvorbis \
guile.15:${PORTSDIR}/lang/guile
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui
USE_GCC= 3.4
USE_GETTEXT= yes
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index c26bf55fa1fe..10dc4b399c0a 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomoradio
PORTVERSION= 0.15.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
vorbis:${PORTSDIR}/audio/libvorbis \
ao:${PORTSDIR}/audio/libao
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GCC= 3.4+
USE_GNOME= gnomehack gnomeprefix
INSTALLS_SHLIB= yes
diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist
index c8af2c511080..80747b209dd5 100644
--- a/audio/gnomoradio/pkg-plist
+++ b/audio/gnomoradio/pkg-plist
@@ -47,4 +47,3 @@ share/gnome/pixmaps/gnomoradio/gnomoradio-heart.png
@dirrm include/rainbow
@dirrm include/roboradio
@dirrm share/gnome/pixmaps/gnomoradio
-@dirrmtry sbin
diff --git a/audio/gnowavcut/Makefile b/audio/gnowavcut/Makefile
index 3c75dee63ad5..fca5c5d3897f 100644
--- a/audio/gnowavcut/Makefile
+++ b/audio/gnowavcut/Makefile
@@ -7,14 +7,14 @@
PORTNAME= gnowavcut
PORTVERSION= 0.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= http://gnowavcut.good-day.net/src/
MAINTAINER= spcoltri@omcl.org
COMMENT= A GNOME/GTK+ based RIFF PCM Wave file splitter
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnomelibs
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index a737305b45ce..85263055f0a3 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,12 +3,12 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/goobox/Makefile,v 1.15 2006/04/13 07:52:30 bland Exp $
+# $MCom: ports/audio/goobox/Makefile,v 1.17 2006/07/25 06:20:43 mezz Exp $
#
PORTNAME= goobox
PORTVERSION= 0.9.93
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,7 @@ COMMENT= CD player and ripper for GNOME Desktop environment
RUN_DEPENDS= cddb-slave2-properties:${PORTSDIR}/audio/gnome-media
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
index a49a45045d1f..a006a0d2afce 100644
--- a/audio/goobox/pkg-plist
+++ b/audio/goobox/pkg-plist
@@ -44,3 +44,25 @@ share/locale/zh_TW/LC_MESSAGES/goobox.mo
@dirrm share/gnome/help/goobox
@dirrm share/gnome/goobox/glade
@dirrm share/gnome/goobox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 91747a62b53d..85f9047e93ec 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqradio
PORTVERSION= 1.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=gqmpeg
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=gqmpeg
MAINTAINER= stefan.jahn@nemesis-sektor.de
COMMENT= GTK2 based FM tuner
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 63065c8b67c2..7f6b7c578dcd 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grip
PORTVERSION= 3.2.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
curl.3:${PORTSDIR}/ftp/curl
PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index 3f0e1ce4d3d8..d79a9f8ef3f8 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -63,7 +63,17 @@ share/locale/ru/LC_MESSAGES/grip-2.2.mo
share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo
share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/help/grip/C
@dirrm share/gnome/help/grip
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 095841c30d6b..a4a27a7b9101 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gspeakers
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ COMMENT= Gnome-based loudspeaker design program
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnometarget libxml2
USE_GMAKE= yes
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index cf3714c98175..5e3e1cf69e54 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jamboree
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -18,14 +18,14 @@ COMMENT= A simple GNOME music player
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libglade2
USE_GSTREAMER80= vorbis mad gconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- GST_INSPECT="${X11BASE}/bin/gst-inspect-0.8"
+ GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.8"
GCONF_SCHEMAS= jamboree.schemas
post-patch:
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
index 3c3f01bcf2c6..650e57727f39 100644
--- a/audio/jamboree/pkg-plist
+++ b/audio/jamboree/pkg-plist
@@ -38,3 +38,15 @@ share/locale/sr/LC_MESSAGES/jamboree.mo
share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
share/locale/sv/LC_MESSAGES/jamboree.mo
@dirrm share/gnome/jamboree
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
index 28441e7be43c..1583d23e465f 100644
--- a/audio/lindele/Makefile
+++ b/audio/lindele/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lindele
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/${PORTNAME}/
@@ -18,7 +18,7 @@ RUN_DEPENDS= musicbox-tag-editor:${PORTSDIR}/audio/musicbox-tag-editor
LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
tag:${PORTSDIR}/audio/taglib
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GSTREAMER80= gconf
GNU_CONFIGURE= yes
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 237809f8604e..69e9d71458bf 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,7 +6,7 @@
PORTNAME= liteamp
PORTVERSION= 0.2.3.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio gnome
MASTER_SITES= http://kldp.net/frs/download.php/547/
@@ -17,7 +17,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
mad.2:${PORTSDIR}/audio/mad \
vorbisfile.4:${PORTSDIR}/audio/libvorbis
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui gnomeprefix
.ifndef WITHOUT_NLS
diff --git a/audio/liteamp/pkg-plist b/audio/liteamp/pkg-plist
index 613d7b7761b0..7faf25930cb9 100644
--- a/audio/liteamp/pkg-plist
+++ b/audio/liteamp/pkg-plist
@@ -29,3 +29,5 @@ share/gnome/pixmaps/liteamp/vol_mute.png
share/gnome/pixmaps/liteamp/vol_up.png
share/gnome/applications/liteamp.desktop
@dirrm share/gnome/pixmaps/liteamp
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index bafd9cdcdcb1..f7a94fe8070f 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= marlin
PORTVERSION= 0.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,9 @@ COMMENT= Sample editor for GNOME 2 using Gstreamer backend
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
-USE_X_PREFIX= yes
+BROKEN= does not build with new nautilus-cd-burner
+
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
USE_GSTREAMER80= flac gconf mad vorbis
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
index 086b159bb394..b5e9fbd59d56 100644
--- a/audio/marlin/pkg-plist
+++ b/audio/marlin/pkg-plist
@@ -114,3 +114,21 @@ share/locale/zh_CN/LC_MESSAGES/marlin.mo
@dirrm share/gnome/help/marlin/C
@dirrm share/gnome/help/marlin
@dirrm include/libmarlin
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index cccddf4ef1aa..358073d66ab1 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -8,6 +8,7 @@
PORTNAME= muine
PORTVERSION= 0.8.5
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= http://muine-player.org/releases/
@@ -26,7 +27,7 @@ RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intltool libgnomeui
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 0a24e05efdaa..b28ec8eb0a0d 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= musicbox-tag-editor
PORTVERSION= 0.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= musicbox
@@ -18,7 +18,7 @@ COMMENT= A simple GTK+ audio tag editor
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index c40bb9b23d42..e379c0446fa7 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paman
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/paman/
@@ -20,7 +20,7 @@ LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
USE_GCC= 3.4
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ARGS= --disable-lynx
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index af90b8131666..d7c190516e21 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,18 +15,18 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
DIST_SUBDIR= gnome2
MAINTAINER= marcus@FreeBSD.org
-COMMENT= Audio player for the Gnome 2 desktop environment
+COMMENT= Audio player for the GNOME 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
@@ -42,11 +42,12 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off \
- DAAP "Enable iTunes music sharing" off \
+OPTIONS= DAAP "Enable iTunes music sharing" off \
+ IPOD "Enable iPod support" on \
FAAD "Enable FAAD decoder support" off \
NOTIFY "Enable libnotify support" on \
- VORBIS "Enable Ogg/Vorbis support" on
+ VORBIS "Enable Ogg/Vorbis support" on \
+ GDA "Enable GDA database storage" off
.include <bsd.port.pre.mk>
@@ -54,10 +55,6 @@ OPTIONS= IPOD "Enable iPod support" off \
BROKEN= Does not build on 4.X
.endif
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+= --enable-ipod
-.endif
-
.if !defined(WITHOUT_VORBIS)
USE_GSTREAMER+= vorbis
.else
@@ -68,6 +65,13 @@ CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_GDA)
+USE_GNOME+= libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
.if defined(WITH_DAAP)
CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
@@ -95,4 +99,13 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_IPOD)
+LIB_DEPENDS+= gpod.400:${PORTSDIR}/audio/libgpod
+CONFIGURE_ARGS+=--with-ipod
+PLIST_SUB+= IPOD=""
+.else
+CONFIGURE_ARGS+=--without-ipod
+PLIST_SUB+= IPOD="@comment "
+.endif
+
.include <bsd.port.post.mk>
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 8b33c6d1a079..f05070cb9377 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 6a4564ee7f35..a3f756509f1b 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,37 +1,55 @@
bin/rhythmbox
bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+%%IPOD%%lib/rhythmbox/plugins/ipod/ipod.rb-plugin
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.a
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.la
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
libexec/rhythmbox-metadata
share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/ch01.html
@@ -110,7 +128,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/fdl-appendix.xml
share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +215,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-es.omf
share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -292,8 +308,6 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/rhythmbox/glade
@dirrm share/gnome/rhythmbox/art
@dirrm share/gnome/rhythmbox
@@ -312,6 +326,49 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
@dirrm share/gnome/help/rhythmbox/C
@dirrm share/gnome/help/rhythmbox
@dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+%%IPOD%%@dirrm lib/rhythmbox/plugins/ipod
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
@dirrm lib/rhythmbox/plugins
@dirrm lib/rhythmbox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index af90b8131666..d7c190516e21 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -15,18 +15,18 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
DIST_SUBDIR= gnome2
MAINTAINER= marcus@FreeBSD.org
-COMMENT= Audio player for the Gnome 2 desktop environment
+COMMENT= Audio player for the GNOME 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.2.8:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
@@ -42,11 +42,12 @@ CONFIGURE_ENV= LIBS="-lm" \
GCONF_SCHEMAS= rhythmbox.schemas
-OPTIONS= IPOD "Enable iPod support" off \
- DAAP "Enable iTunes music sharing" off \
+OPTIONS= DAAP "Enable iTunes music sharing" off \
+ IPOD "Enable iPod support" on \
FAAD "Enable FAAD decoder support" off \
NOTIFY "Enable libnotify support" on \
- VORBIS "Enable Ogg/Vorbis support" on
+ VORBIS "Enable Ogg/Vorbis support" on \
+ GDA "Enable GDA database storage" off
.include <bsd.port.pre.mk>
@@ -54,10 +55,6 @@ OPTIONS= IPOD "Enable iPod support" off \
BROKEN= Does not build on 4.X
.endif
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+= --enable-ipod
-.endif
-
.if !defined(WITHOUT_VORBIS)
USE_GSTREAMER+= vorbis
.else
@@ -68,6 +65,13 @@ CONFIGURE_ARGS+= --disable-vorbis --disable-vorbistest
USE_GSTREAMER+= faad
.endif
+.if defined(WITH_GDA)
+USE_GNOME+= libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
.if defined(WITH_DAAP)
CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
@@ -95,4 +99,13 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_IPOD)
+LIB_DEPENDS+= gpod.400:${PORTSDIR}/audio/libgpod
+CONFIGURE_ARGS+=--with-ipod
+PLIST_SUB+= IPOD=""
+.else
+CONFIGURE_ARGS+=--without-ipod
+PLIST_SUB+= IPOD="@comment "
+.endif
+
.include <bsd.port.post.mk>
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 8b33c6d1a079..f05070cb9377 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 6a4564ee7f35..a3f756509f1b 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,37 +1,55 @@
bin/rhythmbox
bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+%%IPOD%%lib/rhythmbox/plugins/ipod/ipod.rb-plugin
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.a
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.la
+%%IPOD%%lib/rhythmbox/plugins/ipod/libipod.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
libexec/rhythmbox-metadata
share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/ch01.html
@@ -110,7 +128,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
share/gnome/applications/rhythmbox.desktop
share/gnome/help/rhythmbox/C/fdl-appendix.xml
share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +215,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
share/gnome/omf/rhythmbox/rhythmbox-C.omf
share/gnome/omf/rhythmbox/rhythmbox-es.omf
share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -292,8 +308,6 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/rhythmbox/glade
@dirrm share/gnome/rhythmbox/art
@dirrm share/gnome/rhythmbox
@@ -312,6 +326,49 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
@dirrm share/gnome/help/rhythmbox/C
@dirrm share/gnome/help/rhythmbox
@dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+%%IPOD%%@dirrm lib/rhythmbox/plugins/ipod
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
@dirrm lib/rhythmbox/plugins
@dirrm lib/rhythmbox
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 51099e273ab0..4f3e990a018c 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= streamtuner
PORTVERSION= 0.99.99
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio www
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,9 +17,9 @@ COMMENT= A GTK+ stream directory browser
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gtk20 gnomehack gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/streamtuner/pkg-plist b/audio/streamtuner/pkg-plist
index 49b9461ba2df..421ec793b11e 100644
--- a/audio/streamtuner/pkg-plist
+++ b/audio/streamtuner/pkg-plist
@@ -108,3 +108,5 @@ share/locale/pt/LC_MESSAGES/streamtuner.mo
%%PYTHON%%@dirrm share/gnome/streamtuner/python/scripts
%%PYTHON%%@dirrm share/gnome/streamtuner/python
@dirrm share/gnome/streamtuner
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index d2f7b3bd5f12..063187d2fb3e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sweep
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/sweep/pkg-plist b/audio/sweep/pkg-plist
index d722fd84f35e..d6afb21593c3 100644
--- a/audio/sweep/pkg-plist
+++ b/audio/sweep/pkg-plist
@@ -44,3 +44,9 @@ share/locale/ru/LC_MESSAGES/sweep.mo
@dirrm include/sweep
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 7fd47bfda7c5..10e5abfac6e5 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -3,11 +3,11 @@
# Whom: Anthony Ginepro <anthony.ginepro@laposte.net>
#
# $FreeBSD$
-#
+# $MCom: ports/audio/tagtool/Makefile,v 1.1 2006/09/30 01:15:37 ahze Exp $
PORTNAME= tagtool
PORTVERSION= 0.12.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,8 +18,8 @@ COMMENT= A GNOME MP3/Ogg file tagger
LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_X_PREFIX= yes
-
+USE_XLIB= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack libglade2 gnomehier
diff --git a/audio/tagtool/pkg-plist b/audio/tagtool/pkg-plist
index 40c77579c65a..57ef492d3f76 100644
--- a/audio/tagtool/pkg-plist
+++ b/audio/tagtool/pkg-plist
@@ -32,3 +32,9 @@ share/locale/ua/LC_MESSAGES/tagtool.mo
@dirrm %%DATADIR%%
@unexec /bin/rmdir %D/share/locale/ua/LC_MESSAGES 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/locale/ua 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/ua/LC_MESSAGES
+@dirrmtry share/locale/ua
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index ed9fd90fa05e..951eb49237cc 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,7 +6,7 @@
PORTNAME= terminatorx
PORTVERSION= 3.82
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
DISTNAME= terminatorX-${PORTVERSION}
@@ -21,7 +21,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
jack.0:${PORTSDIR}/audio/jack
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 libxml2
USE_GMAKE= yes
@@ -72,8 +72,6 @@ post-patch:
's|malloc\.h|stdlib.h|g'
@${GREP} -lR "%%LOCALBASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|%%LOCALBASE%%|${LOCALBASE}|g'
- @${GREP} -lR "%%X11BASE%%" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
- 's|%%X11BASE%%|${LOCALBASE}|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/terminatorX ${PREFIX}/bin
diff --git a/audio/terminatorx/files/patch-src::main.cc b/audio/terminatorx/files/patch-src::main.cc
index 834b59e3ad6f..4b8a777e90f5 100644
--- a/audio/terminatorx/files/patch-src::main.cc
+++ b/audio/terminatorx/files/patch-src::main.cc
@@ -5,7 +5,7 @@
*/
-#define TX_GTKRC "/usr/share/themes/terminatorX/gtk/gtkrc"
-+#define TX_GTKRC "%%X11BASE%%/share/themes/terminatorX/gtk/gtkrc"
++#define TX_GTKRC "%%LOCALBASE%%/share/themes/terminatorX/gtk/gtkrc"
#define BENCH_CYCLES 100000
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 9be39bf1e8cd..09341bbed873 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -30,7 +30,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index c5d75cc62155..b68db9eadb9a 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -60,9 +60,39 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index bf2594a6d32d..bab939cfdeeb 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkperf
PORTVERSION= 0.40
+PORTREVISION= 1
CATEGORIES= benchmarks
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/benchmarks/gtkperf/pkg-plist b/benchmarks/gtkperf/pkg-plist
index 3667bc507576..0fc1cccfa88c 100644
--- a/benchmarks/gtkperf/pkg-plist
+++ b/benchmarks/gtkperf/pkg-plist
@@ -6,5 +6,6 @@ doc/gtkperf/INSTALL
doc/gtkperf/README
doc/gtkperf/TODO
share/pixmaps/duck.png
+@dirrmtry share/pixmaps
@dirrm doc/gtkperf
@dirrm doc
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index 9350895de9ab..e3d318199230 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -3,21 +3,21 @@
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
-#
+# $MCom: ports/biology/gperiodic/Makefile,v 1.1 2006/09/29 23:42:13 ahze Exp $
PORTNAME= gperiodic
PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= biology
MASTER_SITES= http://koti.welho.com/jfrantz/software/
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays a periodic table of the elements
-USE_X_PREFIX= yes
-USE_GNOME= gnomehier gtk20
+USE_XLIB= yes
+USE_GNOME= gnomeprefix gtk20
ALL_TARGET= ${PORTNAME}
-
+USE_GETTEXT= yes
LANGS= da fr pl sv tr
post-patch:
diff --git a/biology/gperiodic/pkg-plist b/biology/gperiodic/pkg-plist
index db8a172e1e3b..eaf00bcb6513 100644
--- a/biology/gperiodic/pkg-plist
+++ b/biology/gperiodic/pkg-plist
@@ -11,3 +11,5 @@ share/locale/pl/LC_MESSAGES/gperiodic.mo
share/locale/sv/LC_MESSAGES/gperiodic.mo
share/locale/tr/LC_MESSAGES/gperiodic.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index dac9c2b8cee1..9518d579d248 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -3,10 +3,11 @@
# Whom: Anders Andersson <anders@hack.org>
#
# $FreeBSD$
-#
+# $MCom: ports/cad/oregano/Makefile,v 1.7 2006/10/10 05:25:08 ahze Exp $
PORTNAME= oregano
PORTVERSION= 0.60.0
+PORTREVISION= 1
CATEGORIES= cad gnome
MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/84/
@@ -16,7 +17,7 @@ COMMENT= Schematic capture and simulation of electrical circuits
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \
libgnomeprintui libgnomeui
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index 1ffb65f71a79..71f28b6e6fd3 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -59,6 +59,7 @@ share/locale/es/LC_MESSAGES/oregano.mo
share/locale/fr/LC_MESSAGES/oregano.mo
share/locale/it/LC_MESSAGES/oregano.mo
share/locale/ja/LC_MESSAGES/oregano.mo
+share/locale/pl/LC_MESSAGES/oregano.mo
share/locale/pt_BR/LC_MESSAGES/oregano.mo
share/locale/ro/LC_MESSAGES/oregano.mo
share/locale/ru/LC_MESSAGES/oregano.mo
@@ -76,3 +77,9 @@ share/mime/packages/oregano.xml
@dirrm share/gnome/help/oregano
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile
index 7f0b53255602..9adfad2bf27a 100644
--- a/chinese/chinput3/Makefile
+++ b/chinese/chinput3/Makefile
@@ -3,11 +3,11 @@
# Whom: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
#
# $FreeBSD$
-#
+# $MCom: ports/chinese/chinput3/Makefile,v 1.1 2006/10/04 13:15:20 ahze Exp $
PORTNAME= chinput
PORTVERSION= 3.0.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= chinese x11
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/chinput3/
@@ -36,7 +36,10 @@ post-patch:
pre-build:
@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
- -e 's|-lc_r|${PTHREAD_CFLAGS} ${PTHREAD_LIBS}|'
+ -e 's|-lc_r|${PTHREAD_CFLAGS} ${PTHREAD_LIBS}|; \
+ s|-I/usr/include|-I${LOCALBASE}/include|; \
+ s|-L/usr/lib|-L${LOCALBASE}/lib|; \
+ s|-L/usr/X11R6|-L${LOCALBASE}/lib -L/usr/X11R6|'
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/chinese/chinput3/pkg-plist b/chinese/chinput3/pkg-plist
index 780ac2a060f2..23dc738565ac 100644
--- a/chinese/chinput3/pkg-plist
+++ b/chinese/chinput3/pkg-plist
@@ -29,3 +29,5 @@ share/locale/zh_CN/LC_MESSAGES/zwincontrol.mo
@dirrm lib/Chinput/im/bin
@dirrm lib/Chinput/im
@dirrm lib/Chinput
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 0b33377cd9b7..1ed2f6d78bd1 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcin
PORTVERSION= 1.2.7
+PORTREVISION= 2
CATEGORIES= chinese textproc gnome
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
@@ -15,10 +16,9 @@ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.bz2
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A traditional chinese input utility in X
-USE_X_PREFIX= YES
USE_BZIP2= YES
GNU_CONFIGURE= YES
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gnomecontrolcenter2 gnomehier
USE_GMAKE= YES
USE_GCC= 3.4+
INSTALLS_ICONS= YES
@@ -48,9 +48,12 @@ pre-patch:
s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
s/mandir=$$datadir/mandir=$$prefix/; \
s/\/usr\/share/$$prefix\/share/; \
- 109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
+ 123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+ @${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+ ${WRKSRC}/gtk-im/Makefile \
+ ${WRKSRC}/menu/Makefile
@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
@${REINPLACE_CMD} -e 's/bash/sh/; s/&//;' ${WRKSRC}/scripts/gcin-user-setup
@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
diff --git a/chinese/gcin-devel/files/patch-menu b/chinese/gcin-devel/files/patch-menu
index 2acd2a1f3036..acda831cfa80 100644
--- a/chinese/gcin-devel/files/patch-menu
+++ b/chinese/gcin-devel/files/patch-menu
@@ -1,8 +1,11 @@
---- menu/Makefile.orig Mon Aug 29 09:40:32 2005
-+++ menu/Makefile Thu Sep 15 11:53:49 2005
-@@ -12,12 +12,12 @@
+--- menu/Makefile.orig Sun Aug 28 21:40:32 2005
++++ menu/Makefile Fri Oct 13 14:43:28 2006
+@@ -10,14 +10,14 @@ install:
+ install gcin-setup.desktop /usr/share/applications; \
+ install -d /usr/lib/menu; \
install -m 644 $(MENUS) /usr/lib/menu; \
- which update-menus >& /dev/null && update-menus || exit 0; \
+- which update-menus >& /dev/null && update-menus || exit 0; \
++ which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
else \
- install -d $(libdir)/menu; \
- install -m 644 $(MENUS) $(libdir)/menu; \
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 2a8fd9beaf53..048f1367b678 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -62,13 +62,9 @@ share/icons/gcin/pin-float16.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/icons/gcin
@dirrmtry share/icons
-@dirrmtry share/gnome/control-center-2.0/capplets
-@dirrmtry share/gnome/control-center-2.0
-@dirrmtry share/gnome
@dirrmtry share/applications
@dirrmtry %%DATADIR%%/table
@dirrmtry %%DATADIR%%/script
@dirrmtry %%DATADIR%%
-@dirrmtry lib/gtk-2.0/immodules
@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 0b33377cd9b7..1ed2f6d78bd1 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcin
PORTVERSION= 1.2.7
+PORTREVISION= 2
CATEGORIES= chinese textproc gnome
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
@@ -15,10 +16,9 @@ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.bz2
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A traditional chinese input utility in X
-USE_X_PREFIX= YES
USE_BZIP2= YES
GNU_CONFIGURE= YES
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gnomecontrolcenter2 gnomehier
USE_GMAKE= YES
USE_GCC= 3.4+
INSTALLS_ICONS= YES
@@ -48,9 +48,12 @@ pre-patch:
s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
s/mandir=$$datadir/mandir=$$prefix/; \
s/\/usr\/share/$$prefix\/share/; \
- 109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
+ 123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+ @${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+ ${WRKSRC}/gtk-im/Makefile \
+ ${WRKSRC}/menu/Makefile
@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
@${REINPLACE_CMD} -e 's/bash/sh/; s/&//;' ${WRKSRC}/scripts/gcin-user-setup
@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
diff --git a/chinese/gcin/files/patch-menu b/chinese/gcin/files/patch-menu
index 2acd2a1f3036..acda831cfa80 100644
--- a/chinese/gcin/files/patch-menu
+++ b/chinese/gcin/files/patch-menu
@@ -1,8 +1,11 @@
---- menu/Makefile.orig Mon Aug 29 09:40:32 2005
-+++ menu/Makefile Thu Sep 15 11:53:49 2005
-@@ -12,12 +12,12 @@
+--- menu/Makefile.orig Sun Aug 28 21:40:32 2005
++++ menu/Makefile Fri Oct 13 14:43:28 2006
+@@ -10,14 +10,14 @@ install:
+ install gcin-setup.desktop /usr/share/applications; \
+ install -d /usr/lib/menu; \
install -m 644 $(MENUS) /usr/lib/menu; \
- which update-menus >& /dev/null && update-menus || exit 0; \
+- which update-menus >& /dev/null && update-menus || exit 0; \
++ which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
else \
- install -d $(libdir)/menu; \
- install -m 644 $(MENUS) $(libdir)/menu; \
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 2a8fd9beaf53..048f1367b678 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -62,13 +62,9 @@ share/icons/gcin/pin-float16.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/icons/gcin
@dirrmtry share/icons
-@dirrmtry share/gnome/control-center-2.0/capplets
-@dirrmtry share/gnome/control-center-2.0
-@dirrmtry share/gnome
@dirrmtry share/applications
@dirrmtry %%DATADIR%%/table
@dirrmtry %%DATADIR%%/script
@dirrmtry %%DATADIR%%
-@dirrmtry lib/gtk-2.0/immodules
@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index dbc35247784f..e68a71d26e65 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oxim
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese textproc
MASTER_SITES= ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
@@ -28,7 +28,7 @@ OPTIONS= GTK2 "Enable GTK2 input method module" On \
USE_GCC= 3.2+
USE_ICONV= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME=
GNU_CONFIGURE= yes
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index c1bfaf940dad..dbd256e39ac7 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-chewing
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= http://chewing.csie.net/download/scim/
@@ -18,7 +19,6 @@ LIB_DEPENDS= chewing.3:${PORTSDIR}/chinese/libchewing
BUILD_DEPENDS= ${RUN_DEPENDS} \
p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/chinese/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist
index d43187c74b4f..739d4ce5d4ff 100644
--- a/chinese/scim-chewing/pkg-plist
+++ b/chinese/scim-chewing/pkg-plist
@@ -9,3 +9,5 @@ share/scim/icons/scim-chewing-swap-colors.png
share/scim/icons/scim-chewing.png
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index d11caff9f389..ce2a1b43e369 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-pinyin
PORTVERSION= 0.5.91
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -19,7 +19,6 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gnomehack lthack
-USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index 71917778a593..c55fc533deb1 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -35,3 +35,9 @@ share/scim/icons/smart-pinyin.png
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
@dirrm share/scim/pinyin
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index c29dfe570d60..95bc05bab1ae 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-tables
PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT= SCIM table based Chinese input methods
BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 7cd7cadddc61..17038468fe2b 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-zh_CN
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -24,7 +24,6 @@ COMMENT= English-Chinese(S)/Chinese(S)-English dictionaries for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
do-install:
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 7cd7cadddc61..17038468fe2b 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-zh_CN
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -24,7 +24,6 @@ COMMENT= English-Chinese(S)/Chinese(S)-English dictionaries for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
do-install:
diff --git a/chinese/stardict2-dict-zh_TW/Makefile b/chinese/stardict2-dict-zh_TW/Makefile
index 0b023b42ce51..ed16c3b315ba 100644
--- a/chinese/stardict2-dict-zh_TW/Makefile
+++ b/chinese/stardict2-dict-zh_TW/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-zh_TW
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -25,7 +25,6 @@ COMMENT= English-Chinese(T)/Chinese(T)-English dictionaries for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
do-install:
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index cd0ddd8168b6..e8f38b379b39 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wenju
PORTVERSION= 1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wenju
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool:15
USE_GETOPT_LONG=yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
index ccc4924bd77c..18330c5d908b 100644
--- a/chinese/wenju/pkg-plist
+++ b/chinese/wenju/pkg-plist
@@ -1,9 +1,9 @@
@comment $FreeBSD$
bin/tim-config
bin/wrap
-lib/gtk-2.0/2.4.0/immodules/im-tim.a
-lib/gtk-2.0/2.4.0/immodules/im-tim.la
-lib/gtk-2.0/2.4.0/immodules/im-tim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.so
%%NLS%%share/locale/zh_CN/LC_MESSAGES/wenju.mo
%%DATADIR%%/bxm.tim
%%DATADIR%%/cj.tim
diff --git a/chinese/xttmgr/files/patch-xttmgr.c b/chinese/xttmgr/files/patch-xttmgr.c
new file mode 100644
index 000000000000..a44e6b2dfa9e
--- /dev/null
+++ b/chinese/xttmgr/files/patch-xttmgr.c
@@ -0,0 +1,57 @@
+--- xttmgr.c.orig Sat Oct 7 11:34:31 2006
++++ xttmgr.c Sat Oct 7 11:34:10 2006
+@@ -7,7 +7,6 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_MODULE_H
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_TRUETYPE_IDS_H
+ #include FT_TRUETYPE_TABLES_H
+ #include FT_SFNT_NAMES_H
+@@ -269,7 +268,7 @@ int main( int argc, char *argv[] )
+ static int Check_Font_Face( char *filename )
+ {
+ FT_Face face;
+- FT_ModuleRec* module;
++ int is_sfnt = 0;
+
+ num_faces = 0; /* ¥ý±N face Á`¼Æ³]¬° 0 */
+
+@@ -278,16 +277,12 @@ static int Check_Font_Face( char *filena
+ return 1;
+ }
+
+- module = &face->driver->root;
+ num_faces = face->num_faces; /* ¬ö¿ý¦@¦³¦h¤Ö­Ó faces */
++ is_sfnt = FT_IS_SFNT( face );
+ FT_Done_Face( face );
+
+ /* Àˬd¸ÓÀɮ׬O§_¬O TrueType ÀÉ */
+- if ( strncasecmp( module->clazz->module_name, "TrueType", 8 ) ) {
+- return 1;
+- }
+-
+- return 0;
++ return is_sfnt;
+
+ }
+
+@@ -1305,7 +1300,6 @@ static int Font_Info( char *filename )
+ FT_ULong face_idx;
+ FT_Int pos, num_encodings;
+ FT_CharMap charmap;
+- FT_ModuleRec* module;
+ TT_OS2 *os2;
+ FT_UShort platform_id, encoding_id;
+ char *platform_name=NULL;
+@@ -1366,8 +1360,8 @@ static int Font_Info( char *filename )
+ printf( "Number of glyphs : %ld\n", face->num_glyphs );
+ printf( "..........................................\n\n" );
+
+- module = &face->driver->root;
+- printf( "¼Ò²Õ¦WºÙ : %s\n", module->clazz->module_name );
++ /*module = &face->driver->root;
++ printf( "¼Ò²Õ¦WºÙ : %s\n", module->clazz->module_name );*/
+
+ printf( "\nFace flags :\n" );
+
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 32ab156c77f4..8c3ff31a1877 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= efax-gtk
PORTVERSION= 3.0.11
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +17,8 @@ MAINTAINER= jb.quenot@caraldi.com
COMMENT= GUI front end for the efax fax program
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
-RUN_DEPENDS= ${X11BASE}/bin/ggv:${PORTSDIR}/print/ggv \
- ${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS= ggv:${PORTSDIR}/print/ggv \
+ gs:${PORTSDIR}/print/ghostscript-gnu
USE_GNOME= gtk20
USE_X_PREFIX= yes
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index ac70513f1ea2..7a1dff216400 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmfsk
PORTVERSION= 0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= comms audio hamradio
MASTER_SITES= http://gmfsk.connect.fi/
@@ -23,7 +23,10 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
USE_GMAKE= yes
USE_GNOME= libgnomeui gnomehack gnomeprefix
-USE_X_PREFIX= yes
+USE_XLIB= yes
+INSTALLS_OMF= yes
+
+GCONF_SCHEMAS= gmfsk.schemas
OPTIONS= HAMLIB "Enable HAMLIB Support" On
diff --git a/comms/gmfsk/pkg-plist b/comms/gmfsk/pkg-plist
index 7516f5d16fcc..4a171ebbe364 100644
--- a/comms/gmfsk/pkg-plist
+++ b/comms/gmfsk/pkg-plist
@@ -1,7 +1,4 @@
bin/gmfsk
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gmfsk.schemas >/dev/null || /usr/bin/true
-etc/gconf/schemas/gmfsk.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gmfsk.schemas >/dev/null || /usr/bin/true
share/gnome/help/gmfsk/C/fdl-appendix.xml
share/gnome/help/gmfsk/C/figures/gmfsk_start_window.png
share/gnome/help/gmfsk/C/figures/note.png
@@ -21,5 +18,3 @@ share/gnome/pixmaps/gmfsk/tx.xpm
@dirrm share/gnome/help/gmfsk/C/figures
@dirrm share/gnome/help/gmfsk/C
@dirrm share/gnome/help/gmfsk
-@exec scrollkeeper-install -q %D/share/gnome/omf/gmfsk/gmfsk-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gmfsk/gmfsk-C.omf 2>/dev/null || /usr/bin/true
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 3df3bb779d89..61d676925c91 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/glom/Makefile,v 1.4 2005/07/01 17:55:37 marcus Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.9 2006/09/05 03:44:45 mezz Exp $
#
PORTNAME= glom
PORTVERSION= 0.8.30
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
@@ -22,9 +22,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
-
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 2d71c3ced2c6..b85a2ea0e874 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -36,5 +36,11 @@ share/mime/packages/glom.xml
@dirrm share/gnome/glom/xslt
@dirrm share/gnome/glom/glade
@dirrm share/gnome/glom
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index bfb14502b981..f1d1d974de78 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/databases/gnome-db/Makefile,v 1.2 2006/09/10 00:51:05 mezz Exp $
#
PORTNAME= gnome-db
PORTVERSION= 0.2.96
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-db/0.2
@@ -17,13 +18,13 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Provide uniform access to data sources for the GNOME environment
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnomehier libgda
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index b85a8396e885..f15e14489af8 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -177,3 +177,29 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
@dirrm %%DOCSDIR%%
@dirrm include/libgnomedb-%%VERSION%%/gnome-db
@dirrm include/libgnomedb-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index a6ff800d0164..6cca07684c21 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/databases/libgda/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
#
PORTNAME= libgda
PORTVERSION= 0.2.96
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
@@ -19,12 +20,12 @@ COMMENT= Provides uniform access to different kinds of data sources
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 195f9aa7a656..18c1135dd87a 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -213,3 +213,25 @@ share/locale/uk/LC_MESSAGES/libgda.mo
@dirrm include/libgda-%%VERSION%%/gda++
@dirrm include/libgda-%%VERSION%%/gda
@dirrm include/libgda-%%VERSION%%
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 090173194e07..1bb2f9c3c779 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda2/Makefile,v 1.32 2005/10/29 04:20:53 mezz Exp $
+# $MCom: ports/databases/libgda3/Makefile,v 1.2 2006/09/10 00:51:06 mezz Exp $
#
PORTNAME= libgda3
PORTVERSION= 1.9.102
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
@@ -25,10 +25,10 @@ USE_BZIP2= yes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-bdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index e9362ddac195..fa73f702de4c 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -205,10 +205,6 @@ share/locale/vi/LC_MESSAGES/libgda-3.mo
share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/libgda/xml
@dirrm share/gnome/libgda/dtd
@dirrm share/gnome/libgda
@@ -223,3 +219,39 @@ share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
@dirrm include/libgda-%%VERSION%%/libgda
@dirrm include/libgda-%%VERSION%%
@dirrm etc/libgda
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 5f6cc75ce463..8088e45634cd 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,11 +3,12 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgdamm/Makefile,v 1.3 2005/10/14 20:39:55 adamw Exp $
+# $MCom: ports/databases/libgdamm/Makefile,v 1.5 2006/07/25 18:12:02 mezz Exp $
#
PORTNAME= libgdamm
PORTVERSION= 1.3.7
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3
@@ -20,7 +21,7 @@ LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GCC= 3.4
USE_GMAKE= yes
USE_GNOME= gnomehack libgda2
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index db1eca3f4cbc..e3ce9b56daaa 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgnomedb/Makefile,v 1.25 2005/10/13 20:20:19 marcus Exp $
+# $MCom: ports/databases/libgnomedb/Makefile,v 1.28 2006/09/10 00:51:06 mezz Exp $
#
PORTNAME= libgnomedb
PORTVERSION= 1.9.102
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -24,11 +24,11 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
intlhack referencehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index d1b67ec41278..f45b33bf9e5d 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -185,10 +185,6 @@ share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
share/locale/zh_HK/LC_MESSAGES/libgnomedb-3.mo
share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/pixmaps/libgnomedb
@dirrm share/gnome/omf/libgnomedb
@dirrm lib/libgnomedb/plugins
@@ -197,3 +193,41 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/data-entries
@dirrm include/libgnomedb-%%VERSION%%/libgnomedb
@dirrm include/libgnomedb-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 0670afa7272d..dde139981702 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mdbtools
PORTVERSION= 0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,25 +19,24 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk # To build man-pages
USE_BISON= yes
USE_GNOME= glib20
+WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
MAN1= mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1
-.if defined(WITH_GNOME) || exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
-USE_X_PREFIX= yes
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_XLIB= yes
USE_GNOME+= gnomeprefix gnomehack libgnomeui
-PLIST_SUB+= GNOME:=""
PKGNAMESUFFIX= -gnome
-.else
-PLIST_SUB+= GNOME:="@comment "
.endif
-.include <bsd.port.pre.mk>
-
post-patch:
- @${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' ${WRKSRC}/doc/Makefile.in
+ @${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' \
+ ${WRKSRC}/doc/Makefile.in
.if !defined(NOPORTDOCS)
post-install:
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 68f1b45611a0..ce45523b51d5 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/mergeant/Makefile,v 1.15 2005/08/07 21:55:46 marcus Exp $
+# $MCom: ports/databases/mergeant/Makefile,v 1.18 2006/09/10 00:51:06 mezz Exp $
#
PORTNAME= mergeant
PORTVERSION= 0.62
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -18,19 +18,17 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Provide uniform access to data sources for the GNOME 2 environment
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui
USE_PERL5= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
BROKEN= does not build with new libgnomedb
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
.include <bsd.port.mk>
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index fa89db31d7be..9266d0f45b58 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -88,11 +88,33 @@ share/locale/tr/LC_MESSAGES/mergeant.mo
share/locale/uk/LC_MESSAGES/mergeant.mo
share/locale/vi/LC_MESSAGES/mergeant.mo
share/locale/zh_CN/LC_MESSAGES/mergeant.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/pixmaps/mergeant
@dirrm share/gnome/omf/mergeant
@dirrm share/gnome/help/mergeant/C/stylesheet-images
@dirrm share/gnome/help/mergeant/C/images
@dirrm share/gnome/help/mergeant/C
@dirrm share/gnome/help/mergeant
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile
index e8ba0f0ee711..80380a017f99 100644
--- a/deskutils/alexandria/Makefile
+++ b/deskutils/alexandria/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alexandria
PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= deskutils ruby
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,12 +24,16 @@ RUN_DEPENDS= ${RUBY_SITELIBDIR}/amazon.rb:${PORTSDIR}/www/ruby-amazon \
${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \
${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2
+USE_GNOME= gnomehier
INSTALLS_OMF= yes
USE_GETTEXT= yes
USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
+DOCS= NEWS README TODO
+GCONF_SCHEMAS= alexandria.schemas
+
RUBY_REQUIRE= Ruby > 180
CONFIGURE_ARGS= "--prefix=${PREFIX}"
@@ -39,7 +43,18 @@ CONFIGURE_ARGS= "--prefix=${PREFIX}"
IGNORE= only works with Ruby 1.8.0 or later
.endif
+post-extract:
+ @${MV} ${WRKSRC}/data/omf ${WRKSRC}/data/gnome/
+
post-install:
- ${RM} ${PREFIX}/share/gnome/help/alexandria/ChangeLog
+ @${MKDIR} ${LOCALBASE}/etc/gconf/schemas
+ @${INSTALL_DATA} ${WRKSRC}/schemas/alexandria.schemas \
+ ${LOCALBASE}/etc/gconf/schemas/
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${RUBY_MODDOCDIR}
+.for f in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.endif
.include <bsd.port.post.mk>
diff --git a/deskutils/alexandria/pkg-plist b/deskutils/alexandria/pkg-plist
index a3603f70f57c..7b12ce316a9e 100644
--- a/deskutils/alexandria/pkg-plist
+++ b/deskutils/alexandria/pkg-plist
@@ -1,33 +1,54 @@
bin/alexandria
%%RUBY_SITELIBDIR%%/alexandria.rb
%%RUBY_SITELIBDIR%%/alexandria/book.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/amadeus.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/amazon.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/bn.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/ibs_it.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/mcu.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/proxis.rb
+%%RUBY_SITELIBDIR%%/alexandria/book_providers/z3950.rb
+%%RUBY_SITELIBDIR%%/alexandria/config.rb
+%%RUBY_SITELIBDIR%%/alexandria/default_preferences.rb
%%RUBY_SITELIBDIR%%/alexandria/execution_queue.rb
%%RUBY_SITELIBDIR%%/alexandria/export_library.rb
%%RUBY_SITELIBDIR%%/alexandria/import_library.rb
%%RUBY_SITELIBDIR%%/alexandria/library.rb
-%%RUBY_SITELIBDIR%%/alexandria/preferences.rb
-%%RUBY_SITELIBDIR%%/alexandria/ui.rb
-%%RUBY_SITELIBDIR%%/alexandria/web_themes.rb
%%RUBY_SITELIBDIR%%/alexandria/macui.rb
-%%RUBY_SITELIBDIR%%/alexandria/utils.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/AboutController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/AddBookController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/BookIconCell.m
+%%RUBY_SITELIBDIR%%/alexandria/macui/BookInfoController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/BooksDataSource.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/ExportController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/Icons.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/ImportController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/Info.plist
+%%RUBY_SITELIBDIR%%/alexandria/macui/LibrariesDataSource.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/MainController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/classes.nib
+%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/info.nib
+%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/keyedobjects.nib
+%%RUBY_SITELIBDIR%%/alexandria/macui/Matrix.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/PreferencesController.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/RatingCell.m
+%%RUBY_SITELIBDIR%%/alexandria/macui/RatingField.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/TableView.rb
+%%RUBY_SITELIBDIR%%/alexandria/macui/TitledImageCell.m
+%%RUBY_SITELIBDIR%%/alexandria/macui/Utils.m
+%%RUBY_SITELIBDIR%%/alexandria/macui/main.m
+%%RUBY_SITELIBDIR%%/alexandria/macui/main.rb
+%%RUBY_SITELIBDIR%%/alexandria/preferences.rb
%%RUBY_SITELIBDIR%%/alexandria/scanners.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers.rb
-%%RUBY_SITELIBDIR%%/alexandria/default_preferences.rb
-%%RUBY_SITELIBDIR%%/alexandria/config.rb
-%%RUBY_SITELIBDIR%%/alexandria/version.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/mcu.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/amazon.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/bn.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/proxis.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/amadeus.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/ibs_it.rb
-%%RUBY_SITELIBDIR%%/alexandria/book_providers/z3950.rb
%%RUBY_SITELIBDIR%%/alexandria/scanners/cuecat.rb
-%%RUBY_SITELIBDIR%%/alexandria/ui/export_dialog.rb
+%%RUBY_SITELIBDIR%%/alexandria/ui.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/about_dialog.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/alert_dialog.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/book_properties_dialog.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/book_properties_dialog_base.rb
+%%RUBY_SITELIBDIR%%/alexandria/ui/completion_models.rb
+%%RUBY_SITELIBDIR%%/alexandria/ui/export_dialog.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/glade_base.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/icons.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/import_dialog.rb
@@ -35,61 +56,43 @@ bin/alexandria
%%RUBY_SITELIBDIR%%/alexandria/ui/new_book_dialog.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/new_book_dialog_manual.rb
%%RUBY_SITELIBDIR%%/alexandria/ui/preferences_dialog.rb
-%%RUBY_SITELIBDIR%%/alexandria/ui/completion_models.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/AddBookController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/BookInfoController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/BooksDataSource.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/Info.plist
-%%RUBY_SITELIBDIR%%/alexandria/macui/LibrariesDataSource.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/MainController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/RatingCell.m
-%%RUBY_SITELIBDIR%%/alexandria/macui/TableView.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/TitledImageCell.m
-%%RUBY_SITELIBDIR%%/alexandria/macui/main.m
-%%RUBY_SITELIBDIR%%/alexandria/macui/main.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/AboutController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/BookIconCell.m
-%%RUBY_SITELIBDIR%%/alexandria/macui/ExportController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/Icons.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/ImportController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/Matrix.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/PreferencesController.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/RatingField.rb
-%%RUBY_SITELIBDIR%%/alexandria/macui/Utils.m
-%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/classes.nib
-%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/info.nib
-%%RUBY_SITELIBDIR%%/alexandria/macui/MainWindow.nib/keyedobjects.nib
+%%RUBY_SITELIBDIR%%/alexandria/utils.rb
+%%RUBY_SITELIBDIR%%/alexandria/version.rb
+%%RUBY_SITELIBDIR%%/alexandria/web_themes.rb
%%DATADIR%%/glade/book_properties_dialog.glade
+%%DATADIR%%/glade/main_app.glade
%%DATADIR%%/glade/new_book_dialog.glade
%%DATADIR%%/glade/preferences_dialog.glade
-%%DATADIR%%/glade/main_app.glade
%%DATADIR%%/icons/alexandria.png
%%DATADIR%%/icons/alexandria_small.png
%%DATADIR%%/icons/book.png
+%%DATADIR%%/icons/book_icon.png
+%%DATADIR%%/icons/book_small.png
%%DATADIR%%/icons/cuecat.png
%%DATADIR%%/icons/cuecat_inactive.png
-%%DATADIR%%/icons/library.png
-%%DATADIR%%/icons/library_small.png
-%%DATADIR%%/icons/star_set.png
-%%DATADIR%%/icons/star_unset.png
%%DATADIR%%/icons/favorite_tag.png
-%%DATADIR%%/icons/book_small.png
-%%DATADIR%%/icons/book_icon.png
%%DATADIR%%/icons/less.png
+%%DATADIR%%/icons/library.png
+%%DATADIR%%/icons/library_small.png
+%%DATADIR%%/icons/lookup.png
%%DATADIR%%/icons/more.png
%%DATADIR%%/icons/no_cover.png
+%%DATADIR%%/icons/star_set.png
+%%DATADIR%%/icons/star_unset.png
%%DATADIR%%/icons/view_as_icons.png
%%DATADIR%%/icons/view_as_list.png
-%%DATADIR%%/icons/lookup.png
%%DATADIR%%/ui/menus.xml
%%DATADIR%%/ui/popups.xml
%%DATADIR%%/web-themes/clean/clean.css
%%DATADIR%%/web-themes/clean/preview.jpg
-share/omf/alexandria/alexandria-C.omf
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
share/gnome/help/alexandria/C/alexandria.xml
share/gnome/help/alexandria/C/figures/alexandria_add_by_isbn_1.png
share/gnome/help/alexandria/C/figures/alexandria_add_by_search_1.png
share/gnome/help/alexandria/C/figures/alexandria_add_manually.png
+share/gnome/help/alexandria/C/figures/alexandria_add_z3950.png
share/gnome/help/alexandria/C/figures/alexandria_edit_info.png
share/gnome/help/alexandria/C/figures/alexandria_export_web_page.png
share/gnome/help/alexandria/C/figures/alexandria_importing.png
@@ -98,25 +101,24 @@ share/gnome/help/alexandria/C/figures/alexandria_list_view.png
share/gnome/help/alexandria/C/figures/alexandria_list_view_search.png
share/gnome/help/alexandria/C/figures/alexandria_loaning.png
share/gnome/help/alexandria/C/figures/alexandria_main_window.png
-share/gnome/help/alexandria/C/figures/alexandria_add_z3950.png
-share/locale/sv/LC_MESSAGES/alexandria.mo
-share/locale/fr/LC_MESSAGES/alexandria.mo
-share/locale/de/LC_MESSAGES/alexandria.mo
+share/gnome/help/alexandria/ChangeLog
+share/gnome/omf/alexandria/alexandria-C.omf
+share/locale/cs/LC_MESSAGES/alexandria.mo
share/locale/cy/LC_MESSAGES/alexandria.mo
+share/locale/de/LC_MESSAGES/alexandria.mo
share/locale/es/LC_MESSAGES/alexandria.mo
-share/locale/pl/LC_MESSAGES/alexandria.mo
-share/locale/pt_BR/LC_MESSAGES/alexandria.mo
+share/locale/fr/LC_MESSAGES/alexandria.mo
share/locale/it/LC_MESSAGES/alexandria.mo
share/locale/ja/LC_MESSAGES/alexandria.mo
+share/locale/pl/LC_MESSAGES/alexandria.mo
share/locale/pt/LC_MESSAGES/alexandria.mo
-share/locale/cs/LC_MESSAGES/alexandria.mo
-@dirrm share/omf/alexandria
-@dirrm share/omf
+share/locale/pt_BR/LC_MESSAGES/alexandria.mo
+share/locale/sv/LC_MESSAGES/alexandria.mo
+@dirrm share/gnome/omf/alexandria
@dirrm share/gnome/help/alexandria/C/figures
@dirrm share/gnome/help/alexandria/C
@dirrm share/gnome/help/alexandria
-@dirrm share/gnome/help
-@dirrm share/gnome
+@dirrm %%PORTDOCS%%%%RUBY_MODDOCDIR%%
@dirrm %%DATADIR%%/web-themes/clean
@dirrm %%DATADIR%%/web-themes
@dirrm %%DATADIR%%/ui
@@ -129,6 +131,9 @@ share/locale/cs/LC_MESSAGES/alexandria.mo
@dirrm %%RUBY_SITELIBDIR%%/alexandria/macui
@dirrm %%RUBY_SITELIBDIR%%/alexandria/book_providers
@dirrm %%RUBY_SITELIBDIR%%/alexandria
-@dirrm %%RUBY_SITELIBDIR%%
-@dirrm lib/ruby/site_ruby
-@dirrm lib/ruby
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile
index 1769c5c078e0..06ead610ab50 100644
--- a/deskutils/buoh/Makefile
+++ b/deskutils/buoh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= buoh
PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= deskutils www gnome
MASTER_SITES= http://buoh.steve-o.org/downloads/
@@ -18,7 +18,7 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -46,7 +46,7 @@ pre-everything::
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${X11BASE}/share/applications|g' \
+ @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${LOCALBASE}/share/applications|g' \
${WRKSRC}/data/Makefile.in
post-install:
@@ -56,7 +56,8 @@ post-install:
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
+ @${MKDIR} ${LOCALBASE}/share/pixmaps
@${LN} -sf ${DATADIR}/pixmaps/buoh64x64.png \
- ${X11BASE}/share/pixmaps/buoh64x64.png
+ ${LOCALBASE}/share/pixmaps/buoh64x64.png
.include <bsd.port.post.mk>
diff --git a/deskutils/buoh/pkg-plist b/deskutils/buoh/pkg-plist
index 9ab5c41782bd..f1923d82b3aa 100644
--- a/deskutils/buoh/pkg-plist
+++ b/deskutils/buoh/pkg-plist
@@ -11,6 +11,7 @@ share/applications/buoh.desktop
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/pixmaps/buoh64x64.png
+@dirrmtry share/pixmaps
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/pixmaps
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index 24249972fa10..b9e54845044e 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= contacts
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.openedhand.com/~chris/ \
http://smyru.petronet.pl/freebsd/
diff --git a/deskutils/contacts/files/patch-src_constacts-utils.c b/deskutils/contacts/files/patch-src_constacts-utils.c
new file mode 100644
index 000000000000..605a374d5802
--- /dev/null
+++ b/deskutils/contacts/files/patch-src_constacts-utils.c
@@ -0,0 +1,44 @@
+--- src/contacts-utils.c.orig Sat Sep 30 02:02:40 2006
++++ src/contacts-utils.c Sat Sep 30 02:03:54 2006
+@@ -180,13 +180,13 @@
+
+ /* TODO: Would adding a struct for this be gratuititous? RB: NOT AT ALL */
+ static const gchar **contacts_field_types[] = {
+- (gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
++ (const gchar *[]){ "TEL", "Home", "Msg", "Work", "Pref", "Voice", "Fax",
+ "Cell", "Video", "Pager", "BBS", "Modem", "Car",
+ "ISDN", "PCS", NULL },
+- (gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
+- (gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
++ (const gchar *[]){ "EMAIL", "Internet", "X400", "Pref", NULL },
++ (const gchar *[]){ "ADR", "Dom", "Intl", "Postal", "Parcel", "Home", "Work",
+ "Pref", NULL },
+- (gchar *[]){ NULL }
++ (const gchar *[]){ NULL }
+ };
+
+ const gchar **
+@@ -357,8 +357,8 @@
+ switch (photo->type) {
+ case E_CONTACT_PHOTO_TYPE_INLINED :
+ gdk_pixbuf_loader_write (loader,
+- photo->inlined.data,
+- photo->inlined.length, NULL);
++ photo->data.inlined.data,
++ photo->data.inlined.length, NULL);
+ break;
+ case E_CONTACT_PHOTO_TYPE_URI :
+ default :
+@@ -545,9 +545,9 @@
+ int *length;
+ #if HAVE_PHOTO_TYPE
+ new_photo.type = E_CONTACT_PHOTO_TYPE_INLINED;
+- data = &new_photo.inlined.data;
+- length = &new_photo.inlined.length;
+- new_photo.inlined.mime_type = NULL;
++ data = &new_photo.data.inlined.data;
++ length = &new_photo.data.inlined.length;
++ new_photo.data.inlined.mime_type = NULL;
+ #else
+ data = &new_photo.data;
+ length = &new_photo.length;
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index a6377d6ac9a2..8a8a69ee299d 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drivel
PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,6 +17,7 @@ COMMENT= Blog editor for GNOME
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
+INSTALLS_ICONS= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui intlhack gtksourceview
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index fc1789199ff7..42f07a101b0c 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -61,6 +61,8 @@ share/mime/application/x-drivel.xml
share/mime/packages/drivel.xml
@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
@dirrm share/gnome/pixmaps/drivel
@dirrm share/gnome/omf/drivel
@dirrm share/gnome/help/drivel/C
@@ -70,3 +72,21 @@ share/mime/packages/drivel.xml
@dirrm share/gnome/drivel
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile
index c177b2c0a29c..6663ad85efb3 100644
--- a/deskutils/gdeskcal-skins/Makefile
+++ b/deskutils/gdeskcal-skins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdeskcal-skins
PORTVERSION= 0.56
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils python gnome
MASTER_SITES= http://www.pycage.de/download/skins/gdeskcal/
DISTNAME=
@@ -30,10 +30,10 @@ DISTFILES= gnometheme.tar.gz \
MAINTAINER= ports@FreeBSD.org
COMMENT= Skins for gdeskcal
-RUN_DEPENDS= ${X11BASE}/bin/gdeskcal:${PORTSDIR}/deskutils/gdeskcal
+RUN_DEPENDS= gdeskcal:${PORTSDIR}/deskutils/gdeskcal
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix
NO_BUILD= yes
diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile
index 85fe7cc5bbb5..87184f177d07 100644
--- a/deskutils/gdeskcal/Makefile
+++ b/deskutils/gdeskcal/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/gdeskcal/Makefile,v 1.2 2006/09/30 03:23:19 ahze Exp $
PORTNAME= gdeskcal
PORTVERSION= 0.57.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= deskutils python gnome
MASTER_SITES= http://www.pycage.de/download/
DISTNAME= gDeskCal-${PORTVERSION:S/./_/g}
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/gDeskCal-${PORTVERSION}
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehier
NO_BUILD= yes
diff --git a/deskutils/gdeskcal/pkg-plist b/deskutils/gdeskcal/pkg-plist
index 191d32eecfda..eef2330b773d 100644
--- a/deskutils/gdeskcal/pkg-plist
+++ b/deskutils/gdeskcal/pkg-plist
@@ -99,3 +99,25 @@ share/locale/zh_CN/LC_MESSAGES/gdeskcal.mo
@dirrm share/gnome/gdeskcal/code/planner
@dirrm share/gnome/gdeskcal/code
@dirrm share/gnome/gdeskcal
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/deskutils/gdesklets-recentlyused/Makefile b/deskutils/gdesklets-recentlyused/Makefile
index 6ae61d6dd99e..1669238443ee 100644
--- a/deskutils/gdesklets-recentlyused/Makefile
+++ b/deskutils/gdesklets-recentlyused/Makefile
@@ -7,7 +7,7 @@
PORTNAME= recentlyused
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -19,7 +19,7 @@ COMMENT= A toolbar for the most recently used items from ~/.recently-used
RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/deskutils/gdesklets-sensor-displayconstraints/Makefile b/deskutils/gdesklets-sensor-displayconstraints/Makefile
index 26a024b7a2bd..cad18a3c6885 100644
--- a/deskutils/gdesklets-sensor-displayconstraints/Makefile
+++ b/deskutils/gdesklets-sensor-displayconstraints/Makefile
@@ -7,7 +7,7 @@
PORTNAME= displayconstraints
PORTVERSION= 0.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-sensor-
@@ -24,7 +24,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
WRKSRC= ${WRKDIR}/${NAME}-${PORTVERSION}
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
NAME= DisplayConstraints
diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 555f85b13032..e638a3857ca2 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= starterbar
PORTVERSION= 0.31.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -21,7 +21,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
USE_BZIP2= yes
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= StarterBar
DATADIR= ${PREFIX}/share/gnome
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 1c540c461e28..a98cbbdc78ab 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.35.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gdesklets.org/downloads/ \
http://www.pycage.de/download/${PORTNAME}/ \
@@ -19,6 +19,7 @@ COMMENT= A framework for Gnome 2.x for desktop applets
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index eae64058eca0..5c5dfebbc1ae 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -650,5 +650,30 @@ share/mime/packages/gdesklets.xml
@dirrm lib/gdesklets
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/gnome/48x48/mimetypes
diff --git a/deskutils/gnome-menu-editor/Makefile b/deskutils/gnome-menu-editor/Makefile
index f60d410a388b..214609d243c0 100644
--- a/deskutils/gnome-menu-editor/Makefile
+++ b/deskutils/gnome-menu-editor/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.8 2005/09/08 18:09:45 marcus Exp $
+# $MCom: ports/deskutils/gnome-menu-editor/Makefile,v 1.11 2006/09/01 20:29:54 ahze Exp $
#
PORTNAME= gnome-menu-editor
PORTVERSION= 0.6
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://manny.cluecoder.org/packages/gnome-menu-editor/
@@ -17,12 +18,14 @@ COMMENT= Simple menu editor for Gnome
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomemenus intlhack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-patch:
+ @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+ ${WRKSRC}/src/gme-util.c
# Make .desktop file valid to desktop-file-validate
@${REINPLACE_CMD} -e 's|OnlyShowIn=GNOME|OnlyShowIn=GNOME;|' \
${WRKSRC}/data/gnome-menu-editor.desktop.in
diff --git a/deskutils/gnome-menu-editor/pkg-plist b/deskutils/gnome-menu-editor/pkg-plist
index d414b408d7ba..45ce0313f159 100644
--- a/deskutils/gnome-menu-editor/pkg-plist
+++ b/deskutils/gnome-menu-editor/pkg-plist
@@ -29,5 +29,25 @@ share/locale/uk/LC_MESSAGES/gnome-menu-editor.mo
share/locale/vi/LC_MESSAGES/gnome-menu-editor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-menu-editor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-menu-editor.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 721736cadcb2..ed85444dae41 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -3,16 +3,15 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $
+# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
#
PORTNAME= sunbird
-PORTVERSION= 0.3a1
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source
+DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Redesign of the Mozilla Calendar with XUL interface
@@ -24,19 +23,20 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
SUNBIRD= ${PORTNAME}
SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm
SUNBIRD_ICON= ${PORTNAME}.xpm
-
-MOZ_PROTOCOLS= about,http,ftp,file,jar,res
+LIBS= -Wl,-Bsymbolic -lc
+PKGCONFIG_FILES?= ${MOZILLA}-js \
+ ${MOZILLA}-xpcom ${MOZILLA}-plugin
MOZ_OPTIONS= --enable-application=calendar \
- --enable-plaintext-editor-only \
- --disable-plugins --disable-cookies
+ --enable-system-cairo \
+ --with-system-nss \
+ --enable-canvas
MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${OSVERSION} < 500000
BROKEN= does not build
@@ -50,21 +50,16 @@ IGNORE= does not build
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif
-post-extract::
+post-patch:
@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
-
-post-patch:
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
- embedding/minimo
- @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/' \
- ${WRKSRC}/${ii}/all.js
-.endfor
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/security/manager/ssl/src/Makefile.in
pre-install:
${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
do-install:
diff --git a/deskutils/lightning-thunderbird/distinfo b/deskutils/lightning-thunderbird/distinfo
index 9a9b0708a6aa..6da5658bd86b 100644
--- a/deskutils/lightning-thunderbird/distinfo
+++ b/deskutils/lightning-thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3
-SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda
-SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798
+MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366
+SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224
+SIZE (sunbird-0.3.source.tar.bz2) = 32564480
diff --git a/deskutils/lightning-thunderbird/files/patch-Makefile.in b/deskutils/lightning-thunderbird/files/patch-Makefile.in
deleted file mode 100644
index b09d564958c6..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Thu Oct 21 19:25:55 2004
-+++ Makefile.in Thu Oct 21 19:26:46 2004
-@@ -80,8 +80,7 @@
- $(tier_1_dirs) \
- $(tier_2_dirs) \
- $(tier_9_dirs) \
-- $(tier_50_dirs) \
-- $(NULL)
-+ $(tier_50_dirs)
-
- ifdef GC_LEAK_DETECTOR
- DIRS += gc/boehm
-@@ -100,7 +99,8 @@
- DIRS += $(tier_98_dirs)
- endif
-
--DIRS += $(tier_99_dirs)
-+DIRS += $(tier_99_dirs) \
-+ $(NULL)
-
- #
- # tier 0 - base build config dirs
diff --git a/deskutils/lightning-thunderbird/files/patch-config_rules.mk b/deskutils/lightning-thunderbird/files/patch-config_rules.mk
index 16cb6ae1192e..7377726fdc66 100644
--- a/deskutils/lightning-thunderbird/files/patch-config_rules.mk
+++ b/deskutils/lightning-thunderbird/files/patch-config_rules.mk
@@ -1,14 +1,11 @@
---- config/rules.mk.orig Sun May 18 16:10:18 2003
-+++ config/rules.mk Sun Jul 20 18:07:26 2003
-@@ -448,7 +448,11 @@
+--- config/rules.mk.orig Fri Jul 7 00:13:36 2006
++++ config/rules.mk Sun Sep 3 00:04:03 2006
+@@ -443,7 +443,7 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
endif
endif
diff --git a/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h
new file mode 100644
index 000000000000..534bccba48be
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h
@@ -0,0 +1,20 @@
+--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006
++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+ * Macros to workaround math-bugs bugs in various platforms
+ */
diff --git a/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp
deleted file mode 100644
index 6795f921501d..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-content_xslt_src_base_txDouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006
-+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006
-@@ -52,11 +52,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
- #endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
-+#endif
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/deskutils/lightning-thunderbird/files/patch-libm b/deskutils/lightning-thunderbird/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
-
--FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK = jsmathtemp.o
- JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
- endif
- @$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
-
---- js/Makefile.in Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in Thu Aug 4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
-
--DIRS = src/fdlibm src
-+DIRS = src
-
- include $(topsrcdir)/config/rules.mk
diff --git a/www/firefox-devel/files/patch-nothreads-sqlite3 b/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite
index 1b1bbbcbda15..1b1bbbcbda15 100644
--- a/www/firefox-devel/files/patch-nothreads-sqlite3
+++ b/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite
diff --git a/deskutils/lightning-thunderbird/files/patch-sysnss b/deskutils/lightning-thunderbird/files/patch-sysnss
index a9154ce9a292..f1397eb524a2 100644
--- a/deskutils/lightning-thunderbird/files/patch-sysnss
+++ b/deskutils/lightning-thunderbird/files/patch-sysnss
@@ -1,103 +1,55 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 - 3rd party individual libraries
- #
--tier_1_dirs += dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs += jpeg
---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
- $(NULL)
+--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006
+@@ -124,19 +124,19 @@
+ pipboot \
+ $(NULL)
---- config/config.mk Tue Oct 12 00:11:11 2004
-+++ config/config.mk Tue Aug 2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS = \
- $(LIBS_DIR) \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- -lsmime3 \
- -lssl3 \
-@@ -189,11 +188,5 @@
- endif
+-EXTRA_DEPS = $(NSS_DEP_LIBS)
--NSS_DEP_LIBS = \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-- $(NULL)
-+NSS_DEP_LIBS =
+ DEFINES += -DNSS_ENABLE_ECC
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
- const char *possible_ckbi_locations[] = {
- NS_GRE_DIR,
-+ NS_UNIX_LIB_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR
- };
-@@ -419,5 +424,5 @@
- }
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NSS_LIBS) \
++ $(LOCAL_INCLUDES) \
+ $(NULL)
-- char *fullModuleName = nsnull;
-+ char *fullModuleName;
- #ifdef XP_MAC
- nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+ if (fullModuleName == nsnull)
-+ continue;
-+ struct stat sb;
-+ if (stat(fullModuleName, &sb)) {
-+ if (errno != ENOENT)
-+ perror(fullModuleName);
-+ continue;
-+ }
- /* If a module exists with the same name, delete it. */
- NS_ConvertUCS2toUTF8 modNameUTF8(modName);
---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005
-+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005
-@@ -52,18 +52,9 @@
+ include $(topsrcdir)/config/rules.mk
+--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006
++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006
+@@ -54,22 +54,13 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_MODULES \
+ HAVE_FREEBL_LIBS \
+ HAVE_FREEBL_LIBS_32 \
+ HAVE_FREEBL_LIBS_32INT64 \
+ HAVE_FREEBL_LIBS_64 \
$(NULL)
-
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+ endif
+
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
- ifndef HAVE_64BIT_OS
-@@ -151,11 +142,6 @@
+ # Default
+ HAVE_FREEBL_LIBS = 1
+@@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout
+ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
@@ -105,26 +57,66 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
-
- .nss.checkout:
-@@ -176,10 +162,10 @@
- else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
+
+@@ -242,95 +228,16 @@
+
+ libs::
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
- ifndef SKIP_CHK
+-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
- endif
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
- ifndef SKIP_CHK
-@@ -203,20 +189,6 @@
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+-endif
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ $(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ $(MAKE) -C pki $@
endif
++endif
install::
+ ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -133,24 +125,47 @@
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+ endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -232,11 +204,6 @@
+@@ -347,12 +254,6 @@
$(MAKE) -C pki $@
endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
+ endif
echo-requires-recursive::
- $(MAKE) -C boot $@
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 721736cadcb2..ed85444dae41 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -3,16 +3,15 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $
+# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
#
PORTNAME= sunbird
-PORTVERSION= 0.3a1
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source
+DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Redesign of the Mozilla Calendar with XUL interface
@@ -24,19 +23,20 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
SUNBIRD= ${PORTNAME}
SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm
SUNBIRD_ICON= ${PORTNAME}.xpm
-
-MOZ_PROTOCOLS= about,http,ftp,file,jar,res
+LIBS= -Wl,-Bsymbolic -lc
+PKGCONFIG_FILES?= ${MOZILLA}-js \
+ ${MOZILLA}-xpcom ${MOZILLA}-plugin
MOZ_OPTIONS= --enable-application=calendar \
- --enable-plaintext-editor-only \
- --disable-plugins --disable-cookies
+ --enable-system-cairo \
+ --with-system-nss \
+ --enable-canvas
MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${OSVERSION} < 500000
BROKEN= does not build
@@ -50,21 +50,16 @@ IGNORE= does not build
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif
-post-extract::
+post-patch:
@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
-
-post-patch:
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
- embedding/minimo
- @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/' \
- ${WRKSRC}/${ii}/all.js
-.endfor
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/security/manager/ssl/src/Makefile.in
pre-install:
${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
do-install:
diff --git a/deskutils/lightning/distinfo b/deskutils/lightning/distinfo
index 9a9b0708a6aa..6da5658bd86b 100644
--- a/deskutils/lightning/distinfo
+++ b/deskutils/lightning/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3
-SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda
-SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798
+MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366
+SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224
+SIZE (sunbird-0.3.source.tar.bz2) = 32564480
diff --git a/deskutils/lightning/files/patch-Makefile.in b/deskutils/lightning/files/patch-Makefile.in
deleted file mode 100644
index b09d564958c6..000000000000
--- a/deskutils/lightning/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Thu Oct 21 19:25:55 2004
-+++ Makefile.in Thu Oct 21 19:26:46 2004
-@@ -80,8 +80,7 @@
- $(tier_1_dirs) \
- $(tier_2_dirs) \
- $(tier_9_dirs) \
-- $(tier_50_dirs) \
-- $(NULL)
-+ $(tier_50_dirs)
-
- ifdef GC_LEAK_DETECTOR
- DIRS += gc/boehm
-@@ -100,7 +99,8 @@
- DIRS += $(tier_98_dirs)
- endif
-
--DIRS += $(tier_99_dirs)
-+DIRS += $(tier_99_dirs) \
-+ $(NULL)
-
- #
- # tier 0 - base build config dirs
diff --git a/deskutils/lightning/files/patch-config_rules.mk b/deskutils/lightning/files/patch-config_rules.mk
index 16cb6ae1192e..7377726fdc66 100644
--- a/deskutils/lightning/files/patch-config_rules.mk
+++ b/deskutils/lightning/files/patch-config_rules.mk
@@ -1,14 +1,11 @@
---- config/rules.mk.orig Sun May 18 16:10:18 2003
-+++ config/rules.mk Sun Jul 20 18:07:26 2003
-@@ -448,7 +448,11 @@
+--- config/rules.mk.orig Fri Jul 7 00:13:36 2006
++++ config/rules.mk Sun Sep 3 00:04:03 2006
+@@ -443,7 +443,7 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
endif
endif
diff --git a/deskutils/lightning/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning/files/patch-content_xslt_public_txDouble.h
new file mode 100644
index 000000000000..534bccba48be
--- /dev/null
+++ b/deskutils/lightning/files/patch-content_xslt_public_txDouble.h
@@ -0,0 +1,20 @@
+--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006
++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+ * Macros to workaround math-bugs bugs in various platforms
+ */
diff --git a/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp
deleted file mode 100644
index 6795f921501d..000000000000
--- a/deskutils/lightning/files/patch-content_xslt_src_base_txDouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006
-+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006
-@@ -52,11 +52,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
- #endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
-+#endif
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/deskutils/lightning/files/patch-libm b/deskutils/lightning/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/deskutils/lightning/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
-
--FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK = jsmathtemp.o
- JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
- endif
- @$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
-
---- js/Makefile.in Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in Thu Aug 4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
-
--DIRS = src/fdlibm src
-+DIRS = src
-
- include $(topsrcdir)/config/rules.mk
diff --git a/www/firefox3-devel/files/patch-nothreads-sqlite3 b/deskutils/lightning/files/patch-nothreads-sqlite
index 1b1bbbcbda15..1b1bbbcbda15 100644
--- a/www/firefox3-devel/files/patch-nothreads-sqlite3
+++ b/deskutils/lightning/files/patch-nothreads-sqlite
diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss
index a9154ce9a292..f1397eb524a2 100644
--- a/deskutils/lightning/files/patch-sysnss
+++ b/deskutils/lightning/files/patch-sysnss
@@ -1,103 +1,55 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 - 3rd party individual libraries
- #
--tier_1_dirs += dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs += jpeg
---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
- $(NULL)
+--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006
+@@ -124,19 +124,19 @@
+ pipboot \
+ $(NULL)
---- config/config.mk Tue Oct 12 00:11:11 2004
-+++ config/config.mk Tue Aug 2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS = \
- $(LIBS_DIR) \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- -lsmime3 \
- -lssl3 \
-@@ -189,11 +188,5 @@
- endif
+-EXTRA_DEPS = $(NSS_DEP_LIBS)
--NSS_DEP_LIBS = \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-- $(NULL)
-+NSS_DEP_LIBS =
+ DEFINES += -DNSS_ENABLE_ECC
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
- const char *possible_ckbi_locations[] = {
- NS_GRE_DIR,
-+ NS_UNIX_LIB_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR
- };
-@@ -419,5 +424,5 @@
- }
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NSS_LIBS) \
++ $(LOCAL_INCLUDES) \
+ $(NULL)
-- char *fullModuleName = nsnull;
-+ char *fullModuleName;
- #ifdef XP_MAC
- nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+ if (fullModuleName == nsnull)
-+ continue;
-+ struct stat sb;
-+ if (stat(fullModuleName, &sb)) {
-+ if (errno != ENOENT)
-+ perror(fullModuleName);
-+ continue;
-+ }
- /* If a module exists with the same name, delete it. */
- NS_ConvertUCS2toUTF8 modNameUTF8(modName);
---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005
-+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005
-@@ -52,18 +52,9 @@
+ include $(topsrcdir)/config/rules.mk
+--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006
++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006
+@@ -54,22 +54,13 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_MODULES \
+ HAVE_FREEBL_LIBS \
+ HAVE_FREEBL_LIBS_32 \
+ HAVE_FREEBL_LIBS_32INT64 \
+ HAVE_FREEBL_LIBS_64 \
$(NULL)
-
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+ endif
+
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
- ifndef HAVE_64BIT_OS
-@@ -151,11 +142,6 @@
+ # Default
+ HAVE_FREEBL_LIBS = 1
+@@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout
+ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
@@ -105,26 +57,66 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
-
- .nss.checkout:
-@@ -176,10 +162,10 @@
- else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
+
+@@ -242,95 +228,16 @@
+
+ libs::
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
- ifndef SKIP_CHK
+-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
- endif
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
- ifndef SKIP_CHK
-@@ -203,20 +189,6 @@
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+-endif
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ $(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ $(MAKE) -C pki $@
endif
++endif
install::
+ ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -133,24 +125,47 @@
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+ endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -232,11 +204,6 @@
+@@ -347,12 +254,6 @@
$(MAKE) -C pki $@
endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
+ endif
echo-requires-recursive::
- $(MAKE) -C boot $@
diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 139b31050a65..4a41be024c08 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mcatalog
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.mcatalog.net/releases/
@@ -39,7 +39,7 @@ post-patch:
${WRKSRC}/images/Makefile.in
@${REINPLACE_CMD} -e 's|@prefix@/share|${PREFIX}/share/gnome|g' \
${WRKSRC}/mcatalog.desktop.in
- @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${X11BASE}/lib/${GECKO}|g' \
+ @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${LOCALBASE}/lib/${GECKO}|g' \
${WRKSRC}/src/mcatalog.in
.ifndef (NOPORTDOCS)
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 621d5424a00b..3bd3f196352b 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,28 +3,27 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.4 2006/10/01 02:12:23 ahze Exp $
PORTNAME= nautilus-actions
-PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ftp://ftp2.grumz.net/grumz/
MAINTAINER= ahze@FreeBSD.org
COMMENT= Extension for Nautilus to configure programs to launch on files
-USE_GNOME= nautilus2 intlhack pygtk2
+LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+INSTALLS_ICONS= yes
+USE_GETTEXT= yes
+USE_GNOME= nautilus2 intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-nautilus-extdir=${X11BASE}/lib/nautilus/extensions-1.0
-
-post-patch:
- @${REINPLACE_CMD} -e 's|@datadir@datadir@/pixmaps|${DATADIR}/nact|' \
- ${WRKSRC}/nact/nact.desktop.in.in
+CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-1.0
.include <bsd.port.mk>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 74b7f4e2e6f7..4c043f918a91 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-0.7.1.tar.gz) = 98caa03d2d0616a9dd4a4c35c08d4502
-SHA256 (nautilus-actions-0.7.1.tar.gz) = 7456419bdc78953cd0321e0730574b063ec0d5e1ebe6839bd01c70b93be26dde
-SIZE (nautilus-actions-0.7.1.tar.gz) = 397906
+MD5 (nautilus-actions-1.4.tar.gz) = c3434900718401e13432533eab10e681
+SHA256 (nautilus-actions-1.4.tar.gz) = 61f05fcf7557eda96c9f275de5fb132858e80c8b7a33b04fbd06caafff4b056b
+SIZE (nautilus-actions-1.4.tar.gz) = 800222
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index fbb8286f7de5..9d25dff6b730 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -1,14 +1,53 @@
bin/nautilus-actions-config
+bin/nautilus-actions-convert
+bin/nautilus-actions-new-config
lib/nautilus/extensions-1.0/libnautilus-actions.la
lib/nautilus/extensions-1.0/libnautilus-actions.so
share/applications/nact.desktop
+share/icons/hicolor/16x16/apps/nautilus-actions.png
+share/icons/hicolor/22x22/apps/nautilus-actions.png
+share/icons/hicolor/48x48/apps/nautilus-actions.png
+share/icons/hicolor/scalable/apps/nautilus-actions.svg
+share/locale/bg/LC_MESSAGES/nautilus-actions.mo
+share/locale/bn/LC_MESSAGES/nautilus-actions.mo
+share/locale/ca/LC_MESSAGES/nautilus-actions.mo
+share/locale/cs/LC_MESSAGES/nautilus-actions.mo
+share/locale/da/LC_MESSAGES/nautilus-actions.mo
share/locale/de/LC_MESSAGES/nautilus-actions.mo
+share/locale/en_CA/LC_MESSAGES/nautilus-actions.mo
share/locale/es/LC_MESSAGES/nautilus-actions.mo
+share/locale/fi/LC_MESSAGES/nautilus-actions.mo
share/locale/fr/LC_MESSAGES/nautilus-actions.mo
-%%DATADIR%%/config_newaction.xml
-%%DATADIR%%/nact/nautilus-actions-config.glade
-%%DATADIR%%/nact/nautilus-actions-icon.png
-share/pixmaps/nautilus-actions-icon.png
-@dirrmtry %%DATADIR%%/nact
-@dirrmtry %%DATADIR%%
-@dirrmtry share/applications
+share/locale/gl/LC_MESSAGES/nautilus-actions.mo
+share/locale/gu/LC_MESSAGES/nautilus-actions.mo
+share/locale/he/LC_MESSAGES/nautilus-actions.mo
+share/locale/ja/LC_MESSAGES/nautilus-actions.mo
+share/locale/lt/LC_MESSAGES/nautilus-actions.mo
+share/locale/lv/LC_MESSAGES/nautilus-actions.mo
+share/locale/nb/LC_MESSAGES/nautilus-actions.mo
+share/locale/nl/LC_MESSAGES/nautilus-actions.mo
+share/locale/pa/LC_MESSAGES/nautilus-actions.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-actions.mo
+share/locale/sv/LC_MESSAGES/nautilus-actions.mo
+share/locale/th/LC_MESSAGES/nautilus-actions.mo
+share/locale/vi/LC_MESSAGES/nautilus-actions.mo
+share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo
+share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
+share/nautilus-actions/nact/nautilus-actions-config.glade
+@dirrm share/nautilus-actions/nact
+@dirrm share/nautilus-actions
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index dd08404c7ab1..124052903b59 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.2 2005/09/20 09:31:50 ahze Exp $
+# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.4 2006/07/18 12:22:24 ahze Exp $
#
PORTNAME= nautilus-locked-folder
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils security
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
@@ -17,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_GNOME= nautilus2
PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \
@@ -28,7 +27,7 @@ PLIST_FILES= lib/nautilus/extensions-1.0/libnautilus-locked-folder.a \
lib/nautilus/extensions-1.0/libnautilus-locked-folder.so
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${X11BASE}/share/icons/hicolor/32x32/stock/data/|' \
+ @${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${LOCALBASE}/share/icons/hicolor/32x32/stock/data/|' \
${WRKSRC}/src/lockedfolder-extension.c
.include <bsd.port.pre.mk>
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 99d9110154ea..35fe306c07ce 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -3,22 +3,23 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.5 2005/10/08 19:41:16 marcus Exp $
+# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.7 2006/08/09 13:07:37 ahze Exp $
#
PORTNAME= nautilus-open-terminal
-PORTVERSION= 0.6
-PORTREVISION= 1
+PORTVERSION= 0.7
CATEGORIES= deskutils
MASTER_SITES= http://manny.cluecoder.org/packages/nautilus-open-terminal/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Nautilus extension which allows you to open a terminal
+USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_LDCONFIG= yes
+USE_XLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/nautilus-open-terminal/distinfo b/deskutils/nautilus-open-terminal/distinfo
index 8a4c95c79689..57846ca7cd00 100644
--- a/deskutils/nautilus-open-terminal/distinfo
+++ b/deskutils/nautilus-open-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-open-terminal-0.6.tar.gz) = c4ffdd5bbae9f82be2696af6cb0eb7f5
-SHA256 (nautilus-open-terminal-0.6.tar.gz) = 66c91c009a53e8eb44b49bdd54759c6f461d5bfaf02be4cbd50fe349f29ec48a
-SIZE (nautilus-open-terminal-0.6.tar.gz) = 346513
+MD5 (nautilus-open-terminal-0.7.tar.gz) = 318e9673017d9faf9a56aeeb74d36124
+SHA256 (nautilus-open-terminal-0.7.tar.gz) = 136adadbabed4b2436ddbff49f967c8dc17ad632aaaf1bff69f2fa17182e64eb
+SIZE (nautilus-open-terminal-0.7.tar.gz) = 360315
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index 1dbc3c3dce5a..80add23042f1 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -9,6 +9,7 @@ share/locale/de/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/en_CA/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/en_GB/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/es/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/eu/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/fi/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/fr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/gl/LC_MESSAGES/nautilus-open-terminal.mo
@@ -18,21 +19,52 @@ share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ja/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ko/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/lt/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/mk/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/nb/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ne/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/nl/LC_MESSAGES/nautilus-open-terminal.mo
-share/locale/no/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/or/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pa/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pl/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pt_BR/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sk/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/th/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/vi/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index b5b857e6b9c8..5d5af3e17648 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,14 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.2 2006/02/24 05:52:41 marcus Exp $
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.5 2006/10/12 16:46:23 marcus Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 0.5
-PORTREVISION= 1
+PORTVERSION= 0.8
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.5
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and gaim
@@ -20,10 +18,14 @@ BUILD_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \
evolution:${PORTSDIR}/mail/evolution
+MAN1= nautilus-sendto.1
+GCONF_SCHEMAS= nst.schemas
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 2b285a5ea4bf..b0e85cbcdcd0 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.5.tar.bz2) = e43a5e51270ef3e0f4743ed4d23f7409
-SHA256 (nautilus-sendto-0.5.tar.bz2) = 63709f0b8dc4c8006c9aa792b2898c3e956cb457b1c49e9e552d2fd1c4df7d38
-SIZE (nautilus-sendto-0.5.tar.bz2) = 268518
+MD5 (nautilus-sendto-0.8.tar.bz2) = 19165c7404c4956efd4366a8ebe3ddfa
+SHA256 (nautilus-sendto-0.8.tar.bz2) = b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73
+SIZE (nautilus-sendto-0.8.tar.bz2) = 310098
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 05f7ab58fa61..7048347407b7 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -1,14 +1,86 @@
bin/nautilus-sendto
lib/gaim/nautilus.la
lib/gaim/nautilus.so
-lib/nautilus-sendto/plugins/libevolution.la
-lib/nautilus-sendto/plugins/libevolution.so
-lib/nautilus-sendto/plugins/libgaim.la
-lib/nautilus-sendto/plugins/libgaim.so
+lib/nautilus-sendto/plugins/libnstevolution.la
+lib/nautilus-sendto/plugins/libnstevolution.so
+lib/nautilus-sendto/plugins/libnstgaim.la
+lib/nautilus-sendto/plugins/libnstgaim.so
+lib/nautilus-sendto/plugins/libnstsylpheed.la
+lib/nautilus-sendto/plugins/libnstsylpheed.so
lib/nautilus/extensions-1.0/libnautilus-sendto.la
lib/nautilus/extensions-1.0/libnautilus-sendto.so
share/gnome/nautilus-sendto/glade/nautilus-sendto-force.glade
share/gnome/nautilus-sendto/glade/nautilus-sendto.glade
+share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
+share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
+share/locale/da/LC_MESSAGES/nautilus-sendto.mo
+share/locale/de/LC_MESSAGES/nautilus-sendto.mo
+share/locale/dz/LC_MESSAGES/nautilus-sendto.mo
+share/locale/el/LC_MESSAGES/nautilus-sendto.mo
+share/locale/en_CA/LC_MESSAGES/nautilus-sendto.mo
+share/locale/en_GB/LC_MESSAGES/nautilus-sendto.mo
+share/locale/es/LC_MESSAGES/nautilus-sendto.mo
+share/locale/et/LC_MESSAGES/nautilus-sendto.mo
+share/locale/eu/LC_MESSAGES/nautilus-sendto.mo
+share/locale/fi/LC_MESSAGES/nautilus-sendto.mo
+share/locale/fr/LC_MESSAGES/nautilus-sendto.mo
+share/locale/gl/LC_MESSAGES/nautilus-sendto.mo
+share/locale/he/LC_MESSAGES/nautilus-sendto.mo
+share/locale/hu/LC_MESSAGES/nautilus-sendto.mo
+share/locale/it/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ja/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ko/LC_MESSAGES/nautilus-sendto.mo
+share/locale/lt/LC_MESSAGES/nautilus-sendto.mo
+share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
+share/locale/nl/LC_MESSAGES/nautilus-sendto.mo
+share/locale/or/LC_MESSAGES/nautilus-sendto.mo
+share/locale/pa/LC_MESSAGES/nautilus-sendto.mo
+share/locale/pl/LC_MESSAGES/nautilus-sendto.mo
+share/locale/pt/LC_MESSAGES/nautilus-sendto.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ru/LC_MESSAGES/nautilus-sendto.mo
+share/locale/rw/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sq/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
+share/locale/th/LC_MESSAGES/nautilus-sendto.mo
+share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
+share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
+share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/gnome/nautilus-sendto/glade
@dirrm share/gnome/nautilus-sendto
@dirrm lib/nautilus-sendto/plugins
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index af73a6f662f2..adfa26ad4b18 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -7,20 +7,20 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/
MAINTAINER= andreas@syndrom23.de
COMMENT= Send small notifications to your desktop
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy:${PORTSDIR}/x11-toolkits/libsexy \
popt.0:${PORTSDIR}/devel/popt
-USE_GNOME= gnomehack gnometarget intlhack gconf2 libwnck
+USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
GCONF_SCHEMAS= notification-daemon.schemas
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 721736cadcb2..ed85444dae41 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -3,16 +3,15 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $
+# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
#
PORTNAME= sunbird
-PORTVERSION= 0.3a1
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source
+DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Redesign of the Mozilla Calendar with XUL interface
@@ -24,19 +23,20 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
SUNBIRD= ${PORTNAME}
SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm
SUNBIRD_ICON= ${PORTNAME}.xpm
-
-MOZ_PROTOCOLS= about,http,ftp,file,jar,res
+LIBS= -Wl,-Bsymbolic -lc
+PKGCONFIG_FILES?= ${MOZILLA}-js \
+ ${MOZILLA}-xpcom ${MOZILLA}-plugin
MOZ_OPTIONS= --enable-application=calendar \
- --enable-plaintext-editor-only \
- --disable-plugins --disable-cookies
+ --enable-system-cairo \
+ --with-system-nss \
+ --enable-canvas
MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${OSVERSION} < 500000
BROKEN= does not build
@@ -50,21 +50,16 @@ IGNORE= does not build
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif
-post-extract::
+post-patch:
@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
-
-post-patch:
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
- embedding/minimo
- @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/' \
- ${WRKSRC}/${ii}/all.js
-.endfor
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/security/manager/ssl/src/Makefile.in
pre-install:
${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
do-install:
diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo
index 9a9b0708a6aa..6da5658bd86b 100644
--- a/deskutils/sunbird/distinfo
+++ b/deskutils/sunbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3
-SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda
-SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798
+MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366
+SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224
+SIZE (sunbird-0.3.source.tar.bz2) = 32564480
diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in
deleted file mode 100644
index b09d564958c6..000000000000
--- a/deskutils/sunbird/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Thu Oct 21 19:25:55 2004
-+++ Makefile.in Thu Oct 21 19:26:46 2004
-@@ -80,8 +80,7 @@
- $(tier_1_dirs) \
- $(tier_2_dirs) \
- $(tier_9_dirs) \
-- $(tier_50_dirs) \
-- $(NULL)
-+ $(tier_50_dirs)
-
- ifdef GC_LEAK_DETECTOR
- DIRS += gc/boehm
-@@ -100,7 +99,8 @@
- DIRS += $(tier_98_dirs)
- endif
-
--DIRS += $(tier_99_dirs)
-+DIRS += $(tier_99_dirs) \
-+ $(NULL)
-
- #
- # tier 0 - base build config dirs
diff --git a/deskutils/sunbird/files/patch-config_rules.mk b/deskutils/sunbird/files/patch-config_rules.mk
index 16cb6ae1192e..7377726fdc66 100644
--- a/deskutils/sunbird/files/patch-config_rules.mk
+++ b/deskutils/sunbird/files/patch-config_rules.mk
@@ -1,14 +1,11 @@
---- config/rules.mk.orig Sun May 18 16:10:18 2003
-+++ config/rules.mk Sun Jul 20 18:07:26 2003
-@@ -448,7 +448,11 @@
+--- config/rules.mk.orig Fri Jul 7 00:13:36 2006
++++ config/rules.mk Sun Sep 3 00:04:03 2006
+@@ -443,7 +443,7 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
endif
endif
diff --git a/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
new file mode 100644
index 000000000000..534bccba48be
--- /dev/null
+++ b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
@@ -0,0 +1,20 @@
+--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006
++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+ * Macros to workaround math-bugs bugs in various platforms
+ */
diff --git a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp
deleted file mode 100644
index 6795f921501d..000000000000
--- a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006
-+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006
-@@ -52,11 +52,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
- #endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
-+#endif
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/deskutils/sunbird/files/patch-libm b/deskutils/sunbird/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/deskutils/sunbird/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
-
--FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK = jsmathtemp.o
- JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
- endif
- @$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
-
---- js/Makefile.in Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in Thu Aug 4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
-
--DIRS = src/fdlibm src
-+DIRS = src
-
- include $(topsrcdir)/config/rules.mk
diff --git a/www/firefox35/files/patch-nothreads-sqlite3 b/deskutils/sunbird/files/patch-nothreads-sqlite
index 1b1bbbcbda15..1b1bbbcbda15 100644
--- a/www/firefox35/files/patch-nothreads-sqlite3
+++ b/deskutils/sunbird/files/patch-nothreads-sqlite
diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss
index a9154ce9a292..f1397eb524a2 100644
--- a/deskutils/sunbird/files/patch-sysnss
+++ b/deskutils/sunbird/files/patch-sysnss
@@ -1,103 +1,55 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 - 3rd party individual libraries
- #
--tier_1_dirs += dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs += jpeg
---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
-@@ -117,5 +117,5 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
- $(NULL)
+--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
++++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006
+@@ -124,19 +124,19 @@
+ pipboot \
+ $(NULL)
---- config/config.mk Tue Oct 12 00:11:11 2004
-+++ config/config.mk Tue Aug 2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS = \
- $(LIBS_DIR) \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- -lsmime3 \
- -lssl3 \
-@@ -189,11 +188,5 @@
- endif
+-EXTRA_DEPS = $(NSS_DEP_LIBS)
--NSS_DEP_LIBS = \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-- $(NULL)
-+NSS_DEP_LIBS =
+ DEFINES += -DNSS_ENABLE_ECC
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
-@@ -88,4 +88,8 @@
- }
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
- const char *possible_ckbi_locations[] = {
- NS_GRE_DIR,
-+ NS_UNIX_LIB_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR
- };
-@@ -419,5 +424,5 @@
- }
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NSS_LIBS) \
++ $(LOCAL_INCLUDES) \
+ $(NULL)
-- char *fullModuleName = nsnull;
-+ char *fullModuleName;
- #ifdef XP_MAC
- nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
-+ if (fullModuleName == nsnull)
-+ continue;
-+ struct stat sb;
-+ if (stat(fullModuleName, &sb)) {
-+ if (errno != ENOENT)
-+ perror(fullModuleName);
-+ continue;
-+ }
- /* If a module exists with the same name, delete it. */
- NS_ConvertUCS2toUTF8 modNameUTF8(modName);
---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005
-+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005
-@@ -52,18 +52,9 @@
+ include $(topsrcdir)/config/rules.mk
+--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006
++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006
+@@ -54,22 +54,13 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_MODULES \
+ HAVE_FREEBL_LIBS \
+ HAVE_FREEBL_LIBS_32 \
+ HAVE_FREEBL_LIBS_32INT64 \
+ HAVE_FREEBL_LIBS_64 \
$(NULL)
-
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+ endif
+
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
- ifndef HAVE_64BIT_OS
-@@ -151,11 +142,6 @@
+ # Default
+ HAVE_FREEBL_LIBS = 1
+@@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout
+ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
@@ -105,26 +57,66 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
-
- .nss.checkout:
-@@ -176,10 +162,10 @@
- else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
+
+@@ -242,95 +228,16 @@
+
+ libs::
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
- ifndef SKIP_CHK
+-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
- endif
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
- ifndef SKIP_CHK
-@@ -203,20 +189,6 @@
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+-endif
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ $(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ $(MAKE) -C pki $@
endif
++endif
install::
+ ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -133,24 +125,47 @@
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+ endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -232,11 +204,6 @@
+@@ -347,12 +254,6 @@
$(MAKE) -C pki $@
endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
+ endif
echo-requires-recursive::
- $(MAKE) -C boot $@
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 958221fedec6..867ecf7f987d 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= timer-applet
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= timerapplet
@@ -15,12 +16,12 @@ MAINTAINER= jylefort@FreeBSD.org
COMMENT= A timer applet for the GNOME panel
LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
+RUN_DEPENDS= ${LOCALBASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GCONF_SCHEMAS= timer-applet.schemas
INSTALLS_OMF= yes
@@ -30,7 +31,7 @@ post-patch:
's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|' \
${WRKSRC}/GNOME_TimerApplet.server.in.in
@${REINPLACE_CMD} -e \
- 's|$$(datadir)/sounds|${X11BASE}/share/gnome/sounds|' \
+ 's|$$(datadir)/sounds|${LOCALBASE}/share/gnome/sounds|' \
${WRKSRC}/src/Makefile.in
.include <bsd.port.mk>
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 1359518a71a9..04ec9a57fd8a 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -24,3 +24,9 @@ share/locale/tr/LC_MESSAGES/timer-applet.mo
@dirrm share/gnome/help/timer-applet
@dirrm share/gnome/omf/timer-applet
@dirrm share/gnome/pixmaps/timer-applet
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
index b7b25dfe63d3..f20b7ed94a1b 100644
--- a/deskutils/xfce4-calendar/Makefile
+++ b/deskutils/xfce4-calendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-calendar
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
dbh-1.0.1:${PORTSDIR}/databases/dbh
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist
index b469b8acd41f..c82b525d489b 100644
--- a/deskutils/xfce4-calendar/pkg-plist
+++ b/deskutils/xfce4-calendar/pkg-plist
@@ -55,3 +55,39 @@ share/locale/vi/LC_MESSAGES/xfcalendar.mo
share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo
share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo
@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 8a16d373b1b5..1be7b2a693a0 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 0.9.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -21,7 +21,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
index bb9a09dac684..6bb37b59d619 100644
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ b/deskutils/xfce4-taskbar-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Lancereau <matt@rimasec.net>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/xfce4-taskbar-plugin/Makefile,v 1.1 2006/10/02 20:05:39 ahze Exp $
PORTNAME= xfce4-taskbar-plugin
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DISTNAME= xfce4-taskbar-plugin-${PORTVERSION}
@@ -23,7 +23,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
index 9be8a95e6886..a254b553c19c 100644
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ b/deskutils/xfce4-windowlist-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Lancereau <matt@rimasec.net>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/xfce4-windowlist-plugin/Makefile,v 1.1 2006/10/02 20:06:45 ahze Exp $
PORTNAME= xfce4-windowlist-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DISTNAME= xfce4-windowlist-plugin-${PORTVERSION}
@@ -23,7 +23,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 768c9482ec80..1abc1850ca0e 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -20,7 +21,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 7635c78b33f0..7432be92d622 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpad
PORTVERSION= 2.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +16,8 @@ MAINTAINER= amyfoub@gmail.com
COMMENT= A virtual note-pad system for your X11 desktop
USE_BZIP2= yes
-USE_GNOME= pkgconfig gtk20 gnomehack intltool
-USE_X_PREFIX= yes
+USE_GNOME= pkgconfig gtk20 gnomehier intltool
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index 740bda4936c8..8a912632f42e 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -22,6 +22,17 @@ share/locale/vi/LC_MESSAGES/xpad.mo
share/locale/zh_CN/LC_MESSAGES/xpad.mo
share/locale/zh_TW/LC_MESSAGES/xpad.mo
share/pixmaps/xpad.png
+@dirrmtry share/pixmaps
@dirrmtry share/applications
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
diff --git a/devel/alleyoop/Makefile b/devel/alleyoop/Makefile
index f0a881e6706e..75b51b0626d4 100644
--- a/devel/alleyoop/Makefile
+++ b/devel/alleyoop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alleyoop
PORTVERSION= 0.8.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -25,10 +25,10 @@ DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2006-12-01
USE_GMAKE= yes
-USE_X_PREFIX= yex
+USE_XLIB= yex
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomehier \
+USE_GNOME= gnomeprefix \
gconf2 \
glib20 \
gtk20 \
diff --git a/devel/alleyoop/pkg-plist b/devel/alleyoop/pkg-plist
index bf907c9e468d..1a275e1cf3c6 100644
--- a/devel/alleyoop/pkg-plist
+++ b/devel/alleyoop/pkg-plist
@@ -29,3 +29,23 @@ share/locale/sr@Latn/LC_MESSAGES/alleyoop.mo
share/locale/sv/LC_MESSAGES/alleyoop.mo
share/locale/uk/LC_MESSAGES/alleyoop.mo
share/locale/zh_CN/LC_MESSAGES/alleyoop.mo
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 390506128ff8..d8a8457501b3 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
+# $MCom: ports/devel/bonobo/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
#
PORTNAME= bonobo
PORTVERSION= 1.0.22
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -17,13 +18,13 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The component and compound document system for GNOME
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint
USE_GETTEXT= yes
GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 4cc3ae908a2e..cd3f5acaa7b8 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -251,3 +251,31 @@ share/locale/zh_TW/LC_MESSAGES/bonobo.mo
@dirrm %%DOCSDIR%%/bonobo
@dirrm %%DOCSDIR%%
@dirrm include/gnome-1.0/bonobo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 1dae10a0e7ae..46839bcbda2a 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= devhelp
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -16,8 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
COMMENT= Developer help browser for GNOME 2
-BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS= ${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS= ${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
MOZILLA= mozilla
@@ -30,12 +30,12 @@ MOZILLA= firefox
.endif
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
GNU_CONFIGURE= yes
-USE_LDCONFIG= ${X11BASE}/lib/${MOZILLA}
+USE_LDCONFIG= ${LOCALBASE}/lib/${MOZILLA}
GCONF_SCHEMAS= devhelp.schemas
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 6f3906d576ca..ae12a8397655 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -76,5 +76,33 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrm share/gnome/devhelp
@dirrm include/devhelp-1.0/devhelp
@dirrm include/devhelp-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 3247d29b113e..a82ce60e0de7 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gconf/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
#
PORTNAME= gconf
PORTVERSION= 1.0.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/1.0
@@ -21,10 +22,10 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 7ff843231b9e..cc6ceb612da6 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -64,3 +64,31 @@ share/locale/zh_CN/LC_MESSAGES/GConf.mo
@dirrm include/gconf/1/gconf
@dirrm include/gconf/1
@dirrm etc/gconf/1
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 6d055fca1b72..944042f0e52a 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.14 2006/08/21 15:35:55 ahze Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,17 +18,17 @@ COMMENT= C++ wrapper for gconf2 API library
LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
- ${X11BASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
+ ${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
LATEST_LINK= gconfmm26
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack gconf2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index d83ce30ad974..c74297b16ff2 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.14.2.tar.bz2) = adcaeb572c466c1395b35d0271ac6438
-SHA256 (gnome2/gconfmm-2.14.2.tar.bz2) = b9ef70b158d254b8bdce6f7aeb252a84239a649ce2db0ab4c11d8efeca08c88b
-SIZE (gnome2/gconfmm-2.14.2.tar.bz2) = 275781
+MD5 (gnome2/gconfmm-2.16.0.tar.bz2) = 2b3aa57276f6f63c4effc585ba205a3d
+SHA256 (gnome2/gconfmm-2.16.0.tar.bz2) = 514f1062d85b7b3843f461b095b64551f20e647386dab6a513982af52e0392f2
+SIZE (gnome2/gconfmm-2.16.0.tar.bz2) = 275789
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 8e250bdac660..5c5534e2cc40 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -3,11 +3,11 @@
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
-#
+# $MCom: ports/devel/gcvs/Makefile,v 1.1 2006/10/07 17:10:25 ahze Exp $
PORTNAME= gcvs
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= devel tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -19,8 +19,9 @@ COMMENT= High-end interface client for CVS
BUILD_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
+BROKEN= Does not build
+
USE_GETOPT_LONG=yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -32,6 +33,6 @@ MAN1= cvs.1
MAN5= cvs.5
MAN8= cvsbug.8
INFO= cvs cvsclient
-USE_AUTOTOOLS= automake:14:env autoconf:213:env
+USE_AUTOTOOLS= automake:15:env autoconf:259:env
.include <bsd.port.mk>
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 04577ce383cf..03b6ec142d2d 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib-java/Makefile,v 1.2 2005/10/29 22:06:05 marcus Exp $
+# $MCom: ports/devel/glib-java/Makefile,v 1.4 2006/09/14 12:37:40 ahze Exp $
#
PORTNAME= glib-java
-PORTVERSION= 0.2.5
+PORTVERSION= 0.2.6
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
@@ -18,7 +18,7 @@ COMMENT= Java wrapper GLib 2
USE_BZIP2= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
JAVA_VERSION= 1.2+
diff --git a/devel/glib-java/distinfo b/devel/glib-java/distinfo
index 0655eba3025c..faeb48896762 100644
--- a/devel/glib-java/distinfo
+++ b/devel/glib-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-java-0.2.5.tar.bz2) = 83d49e96f6bc806aead66b83be542ef0
-SHA256 (gnome2/glib-java-0.2.5.tar.bz2) = 777b3b064ad5daae9890ca08698bff662ff0c397a968d74ada3209161fb3ffc1
-SIZE (gnome2/glib-java-0.2.5.tar.bz2) = 229396
+MD5 (gnome2/glib-java-0.2.6.tar.bz2) = 80aa32ba4901ed92a1ef8a53fd9157e5
+SHA256 (gnome2/glib-java-0.2.6.tar.bz2) = 57733a9308c9f6781411e38b8936fff99d33298cc65790b63be67b15678a086b
+SIZE (gnome2/glib-java-0.2.6.tar.bz2) = 229797
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 29e3fa37fb6f..cda44db471d7 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.31 2006/04/14 21:55:21 mezz Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.37 2006/09/29 20:47:23 ahze Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.10.7
+PORTVERSION= 2.12.2
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -29,7 +29,7 @@ USE_GCC= 3.4
USE_GNOME= gnomehack gnometarget glib20
USE_PERL5= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 2046b7195944..a551edef5930 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.10.7.tar.bz2) = f64b962ec2f9ec7e7daebff9769680e3
-SHA256 (gnome2/glibmm-2.10.7.tar.bz2) = 55ec9aae13c47821835a11ebcd3747df1f30213072197716f45c7822a412699a
-SIZE (gnome2/glibmm-2.10.7.tar.bz2) = 2353315
+MD5 (gnome2/glibmm-2.12.2.tar.bz2) = a70be72261b19a080b1666e5e04fd43a
+SHA256 (gnome2/glibmm-2.12.2.tar.bz2) = 9280ae9c45fa0178dea65778d7fcf02d06988c9168804aa3ca9e649e33dd74d8
+SIZE (gnome2/glibmm-2.12.2.tar.bz2) = 2351574
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 48c146419b57..8116f1a61932 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.17 2006/04/13 07:52:32 bland Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.21 2006/08/21 15:51:25 ahze Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,12 +20,11 @@ LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GCC= 3.4
USE_GMAKE= yes
USE_GNOME= gnomehack gnomevfs2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 6678e003e9e7..49ba615d3dc1 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = bd5c3796e417a9780201835060461be3
-SHA256 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = c59e640cdff8f877a3eae0e39a67e2ff07485290d8abccffbb522c54ccccb796
-SIZE (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = 324357
+MD5 (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 523d7195cabaf2ecfeda9f6683f475d1
+SHA256 (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 1db5a031a0cc3649c487ba85cd6116f73aab067f1b8ff2370733dbc42e6b70e1
+SIZE (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 328827
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index cc1457909986..d2d590d4a4d7 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -3,10 +3,11 @@
# Whom: giffunip
#
# $FreeBSD$
-#
+# $MCom: ports/devel/lasi/Makefile,v 1.1 2006/10/04 20:25:40 ahze Exp $
PORTNAME= lasi
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.unifont.org/lasi/download/
diff --git a/devel/lasi/files/patch-src_drawGlyph.cpp b/devel/lasi/files/patch-src_drawGlyph.cpp
new file mode 100644
index 000000000000..18338e6e1dda
--- /dev/null
+++ b/devel/lasi/files/patch-src_drawGlyph.cpp
@@ -0,0 +1,34 @@
+--- src/drawGlyph.cpp.orig Wed Oct 4 16:21:41 2006
++++ src/drawGlyph.cpp Wed Oct 4 16:23:29 2006
+@@ -81,7 +81,7 @@
+ return 0;
+ }
+
+-static int moveTo(FT_Vector* pftVec, void* data) {
++static int moveTo(const FT_Vector* pftVec, void* data) {
+ StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+ state->os() << (state->isNewPath() ? "newpath" : "closepath") << endl;
+ state->setNewPathFalse();
+@@ -89,19 +89,19 @@
+ return 0;
+ }
+
+-static int lineTo(FT_Vector* pftVec, void* data) {
++static int lineTo(const FT_Vector* pftVec, void* data) {
+ xTo(pftVec, data, "lineto");
+ return 0;
+ }
+
+-static int cubicTo(FT_Vector* ctrlPt1, FT_Vector* ctrlPt2, FT_Vector* pEndPt, void* data) {
++static int cubicTo(const FT_Vector* ctrlPt1, const FT_Vector* ctrlPt2, const FT_Vector* pEndPt, void* data) {
+ StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+ state->os() << *ctrlPt1 << " " << *ctrlPt2 << " " << *pEndPt << " curveto" << endl;
+ state->setStartPt(*pEndPt);
+ return 0;
+ }
+
+-static int conicTo(FT_Vector* pCtrlPt, FT_Vector* pEndPt, void* data) {
++static int conicTo(const FT_Vector* pCtrlPt, const FT_Vector* pEndPt, void* data) {
+ StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+ FT_Vector ctrlPt1 = (state->startPt() + 2 * *pCtrlPt) / 3;
+ FT_Vector ctrlPt2 = (*pEndPt + 2 * *pCtrlPt) / 3;
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 7b1c0860e0cb..140b06f7de08 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libglademm
PORTVERSION= 2.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmm
@@ -19,7 +19,7 @@ COMMENT= C++ wrapper for libglade2 library
LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libglade2
USE_AUTOTOOLS= libtool:15
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 85f389f72885..855ea368d2bb 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -3,11 +3,12 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/libglademm24/Makefile,v 1.1 2006/02/25 20:51:44 marcus Exp $
+# $MCom: ports/devel/libglademm24/Makefile,v 1.8 2006/08/19 19:06:16 mezz Exp $
#
PORTNAME= libglademm
PORTVERSION= 2.6.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -22,7 +23,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libglademm24
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack libglade2
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index b3085265c065..1eb637898184 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -7,14 +7,14 @@
PORTNAME= libnotify
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/
MAINTAINER= andreas@syndrom23.de
COMMENT= A library for desktop notifications
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
popt.0:${PORTSDIR}/devel/popt
USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index d4343172c5a4..be57ecf06b86 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/devel/libunicode/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
PORTNAME= libunicode
PORTVERSION= 0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libunicode/0.4
@@ -17,9 +17,9 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for manipulating Unicode characters and strings
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index b2ff6cdc1459..a29bb93c0ce3 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= maketool
PORTVERSION= 0.8.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://home.alphalink.com.au/~gnb/maketool/downloads/
diff --git a/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
new file mode 100644
index 000000000000..da481dae85d3
--- /dev/null
+++ b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
@@ -0,0 +1,50 @@
+--- lib/gtk2/gtk/gtkctree.c.orig Sun Oct 8 23:15:57 2006
++++ lib/gtk2/gtk/gtkctree.c Sun Oct 8 23:18:58 2006
+@@ -563,24 +563,12 @@ gtk_ctree_set_arg (GtkObject *objec
+ switch (arg_id)
+ {
+ case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
+- g_return_if_fail (clist->row_mem_chunk == NULL);
+ clist->columns = MAX (1, GTK_VALUE_UINT (*arg));
+- clist->row_mem_chunk = g_mem_chunk_new ("ctree row mem chunk",
+- sizeof (GtkCTreeRow),
+- sizeof (GtkCTreeRow)
+- * CLIST_OPTIMUM_SIZE,
+- G_ALLOC_AND_FREE);
+- clist->cell_mem_chunk = g_mem_chunk_new ("ctree cell mem chunk",
+- sizeof (GtkCell) * clist->columns,
+- sizeof (GtkCell) * clist->columns
+- * CLIST_OPTIMUM_SIZE,
+- G_ALLOC_AND_FREE);
+ ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+ break;
+ case ARG_TREE_COLUMN: /* construct-only arg, only set at construction time */
+ ctree->tree_column = GTK_VALUE_UINT (*arg);
+- if (clist->row_mem_chunk)
+- ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
++ ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+ break;
+ case ARG_INDENT:
+ gtk_ctree_set_indent (ctree, GTK_VALUE_UINT (*arg));
+@@ -3197,8 +3185,8 @@ row_new (GtkCTree *ctree)
+ int i;
+
+ clist = GTK_CLIST (ctree);
+- ctree_row = g_chunk_new (GtkCTreeRow, clist->row_mem_chunk);
+- ctree_row->row.cell = g_chunk_new (GtkCell, clist->cell_mem_chunk);
++ ctree_row = g_slice_new (GtkCTreeRow);
++ ctree_row->row.cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
+
+ for (i = 0; i < clist->columns; i++)
+ {
+@@ -3286,8 +3274,8 @@ row_delete (GtkCTree *ctree,
+ dnotify (ddata);
+ }
+
+- g_mem_chunk_free (clist->cell_mem_chunk, ctree_row->row.cell);
+- g_mem_chunk_free (clist->row_mem_chunk, ctree_row);
++ g_slice_free1 (sizeof (GtkCell) * clist->columns, ctree_row->row.cell);
++ g_slice_free (GtkCTreeRow, ctree_row);
+ }
+
+ static void
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 43c84c1dac59..ded7de44e514 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/oaf/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
#
PORTNAME= oaf
PORTVERSION= 0.6.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/oaf/0.6
@@ -19,12 +20,12 @@ COMMENT= Object Activation Framework for GNOME
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static --enable-shared \
--disable-more-warnings
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index 59a4b1ac80f2..6ae0a769c48e 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -63,3 +63,31 @@ share/locale/zh_TW/LC_MESSAGES/oaf.mo
@dirrm include/liboaf
@dirrm etc/oaf
@unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 87b861f593f6..3150e8824413 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Glib2
PORTVERSION= 1.140
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN/Glib SF/gtk2-perl
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Glib2/pkg-plist b/devel/p5-Glib2/pkg-plist
index 775e980cf89a..4f38c222e6a2 100644
--- a/devel/p5-Glib2/pkg-plist
+++ b/devel/p5-Glib2/pkg-plist
@@ -1,4 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Glib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Glib/BookmarkFile.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Boxed.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Glib/CodeGen.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Glib/Error.pod
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 1cce9ff6c30e..ba2d833063d0 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= preps
PORTVERSION= 2.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://webpages.charter.net/stuffle/preps/download/files/
PKGNAMESUFFIX= -gui
@@ -19,9 +19,9 @@ COMMENT= Problem reporting system
RUN_DEPENDS= prepsdb_tool:${PORTSDIR}/devel/prepstools
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gtk20 gconf2 libgnomeui
+USE_GNOME= gnomehack gnomeprefix gtk20 gconf2 libgnomeui
USE_PGSQL= yes
INSTALLS_OMF= yes
GCONF_SCHEMAS= preps.schema
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-pgsqldir=${LOCALBASE} \
--localstatedir=/var
post-patch:
- @${REINPLACE_CMD} -e 's#^\(omf_dest_dir\).*#\1=${PREFIX}/share/gnome/omf/@PACKAGE@#' \
- ${WRKSRC}/omf.make ${WRKSRC}/help/C/Makefile.in
+ @${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|help|g' \
+ ${WRKSRC}/help/C/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index 2e674abb8e3f..d35c0dc66ee3 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -1,34 +1,32 @@
@comment $FreeBSD$
bin/preps
share/gnome/apps/Development/PRepS.desktop
+share/gnome/help/preps/C/figures/arch_dlg.png
+share/gnome/help/preps/C/figures/attriblist.png
+share/gnome/help/preps/C/figures/editpr.png
+share/gnome/help/preps/C/figures/findpr.png
+share/gnome/help/preps/C/figures/gentab.png
+share/gnome/help/preps/C/figures/login.png
+share/gnome/help/preps/C/figures/main_win_arch.png
+share/gnome/help/preps/C/figures/mainwin.png
+share/gnome/help/preps/C/figures/mainwintab.png
+share/gnome/help/preps/C/figures/newpr.png
+share/gnome/help/preps/C/figures/printdlg.png
+share/gnome/help/preps/C/figures/prjedit.png
+share/gnome/help/preps/C/figures/prjvers.png
+share/gnome/help/preps/C/figures/prquery.png
+share/gnome/help/preps/C/figures/ptedit.png
+share/gnome/help/preps/C/figures/rawsql.png
+share/gnome/help/preps/C/figures/sevredit.png
+share/gnome/help/preps/C/figures/statedit.png
+share/gnome/help/preps/C/figures/useredit.png
+share/gnome/help/preps/C/legal.xml
+share/gnome/help/preps/C/preps.xml
share/gnome/omf/preps/preps-C.omf
-share/pixmaps/preps.png
-%%DATADIR%%/preps_logo.xpm
-%%DATADIR%%/gnome/help/preps/C/legal.xml
-%%DATADIR%%/gnome/help/preps/C/preps.xml
-%%DATADIR%%/gnome/help/preps/C/figures/arch_dlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/attriblist.png
-%%DATADIR%%/gnome/help/preps/C/figures/editpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/findpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/gentab.png
-%%DATADIR%%/gnome/help/preps/C/figures/login.png
-%%DATADIR%%/gnome/help/preps/C/figures/main_win_arch.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwin.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwintab.png
-%%DATADIR%%/gnome/help/preps/C/figures/newpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/printdlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjvers.png
-%%DATADIR%%/gnome/help/preps/C/figures/prquery.png
-%%DATADIR%%/gnome/help/preps/C/figures/ptedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/rawsql.png
-%%DATADIR%%/gnome/help/preps/C/figures/sevredit.png
-%%DATADIR%%/gnome/help/preps/C/figures/statedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/useredit.png
+share/gnome/pixmaps/preps.png
+share/gnome/preps/preps_logo.xpm
+@dirrm share/gnome/preps
@dirrm share/gnome/omf/preps
-@dirrm %%DATADIR%%/gnome/help/preps/C/figures
-@dirrm %%DATADIR%%/gnome/help/preps/C
-@dirrm %%DATADIR%%/gnome/help/preps
-@dirrm %%DATADIR%%/gnome/help
-@dirrm %%DATADIR%%/gnome
-@dirrm %%DATADIR%%
+@dirrm share/gnome/help/preps/C/figures
+@dirrm share/gnome/help/preps/C
+@dirrm share/gnome/help/preps
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 335205ff8ca9..02ba1a264f72 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -3,11 +3,12 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/py-xdg/Makefile,v 1.4 2005/08/12 00:08:44 ahze Exp $
+# $MCom: ports/devel/py-xdg/Makefile,v 1.2 2006/09/02 14:38:55 ahze Exp $
#
PORTNAME= xdg
PORTVERSION= 0.15
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= http://www.freedesktop.org/~lanius/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ USE_PYDISTUTILS=yes
post-patch:
@${REINPLACE_CMD} -e \
- 's|/etc|${X11BASE}/etc|g ; \
+ 's|/etc|${LOCALBASE}/etc|g ; \
s|%%X11BASE%%|${X11BASE}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/xdg/BaseDirectory.py \
diff --git a/devel/py-xdg/files/patch-xdg::BaseDirectory.py b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
index 52e303d8124c..47bd3f33a7ab 100644
--- a/devel/py-xdg/files/patch-xdg::BaseDirectory.py
+++ b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
@@ -5,7 +5,7 @@
xdg_data_dirs = [xdg_data_home] + \
- os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
-+ os.environ.get('XDG_DATA_DIRS', '%%X11BASE%%/share/gnome:%%X11BASE%%/share:%%LOCALBASE%%/share:/usr/share').split(':')
++ os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share/gnome:%%LOCALBASE%%/share:/usr/share').split(':')
xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
os.path.join(_home, '.config'))
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
index c368e385f246..cc5714b82a78 100644
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ b/devel/py-xdg/files/patch-xdg::IconTheme.py
@@ -7,7 +7,7 @@
-icondirs.append("/usr/share/pixmaps")
+icondirs.append("%%X11BASE%%/share/pixmaps")
+icondirs.append("%%LOCALBASE%%/share/pixmaps")
-+icondirs.append("%%X11BASE%%/share/gnome/pixmaps")
++icondirs.append("%%LOCALBASE%%/share/gnome/pixmaps")
+icondirs.append("%%X11BASE%%/share/icons")
+icondirs.append("%%LOCALBASE%%/share/icons")
icondirs.append(os.path.expanduser("~/.icons"))
diff --git a/devel/py-xdg/files/patch-xdg_Menu.py b/devel/py-xdg/files/patch-xdg_Menu.py
new file mode 100644
index 000000000000..186fda59171f
--- /dev/null
+++ b/devel/py-xdg/files/patch-xdg_Menu.py
@@ -0,0 +1,13 @@
+--- xdg/Menu.py.orig Thu Aug 11 07:37:48 2005
++++ xdg/Menu.py Sat Sep 2 05:10:19 2006
+@@ -494,6 +494,10 @@
+ if not filename:
+ filename = __getFileName("applications.menu")
+
++ # use gnome if no filename given
++ if not filename:
++ filename = __getFileName("gnome-applications.menu")
++
+ if not filename:
+ raise ParsingError('File not found', "/etc/xdg/menus/applications.menu")
+
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 4b9bf08ec08b..f673625d6997 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= regexxer
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel textproc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/:pcre \
@@ -25,7 +25,7 @@ LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
glademm-2.4:${PORTSDIR}/devel/libglademm24
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intltool intlhack
@@ -33,6 +33,8 @@ CONFIGURE_ARGS= PCRE_CONFIG="${PCRE_WRKDIR}/.install/bin/pcre-config"
CONFIGURE_ENV= CPPFLAGS="-I${PCRE_WRKDIR}/.install/include -I${LOCALBASE}/include" \
LDFLAGS="-L${PCRE_WRKDIR}/.install/lib -L${LOCALBASE}/lib"
+GCONF_SCHEMAS= regexxer.schemas
+
PCRE_NAME= pcre
PCRE_VERSION= 4.5
PCRE_WRKDIR= ${WRKDIR}/${PCRE_NAME}-${PCRE_VERSION}
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index def9d28900c2..54bdb44a8944 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,7 +1,4 @@
bin/regexxer
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/regexxer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
share/gnome/applications/regexxer.desktop
share/gnome/pixmaps/regexxer.png
share/gnome/regexxer/aboutdialog.glade
@@ -19,3 +16,7 @@ share/locale/pt/LC_MESSAGES/regexxer.mo
share/locale/pt_BR/LC_MESSAGES/regexxer.mo
share/locale/sv/LC_MESSAGES/regexxer.mo
@dirrm share/gnome/regexxer
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index aec069a8d0aa..f2673b557e36 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sge
PORTVERSION= 0.030809
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel graphics
MASTER_SITES= http://www.etek.chalmers.se/~e8cal1/sge/files/ \
http://www.digitalfanatics.org/cal/sge/files/
diff --git a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp b/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
index 44571a375c9f..83cff497cf45 100644
--- a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
+++ b/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
@@ -1,17 +1,26 @@
-diff -ur sge030809_orig/sge_tt_text.cpp sge030809/sge_tt_text.cpp
---- sge030809_orig/sge_tt_text.cpp Fri Aug 8 14:48:08 2003
-+++ sge_tt_text.cpp Sun Jul 30 20:49:29 2006
-@@ -36,9 +36,10 @@
+--- sge_tt_text.cpp.orig Fri Aug 8 08:48:08 2003
++++ sge_tt_text.cpp Wed Oct 4 11:43:47 2006
+@@ -36,10 +36,10 @@
#include "sge_textpp.h"
#ifndef _SGE_NOTTF
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
+-#include <freetype/internal/ftobjs.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_IDS_H
- #include <freetype/internal/ftobjs.h>
/* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -294,7 +294,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = _sge_library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/devel/sge/Makefile b/devel/sge/Makefile
index aec069a8d0aa..f2673b557e36 100644
--- a/devel/sge/Makefile
+++ b/devel/sge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sge
PORTVERSION= 0.030809
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel graphics
MASTER_SITES= http://www.etek.chalmers.se/~e8cal1/sge/files/ \
http://www.digitalfanatics.org/cal/sge/files/
diff --git a/devel/sge/files/patch-sge030809-sge_tt_text.cpp b/devel/sge/files/patch-sge030809-sge_tt_text.cpp
index 44571a375c9f..83cff497cf45 100644
--- a/devel/sge/files/patch-sge030809-sge_tt_text.cpp
+++ b/devel/sge/files/patch-sge030809-sge_tt_text.cpp
@@ -1,17 +1,26 @@
-diff -ur sge030809_orig/sge_tt_text.cpp sge030809/sge_tt_text.cpp
---- sge030809_orig/sge_tt_text.cpp Fri Aug 8 14:48:08 2003
-+++ sge_tt_text.cpp Sun Jul 30 20:49:29 2006
-@@ -36,9 +36,10 @@
+--- sge_tt_text.cpp.orig Fri Aug 8 08:48:08 2003
++++ sge_tt_text.cpp Wed Oct 4 11:43:47 2006
+@@ -36,10 +36,10 @@
#include "sge_textpp.h"
#ifndef _SGE_NOTTF
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
+-#include <freetype/internal/ftobjs.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_IDS_H
- #include <freetype/internal/ftobjs.h>
/* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -294,7 +294,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = _sge_library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index fa3a8e0c81a1..ef11dbb96024 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -7,7 +7,7 @@
PORTNAME= titano
PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT= An IDE for GNOME desktop
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
USE_GNOME= gnomelibs libglade
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/titano/pkg-plist b/devel/titano/pkg-plist
index 323d2fd5ecc2..2ec921f35b29 100644
--- a/devel/titano/pkg-plist
+++ b/devel/titano/pkg-plist
@@ -54,4 +54,5 @@ share/pixmaps/titano/gnome.png
share/pixmaps/titano/gtk.png
share/pixmaps/titano/logo.png
@dirrm share/pixmaps/titano
+@dirrmtry share/pixmaps
share/gnome/apps/Development/titano.desktop
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 3b2063f2d9a1..9bdc71d7a7f5 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfc
PORTVERSION= 4.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel xfce
MASTER_SITES= http://xfc.xfce.org/download/${PORTVERSION}/src/
@@ -21,7 +21,6 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GCC= 3.4+
USE_GNOME= glib20 gtk20 atk pango pkgconfig libglade2 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 0c9dbf01d7a5..a798ee2228e3 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -3,11 +3,12 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/abiword-plugins/Makefile,v 1.16 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/editors/abiword-plugins/Makefile,v 1.18 2006/07/18 12:45:43 ahze Exp $
#
PORTNAME= abiword
PORTVERSION= 2.4.5
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -24,7 +25,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20
WANT_GNOME= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 6572b9149b3f..37093dc65e0e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/abiword/Makefile,v 1.2 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/editors/abiword/Makefile,v 1.6 2006/09/30 04:39:56 ahze Exp $
#
PORTNAME= abiword
PORTVERSION= 2.4.5
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -28,7 +29,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_GNOME= libglade2 libxml2 libgnomeprintui desktopfileutils
WANT_GNOME= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xft \
--with-sys-wv \
@@ -72,8 +73,8 @@ PKGNAMESUFFIX:= -gnome
GNOME_ENABLED= yes
.endif
-.if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
-LIB_DEPENDS+= gucharmap.4:${PORTSDIR}/deskutils/gucharmap
+.if defined(WITH_GUCHARMAP) || exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)
+LIB_DEPENDS+= gucharmap.5:${PORTSDIR}/deskutils/gucharmap
.else
CONFIGURE_ARGS+= --enable-cmap=no
.endif
@@ -99,19 +100,19 @@ post-patch:
post-install:
@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
- @${MKDIR} ${X11BASE}/share/applications
+ @${MKDIR} ${LOCALBASE}/share/applications
@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
- ${X11BASE}/share/applications/abiword.desktop
- @${MKDIR} ${X11BASE}/share/pixmaps
+ ${LOCALBASE}/share/applications/abiword.desktop
+ @${MKDIR} ${LOCALBASE}/share/pixmaps
@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
- ${X11BASE}/share/pixmaps/abiword_48.png
+ ${LOCALBASE}/share/pixmaps/abiword_48.png
.if defined(GNOME_ENABLED)
- @${MKDIR} ${X11BASE}/libdata/bonobo/servers
+ @${MKDIR} ${LOCALBASE}/libdata/bonobo/servers
@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
- ${X11BASE}/libdata/bonobo/servers/
- @${MKDIR} ${X11BASE}/share/gnome/gnome-2.0/ui
+ ${LOCALBASE}/libdata/bonobo/servers/
+ @${MKDIR} ${LOCALBASE}/share/gnome/gnome-2.0/ui
@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
- ${X11BASE}/share/gnome/gnome-2.0/ui/
+ ${LOCALBASE}/share/gnome/gnome-2.0/ui/
.endif
@-update-desktop-database
diff --git a/editors/abiword/files/patch-ar b/editors/abiword/files/patch-ar
index fb71cb0b6a26..7e5c85d3ddca 100644
--- a/editors/abiword/files/patch-ar
+++ b/editors/abiword/files/patch-ar
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-$MCom: ports/editors/abiword/files/patch-ar,v 1.2 2005/10/14 20:39:57 adamw Exp $
-
--- src/pkg/common/unix/scripts/install.sh.orig Sat Apr 7 10:59:52 2001
+++ src/pkg/common/unix/scripts/install.sh Wed Aug 8 13:31:57 2001
@@ -80,7 +80,7 @@
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 05f78dc8074d..cb5b016940f3 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -292,6 +292,7 @@ share/pixmaps/abiword_48.png
@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/glade
@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
@dirrm share/AbiSuite-%%ABIVERSION%%
+@dirrmtry share/pixmaps
@exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
@dirrmtry lib/AbiWord-%%ABIVERSION%%/plugins
@dirrmtry lib/AbiWord-%%ABIVERSION%%
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 1ba2b0febb1f..73a2a3842f63 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= elvis
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
ftp://ftp.false.com/pub/elvis/ \
@@ -55,6 +56,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \
s|-lipc|-lcurses|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|FT_FILE|ELVIS_FT_FILE|g' \
+ ${WRKSRC}/guix11/xdialog.c \
+ ${WRKSRC}/guix11/xdialog.h
do-install:
.for file in elvfmt elvis elvtags ref
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 20f0bb132cd7..043179cb3149 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= leafpad
PORTVERSION= 0.8.9
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,11 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= radek@raadradd.com
COMMENT= GTK+ based simple text editor
-USE_GNOME= gtk20 gnomehier desktopfileutils intlhack
+USE_GNOME= gtk20 desktopfileutils intlhack
USE_GCC= 3.4
USE_GETOPT_LONG= yes
USE_GETTEXT= YES
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
@@ -29,11 +30,6 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
-post-patch:
- @${REINPLACE_CMD} -e 's|/pixmaps|/gnome/pixmaps|; \
- s|/applications|/gnome/applications|' \
- ${WRKSRC}/Makefile.in ${WRKSRC}/src/Makefile.in
-
post-install:
.if !defined(NOPORTDOCS)
@${INSTALL} -d ${DOCSDIR}
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 26592edab164..58f26f0e52eb 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -1,7 +1,5 @@
bin/leafpad
-share/gnome/applications/leafpad.desktop
-share/gnome/pixmaps/leafpad.png
-share/gnome/pixmaps/leafpad.xpm
+share/applications/leafpad.desktop
share/locale/bg/LC_MESSAGES/leafpad.mo
share/locale/ca/LC_MESSAGES/leafpad.mo
share/locale/cs/LC_MESSAGES/leafpad.mo
@@ -24,5 +22,25 @@ share/locale/tr/LC_MESSAGES/leafpad.mo
share/locale/vi/LC_MESSAGES/leafpad.mo
share/locale/zh_CN/LC_MESSAGES/leafpad.mo
share/locale/zh_TW/LC_MESSAGES/leafpad.mo
+share/pixmaps/leafpad.png
+share/pixmaps/leafpad.xpm
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index fa8b35d94cfa..050cdf316d97 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mlview
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -29,12 +29,12 @@ GCONF_SCHEMAS= mlview.schemas
.include <bsd.port.pre.mk>
# Autodetect dbus
-.if exists (${LOCALBASE}/lib/libdbus-1.so.2)
+.if exists (${LOCALBASE}/lib/libdbus-1.so.3)
WITH_DBUS= yes
.endif
.if defined (WITH_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+="--enable-dbus=yes"
.endif
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index ccf12c2f10c0..ad017e8c3440 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -63,3 +63,15 @@ share/locale/sr/LC_MESSAGES/mlview.mo
share/locale/sr@Latn/LC_MESSAGES/mlview.mo
share/locale/sv/LC_MESSAGES/mlview.mo
@dirrm share/gnome/mlview
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index e56695575408..e60ee17f47cf 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,11 +4,12 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $
#
PORTNAME= poedit
PORTVERSION= 1.3.5
-PORTREVISION= 0
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +21,6 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index 6e09cae593cc..47438b745b47 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -66,36 +66,6 @@ share/locale/uk/LC_MESSAGES/poedit.mo
share/locale/wa/LC_MESSAGES/poedit.mo
share/locale/zh_CN/LC_MESSAGES/poedit.mo
share/locale/zh_TW/LC_MESSAGES/poedit.mo
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/th/LC_MESSAGES
-@dirrmtry share/locale/th
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/sq_AL/LC_MESSAGES
-@dirrmtry share/locale/sq_AL
-@dirrmtry share/locale/ms/LC_MESSAGES
-@dirrmtry share/locale/ms
-@dirrmtry share/locale/mk/LC_MESSAGES
-@dirrmtry share/locale/mk
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/es_PR/LC_MESSAGES
-@dirrmtry share/locale/es_PR
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/am/LC_MESSAGES
-@dirrmtry share/locale/am
-@dirrmtry share/locale/af_ZA/LC_MESSAGES
-@dirrmtry share/locale/af_ZA
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
%%DATADIR%%/help/common/comment.gif
%%DATADIR%%/help/common/fileopen.gif
%%DATADIR%%/help/common/filesave.gif
@@ -168,3 +138,54 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
@dirrm %%DATADIR%%/help/common
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sq_AL/LC_MESSAGES
+@dirrmtry share/locale/sq_AL
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/fa_IR/LC_MESSAGES
+@dirrmtry share/locale/fa_IR
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/af_ZA/LC_MESSAGES
+@dirrmtry share/locale/af_ZA
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 5e926f33ae57..8fa25287e357 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,6 +7,7 @@
PORTNAME= winefish
DISTVERSION= 1.3.3
+PORTREVISION= 2
CATEGORIES= editors print
MASTER_SITES= http://download.berlios.de/winefish/ \
http://nivi.interfree.it/distfiles/winefish/
@@ -29,8 +30,8 @@ MANCOMPRESSED= no
GNU_CONFIGURE= yes
USE_GCC= 3.3+
USE_GMAKE= yes
-USE_GNOME= libgnomeui desktopfileutils
-USE_X_PREFIX= yes
+USE_GNOME= libgnomeui desktopfileutils gnomehier
+USE_XLIB= yes
OPTIONS= CONTEXT "Enable ConTexT support (Experimental)" off \
VNTEX "Vietnamese TeX user" off \
diff --git a/editors/winefish/pkg-plist b/editors/winefish/pkg-plist
index ba524d63ccd1..15fded4286c6 100644
--- a/editors/winefish/pkg-plist
+++ b/editors/winefish/pkg-plist
@@ -5,12 +5,12 @@ share/gnome/applications/winefish.desktop
share/gnome/applications/winefish-project.desktop
share/gnome/mime-info/winefish.mime
share/gnome/mime-info/winefish.keys
+share/gnome/pixmaps/gnome-application-winefish-project.png
+share/gnome/pixmaps/winefish-icon.png
%%IFNLS%%share/locale/fr/LC_MESSAGES/winefish.mo
%%IFNLS%%share/locale/it/LC_MESSAGES/winefish.mo
%%IFNLS%%share/locale/vi/LC_MESSAGES/winefish.mo
share/mime/packages/winefish.xml
-share/pixmaps/gnome-application-winefish-project.png
-share/pixmaps/winefish-icon.png
%%PORTDOCS%%%%DOCSDIR%%/winefish.html
%%DATADIR%%/autotext.default
%%DATADIR%%/custom_menu.default
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index d83ae1ee0433..10b597e7eb1d 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
+PORTREVISION= 1
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -44,7 +45,7 @@ MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
ALL_TARGET= all dist
PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \
- LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+ LOCALBASE=${LOCALBASE}
.include <bsd.port.pre.mk>
@@ -137,7 +138,7 @@ post-install::
.endfor
.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
- ${X11BASE}/share/gnome/applications
+ ${LOCALBASE}/share/gnome/applications
.endif
# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
# Do what PLIST does for pkg_add.
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index c9828454f949..a8c8f860d964 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1269,9 +1269,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-%%DESKTOP%%@cwd %%X11BASE%%
%%DESKTOP%%share/gnome/applications/xemacs.desktop
-%%DESKTOP%%@cwd %%LOCALBASE%%
@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
@dirrm lib/xemacs-%%XEMACS_VER%%/lisp
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index e264c728f8ba..97f40f044519 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,8 +7,8 @@
PORTNAME= gxmame
DISTVERSION= 0.35beta2
+PORTREVISION= 4
PORTEPOCH= 1
-PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,13 +20,13 @@ COMMENT= GXmame is a GTK frontend for xmame
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gtk20 intlhack gnomehack gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-xmame-dir=${X11BASE}/share/xmame
+CONFIGURE_ARGS= --with-xmame-dir=${LOCALBASE}/share/xmame
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
index f0e6a0abe42b..c428262407bc 100644
--- a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
+++ b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
@@ -1,6 +1,6 @@
---- src/SDL_ttf.c.orig Wed Oct 15 02:44:17 2003
-+++ src/SDL_ttf.c Thu Aug 12 15:06:42 2004
-@@ -39,7 +39,8 @@
+--- src/SDL_ttf.c.orig Tue Oct 14 20:44:17 2003
++++ src/SDL_ttf.c Wed Oct 4 08:38:49 2006
+@@ -39,10 +39,10 @@
#define FREEA(p) free(p)
#endif
@@ -9,4 +9,16 @@
+#include FT_FREETYPE_H
#include <freetype/ftoutln.h>
#include <freetype/ttnameid.h>
- #include <freetype/internal/ftobjs.h>
+-#include <freetype/internal/ftobjs.h>
+
+ /** hack **/
+ #ifndef ft_open_stream
+@@ -272,7 +272,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index a8a1757f85dd..c9d7b303c29a 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= raine
PORTVERSION= 0.43.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators games
MASTER_SITES= http://www.rainemu.com/html/archive/
DISTNAME= ${PORTNAME}s-${PORTVERSION}
@@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GCC= 3.2+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehier
MAKEFILE= makefile
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 416643627041..79329417272e 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,11 +3,12 @@
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
+# $MCom: ports/finance/gnucash/Makefile,v 1.7 2006/10/13 10:26:39 ahze Exp $
#
PORTNAME= gnucash
PORTVERSION= 1.8.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= finance gnome
MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \
${MASTER_SITE_SOURCEFORGE}
@@ -20,18 +21,18 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \
guppi.16:${PORTSDIR}/math/guppi \
popt.0:${PORTSDIR}/devel/popt \
ofx.3:${PORTSDIR}/finance/libofx \
- gw-standard.0:${PORTSDIR}/devel/g-wrap
+ gw-guile-standard.0:${PORTSDIR}/devel/g-wrap
RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile \
${SITE_PERL}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
${SITE_PERL}/Finance/Quote.pm:${PORTSDIR}/finance/p5-Finance-Quote \
${SITE_PERL}/Finance/QuoteHist.pm:${PORTSDIR}/finance/p5-Finance-QuoteHist \
- ${X11BASE}/share/gnome/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs
+ ${LOCALBASE}/share/gnome/omf/gnucash-docs/gnucash-guide-C.omf:${PORTSDIR}/finance/gnucash-docs
OPTIONS= AQBANKING "AqBanking support (HBCI/OpenHBCI)" off
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_XPM= yes
USE_PERL5= yes
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 62c44e6dd85b..89592a09ed21 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -677,10 +677,6 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
share/locale/uk/LC_MESSAGES/gnucash.mo
share/locale/zh_CN/LC_MESSAGES/gnucash.mo
share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/es_NI/LC_MESSAGES
-@dirrmtry share/locale/es_NI
@dirrm share/gnome/pixmaps/gnucash
@dirrm share/gnome/gnucash/scm/qif-import
@dirrm share/gnome/gnucash/scm/printing
@@ -724,3 +720,25 @@ share/locale/zh_TW/LC_MESSAGES/gnucash.mo
@dirrm lib/gnucash
@dirrm include/gnucash
@dirrm etc/gnucash
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/finance/mybudget/Makefile b/finance/mybudget/Makefile
index 7dce2416a201..5eea46bc9f4a 100644
--- a/finance/mybudget/Makefile
+++ b/finance/mybudget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= myBudget
PORTVERSION= 0.60
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= finance gnome
MASTER_SITES= http://www.abisource.com/~msevior/
@@ -18,6 +18,10 @@ NO_BUILD= yes
USE_PYTHON= yes
USE_GNOME= pygnome2
+post-patch:
+ @${REINPLACE_CMD} -e 's|gobject.so|_gobject.so|' \
+ ${WRKSRC}/install.py
+
do-install:
cd ${WRKSRC} && ${PYTHON_CMD} ./install.py ${PREFIX}
diff --git a/french/alphabet_sounds_fr/Makefile b/french/alphabet_sounds_fr/Makefile
index c5f43d0b1411..2a06507b5a23 100644
--- a/french/alphabet_sounds_fr/Makefile
+++ b/french/alphabet_sounds_fr/Makefile
@@ -5,7 +5,7 @@
PORTNAME= alphabet_sounds_fr
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= french games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= childsplay
@@ -14,11 +14,10 @@ DISTNAME= alphabet_sounds_fr
MAINTAINER= bruno@tinkerbox.org
COMMENT= Educative games for children. Alphabet sounds package (french)
-BUILD_DEPENDS= ${X11BASE}/bin/childsplay:${PORTSDIR}/games/childsplay
+BUILD_DEPENDS= ${LOCALBASE}/bin/childsplay:${PORTSDIR}/games/childsplay
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PYTHON= yes
-USE_X_PREFIX= yes
post-patch:
@${REINPLACE_CMD} -e "s@PREFIX=/usr/local@PREFIX=${PREFIX}@g " ${WRKSRC}/install.sh
diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile
index d613b8a625f2..45706edce6a7 100644
--- a/french/mozilla-flp/Makefile
+++ b/french/mozilla-flp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ${GECKO}-flp
PORTVERSION= ${MOZVERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= french www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@@ -17,7 +18,6 @@ DISTNAME= ${GECKO}-${PORTVERSION}.fr-FR.langpack
MAINTAINER= thierry@FreeBSD.org
COMMENT= ${GECKO} French Language Pack (FLP)
-USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>.
WRKSRC= ${WRKDIR}/bin
REPS= defaults/profile/FR/chrome defaults/messenger/FR defaults/isp/FR
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 8f7e699b949c..3a3d3fff835d 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwget
PORTVERSION= 0.98.1
+PORTREVISION= 1
CATEGORIES= ftp www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -25,7 +26,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libbonobo gconf2
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBBONOBO_IDL="-I${LOCALBASE}/idl/bonobo-2.0" \
@@ -36,7 +37,7 @@ EPHY_VER?= 2.14
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/epiphany) && !defined(WITHOUT_EPIPHANY)
+.if exists(${LOCALBASE}/bin/epiphany) && !defined(WITHOUT_EPIPHANY)
WITH_EPIPHANY= yes
.endif
diff --git a/ftp/gwget/pkg-plist b/ftp/gwget/pkg-plist
index 9acae1f95472..3c4ef20f365a 100644
--- a/ftp/gwget/pkg-plist
+++ b/ftp/gwget/pkg-plist
@@ -64,3 +64,29 @@ share/locale/zh_TW/LC_MESSAGES/gwget.mo
%%EPIPHANY%%@dirrmtry lib/epiphany/%%VERSION%%
%%EPIPHANY%%@dirrmtry lib/epiphany
@dirrm share/gnome/gwget
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 44c929c870f4..086d5179b008 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pureadmin
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= purify
diff --git a/ftp/pureadmin/pkg-plist b/ftp/pureadmin/pkg-plist
index 6ec54249712d..d3a00979ede1 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -30,5 +30,3 @@ share/locale/it/LC_MESSAGES/pureadmin.mo
share/locale/sv/LC_MESSAGES/pureadmin.mo
@dirrm share/gnome/pureadmin/docs
@dirrm share/gnome/pureadmin
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 68513599df1e..77d7750c8c42 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wzdftpd
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -99,7 +99,7 @@ PLIST_SUB+= ZEROCONF="@comment "
.endif
.if defined(WITH_AVAHI) && !defined(WITH_HOWL)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus \
avahi-core.4:${PORTSDIR}/net/avahi
CONFIGURE_ARGS+= --with-zeroconf --enable-avahi
.endif
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 054895e6907e..81a587dc9afa 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -3,11 +3,11 @@
# Whom: Miguel Mendez <flynn@energyhq.es.eu.org>
#
# $FreeBSD$
-#
+# $MCom: ports/games/adonthell/Makefile,v 1.1 2006/10/04 20:13:33 ahze Exp $
PORTNAME= adonthell
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/games/adonthell/files/patch-src_SDL_ttf.c b/games/adonthell/files/patch-src_SDL_ttf.c
new file mode 100644
index 000000000000..0999b7f20ed3
--- /dev/null
+++ b/games/adonthell/files/patch-src_SDL_ttf.c
@@ -0,0 +1,20 @@
+--- src/SDL_ttf.c.orig Wed Oct 4 16:00:53 2006
++++ src/SDL_ttf.c Wed Oct 4 16:12:38 2006
+@@ -43,7 +43,7 @@
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ #include FT_TRUETYPE_IDS_H
+-#include FT_INTERNAL_OBJECTS_H
++/* #include FT_INTERNAL_OBJECTS_H */
+
+ #include "SDL.h"
+ #include "SDL_endian.h"
+@@ -270,7 +270,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 8eff4dd88390..9bc8aea67820 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -7,7 +7,7 @@
PORTNAME= childsplay
PORTVERSION= 0.80.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= childsplay
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/
LIB_DEPENDS= assetml.0:${PORTSDIR}/devel/libassetml
USE_PYTHON= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
# avoid asking for translation to your local language on install
diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index 8f237bd66822..2a43736deb4c 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= childsplay_plugins
PORTVERSION= 0.80.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= childsplay
@@ -20,7 +20,6 @@ BUILD_DEPENDS= childsplay:${PORTSDIR}/games/childsplay
RUN_DEPENDS= childsplay:${PORTSDIR}/games/childsplay
USE_PYTHON= yes
-USE_X_PREFIX= yes
post-patch:
@${REINPLACE_CMD} -e "s@PREFIX=/usr/local@PREFIX=${PREFIX}@g " ${WRKSRC}/install.sh
diff --git a/games/childsplay_plugins/files/patch-Makefile b/games/childsplay_plugins/files/patch-Makefile
index a15980f0207f..e02280ccbc25 100644
--- a/games/childsplay_plugins/files/patch-Makefile
+++ b/games/childsplay_plugins/files/patch-Makefile
@@ -2,7 +2,7 @@
+++ Makefile Sat May 7 23:04:02 2005
@@ -0,0 +1,9 @@
+PYTHON = /usr/bin/env python
-+CPDIR=${X11BASE}/childsplay
++CPDIR=${LOCALBASE}/childsplay
+
+all:
+ echo "Compiling modules to bytecode..."
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index d94710a0ebbe..b0c583aa2627 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomesudoku
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnome-sudoku
diff --git a/games/gnomesudoku/pkg-plist b/games/gnomesudoku/pkg-plist
index c3415e3cf0e8..64fafebcd0ba 100644
--- a/games/gnomesudoku/pkg-plist
+++ b/games/gnomesudoku/pkg-plist
@@ -90,10 +90,17 @@ share/locale/sv/LC_MESSAGES/gnome-sudoku.mo
share/locale/tr/LC_MESSAGES/gnome-sudoku.mo
share/locale/uk/LC_MESSAGES/gnome-sudoku.mo
share/pixmaps/sudoku.png
+@dirrmtry share/pixmaps
@dirrm share/gnome-sudoku
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
@dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
@dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index b31e3523d092..1483a9691371 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wesnoth
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.wesnoth.org/files/
@@ -110,8 +110,8 @@ pre-everything::
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${X11BASE}/share/gnome/applications|g ; \
- s|[$$][(]datadir[)]/icons|${X11BASE}/share/gnome/pixmaps|g' \
+ @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${LOCALBASE}/share/gnome/applications|g ; \
+ s|[$$][(]datadir[)]/icons|${LOCALBASE}/share/gnome/pixmaps|g' \
${WRKSRC}/icons/Makefile.in
.include <bsd.port.post.mk>
diff --git a/games/wesnoth-devel/files/patch-src_sdl_ttf_SDL_ttf.c b/games/wesnoth-devel/files/patch-src_sdl_ttf_SDL_ttf.c
new file mode 100644
index 000000000000..ee4f8be540e1
--- /dev/null
+++ b/games/wesnoth-devel/files/patch-src_sdl_ttf_SDL_ttf.c
@@ -0,0 +1,19 @@
+--- src/sdl_ttf/SDL_ttf.c.orig Wed Oct 4 16:45:59 2006
++++ src/sdl_ttf/SDL_ttf.c Wed Oct 4 16:46:32 2006
+@@ -48,7 +48,6 @@
+ #include <freetype/ftoutln.h>
+ #include <freetype/ttnameid.h>
+ */
+-#include <freetype/internal/ftobjs.h>
+
+ #ifndef FT_OPEN_STREAM
+ #define FT_OPEN_STREAM ft_open_stream
+@@ -282,7 +281,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 4028e099c5b7..b495531ad338 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -4015,18 +4015,18 @@ share/locale/tr/LC_MESSAGES/wesnoth.mo
@dirrm %%DATADIR%%/data/campaigns
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
@dirrmtry man/sv/man6
@dirrmtry man/sv
@dirrmtry man/hu/man6
@dirrmtry man/hu
@dirrmtry man/de/man6
@dirrmtry man/de
+%%GNOME:%%@cwd %%LOCALBASE%%
%%GNOME:%%share/gnome/applications/wesnoth.desktop
%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
-
%%KDE:%%@cwd %%LOCALBASE%%
%%KDE:%%share/applnk/Games/TacticStrategy/wesnoth.desktop
%%KDE:%%share/icons/wesnoth-icon.png
%%SERVER:%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index b31e3523d092..1483a9691371 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wesnoth
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.wesnoth.org/files/
@@ -110,8 +110,8 @@ pre-everything::
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${X11BASE}/share/gnome/applications|g ; \
- s|[$$][(]datadir[)]/icons|${X11BASE}/share/gnome/pixmaps|g' \
+ @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${LOCALBASE}/share/gnome/applications|g ; \
+ s|[$$][(]datadir[)]/icons|${LOCALBASE}/share/gnome/pixmaps|g' \
${WRKSRC}/icons/Makefile.in
.include <bsd.port.post.mk>
diff --git a/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c b/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c
new file mode 100644
index 000000000000..ee4f8be540e1
--- /dev/null
+++ b/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c
@@ -0,0 +1,19 @@
+--- src/sdl_ttf/SDL_ttf.c.orig Wed Oct 4 16:45:59 2006
++++ src/sdl_ttf/SDL_ttf.c Wed Oct 4 16:46:32 2006
+@@ -48,7 +48,6 @@
+ #include <freetype/ftoutln.h>
+ #include <freetype/ttnameid.h>
+ */
+-#include <freetype/internal/ftobjs.h>
+
+ #ifndef FT_OPEN_STREAM
+ #define FT_OPEN_STREAM ft_open_stream
+@@ -282,7 +281,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 4028e099c5b7..b495531ad338 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -4015,18 +4015,18 @@ share/locale/tr/LC_MESSAGES/wesnoth.mo
@dirrm %%DATADIR%%/data/campaigns
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
@dirrmtry man/sv/man6
@dirrmtry man/sv
@dirrmtry man/hu/man6
@dirrmtry man/hu
@dirrmtry man/de/man6
@dirrmtry man/de
+%%GNOME:%%@cwd %%LOCALBASE%%
%%GNOME:%%share/gnome/applications/wesnoth.desktop
%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
-
%%KDE:%%@cwd %%LOCALBASE%%
%%KDE:%%share/applnk/Games/TacticStrategy/wesnoth.desktop
%%KDE:%%share/icons/wesnoth-icon.png
%%SERVER:%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 1b9f00976094..82c6e0758c79 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-toys
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/games/xfce4-toys/pkg-plist b/games/xfce4-toys/pkg-plist
index 34d11103a8cb..cf5e3fed9a4a 100644
--- a/games/xfce4-toys/pkg-plist
+++ b/games/xfce4-toys/pkg-plist
@@ -77,9 +77,37 @@ share/xfce4/tips/tips.dat
@dirrm share/xfce4/tips
@dirrmtry share/xfce4
@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index d68136c2bed6..f3e0903f0d43 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -3,11 +3,11 @@
# Whom: Eckart "Isegrim" Hofmann
#
# $FreeBSD$
-#
+# $MCom: ports/games/xteddy/Makefile,v 1.1 2006/10/04 13:16:56 ahze Exp $
PORTNAME= xteddy
PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/
@@ -16,10 +16,9 @@ COMMENT= A cuddlesome teddy for the X desktop
NO_CDROM= Can only be distributed for free
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
USE_GNOME= imlib
MAN6= xteddy.6
diff --git a/german/bsdforen-firefox-searchplugin/Makefile b/german/bsdforen-firefox-searchplugin/Makefile
index eac398957449..8d5267e83784 100644
--- a/german/bsdforen-firefox-searchplugin/Makefile
+++ b/german/bsdforen-firefox-searchplugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bsdforen-firefox-searchplugin
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= german www
MASTER_SITES= http://www.crashmail.de/files/
DISTFILES= bsdforen.src bsdforen.png bsdforen-wiki.src bsdforen-wiki.png
@@ -15,7 +16,6 @@ EXTRACT_ONLY= yes
MAINTAINER= stefan.tell@crashmail.de
COMMENT= Firefox searchplugins for the www.bsdforen.de board and wiki
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GECKO= firefox
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index 2d71518fb84b..3750149ee09c 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -3,14 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/cairo-java/Makefile,v 1.2 2005/10/29 22:06:06 marcus Exp $
+# $MCom: ports/graphics/cairo-java/Makefile,v 1.4 2006/09/14 12:47:28 ahze Exp $
#
PORTNAME= cairo-java
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= graphics java
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,7 +20,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
USE_BZIP2= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
JAVA_VERSION= 1.2+
diff --git a/graphics/cairo-java/distinfo b/graphics/cairo-java/distinfo
index 3670d791425a..0a8275cd4629 100644
--- a/graphics/cairo-java/distinfo
+++ b/graphics/cairo-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cairo-java-1.0.4.tar.bz2) = a10528654e52b5f22d7e80d74029be98
-SHA256 (gnome2/cairo-java-1.0.4.tar.bz2) = 310d17b9a4637c1f97c7971c334fa8c9f760ba6586bebb5d558e968004a67e52
-SIZE (gnome2/cairo-java-1.0.4.tar.bz2) = 254634
+MD5 (gnome2/cairo-java-1.0.5.tar.bz2) = 2e532ab7d4afe681cfec3b70132d7a80
+SHA256 (gnome2/cairo-java-1.0.5.tar.bz2) = dbe9ace5ce65e434628c4b10c6a3b21110a699c8fabce1fc35b8e2f17ceac7e9
+SIZE (gnome2/cairo-java-1.0.5.tar.bz2) = 256184
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 94cf2e613922..d62b8c2cbc9c 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/cairomm/Makefile,v 1.4 2006/09/06 22:06:40 marcus Exp $
#
PORTNAME= cairomm
-PORTVERSION= 0.6.0
+PORTVERSION= 1.2.2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -17,16 +18,17 @@ LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
cairo.2:${PORTSDIR}/graphics/cairo
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN="Does not build"
+BROKEN= Does not build
.endif
.if defined(NOPORTDOCS)
diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo
index 2a46bb524247..6c4a3de43927 100644
--- a/graphics/cairomm/distinfo
+++ b/graphics/cairomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairomm-0.6.0.tar.gz) = 9d967cf486b0ac59d451d47922c99e6f
-SHA256 (cairomm-0.6.0.tar.gz) = 274d27e8d8644038ec9f9605627753cf2cbfa5c5a62240d67cbbb2d928d408e2
-SIZE (cairomm-0.6.0.tar.gz) = 442864
+MD5 (cairomm-1.2.2.tar.gz) = fabb040a5ff2cf0529af55ff46d22d2d
+SHA256 (cairomm-1.2.2.tar.gz) = 6f02087249f1f9e9293fdfcf008c0d3066a4e52d5c625d6129a451ccb8bdeaae
+SIZE (cairomm-1.2.2.tar.gz) = 582629
diff --git a/graphics/cairomm/files/patch-docs_reference_Makefile.in b/graphics/cairomm/files/patch-docs_reference_Makefile.in
new file mode 100644
index 000000000000..560b3dc7b704
--- /dev/null
+++ b/graphics/cairomm/files/patch-docs_reference_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in.orig Thu Jul 6 00:29:26 2006
++++ docs/reference/Makefile.in Thu Jul 6 00:29:40 2006
+@@ -342,7 +342,7 @@
+
+ $(index_html): $(DOXYGEN_CONFIGFILE) $(wildcard $(top_srcdir)/cairomm/*.h) $(HTML_TEMPLATE_FILES)
+ -rm -rf html
+- doxygen $(DOXYGEN_CONFIGFILE) \
++ $(DOXYGEN) $(DOXYGEN_CONFIGFILE) \
+ 2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt
+
+ html: $(index_html)
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index bfb563b8148b..42d9079b10ed 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -7,183 +7,192 @@ include/cairomm-1.0/cairomm/fontoptions.h
include/cairomm-1.0/cairomm/path.h
include/cairomm-1.0/cairomm/pattern.h
include/cairomm-1.0/cairomm/refptr.h
+include/cairomm-1.0/cairomm/scaledfont.h
include/cairomm-1.0/cairomm/surface.h
include/cairomm-1.0/cairomm/win32_surface.h
include/cairomm-1.0/cairomm/xlib_surface.h
lib/libcairomm-1.0.a
lib/libcairomm-1.0.la
lib/libcairomm-1.0.so
-lib/libcairomm-1.0.so.0
+lib/libcairomm-1.0.so.1
libdata/pkgconfig/cairomm-1.0.pc
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/annotated.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm.css
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error-members.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dirs.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/doxygen.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/files.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_func.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_type.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_vars.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_enum.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_eval.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_type.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.dot
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/hierarchy.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/index.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.map
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.md5
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherits.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaceCairo.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_enum.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_eval.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_type.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaces.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/path_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/path_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h.html
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference/html
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0
+share/doc/libcairomm-1.0/reference/html/annotated.html
+share/doc/libcairomm-1.0/reference/html/cairomm.css
+share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html
+share/doc/libcairomm-1.0/reference/html/cairomm_8h.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error-members.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error.html
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error.html
+share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.map
+share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.md5
+share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png
+share/doc/libcairomm-1.0/reference/html/context_8h-source.html
+share/doc/libcairomm-1.0/reference/html/context_8h.html
+share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d.html
+share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d_dep.map
+share/doc/libcairomm-1.0/reference/html/dir_6283efd5b9f2674eb85d62f98eaada7d_dep.png
+share/doc/libcairomm-1.0/reference/html/dirs.html
+share/doc/libcairomm-1.0/reference/html/doxygen.png
+share/doc/libcairomm-1.0/reference/html/enums_8h-source.html
+share/doc/libcairomm-1.0/reference/html/enums_8h.html
+share/doc/libcairomm-1.0/reference/html/exception_8h-source.html
+share/doc/libcairomm-1.0/reference/html/exception_8h.html
+share/doc/libcairomm-1.0/reference/html/files.html
+share/doc/libcairomm-1.0/reference/html/fontface_8h-source.html
+share/doc/libcairomm-1.0/reference/html/fontface_8h.html
+share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html
+share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html
+share/doc/libcairomm-1.0/reference/html/functions.html
+share/doc/libcairomm-1.0/reference/html/functions_func.html
+share/doc/libcairomm-1.0/reference/html/functions_type.html
+share/doc/libcairomm-1.0/reference/html/functions_vars.html
+share/doc/libcairomm-1.0/reference/html/globals.html
+share/doc/libcairomm-1.0/reference/html/globals_enum.html
+share/doc/libcairomm-1.0/reference/html/globals_eval.html
+share/doc/libcairomm-1.0/reference/html/globals_type.html
+share/doc/libcairomm-1.0/reference/html/graph_legend.dot
+share/doc/libcairomm-1.0/reference/html/graph_legend.html
+share/doc/libcairomm-1.0/reference/html/graph_legend.png
+share/doc/libcairomm-1.0/reference/html/hierarchy.html
+share/doc/libcairomm-1.0/reference/html/index.html
+share/doc/libcairomm-1.0/reference/html/inherit__graph__0.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__0.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__0.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__1.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__1.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__1.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__2.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__2.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__2.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__3.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__3.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__3.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__4.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__4.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__4.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__5.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__5.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__5.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__6.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__6.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__6.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__7.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__7.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png
+share/doc/libcairomm-1.0/reference/html/inherit__graph__8.map
+share/doc/libcairomm-1.0/reference/html/inherit__graph__8.md5
+share/doc/libcairomm-1.0/reference/html/inherit__graph__8.png
+share/doc/libcairomm-1.0/reference/html/inherits.html
+share/doc/libcairomm-1.0/reference/html/namespaceCairo.html
+share/doc/libcairomm-1.0/reference/html/namespacemembers.html
+share/doc/libcairomm-1.0/reference/html/namespacemembers_enum.html
+share/doc/libcairomm-1.0/reference/html/namespacemembers_eval.html
+share/doc/libcairomm-1.0/reference/html/namespacemembers_type.html
+share/doc/libcairomm-1.0/reference/html/namespaces.html
+share/doc/libcairomm-1.0/reference/html/pages.html
+share/doc/libcairomm-1.0/reference/html/path_8h-source.html
+share/doc/libcairomm-1.0/reference/html/path_8h.html
+share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html
+share/doc/libcairomm-1.0/reference/html/pattern_8h.html
+share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html
+share/doc/libcairomm-1.0/reference/html/refptr_8h.html
+share/doc/libcairomm-1.0/reference/html/scaledfont_8h-source.html
+share/doc/libcairomm-1.0/reference/html/scaledfont_8h.html
+share/doc/libcairomm-1.0/reference/html/surface_8h-source.html
+share/doc/libcairomm-1.0/reference/html/surface_8h.html
+share/doc/libcairomm-1.0/reference/html/tabs.css
+share/doc/libcairomm-1.0/reference/html/todo.html
+share/doc/libcairomm-1.0/reference/html/win32__surface_8h-source.html
+share/doc/libcairomm-1.0/reference/html/win32__surface_8h.html
+share/doc/libcairomm-1.0/reference/html/xlib__surface_8h-source.html
+share/doc/libcairomm-1.0/reference/html/xlib__surface_8h.html
+@dirrm share/doc/libcairomm-1.0/reference/html
+@dirrm share/doc/libcairomm-1.0/reference
+@dirrm share/doc/libcairomm-1.0
@dirrm include/cairomm-1.0/cairomm
@dirrm include/cairomm-1.0
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 8398f4a12d86..050b5391baf8 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -3,10 +3,12 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/comix/Makefile,v 1.4 2006/10/03 19:05:14 mezz Exp $
#
PORTNAME= comix
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,11 +20,11 @@ RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \
${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
NO_BUILD= yes
+USE_XLIB= yes
USE_GNOME= desktopfileutils pygtk2
WANT_GNOME= yes
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
INSTALLS_ICONS= yes
DOCS= COPYING ChangeLog README
@@ -31,7 +33,7 @@ MAN1= comix.1
.include <bsd.port.pre.mk>
.if (${HAVE_GNOME:Mnautilus2}!="" || defined(WITH_THUMBNAILS)) && !defined(WITHOUT_THUMBNAILS)
-USE_GNOME+= gconf2
+USE_GNOME+= gnomehier gconf2
MAN1+= comicthumb.1
GCONF_SCHEMAS= comicbook.schemas
PLIST_SUB+= THUMBNAILS:=""
diff --git a/graphics/comix/pkg-plist b/graphics/comix/pkg-plist
index f12ddadeb10b..098b70a36292 100644
--- a/graphics/comix/pkg-plist
+++ b/graphics/comix/pkg-plist
@@ -57,9 +57,20 @@ share/pixmaps/comix/silk-transform.png
share/pixmaps/comix/silk-view.png
share/pixmaps/comix/silk-zoom.png
@dirrm share/pixmaps/comix
+@dirrmtry share/pixmaps
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
%%THUMBNAILS:%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
%%THUMBNAILS:%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/crystalspace-devel/files/patch-configure b/graphics/crystalspace-devel/files/patch-configure
new file mode 100644
index 000000000000..26e7850c443d
--- /dev/null
+++ b/graphics/crystalspace-devel/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig Tue Oct 10 17:24:44 2006
++++ configure Tue Oct 10 17:29:10 2006
+@@ -39605,7 +39605,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ft2build.h>
+- #include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
+@@ -39760,7 +39759,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ft2build.h>
+- #include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
diff --git a/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp b/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp
new file mode 100644
index 000000000000..486843d8769a
--- /dev/null
+++ b/graphics/crystalspace-devel/files/patch-plugins_font_server_freefnt2_freefnt2.cpp
@@ -0,0 +1,214 @@
+--- plugins/font/server/freefnt2/freefnt2.cpp.orig Thu Oct 12 12:48:44 2006
++++ plugins/font/server/freefnt2/freefnt2.cpp Thu Oct 12 12:54:51 2006
+@@ -30,10 +30,11 @@
+ #include "iutil/comp.h"
+
+ #include <ft2build.h>
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
++#include FT_SIZES_H
++#include FT_OUTLINE_H
+
+ #include "freefnt2.h"
+
+@@ -372,6 +373,20 @@
+ return true;
+ }
+
++static void GridFitCbox (FT_BBox& cbox, FT_UInt& glyphW, FT_UInt& glyphH)
++{
++ /* compute the control box, and grid fit it */
++#define FT_PIX_FLOOR( x ) ( (x) & ~63 )
++#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 )
++ cbox.xMin = FT_PIX_FLOOR( cbox.xMin );
++ cbox.yMin = FT_PIX_FLOOR( cbox.yMin );
++ cbox.xMax = FT_PIX_CEIL( cbox.xMax );
++ cbox.yMax = FT_PIX_CEIL( cbox.yMax );
++
++ glyphW = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
++ glyphH = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
++}
++
+ csPtr<iDataBuffer> csFreeType2Font::GetGlyphBitmap (utf32_char c,
+ csBitmapMetrics& metrics)
+ {
+@@ -381,37 +396,65 @@
+ if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0;
+
+ if (server->FreetypeError (FT_Load_Glyph (face->face, ci,
+- FT_LOAD_RENDER | FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO),
++ FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO),
+ "Could not load glyph %u for %s", ci, name))
+ {
+ return 0;
+ }
+
+- int stride = (face->face->glyph->bitmap.width + 7) / 8;
++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width
++ * or height is 0 */
++ FT_Outline* outline = &face->face->glyph->outline;
++ FT_BBox cbox;
++ FT_Outline_Get_CBox( outline, &cbox );
++ FT_UInt glyphW, glyphH;
++ GridFitCbox (cbox, glyphW, glyphH);
+ int maxrows = (size->metrics.height + 63) >> 6;
+- int bitmapsize = maxrows*stride;
+- uint8* bitmap = new uint8 [bitmapsize];
+- memset (bitmap, 0, bitmapsize);
++ int stride, bitmapsize;
++ uint8* bitmap;
++ if ((glyphW > 0) && (glyphH > 0))
++ {
++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph,
++ FT_RENDER_MODE_MONO),
++ "Could not render glyph %u for %s", ci, name))
++ {
++ return 0;
++ }
++ stride = (face->face->glyph->bitmap.width + 7) / 8;
++ bitmapsize = maxrows*stride;
++ }
++ else
++ bitmapsize = 0;
+
+ int descend = (-size->metrics.descender + 63) >> 6;;
+
+- int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
+-
+- int endrow = startrow + face->face->glyph->bitmap.rows;
++ if (bitmapsize > 0)
++ {
++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
++ int endrow = startrow + face->face->glyph->bitmap.rows;
+
+- if (startrow < 0) startrow = 0;
+- if (endrow > maxrows) endrow = maxrows;
++ if (startrow < 0) startrow = 0;
++ if (endrow > maxrows) endrow = maxrows;
+
+- int n, i;
+- for (n = 0, i = startrow; i < endrow; i++, n++)
+- memcpy (bitmap + stride*i,
+- face->face->glyph->bitmap.buffer +
+- n * face->face->glyph->bitmap.pitch,
+- MIN(stride, face->face->glyph->bitmap.pitch));
++ bitmap = new uint8 [bitmapsize];
++ memset (bitmap, 0, bitmapsize);
++ int n, i;
++ for (n = 0, i = startrow; i < endrow; i++, n++)
++ memcpy (bitmap + stride*i,
++ face->face->glyph->bitmap.buffer +
++ n * face->face->glyph->bitmap.pitch,
++ MIN(stride, face->face->glyph->bitmap.pitch));
++ metrics.width = face->face->glyph->bitmap.width;
++ metrics.left = face->face->glyph->bitmap_left;
++ }
++ else
++ {
++ bitmap = 0;
++ metrics.width = glyphW >> 6;
++ metrics.left = (FT_Int)( cbox.xMin >> 6 );
++ }
+
+- metrics.width = face->face->glyph->bitmap.width;
+ metrics.height = maxrows;
+- metrics.left = face->face->glyph->bitmap_left;
+ metrics.top = maxrows - descend;
+
+ return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize,
+@@ -427,42 +470,70 @@
+ if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0;
+
+ if (server->FreetypeError (FT_Load_Glyph (face->face, ci,
+- FT_LOAD_RENDER | FT_RENDER_MODE_NORMAL),
++ FT_LOAD_TARGET_NORMAL),
+ "Could not load glyph %u for %s", ci, name))
+ {
+ return 0;
+ }
+
+- if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
+- // That's not what we want.
+- return 0;
+-
+- int stride = face->face->glyph->bitmap.width;
++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width
++ * or height is 0 */
++ FT_Outline* outline = &face->face->glyph->outline;
++ FT_BBox cbox;
++ FT_Outline_Get_CBox( outline, &cbox );
++ FT_UInt glyphW, glyphH;
++ GridFitCbox (cbox, glyphW, glyphH);
+ int maxrows = (size->metrics.height + 63) >> 6;
+- int bitmapsize = maxrows * stride;
+- // Allocate at least 1 byte
+- uint8* bitmap = (bitmapsize > 0) ? new uint8 [bitmapsize] : new uint8[1];
+- memset (bitmap, 0, bitmapsize);
++ int stride, bitmapsize;
++ uint8* bitmap;
++ if ((glyphW > 0) && (glyphH > 0))
++ {
++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph,
++ FT_RENDER_MODE_NORMAL),
++ "Could not render glyph %u for %s", ci, name))
++ {
++ return 0;
++ }
++ if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
++ {
++ // That's not what we want.
++ return 0;
++ }
++ stride = face->face->glyph->bitmap.width;
++ bitmapsize = maxrows*stride;
++ metrics.width = face->face->glyph->bitmap.width;
++ metrics.left = face->face->glyph->bitmap_left;
++ }
++ else
++ {
++ bitmapsize = 0;
++ metrics.width = glyphW >> 6;
++ metrics.left = (FT_Int)( cbox.xMin >> 6 );
++ }
+
+ int descend = (-size->metrics.descender + 63) >> 6;
+
+- int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
+-
+- int endrow = startrow + face->face->glyph->bitmap.rows;
++ if (bitmapsize > 0)
++ {
++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
++ int endrow = startrow + face->face->glyph->bitmap.rows;
+
+- if (startrow < 0) startrow = 0;
+- if (endrow > maxrows) endrow = maxrows;
++ if (startrow < 0) startrow = 0;
++ if (endrow > maxrows) endrow = maxrows;
+
+- int n, i;
+- for (n = 0, i = startrow; i < endrow; i++, n++)
+- memcpy (bitmap + stride*i,
+- face->face->glyph->bitmap.buffer +
+- n * face->face->glyph->bitmap.pitch,
+- MIN(stride, face->face->glyph->bitmap.pitch));
++ bitmap = new uint8 [bitmapsize];
++ memset (bitmap, 0, bitmapsize);
++ int n, i;
++ for (n = 0, i = startrow; i < endrow; i++, n++)
++ memcpy (bitmap + stride*i,
++ face->face->glyph->bitmap.buffer +
++ n * face->face->glyph->bitmap.pitch,
++ MIN(stride, face->face->glyph->bitmap.pitch));
++ }
++ else
++ bitmap = 0;
+
+- metrics.width = face->face->glyph->bitmap.width;
+ metrics.height = maxrows;
+- metrics.left = face->face->glyph->bitmap_left;
+ metrics.top = maxrows - descend;
+
+ return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize,
diff --git a/graphics/crystalspace/files/patch-configure b/graphics/crystalspace/files/patch-configure
new file mode 100644
index 000000000000..26e7850c443d
--- /dev/null
+++ b/graphics/crystalspace/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig Tue Oct 10 17:24:44 2006
++++ configure Tue Oct 10 17:29:10 2006
+@@ -39605,7 +39605,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ft2build.h>
+- #include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
+@@ -39760,7 +39759,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ft2build.h>
+- #include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
diff --git a/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp b/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp
new file mode 100644
index 000000000000..ef9cf0e13fa5
--- /dev/null
+++ b/graphics/crystalspace/files/patch-plugins_font_server_freefnt2_freefnt2.cpp
@@ -0,0 +1,215 @@
+--- plugins/font/server/freefnt2/freefnt2.cpp.orig Tue Oct 10 17:29:34 2006
++++ plugins/font/server/freefnt2/freefnt2.cpp Tue Oct 10 17:36:40 2006
+@@ -29,10 +29,12 @@
+ #include "iutil/eventh.h"
+ #include "iutil/comp.h"
+ #include <ft2build.h>
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #include FT_MODULE_H
++#include FT_SIZES_H
++#include FT_OUTLINE_H
++
+ #include "freefnt2.h"
+
+ CS_IMPLEMENT_PLUGIN
+@@ -370,6 +372,20 @@
+ return true;
+ }
+
++static void GridFitCbox (FT_BBox& cbox, FT_UInt& glyphW, FT_UInt& glyphH)
++{
++ /* compute the control box, and grid fit it */
++#define FT_PIX_FLOOR( x ) ( (x) & ~63 )
++#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 )
++ cbox.xMin = FT_PIX_FLOOR( cbox.xMin );
++ cbox.yMin = FT_PIX_FLOOR( cbox.yMin );
++ cbox.xMax = FT_PIX_CEIL( cbox.xMax );
++ cbox.yMax = FT_PIX_CEIL( cbox.yMax );
++
++ glyphW = (FT_UInt)( ( cbox.xMax - cbox.xMin ) >> 6 );
++ glyphH = (FT_UInt)( ( cbox.yMax - cbox.yMin ) >> 6 );
++}
++
+ csPtr<iDataBuffer> csFreeType2Font::GetGlyphBitmap (utf32_char c,
+ csBitmapMetrics& metrics)
+ {
+@@ -379,37 +395,65 @@
+ if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0;
+
+ if (server->FreetypeError (FT_Load_Glyph (face->face, ci,
+- FT_LOAD_RENDER | FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO),
++ FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO),
+ "Could not load glyph %u for %s", ci, name))
+ {
+ return 0;
+ }
+
+- int stride = (face->face->glyph->bitmap.width + 7) / 8;
++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width
++ * or height is 0 */
++ FT_Outline* outline = &face->face->glyph->outline;
++ FT_BBox cbox;
++ FT_Outline_Get_CBox( outline, &cbox );
++ FT_UInt glyphW, glyphH;
++ GridFitCbox (cbox, glyphW, glyphH);
+ int maxrows = (size->metrics.height + 63) >> 6;
+- int bitmapsize = maxrows*stride;
+- uint8* bitmap = new uint8 [bitmapsize];
+- memset (bitmap, 0, bitmapsize);
++ int stride, bitmapsize;
++ uint8* bitmap;
++ if ((glyphW > 0) && (glyphH > 0))
++ {
++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph,
++ FT_RENDER_MODE_MONO),
++ "Could not render glyph %u for %s", ci, name))
++ {
++ return 0;
++ }
++ stride = (face->face->glyph->bitmap.width + 7) / 8;
++ bitmapsize = maxrows*stride;
++ }
++ else
++ bitmapsize = 0;
+
+ int descend = (-size->metrics.descender + 63) >> 6;;
+
+- int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
+-
+- int endrow = startrow + face->face->glyph->bitmap.rows;
++ if (bitmapsize > 0)
++ {
++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
++ int endrow = startrow + face->face->glyph->bitmap.rows;
+
+- if (startrow < 0) startrow = 0;
+- if (endrow > maxrows) endrow = maxrows;
++ if (startrow < 0) startrow = 0;
++ if (endrow > maxrows) endrow = maxrows;
+
+- int n, i;
+- for (n = 0, i = startrow; i < endrow; i++, n++)
+- memcpy (bitmap + stride*i,
+- face->face->glyph->bitmap.buffer +
+- n * face->face->glyph->bitmap.pitch,
+- MIN(stride, face->face->glyph->bitmap.pitch));
++ bitmap = new uint8 [bitmapsize];
++ memset (bitmap, 0, bitmapsize);
++ int n, i;
++ for (n = 0, i = startrow; i < endrow; i++, n++)
++ memcpy (bitmap + stride*i,
++ face->face->glyph->bitmap.buffer +
++ n * face->face->glyph->bitmap.pitch,
++ MIN(stride, face->face->glyph->bitmap.pitch));
++ metrics.width = face->face->glyph->bitmap.width;
++ metrics.left = face->face->glyph->bitmap_left;
++ }
++ else
++ {
++ bitmap = 0;
++ metrics.width = glyphW >> 6;
++ metrics.left = (FT_Int)( cbox.xMin >> 6 );
++ }
+
+- metrics.width = face->face->glyph->bitmap.width;
+ metrics.height = maxrows;
+- metrics.left = face->face->glyph->bitmap_left;
+ metrics.top = maxrows - descend;
+
+ return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize,
+@@ -425,42 +469,70 @@
+ if ((c != CS_FONT_DEFAULT_GLYPH) && (ci == 0)) return 0;
+
+ if (server->FreetypeError (FT_Load_Glyph (face->face, ci,
+- FT_LOAD_RENDER | FT_RENDER_MODE_NORMAL),
++ FT_LOAD_TARGET_NORMAL),
+ "Could not load glyph %u for %s", ci, name))
+ {
+ return 0;
+ }
+
+- if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
+- // That's not what we want.
+- return 0;
+-
+- int stride = face->face->glyph->bitmap.width;
++ /* Work around an FT2.2.1 issue where rendering of a glyph fails if the width
++ * or height is 0 */
++ FT_Outline* outline = &face->face->glyph->outline;
++ FT_BBox cbox;
++ FT_Outline_Get_CBox( outline, &cbox );
++ FT_UInt glyphW, glyphH;
++ GridFitCbox (cbox, glyphW, glyphH);
+ int maxrows = (size->metrics.height + 63) >> 6;
+- int bitmapsize = maxrows * stride;
+- // malloc at least 1 byte (malloc 0 bytes is undefined).
+- uint8* bitmap = (bitmapsize > 0) ? new uint8 [bitmapsize] : new uint8[1];
+- memset (bitmap, 0, bitmapsize);
++ int stride, bitmapsize;
++ uint8* bitmap;
++ if ((glyphW > 0) && (glyphH > 0))
++ {
++ if (server->FreetypeError (FT_Render_Glyph (face->face->glyph,
++ FT_RENDER_MODE_NORMAL),
++ "Could not render glyph %u for %s", ci, name))
++ {
++ return 0;
++ }
++ if (face->face->glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
++ {
++ // That's not what we want.
++ return 0;
++ }
++ stride = face->face->glyph->bitmap.width;
++ bitmapsize = maxrows*stride;
++ metrics.width = face->face->glyph->bitmap.width;
++ metrics.left = face->face->glyph->bitmap_left;
++ }
++ else
++ {
++ bitmapsize = 0;
++ metrics.width = glyphW >> 6;
++ metrics.left = (FT_Int)( cbox.xMin >> 6 );
++ }
+
+ int descend = (-size->metrics.descender + 63) >> 6;
+
+- int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
+-
+- int endrow = startrow + face->face->glyph->bitmap.rows;
++ if (bitmapsize > 0)
++ {
++ int startrow = maxrows - (descend + face->face->glyph->bitmap_top);
++ int endrow = startrow + face->face->glyph->bitmap.rows;
+
+- if (startrow < 0) startrow = 0;
+- if (endrow > maxrows) endrow = maxrows;
++ if (startrow < 0) startrow = 0;
++ if (endrow > maxrows) endrow = maxrows;
+
+- int n, i;
+- for (n = 0, i = startrow; i < endrow; i++, n++)
+- memcpy (bitmap + stride*i,
+- face->face->glyph->bitmap.buffer +
+- n * face->face->glyph->bitmap.pitch,
+- MIN(stride, face->face->glyph->bitmap.pitch));
++ bitmap = new uint8 [bitmapsize];
++ memset (bitmap, 0, bitmapsize);
++ int n, i;
++ for (n = 0, i = startrow; i < endrow; i++, n++)
++ memcpy (bitmap + stride*i,
++ face->face->glyph->bitmap.buffer +
++ n * face->face->glyph->bitmap.pitch,
++ MIN(stride, face->face->glyph->bitmap.pitch));
++ }
++ else
++ bitmap = 0;
+
+- metrics.width = face->face->glyph->bitmap.width;
+ metrics.height = maxrows;
+- metrics.left = face->face->glyph->bitmap_left;
+ metrics.top = maxrows - descend;
+
+ return (csPtr<iDataBuffer> (new csDataBuffer ((char*)bitmap, bitmapsize,
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index c573b15d4902..1c89297220f7 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= diacanvas2
-PORTVERSION= 0.14.2
-PORTREVISION= 1
+PORTVERSION= 0.14.4
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= diacanvas
@@ -32,11 +31,4 @@ post-patch:
@${REINPLACE_CMD} -e \
's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.html ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.png ${DOCSDIR}
-.endif
-
.include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index 440c317ee7c6..8e4314469d97 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,3 +1,3 @@
-MD5 (diacanvas2-0.14.2.tar.gz) = bd78fff277279abb003bb271baef3788
-SHA256 (diacanvas2-0.14.2.tar.gz) = 06eb7ad7936ca4ba483b2ae2f1f9cb90186529a76ca7020e3bc5d7c674fc9ce3
-SIZE (diacanvas2-0.14.2.tar.gz) = 725584
+MD5 (diacanvas2-0.14.4.tar.gz) = b3db6c961de3023489a4d2419dab89bd
+SHA256 (diacanvas2-0.14.4.tar.gz) = 90972c659015b4d9c45b31177e464df46494d293e83e9ea3657e8b8358edca1c
+SIZE (diacanvas2-0.14.4.tar.gz) = 718229
diff --git a/graphics/diacanvas2/files/patch-python_diacanvas.override b/graphics/diacanvas2/files/patch-python_diacanvas.override
new file mode 100644
index 000000000000..2b5457da9a72
--- /dev/null
+++ b/graphics/diacanvas2/files/patch-python_diacanvas.override
@@ -0,0 +1,58 @@
+--- python/diacanvas.override.orig Tue Oct 26 03:54:46 2004
++++ python/diacanvas.override Fri Oct 13 14:22:52 2006
+@@ -182,55 +182,6 @@ _wrap_dia_canvas_text_new (PyGObject *se
+ return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+ }
+ %%
+-override dia_canvas_item_new kwargs
+-static int
+-_wrap_dia_canvas_item_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ITEM);
+-}
+-%%
+-override dia_canvas_group_new kwargs
+-static int
+-_wrap_dia_canvas_group_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_GROUP);
+-}
+-%%
+-override dia_canvas_element_new kwargs
+-static int
+-_wrap_dia_canvas_element_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ELEMENT);
+-}
+-%%
+-override dia_canvas_line_new kwargs
+-static int
+-_wrap_dia_canvas_line_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_LINE);
+-}
+-%%
+-override dia_canvas_box_new kwargs
+-static int
+-_wrap_dia_canvas_box_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_BOX);
+-}
+-%%
+-override dia_canvas_image_new kwargs
+-static int
+-_wrap_dia_canvas_image_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_IMAGE);
+-}
+-%%
+-override dia_canvas_text_new kwargs
+-static int
+-_wrap_dia_canvas_text_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+- return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+-}
+-%%
+ override dia_canvas_get_pango_layout noargs
+ static PyObject *
+ _wrap_dia_canvas_get_pango_layout(PyGObject *self)
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
index d4c6a2e30ad6..028492d3a767 100644
--- a/graphics/diacanvas2/pkg-plist
+++ b/graphics/diacanvas2/pkg-plist
@@ -59,53 +59,11 @@ lib/libdiacanvas2.so.0
%%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.la
%%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
libdata/pkgconfig/diacanvas2.pc
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvas.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasBox.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasEditable.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasElement.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroupable.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasImage.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasItem.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasLine.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasText.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasView.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasViewItem.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaConstraint.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaHandle.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaHandleLayer.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaSolver.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaTool.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaUndoManager.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaVariable.html
-%%PORTDOCS%%%%DOCSDIR%%/arrowhead.png
-%%PORTDOCS%%%%DOCSDIR%%/chap-DiaCanvas.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Geometry.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Objects.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Python.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Solver.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Views.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas.png
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaEvent.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaExpression.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaGeometry.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-LibArt-rendering.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-X11-rendering.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaStrength.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaUndoManager.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-Exporting.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvasview.png
-%%PORTDOCS%%%%DOCSDIR%%/diasolver.png
-%%PORTDOCS%%%%DOCSDIR%%/element.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/line.png
share/locale/nl/LC_MESSAGES/diacanvas.mo
share/pygtk/2.0/defs/dia-boxed.defs
share/pygtk/2.0/defs/diacanvas.defs
share/pygtk/2.0/defs/diageometry.defs
share/pygtk/2.0/defs/diashape.defs
share/pygtk/2.0/defs/diaview.defs
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/diacanvas
@dirrm include/diacanvas
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 393ea75105f9..fe7573bb9c82 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -7,7 +7,7 @@
PORTNAME= djvulibre
PORTVERSION= 3.5.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= djvu
@@ -78,9 +78,9 @@ post-install:
.endfor
.endfor
.if !defined(WITHOUT_X11)
- @${MKDIR} ${X11BASE}/lib/browser_plugins
+ @${MKDIR} ${LOCALBASE}/lib/browser_plugins
${LN} -sf ${PREFIX}/lib/djvulibre/plugins/nsdejavu.so \
- ${X11BASE}/lib/browser_plugins/nsdejavu.so
+ ${LOCALBASE}/lib/browser_plugins/nsdejavu.so
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 3406dc25b2fa..1a4f931045c3 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -48,9 +48,9 @@ share/djvu/osi/zh/messages.xml
share/djvu/pubtext/DjVuMessages.dtd
share/djvu/pubtext/DjVuOCR.dtd
share/djvu/pubtext/DjVuXML-s.dtd
-%%X11%%@exec mkdir -p %%X11BASE%%/lib/browser_plugins
-%%X11%%@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%X11BASE%%/lib/browser_plugins/nsdejavu.so
-%%X11%%@unexec rm -f %%X11BASE%%/lib/browser_plugins/nsdejavu.so
+%%X11%%@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins
+%%X11%%@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
+%%X11%%@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so
@dirrm share/djvu/pubtext
@dirrm share/djvu/osi/zh
@dirrm share/djvu/osi/ja
@@ -66,4 +66,4 @@ share/djvu/pubtext/DjVuXML-s.dtd
@dirrmtry man/fr
@dirrmtry man/de/man1
@dirrmtry man/de
-@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
+@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index ae0a5e45d633..0ed08a440535 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fyre
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://samy.kerneled.org/ports/ \
http://www.felinemenace.org/~nemo/
@@ -15,14 +15,15 @@ MASTER_SITES= http://samy.kerneled.org/ports/ \
MAINTAINER= sbahra@kerneled.org
COMMENT= Chaos map rendering system with GTK+-2 interface
+BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
LIB_DEPENDS= Half:${PORTSDIR}/graphics/OpenEXR \
gnet-2.0:${PORTSDIR}/net/gnet2
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= libglade2
+USE_XLIB= yes
+USE_GNOME= libglade2 desktopfileutils
USE_GETOPT_LONG=yes
-
+INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -42,10 +43,8 @@ pre-everything::
.endif
.endif
-# check for update-desktop-database should go here
-PLIST_SUB+= WITH_FDO="@comment "
-
post-install:
+ @-update-desktop-database
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/graphics/fyre/pkg-plist b/graphics/fyre/pkg-plist
index 18a128d1c618..30f9fceb4f5f 100644
--- a/graphics/fyre/pkg-plist
+++ b/graphics/fyre/pkg-plist
@@ -1,17 +1,22 @@
bin/fyre
+share/applications/fyre.desktop
%%PORTDOCS%%%%DOCSDIR%%/README
-%%WITH_FDO%%share/applications/fyre.desktop
-share/fyre/animation-render.glade
-share/fyre/explorer.glade
-share/fyre/metadata-emblem.png
-share/fyre/about-box.fa
-share/fyre/fyre-48x48.png
-share/fyre/fyre-32x32.png
-share/fyre/fyre-16x16.png
-%%WITH_FDO%%share/pixmaps/fyre-48x48.png
+%%DATADIR%%/about-box.fa
+%%DATADIR%%/animation-render.glade
+%%DATADIR%%/explorer.glade
+%%DATADIR%%/fyre-16x16.png
+%%DATADIR%%/fyre-32x32.png
+%%DATADIR%%/fyre-48x48.png
+%%DATADIR%%/metadata-emblem.png
share/icons/hicolor/48x48/mimetypes/application-x-fyre-animation.png
-share/mime/packages/fyre.xml
share/mime/application/x-fyre-animation.xml
-@dirrm share/fyre
+share/mime/packages/fyre.xml
+share/pixmaps/fyre-48x48.png
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%WITH_FDO%%@dirrmtry share/applications
+@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index b398a0145eb4..c5f7018aa600 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/gdk-pixbuf/Makefile,v 1.2 2006/09/10 00:51:10 mezz Exp $
PORTNAME?= gdk-pixbuf
PORTVERSION= 0.22.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22
@@ -23,9 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME+= gnomehack gtk12
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/graphics/gdk-pixbuf/files/patch-ad b/graphics/gdk-pixbuf/files/patch-ad
index 06e8ed03edaf..37e0eca6216e 100644
--- a/graphics/gdk-pixbuf/files/patch-ad
+++ b/graphics/gdk-pixbuf/files/patch-ad
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- gdk-pixbuf-config.in.orig Tue Oct 23 20:44:44 2001
+++ gdk-pixbuf-config.in Fri Oct 26 11:06:32 2001
@@ -40,11 +40,11 @@
diff --git a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
index 84b8fd88b41e..ea3dd6a8158a 100644
--- a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
+++ b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1
+++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21
@@ -19,6 +19,8 @@
diff --git a/graphics/gdk-pixbuf/files/patch-ltmain.sh b/graphics/gdk-pixbuf/files/patch-ltmain.sh
index 91c341790451..d35b31cea82a 100644
--- a/graphics/gdk-pixbuf/files/patch-ltmain.sh
+++ b/graphics/gdk-pixbuf/files/patch-ltmain.sh
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- ltmain.sh.orig Sun Jan 20 16:11:07 2002
+++ ltmain.sh Tue Jan 22 13:34:20 2002
@@ -1060,6 +1060,7 @@
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 3aa52f09351a..aee9765c2b33 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimageview
PORTVERSION= 0.2.25
-PORTREVISION= 4
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmmviewer
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= gtkmmviewer
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Yet another GTK+ based image viewer
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gdkpixbuf gnomehier
USE_GETTEXT= yes
diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist
index 16359d8c422f..4e5cc0596eba 100644
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@@ -121,6 +121,7 @@ share/gnome/apps/Graphics/gimageview.desktop
share/locale/fr/LC_MESSAGES/gimageview.mo
share/locale/ja/LC_MESSAGES/gimageview.mo
share/pixmaps/gimv.png
+@dirrmtry share/pixmaps
@dirrm lib/gimageview/archiver
@dirrm lib/gimageview/image_loader
@dirrm lib/gimageview/image_saver
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 69f6414e7c5e..87d72307e68c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,10 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $
PORTNAME= gimp
PORTVERSION= 2.2.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -34,7 +35,6 @@ CONFLICTS= gimp-1.* gimpshop-[0-9]*
SHLIBVER?= 200
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+= --enable-mp
.if ${HAVE_GNOME:Mgnomepanel}!=""
USE_GNOME+= gnomepanel desktopfileutils
-CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome
+CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome
CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS}
PKGNAMESUFFIX:= -gnome
PLIST_SUB+= GNOMEPANEL:=""
diff --git a/graphics/gimp-app/files/patch-gimptool-2.0.in b/graphics/gimp-app/files/patch-gimptool-2.0.in
index e4ed3c228dda..3ee0f17b8be2 100644
--- a/graphics/gimp-app/files/patch-gimptool-2.0.in
+++ b/graphics/gimp-app/files/patch-gimptool-2.0.in
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/graphics/gimp-app/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $
-
--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
+++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 6998b0799940..6946abf9f87a 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1937,3 +1937,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrm etc/gimp/2.2
@dirrm etc/gimp
%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/gimp-greycstoration/Makefile b/graphics/gimp-greycstoration/Makefile
index f69c40f93675..dddfdd0782cd 100644
--- a/graphics/gimp-greycstoration/Makefile
+++ b/graphics/gimp-greycstoration/Makefile
@@ -7,6 +7,7 @@
PORTNAME= greycstoration
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.haypocalc.com/perso/prog/greycstoration/ \
http://bio3k.softboard.ru/uploads/arch/
@@ -20,7 +21,6 @@ BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp \
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk20
# Redifine this if you need
diff --git a/graphics/gimp-help/Makefile b/graphics/gimp-help/Makefile
index ba71db5cf195..ba303a4c7b0a 100644
--- a/graphics/gimp-help/Makefile
+++ b/graphics/gimp-help/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/gimp-help/Makefile,v 1.1 2006/07/18 13:04:28 ahze Exp $
PORTNAME= gimp-help
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
@@ -25,7 +25,6 @@ COMMENT= GIMP user's manual
BUILD_DEPENDS= gimp:${PORTSDIR}/graphics/gimp
RUN_DEPENDS= gimp:${PORTSDIR}/graphics/gimp
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/gimp-pmosaic/Makefile b/graphics/gimp-pmosaic/Makefile
index 531a2fd3c5e3..ff1a2711cb38 100644
--- a/graphics/gimp-pmosaic/Makefile
+++ b/graphics/gimp-pmosaic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pmosaic
PORTVERSION= 1.08
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.kirchgessner.net/pub/gimp-1.2/
PKGNAMEPREFIX= gimp-
@@ -20,7 +20,6 @@ BUILD_DEPENDS= gimp-config:${PORTSDIR}/graphics/gimp1
RUN_DEPENDS= gimp:${PORTSDIR}/graphics/gimp1
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
do-build:
cd ${WRKSRC}; ${CC} ${CFLAGS} -o pmosaic `gimp-config --cflags` \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 69f6414e7c5e..87d72307e68c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,10 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $
PORTNAME= gimp
PORTVERSION= 2.2.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -34,7 +35,6 @@ CONFLICTS= gimp-1.* gimpshop-[0-9]*
SHLIBVER?= 200
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+= --enable-mp
.if ${HAVE_GNOME:Mgnomepanel}!=""
USE_GNOME+= gnomepanel desktopfileutils
-CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome
+CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome
CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS}
PKGNAMESUFFIX:= -gnome
PLIST_SUB+= GNOMEPANEL:=""
diff --git a/graphics/gimp/files/patch-gimptool-2.0.in b/graphics/gimp/files/patch-gimptool-2.0.in
index 6f254900f5ca..3ee0f17b8be2 100644
--- a/graphics/gimp/files/patch-gimptool-2.0.in
+++ b/graphics/gimp/files/patch-gimptool-2.0.in
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/graphics/gimp/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $
-
--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
+++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 6998b0799940..6946abf9f87a 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1937,3 +1937,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrm etc/gimp/2.2
@dirrm etc/gimp
%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 38b7e29a63e9..a3e163ce9f56 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -36,13 +36,13 @@ CONFLICTS= gimp-2.* gimp-gnome-2.* gimpshop-[0-9]*
SHLIBVER?= 2
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_GETTEXT= yes
GNU_CONFIGURE== yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${MPEG_WRKSRC}" \
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 3993fbf503ef..e8b47efe555d 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1561,3 +1561,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/tips
@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 2dd1d53b2cf3..24ecd9a2d9f4 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimpshop
PORTVERSION= 2.2.11
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= http://www.plasticbugs.com/blogimg/ \
http://freebsd.powered.net/distfiles/
@@ -27,7 +28,7 @@ CONFLICTS= gimp-1.* gimp-2.* gimp-gnome-2.*
SHLIBVER?= 200
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -87,7 +88,7 @@ CONFIGURE_ARGS+= --enable-mp
.if ${HAVE_GNOME:Mgnomepanel}!=""
USE_GNOME+= gnomepanel desktopfileutils
-CONFIGURE_ARGS+= --with-desktop-dir=${X11BASE}/share/gnome
+CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome
CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS}
PLIST_SUB+= GNOMEPANEL:=""
GNOME_ENABLED= yes
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index be3ca2cabacf..98bea6e673d8 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1938,3 +1938,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrmtry etc/gimp/2.2
@dirrmtry etc/gimp
%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index eaa66f056cb0..a4872ecfb3b8 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqview
PORTVERSION= 2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= Another gtk2-based graphic file viewer
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_X_PREFIX= yes
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gqview-devel/pkg-plist b/graphics/gqview-devel/pkg-plist
index 1bfe4eae9a72..4d638a3dfdb7 100644
--- a/graphics/gqview-devel/pkg-plist
+++ b/graphics/gqview-devel/pkg-plist
@@ -78,3 +78,21 @@ share/gnome/apps/Graphics/gqview.desktop
share/gnome/pixmaps/gqview.png
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index a4612441cd23..0ba57dac0d08 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqview
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= Another gtk2-based graphic file viewer
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_X_PREFIX= yes
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 213c2ff881f7..4267a45ca313 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gsculpt
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -28,8 +28,9 @@ post-patch:
@${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
s,gtk-config,${GTK_CONFIG},g ; \
s,/usr/include/glib.h,${LOCALBASE}/include/glib12/glib.h,g ; \
- s,/usr/include/gtk/,${X11BASE}/include/gtk12/gtk/,g ; \
- s,/usr/include/gdk/,${X11BASE}/include/gtk12/gdk/,g" ${WRKSRC}/Makefile
+ s,/usr/include/gtk/,${LOCALBASE}/include/gtk12/gtk/,g ; \
+ s,/usr/include/gdk/,${LOCALBASE}/include/gtk12/gdk/,g" \
+ ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/gsculpt ${PREFIX}/bin
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 8bd582e84d12..7558613d4c47 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkam
PORTVERSION= 0.1.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gphoto
@@ -18,7 +18,7 @@ COMMENT= Download and view files from various digital cameras
LIB_DEPENDS= exif-gtk.5:${PORTSDIR}/graphics/libexif-gtk \
gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-USE_X_PREFIX= yes
+USE_XLIB= yes
WANT_GNOME= yes
USE_GNOME= gnomehack gnomehier gnometarget gtk20
GNU_CONFIGURE= yes
@@ -29,7 +29,7 @@ MAN1= gtkam.1
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
+.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
WITH_GIMP= yes
.endif
diff --git a/graphics/gtkam/pkg-plist b/graphics/gtkam/pkg-plist
index 65e033494582..f870a62bd320 100644
--- a/graphics/gtkam/pkg-plist
+++ b/graphics/gtkam/pkg-plist
@@ -63,3 +63,11 @@ share/locale/uk/LC_MESSAGES/gtkam.mo
%%GNOME:%%@dirrm share/gnome/help/gtkam/C
%%GNOME:%%@dirrm share/gnome/help/gtkam
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile
index 0537747507f3..e2c261c0420e 100644
--- a/graphics/imagesort/Makefile
+++ b/graphics/imagesort/Makefile
@@ -3,11 +3,11 @@
# Whom: Mark Pulford <mark@kyne.com.au>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/imagesort/Makefile,v 1.1 2006/10/04 13:18:57 ahze Exp $
PORTNAME= imagesort
PORTVERSION= 2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/viewers/X
@@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/X
MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible X utility for managing many image files
-USE_X_PREFIX= yes
USE_GNOME= imlib
+CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index ed6bdb66b618..3275aa8a1334 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/imlib/Makefile,v 1.2 2006/09/10 00:51:11 mezz Exp $
PORTNAME= imlib
PORTVERSION= 1.9.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/imlib/1.9
@@ -22,10 +22,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk12 gnomehack
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile
index 1a03dd1690b9..4fc2a3fdf358 100644
--- a/graphics/isreal/Makefile
+++ b/graphics/isreal/Makefile
@@ -3,11 +3,11 @@
# Whom: Mark Pulford <mark@kyne.com.au>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/isreal/Makefile,v 1.1 2006/10/04 13:20:38 ahze Exp $
PORTNAME= isreal
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= markp
@@ -19,6 +19,7 @@ COMMENT= An image classification utility
PLIST_FILES= bin/isreal
USE_XLIB= yes
USE_GNOME= imlib
+CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/isreal ${PREFIX}/bin
diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
index 6355d3ded45e..8bb9c5d417b0 100644
--- a/graphics/jumpgis/Makefile
+++ b/graphics/jumpgis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jumpgis
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics java
MASTER_SITES= http://www.jump-project.org/downloads/jump/:main \
http://people.tecnik93.com/~sam/ports/:extra
@@ -63,8 +63,8 @@ do-install:
.if ${HAVE_GNOME:Mgnomelibs}!=""
@${ECHO_MSG} "---> Installing GNOME application links"
- ${INSTALL_DATA} ${DISTDIR}/jump.desktop ${X11BASE}/share/gnome/applications/
- ${INSTALL_DATA} ${DISTDIR}/jump.png ${X11BASE}/share/gnome/pixmaps/
+ ${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/gnome/applications/
+ ${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/gnome/pixmaps/
.endif
.include <bsd.port.post.mk>
diff --git a/graphics/jumpgis/pkg-plist b/graphics/jumpgis/pkg-plist
index 42f348f1a5df..d753d8493ea9 100644
--- a/graphics/jumpgis/pkg-plist
+++ b/graphics/jumpgis/pkg-plist
@@ -7,10 +7,9 @@ jumpgis/lib/jump-1.1.2.jar
jumpgis/lib/junit.jar
jumpgis/lib/xercesImpl.jar
jumpgis/lib/xml-apis.jar
+%%GNOMELINKS%%share/gnome/applications/jump.desktop
+%%GNOMELINKS%%share/gnome/pixmaps/jump.png
@exec mkdir -p %D/jumpgis/lib/ext
@dirrm jumpgis/lib/ext
@dirrm jumpgis/lib
@dirrm jumpgis
-@cwd %%X11BASE%%
-%%GNOMELINKS%%share/gnome/applications/jump.desktop
-%%GNOMELINKS%%share/gnome/pixmaps/jump.png
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index c1e77bf3d8dc..8eb4561b6f89 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.12 2006/04/13 07:52:35 bland Exp $
+# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.14 2006/08/21 15:32:21 ahze Exp $
#
PORTNAME= libgnomecanvasmm
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,12 +22,12 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libgnomecanvasmm26
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack libgnomecanvas
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
index f7e182efc6a4..87806eef911c 100644
--- a/graphics/libgnomecanvasmm26/distinfo
+++ b/graphics/libgnomecanvasmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = a4e5bf13a31e38b4f30b99153bc10aca
-SHA256 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 93c22a04032163d5efe2d95b1b5e7b055221ad0246c64d0dd9584338f93cb4f8
-SIZE (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 327771
+MD5 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = fe54d7f437d03044f863672d6dd38e9f
+SHA256 (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 5f3297cb1b047bc5a02044f54847fbcd7d0044461fc5f28ee351d2d4f6b91ed7
+SIZE (gnome2/libgnomecanvasmm-2.16.0.tar.bz2) = 333980
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index ac126f8a3b22..e5b79be29127 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/librsvg/Makefile,v 1.2 2006/09/10 00:51:11 mezz Exp $
PORTNAME= librsvg
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/librsvg/1.0
@@ -20,9 +20,9 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomelibs gdkpixbuf
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/librsvg/files/patch-Makefile.in b/graphics/librsvg/files/patch-Makefile.in
index b11b408da623..076b991ecdcc 100644
--- a/graphics/librsvg/files/patch-Makefile.in
+++ b/graphics/librsvg/files/patch-Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- Makefile.in.orig Fri Jul 27 16:29:51 2001
+++ Makefile.in Fri Jul 27 16:30:27 2001
@@ -110,7 +110,7 @@
diff --git a/graphics/librsvg/files/patch-librsvg-config.in b/graphics/librsvg/files/patch-librsvg-config.in
index 84d673894427..2c4c58a1984e 100644
--- a/graphics/librsvg/files/patch-librsvg-config.in
+++ b/graphics/librsvg/files/patch-librsvg-config.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- librsvg-config.in 2001/10/05 14:55:24 1.1
+++ librsvg-config.in 2001/10/05 15:05:57
@@ -39,9 +39,7 @@
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index dbc72cab66f7..b00edf37c3c2 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.2 2005/09/05 00:16:51 ahze Exp $
+# $MCom: ports/graphics/p5-Cairo/Makefile,v 1.5 2006/09/06 22:53:39 ahze Exp $
#
PORTNAME= Cairo
-PORTVERSION= 0.03
+PORTVERSION= 1.00
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk2-perl
diff --git a/graphics/p5-Cairo/distinfo b/graphics/p5-Cairo/distinfo
index db27e973845b..c98d9218e375 100644
--- a/graphics/p5-Cairo/distinfo
+++ b/graphics/p5-Cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (Cairo-0.03.tar.gz) = 6ad0ab39eb8f56272373a9ea4515f37a
-SHA256 (Cairo-0.03.tar.gz) = 59d0141c8146f864f421f07b3bf2193c0ded40b4dc67f28feb5fa18ca265dd8a
-SIZE (Cairo-0.03.tar.gz) = 31402
+MD5 (Cairo-1.00.tar.gz) = 60ec93dbe00c9dcefcfb22ca913c237a
+SHA256 (Cairo-1.00.tar.gz) = 87afd67c6158257709783890bed75943f628ba2dc213803f9b9b024d348566b1
+SIZE (Cairo-1.00.tar.gz) = 42587
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 83d8863d39ac..a8d809810ca8 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/passepartout/Makefile,v 1.4 2006/09/30 15:31:05 ahze Exp $
PORTNAME= passepartout
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 10
CATEGORIES= graphics gnome
MASTER_SITES= http://www.stacken.kth.se/project/pptout/files/
@@ -20,7 +20,6 @@ RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \
@@ -31,15 +30,15 @@ MAN1= xml2ps.1 passepartout.1x
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_cxx
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_cxx
.endif
.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM= yes
+WITH_FAM= yes
.endif
.if defined(WITH_FAM)
-LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
+LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
.endif
.include <bsd.port.post.mk>
diff --git a/graphics/passepartout/pkg-plist b/graphics/passepartout/pkg-plist
index 76d035248b41..0abb21e7f120 100644
--- a/graphics/passepartout/pkg-plist
+++ b/graphics/passepartout/pkg-plist
@@ -28,4 +28,3 @@ share/xml/passepartout/xml2ps.dtd
@dirrm %%DOCSDIR%%/examples
@dirrm %%DOCSDIR%%
@dirrm share/xml/passepartout
-@dirrmtry share/xml
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index 9df35ba2fc12..caf118652088 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pixelize
PORTVERSION= 0.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://lashwhip.com/pub/ \
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Use many scaled down images to try to duplicate another image
USE_GNOME= gtk12 imlib
-IMLIB_CONFIG= ${X11BASE}/bin/imlib-config
+IMLIB_CONFIG= ${LOCALBASE}/bin/imlib-config
post-patch:
@${REINPLACE_CMD} -e "s|^CC|#CC|" -e "s|CFLAGS = -g|CFLAGS+= |" \
diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile
index e4b1a83bcee7..e213ab9771ca 100644
--- a/graphics/ruby-cairo/Makefile
+++ b/graphics/ruby-cairo/Makefile
@@ -3,11 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.2 2005/10/17 07:05:40 mezz Exp $
+# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.4 2006/09/09 20:07:18 mezz Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.0.0
+PORTVERSION= 1.2.0
CATEGORIES= graphics ruby
MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-cairo/distinfo b/graphics/ruby-cairo/distinfo
index 71734529b637..130c5386bf22 100644
--- a/graphics/ruby-cairo/distinfo
+++ b/graphics/ruby-cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (rcairo-1.0.0.tar.gz) = e6c6442b24155146ba986dc7774e45e3
-SHA256 (rcairo-1.0.0.tar.gz) = 2662611b9fe8e7c26e8f3c55e1de85ce9fe6f94209ed3e49f4e78bd371a9b5c3
-SIZE (rcairo-1.0.0.tar.gz) = 42088
+MD5 (rcairo-1.2.0.tar.gz) = d5b4da3a6aafd28cf2a0dcbdafb82b04
+SHA256 (rcairo-1.2.0.tar.gz) = f21a21cb30a07693980d5d40b9fc03554d15709a141751efe8d2f73636544b4d
+SIZE (rcairo-1.2.0.tar.gz) = 47529
diff --git a/graphics/ruby-cairo/pkg-plist b/graphics/ruby-cairo/pkg-plist
index 142bf2ce1e9f..2916e53a041a 100644
--- a/graphics/ruby-cairo/pkg-plist
+++ b/graphics/ruby-cairo/pkg-plist
@@ -1,11 +1,11 @@
%%RUBY_SITEARCHLIBDIR%%/cairo.so
%%RUBY_SITEARCHLIBDIR%%/rb_cairo.h
%%RUBY_SITELIBDIR%%/cairo.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pdf.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pdf2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac2.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/png.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ps.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ps2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scalable.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text2.rb
%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 91acaa6da329..c355211a1e2d 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_ttf
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/
DISTNAME= SDL_ttf-${PORTVERSION}
diff --git a/graphics/sdl_ttf/files/patch-SDL_ttf.c b/graphics/sdl_ttf/files/patch-SDL_ttf.c
new file mode 100644
index 000000000000..dbfadc22790f
--- /dev/null
+++ b/graphics/sdl_ttf/files/patch-SDL_ttf.c
@@ -0,0 +1,19 @@
+--- SDL_ttf.c.orig Mon May 1 05:26:17 2006
++++ SDL_ttf.c Sun Sep 24 15:46:44 2006
+@@ -48,7 +48,6 @@
+ #include <freetype/ftoutln.h>
+ #include <freetype/ttnameid.h>
+ */
+-#include <freetype/internal/ftobjs.h>
+
+ #ifndef FT_OPEN_STREAM
+ #define FT_OPEN_STREAM ft_open_stream
+@@ -278,7 +277,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 294ce956f0c9..21f3c925d153 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,7 +8,7 @@
PORTNAME= swfdec
PORTVERSION= 0.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.schleef.org/swfdec/download/
@@ -18,7 +18,7 @@ COMMENT= Flash Rendering Library
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
oil-0.3.1:${PORTSDIR}/devel/liboil
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_SDL= sdl
USE_GNOME= gnomehack gtk20 libartlgpl2
USE_GSTREAMER80= gconf
@@ -31,7 +31,7 @@ INSTALLS_SHLIB= yes
PLIST_SUB= VERSION=${PORTVERSION:R}
-.if exists(${X11BASE}/bin/gimp-2.2)
+.if exists(${LOCALBASE}/bin/gimp-2.2)
WITH_GIMP=yes
.endif
diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist
index aba7ab94647b..d563e90d6881 100644
--- a/graphics/swfdec/pkg-plist
+++ b/graphics/swfdec/pkg-plist
@@ -22,9 +22,9 @@ include/swfdec-%%VERSION%%/swfdec_text.h
include/swfdec-%%VERSION%%/swfdec_transform.h
include/swfdec-%%VERSION%%/swfdec_types.h
include/swfdec-%%VERSION%%/tags.h
-lib/gtk-2.0/2.4.0/loaders/swf_loader.a
-lib/gtk-2.0/2.4.0/loaders/swf_loader.la
-lib/gtk-2.0/2.4.0/loaders/swf_loader.so
+lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.a
+lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.la
+lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.so
lib/libswfdec-%%VERSION%%.a
lib/libswfdec-%%VERSION%%.la
lib/libswfdec-%%VERSION%%.so
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index f03c13d3cdbc..339973e30859 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ufraw
PORTVERSION= 0.9.1
+PORTREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= SF
@@ -19,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack intltool intlhack gtk20 libartlgpl2
WANT_GNOME= yes
diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist
index 42c0d666fa69..2314a9aeb331 100644
--- a/graphics/ufraw/pkg-plist
+++ b/graphics/ufraw/pkg-plist
@@ -3,4 +3,5 @@ bin/ufraw-batch
libexec/gimp/2.2/plug-ins/ufraw-gimp
share/applications/ufraw.desktop
share/pixmaps/ufraw.png
+@dirrmtry share/pixmaps
@dirrmtry share/applications
diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index 2a3d43d25507..f7ed8594c9df 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vertex
PORTVERSION= 0.1.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://wolfpack.twu.net/users/wolfpack/
@@ -17,7 +17,7 @@ COMMENT= A 3D modeller for generating efficient game models
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GL= yes
USE_GNOME= imlib
USE_GMAKE= yes
diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini
index 7428f4c3062b..647c154d41dd 100644
--- a/graphics/vertex/files/patch-platforms.ini
+++ b/graphics/vertex/files/patch-platforms.ini
@@ -1,6 +1,6 @@
---- vertex/platforms.ini.orig Wed Oct 1 06:44:17 2003
-+++ vertex/platforms.ini Tue Oct 21 22:05:42 2003
-@@ -22,23 +22,23 @@
+--- vertex/platforms.ini.orig Mon Nov 1 00:35:03 2004
++++ vertex/platforms.ini Thu Oct 5 17:14:40 2006
+@@ -22,23 +22,26 @@
Platform = UNIX
Description = For most any UNIX system
@@ -17,35 +17,46 @@
+ CPP = %%CXX%%
PlatformSearchPathInclude = /usr/include/
- PlatformSearchPathInclude = /usr/X11R6/include/
++ PlatformSearchPathInclude = %%LOCALBASE%%/include/
+ PlatformSearchPathInclude = %%X11BASE%%/include/
PlatformSearchPathLib = /lib/
PlatformSearchPathLib = /usr/lib/
- PlatformSearchPathLib = /usr/X11R6/lib/
++ PlatformSearchPathLib = %%LOCALBASE%%/lib/
+ PlatformSearchPathLib = %%X11BASE%%/lib/
PlatformSearchPathEtc = /etc/
PlatformSearchPathEtc = /usr/etc/
PlatformSearchPathBin = /bin/
PlatformSearchPathBin = /usr/bin/
- PlatformSearchPathBin = /usr/X11R6/bin/
++ PlatformSearchPathBin = %%LOCALBASE%%/bin/
+ PlatformSearchPathBin = %%X11BASE%%/bin/
PlatformSearchPathData = /usr/share/icons/
PlatformFeature = debug
Description = Just adds -g to the CFLAGS for debugging
-@@ -51,7 +51,7 @@
+@@ -51,7 +54,7 @@
# Newer versions of Imlib only need to link to -lImlib
# FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz
FeatureLIBS = -lImlib
- FeatureLIB_DIR = -L/usr/X11R6/lib/
-+ FeatureLIB_DIR = -L%%X11BASE%%/lib/
++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/
FeatureDepend = Imlib-lib
DependType = Library
MustExist = Yes
-@@ -83,11 +83,11 @@
+@@ -66,6 +69,7 @@
+ Description = An implementation of OpenGL (ie Mesa3D)
+ MustExist = Yes
+ FeatureLIBS = -lGL -lGLU
++ FeatureLIB_DIR = -L%%X11BASE%%/lib/
+ FeatureDepend = gl-lib
+ DependType = Library
+ MustExist = Yes
+@@ -83,11 +87,11 @@
MustExist = Yes
FeatureCFLAGS = `gtk-config --cflags`
FeatureLIBS = `gtk-config --libs`
- FeatureLIB_DIR = -L/usr/X11R6/lib/
-+ FeatureLIB_DIR = -L%%X11BASE%%/lib/
++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/
FeatureDepend = gtk-lib
DependType = Library
MustExist = Yes
@@ -54,12 +65,12 @@
DependGrepString = gtk_init
FeatureDepend = gtk-devel
DependType = Program
-@@ -98,7 +98,7 @@
+@@ -98,7 +102,7 @@
MustExist = Yes
FeatureCFLAGS =
FeatureLIBS = -lgtkgl
- FeatureLIB_DIR = -L/usr/X11R6/lib/
-+ FeatureLIB_DIR = -L%%X11BASE%%/lib/
++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/
FeatureDepend = gtkgl-lib
DependType = Library
MustExist = Yes
diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c
index 11789bbc9265..63dc6bb58d03 100644
--- a/graphics/vertex/files/patch-vmahelp.c
+++ b/graphics/vertex/files/patch-vmahelp.c
@@ -10,7 +10,7 @@ $FreeBSD$
- "/usr/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
- "/usr/local/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
- "/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ "%%X11BASE%%/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%LOCALBASE%%/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
\
- "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
- "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 572fa3d88ab2..0eb3c86e55c0 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/graphics/wxsvg/Makefile,v 1.1 2006/09/22 01:48:33 ahze Exp $
PORTNAME= wxsvg
DISTVERSION= 1.0b6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT= C++ library to create, manipulate, and render SVG files
BUILD_DEPENDS= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
RUN_DEPENDS= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
WX_CONFIG= wxgtk2-2.6-config
USE_AUTOTOOLS= libtool:15
USE_GNOME= libartlgpl2
diff --git a/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp
new file mode 100644
index 000000000000..f0182faeaa77
--- /dev/null
+++ b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp
@@ -0,0 +1,49 @@
+--- src/freetype/SVGCanvasTextFreetype.cpp.orig Thu Sep 21 21:42:35 2006
++++ src/freetype/SVGCanvasTextFreetype.cpp Thu Sep 21 21:45:02 2006
+@@ -165,7 +165,7 @@
+ }
+ }
+
+-gint moveto(FT_Vector* to, gpointer data)
++gint moveto(const FT_Vector* to, gpointer data)
+ {
+ wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+
+@@ -181,7 +181,7 @@
+ return 0;
+ }
+
+-static gint lineto (FT_Vector* to, gpointer data)
++static gint lineto (const FT_Vector* to, gpointer data)
+ {
+ wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+ if (!canvasText->m_endpath)
+@@ -194,7 +194,7 @@
+ return 0;
+ }
+
+-static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data)
++static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data)
+ {
+ wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+ if (!canvasText->m_endpath)
+@@ -209,8 +209,8 @@
+ return 0;
+ }
+
+-static gint cubicto(FT_Vector* ftcontrol1, FT_Vector* ftcontrol2,
+- FT_Vector* to, gpointer data)
++static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2,
++ const FT_Vector* to, gpointer data)
+ {
+ wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+ if (!canvasText->m_endpath)
+@@ -227,7 +227,7 @@
+ return 0;
+ }
+
+-static const FT_Outline_Funcs outline_funcs =
++static FT_Outline_Funcs outline_funcs =
+ {
+ moveto, lineto, conicto, cubicto, 0, 0
+ };
diff --git a/graphics/xpdf/files/patch-splash_SplashFTFont.cc b/graphics/xpdf/files/patch-splash_SplashFTFont.cc
new file mode 100644
index 000000000000..856e3376eb3b
--- /dev/null
+++ b/graphics/xpdf/files/patch-splash_SplashFTFont.cc
@@ -0,0 +1,77 @@
+--- splash/SplashFTFont.cc.orig 2005-12-23 16:57:18.076514614 +0100
++++ splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +0100
+@@ -14,7 +14,8 @@
+
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#include FT_SIZES_H // needed for FT_New_Size decl
++#include FT_GLYPH_H
+ #include "gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"
+@@ -25,11 +26,12 @@
+
+ //------------------------------------------------------------------------
+
+-static int glyphPathMoveTo(FT_Vector *pt, void *path);
+-static int glyphPathLineTo(FT_Vector *pt, void *path);
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+- FT_Vector *pt, void *path);
++static int glyphPathMoveTo( const FT_Vector *pt, void *path);
++static int glyphPathLineTo( const FT_Vector *pt, void *path);
++static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
++ void* path );
++static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++ const FT_Vector *pt, void *path);
+
+ //------------------------------------------------------------------------
+ // SplashFTFont
+@@ -210,7 +212,7 @@
+ };
+
+ SplashPath *SplashFTFont::getGlyphPath(int c) {
+- static FT_Outline_Funcs outlineFuncs = {
++ static const FT_Outline_Funcs outlineFuncs = {
+ &glyphPathMoveTo,
+ &glyphPathLineTo,
+ &glyphPathConicTo,
+@@ -249,7 +251,7 @@
+ return path.path;
+ }
+
+-static int glyphPathMoveTo(FT_Vector *pt, void *path) {
++static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ if (p->needClose) {
+@@ -260,7 +262,7 @@
+ return 0;
+ }
+
+-static int glyphPathLineTo(FT_Vector *pt, void *path) {
++static int glyphPathLineTo(const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
+@@ -268,7 +270,7 @@
+ return 0;
+ }
+
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
++static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+ SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
+
+@@ -306,8 +308,8 @@
+ return 0;
+ }
+
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+- FT_Vector *pt, void *path) {
++static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++ const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,
diff --git a/irc/gaim-irchelper/Makefile b/irc/gaim-irchelper/Makefile
index 23ed04f0c568..2180f2df535a 100644
--- a/irc/gaim-irchelper/Makefile
+++ b/irc/gaim-irchelper/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/irc/gaim-irchelper/Makefile,v 1.1 2006/08/01 04:37:31 ahze Exp $
PORTNAME= gaim-irchelper
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= irc net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +20,6 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
PLIST_FILES= lib/gaim/irchelper.so
.include <bsd.port.mk>
diff --git a/irc/gdesklets-irc/Makefile b/irc/gdesklets-irc/Makefile
index 61c0fccc5a23..049703f80844 100644
--- a/irc/gdesklets-irc/Makefile
+++ b/irc/gdesklets-irc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= irc
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc gnome deskutils
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -19,7 +19,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \
${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= irc
DATADIR= ${PREFIX}/share/gnome/gdesklets
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 3faf7f8949df..dc060b4a5d08 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -3,10 +3,11 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/irc/xchat-fish/Makefile,v 1.1 2006/10/04 22:30:07 ahze Exp $
PORTNAME= fish
DISTVERSION= 0.97a
+PORTREVISION= 1
CATEGORIES= irc security
MASTER_SITES= http://fish.sekure.us/xchat/
PKGNAMEPREFIX= xchat-
@@ -18,9 +19,8 @@ COMMENT= An encryption plugin for XChat
BUILD_DEPENDS= ${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl
RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat
-USE_X_PREFIX= yes
USE_ZIP= yes
-NO_WRKSUBDIR= ys
+NO_WRKSUBDIR= yes
#
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 43c403c842bf..bc966333ce5a 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xchat
PORTVERSION= 0.13
+PORTREVISION= 2
CATEGORIES= irc gnome ipv6
MASTER_SITES= http://releases.navi.cx/xchat-gnome/
PKGNAMESUFFIX= -gnome
@@ -18,11 +19,11 @@ COMMENT= An IRC client for GNOME 2 (development version)
LIB_DEPENDS= sexy:${PORTSDIR}/x11-toolkits/libsexy \
notify:${PORTSDIR}/devel/libnotify
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack libgnomeui gnomedocutils desktopfileutils
+USE_GNOME= gnomehack gnomeprefix libgnomeui gnomedocutils desktopfileutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -32,7 +33,7 @@ INSTALLS_ICONS= yes
INSTALLS_OMF= yes
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-dbus
USE_GNOME+= gconf2
GCONF_SCHEMAS+= xchat_gnome_url_handler.schemas
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index 2df148fe1920..3d3ba72c295a 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -30,10 +30,47 @@ lib/xchat-gnome/plugins/soundnotification.so
lib/xchat-gnome/plugins/urlscraper.a
lib/xchat-gnome/plugins/urlscraper.la
lib/xchat-gnome/plugins/urlscraper.so
-share/applications/xchat-gnome.desktop
+share/gnome/applications/xchat-gnome.desktop
share/gnome/help/xchat-gnome/C/figures/xchat-gnome_main_window.png
share/gnome/help/xchat-gnome/C/legal.xml
share/gnome/help/xchat-gnome/C/xchat-gnome.xml
+share/gnome/omf/xchat-gnome/xchat-gnome-C.omf
+share/gnome/xchat-gnome/channel-list.glade
+share/gnome/xchat-gnome/color.png
+share/gnome/xchat-gnome/connect-dialog.glade
+share/gnome/xchat-gnome/dcc-window.glade
+share/gnome/xchat-gnome/dcc.png
+share/gnome/xchat-gnome/effects.png
+share/gnome/xchat-gnome/global-message.png
+share/gnome/xchat-gnome/hop.png
+share/gnome/xchat-gnome/irc-network-editor.glade
+share/gnome/xchat-gnome/irc.png
+share/gnome/xchat-gnome/logout.png
+share/gnome/xchat-gnome/message.wav
+share/gnome/xchat-gnome/newdata.png
+share/gnome/xchat-gnome/nicksaid.png
+share/gnome/xchat-gnome/notauthorized.png
+share/gnome/xchat-gnome/op.png
+share/gnome/xchat-gnome/plugin-manager.png
+share/gnome/xchat-gnome/preferences-dialog.glade
+share/gnome/xchat-gnome/preferences-keybindings.png
+share/gnome/xchat-gnome/purple.png
+share/gnome/xchat-gnome/red.png
+share/gnome/xchat-gnome/servers.png
+share/gnome/xchat-gnome/setup-dialog.glade
+share/gnome/xchat-gnome/soap.png
+share/gnome/xchat-gnome/spellcheck.png
+share/gnome/xchat-gnome/stock_down.png
+share/gnome/xchat-gnome/stock_link.png
+share/gnome/xchat-gnome/stock_up.png
+share/gnome/xchat-gnome/toilet-paper.png
+share/gnome/xchat-gnome/topic-change.glade
+share/gnome/xchat-gnome/users.png
+share/gnome/xchat-gnome/voice.png
+share/gnome/xchat-gnome/wrap.png
+share/gnome/xchat-gnome/xchat-gnome-ui.xml
+share/gnome/xchat-gnome/xchat-gnome.glade
+share/gnome/xchat-gnome/xchat-gnome.png
share/icons/hicolor/48x48/apps/xchat-gnome.png
share/locale/am/LC_MESSAGES/xchat-gnome.mo
share/locale/az/LC_MESSAGES/xchat-gnome.mo
@@ -84,59 +121,46 @@ share/locale/wa/LC_MESSAGES/xchat-gnome.mo
share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo
share/locale/zh_HK/LC_MESSAGES/xchat-gnome.mo
share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
-share/omf/xchat-gnome/xchat-gnome-C.omf
-share/xchat-gnome/channel-list.glade
-share/xchat-gnome/color.png
-share/xchat-gnome/connect-dialog.glade
-share/xchat-gnome/dcc-window.glade
-share/xchat-gnome/dcc.png
-share/xchat-gnome/effects.png
-share/xchat-gnome/global-message.png
-share/xchat-gnome/hop.png
-share/xchat-gnome/irc-network-editor.glade
-share/xchat-gnome/irc.png
-share/xchat-gnome/logout.png
-share/xchat-gnome/message.wav
-share/xchat-gnome/newdata.png
-share/xchat-gnome/nicksaid.png
-share/xchat-gnome/notauthorized.png
-share/xchat-gnome/op.png
-share/xchat-gnome/plugin-manager.png
-share/xchat-gnome/preferences-dialog.glade
-share/xchat-gnome/preferences-keybindings.png
-share/xchat-gnome/purple.png
-share/xchat-gnome/red.png
-share/xchat-gnome/servers.png
-share/xchat-gnome/setup-dialog.glade
-share/xchat-gnome/soap.png
-share/xchat-gnome/spellcheck.png
-share/xchat-gnome/stock_down.png
-share/xchat-gnome/stock_link.png
-share/xchat-gnome/stock_up.png
-share/xchat-gnome/toilet-paper.png
-share/xchat-gnome/topic-change.glade
-share/xchat-gnome/users.png
-share/xchat-gnome/voice.png
-share/xchat-gnome/wrap.png
-share/xchat-gnome/xchat-gnome-ui.xml
-share/xchat-gnome/xchat-gnome.glade
-share/xchat-gnome/xchat-gnome.png
-@dirrm share/xchat-gnome
-@dirrm share/omf/xchat-gnome
+@dirrm share/gnome/xchat-gnome
+@dirrm share/gnome/omf/xchat-gnome
@dirrm share/gnome/help/xchat-gnome/C/figures
@dirrm share/gnome/help/xchat-gnome/C
@dirrm share/gnome/help/xchat-gnome
-@dirrmtry share/applications
-@dirrmtry lib/xchat-gnome/plugins
-@dirrmtry lib/xchat-gnome
-@dirrmtry share/omf
+@dirrm lib/xchat-gnome/plugins
+@dirrm lib/xchat-gnome
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/tl/LC_MESSAGES
@dirrmtry share/locale/tl
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/jbo/LC_MESSAGES
@dirrmtry share/locale/jbo
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 6bb45b38b3be..679b6acee9c0 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -3,10 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/irc/xchat-mircryption/Makefile,v 1.2 2006/10/10 20:22:11 mezz Exp $
#
PORTNAME= mircryption
DISTVERSION= 1.1.27
+PORTREVISION= 1
CATEGORIES= irc security
MASTER_SITES= http://mircryption.sourceforge.net/Downloads/
PKGNAMEPREFIX= xchat-
@@ -17,7 +19,6 @@ COMMENT= A free encryption add-on for the popular XChat irc client
RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat
-USE_X_PREFIX= yes
USE_ZIP= yes
ALL_TARGET= freebsd
CFLAGS+= -fPIC
diff --git a/irc/xchat-systray-plugin/Makefile b/irc/xchat-systray-plugin/Makefile
index 8e81060fd8fa..bdcb148fe805 100644
--- a/irc/xchat-systray-plugin/Makefile
+++ b/irc/xchat-systray-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xchat-systray-plugin
PORTVERSION= 2.4.5
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= irc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xchat2-plugins
@@ -19,7 +19,6 @@ COMMENT= Systray icon plugin for X-Chat
RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat
WRKSRC= ${WRKDIR}/xchat-systray-integration-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 75ec9068a0f2..bb90fd83dd86 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -3,10 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/irc/xchat/Makefile,v 1.5 2006/10/10 20:51:46 mezz Exp $
PORTNAME= xchat
PORTVERSION= 2.6.6
+PORTREVISION= 3
CATEGORIES= irc gnome ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://xchat.org/files/source/2.6/
@@ -16,7 +17,6 @@ DISTNAME= xchat-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= An X11 IRC client using the GTK+ 2 toolkit
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
@@ -59,10 +59,10 @@ PLIST_SUB+= TCL="@comment "
.endif
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
CONFIGURE_ARGS+=--enable-dbus
USE_GNOME+= gconf2
-GCONF_SCHEMAS= apps_xchat_url_handler.schemas
+GCONF_SCHEMAS+= apps_xchat_url_handler.schemas
PLIST_SUB+= DBUS=""
.else
CONFIGURE_ARGS+=--disable-dbus
diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist
index 78e25081a6a1..f2044973f38a 100644
--- a/irc/xchat/pkg-plist
+++ b/irc/xchat/pkg-plist
@@ -27,6 +27,19 @@ share/locale/vi/LC_MESSAGES/xchat.mo
share/locale/zh_TW/LC_MESSAGES/xchat.mo
share/pixmaps/xchat.png
@dirrmtry share/applications
+@dirrmtry share/pixmaps
@exec mkdir -p %D/lib/xchat/plugins
@dirrm lib/xchat/plugins
@dirrm lib/xchat
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 0e1f74632dba..7f790ce3c9f8 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xchat
PORTVERSION= 1.8.11
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES+= irc gnome ipv6
MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --enable-socks
.endif
.if defined(WITH_TRANSPARENCY)
-BUILD_DEPENDS+= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
CONFIGURE_ARGS+= --enable-gdk-pixbuf
.endif
diff --git a/japanese/firefox-ja/Makefile b/japanese/firefox-ja/Makefile
index 9f4cfc16b2da..7cd0988a6dc4 100644
--- a/japanese/firefox-ja/Makefile
+++ b/japanese/firefox-ja/Makefile
@@ -7,6 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.5.0.3
+PORTREVISION= 1
CATEGORIES= japanese www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/ja
@@ -19,7 +20,6 @@ COMMENT= Firefox Japanese(ja) Language Pack
BUILD_DEPENDS= ${FIREFOX}:${PORTSDIR}/www/firefox
RUN_DEPENDS= ${FIREFOX}:${PORTSDIR}/www/firefox
-USE_X_PREFIX= yes
NO_BUILD= yes
FIREFOX= ${PORTNAME}
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 0a43c4d1d4a3..490a67759b83 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,6 +7,7 @@
PORTNAME= im-ja
PORTVERSION= 1.5
+PORTREVISION= 2
CATEGORIES= japanese x11-toolkits
MASTER_SITES= http://im-ja.sourceforge.net/
@@ -18,7 +19,7 @@ OPTIONS+= CANNA "Use Canna" on
OPTIONS+= WNN "Use FreeWnn" on
OPTIONS+= GNOMEPANEL "Build GNOME Panel Applet" off
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gconf2 gnomehack gnomeprefix gnometarget intlhack libglade2
USE_PERL5_BUILD= yes
USE_GMAKE= yes
@@ -70,7 +71,7 @@ post-patch:
${WRKSRC}/data/Makefile.in
post-install:
- ${X11BASE}/bin/gtk-query-immodules-2.0 > \
- ${X11BASE}/etc/gtk-2.0/gtk.immodules
+ ${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
+ ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
.include <bsd.port.post.mk>
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index 7ae4c28c5907..b18a0e68ea87 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -1,7 +1,7 @@
bin/im-ja-conf
bin/im-ja-xim-server
-lib/gtk-2.0/2.4.0/immodules/im-ja.la
-lib/gtk-2.0/2.4.0/immodules/im-ja.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ja.so
%%GNOMEPANEL%%libdata/bonobo/servers/GNOME_ImJaApplet.server
%%GNOMEPANEL%%libexec/im-ja/im-ja-applet
libexec/im-ja/im-ja-helper
@@ -46,3 +46,5 @@ share/locale/ja/LC_MESSAGES/im-ja.mo
@dirrm libexec/im-ja
@exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
@unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules; fi
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 8b9c83d46aa7..8cc8299b7467 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mozilla
PORTVERSION= 1.7.13
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= japanese www
MASTER_SITES= ftp://ftp.mozilla-japan.org/pub/mozilla/mozilla-japan/mozilla/releases/${PORTVERSION}/ \
@@ -19,13 +19,12 @@ EXTRACT_SUFX= .xpi
MAINTAINER= fortune@n.jpn.ph
COMMENT= Mozilla Japanese Language Pack (JLP)
-BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS= ${LOCALBASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
RUN_DEPENDS= ${MOZILLA}:${PORTSDIR}/www/${MOZILLA} \
${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
WRKSRC= ${WRKDIR}/bin
-USE_X_PREFIX= yes
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -qo
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 6a81f94444e3..fc4427707ca2 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-anthy
PORTVERSION= 1.2.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=scim-imengine/21967
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \
kasumi:${PORTSDIR}/japanese/kasumi
USE_GNOME= lthack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index cafcef02902e..01f3daf36b7c 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-canna
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/18849
@@ -20,7 +20,7 @@ LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 2562f135830d..6d10a0999bd1 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-honoka-plugin-romkan
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-plugin-romkan-${PORTVERSION}
@@ -15,12 +16,12 @@ MAINTAINER= chiba.masashi@gmail.com
COMMENT= Honoka plugin for romaji input
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
- ${X11BASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
+ ${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index c97c769341c9..a2b5d19a504f 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-honoka-plugin-wnn
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-plugin-wnn-${PORTVERSION}
@@ -15,14 +16,15 @@ MAINTAINER= chiba.masashi@gmail.com
COMMENT= Honoka plugin for using wnn7
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
- ${X11BASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
+ ${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
LIB_DEPENDS= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-RUN_DEPENDS+= ${X11BASE}/lib/scim-1.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
+RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim \
+ ${LOCALBASE}/lib/scim-1.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka \
+ ${LOCALBASE}/lib/scim-1.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 869db4ce0fd2..971e372c6cee 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-honoka
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-${PORTVERSION}
@@ -20,7 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_LDCONFIG= yes
USE_GETTEXT= yes
USE_GNOME= lthack gnomehack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 8696dec4649c..b7120d6d1cd8 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-prime
PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/17192
@@ -20,7 +20,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 03491ddb0db6..4e554e3f413b 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -3,10 +3,11 @@
# Whom: Jun Mukai <mukai@jmuk.org>
#
# $FreeBSD$
-#
+# $MCom: ports/japanese/scim-skk/Makefile,v 1.1 2006/09/30 05:17:05 ahze Exp $
PORTNAME= scim-skk
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/18121
@@ -17,7 +18,7 @@ COMMENT= SCIM IMEngine module like SKK
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index cb85beacdded..5fe3b598c6de 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-tables
PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,7 @@ COMMENT= SCIM table based Japanese input methods
BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 60543c50d02f..73f563a4451f 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-tomoe
PORTVERSION= 0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=scim-imengine/17173
@@ -20,7 +20,7 @@ LIB_DEPENDS= tomoe.1:${PORTSDIR}/japanese/tomoe \
tomoe-gtk.0:${PORTSDIR}/japanese/libtomoe-gtk
USE_GNOME= lthack
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 3ebe98657b33..660a029fbc63 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-uim
PORTVERSION= 0.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://freedesktop.org/~suzhe/sources/
@@ -21,7 +21,7 @@ LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index b4c8bae0b740..6763e3c960a0 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-ja
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -20,7 +20,6 @@ COMMENT= English-Japanese/Japanese-English dictionaries for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
do-install:
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index b4c8bae0b740..6763e3c960a0 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-ja
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -20,7 +20,6 @@ COMMENT= English-Japanese/Japanese-English dictionaries for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
do-install:
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index e93b176d72de..6120cb33c2bc 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -48,10 +48,6 @@ do-install:
.endif
post-install:
-.if defined(WITHOUT_X11)
${LOCALBASE}/bin/uim-module-manager --register anthy
-.else
- ${X11BASE}/bin/uim-module-manager --register anthy
-.endif
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index 71f617e76921..2b9906700f99 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -33,10 +33,6 @@ do-install:
${GMAKE} uim_plugin_LTLIBRARIES=libuim-canna.la install-uim_pluginLTLIBRARIES)
post-install:
-.if defined(WITHOUT_X11)
${LOCALBASE}/bin/uim-module-manager --register canna
-.else
- ${X11BASE}/bin/uim-module-manager --register canna
-.endif
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
index 35e623fbf508..156995a6c907 100644
--- a/japanese/uim-prime/Makefile
+++ b/japanese/uim-prime/Makefile
@@ -34,10 +34,6 @@ do-install:
${GMAKE} uim_plugin_LTLIBRARIES=libuim-prime.la install-uim_pluginLTLIBRARIES)
post-install:
-.if defined(WITHOUT_X11)
${LOCALBASE}/bin/uim-module-manager --register prime
-.else
- ${X11BASE}/bin/uim-module-manager --register prime
-.endif
.include "${MASTERDIR}/Makefile"
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index a1304b686824..3c818b7d0b4f 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -42,19 +42,6 @@ USE_ICONV= yes
USE_MOTIF= yes
.else
ECLIPSE_WS= gtk
-.if !defined(WITHOUT_MOZILLA)
-MAKE_MOZILLA= make_mozilla
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"
-BROWSER= ${WITH_MOZILLA}
-BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
-.else
-BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla
-BROWSER= mozilla
-.endif
-.else
-BROWSER=
-MAKE_MOZILLA=
-.endif
.if defined(WITHOUT_CAIRO)
MAKE_CAIRO=
.else
@@ -81,6 +68,17 @@ ECLIPSE_ARCH= x86
ECLIPSE_SWT= gtk
.endif
+.if !defined(WITHOUT_MOZILLA)
+MAKE_MOZILLA= make_mozilla
+USE_GECKO= firefox mozilla seamonkey xulrunner
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+BROWSER= ${GECKO}
+USE_LDCONFIG= yes
+.else
+BROWSER=
+MAKE_MOZILLA=
+.endif
+
MAKE_ENV+= BROWSER=${BROWSER} \
ECLIPSE_ARCH=${ECLIPSE_ARCH} \
ECLIPSE_OS=${ECLIPSE_OS} \
@@ -90,7 +88,8 @@ MAKE_ENV+= BROWSER=${BROWSER} \
MAKE_MOZILLA=${MAKE_MOZILLA} \
MAKE_CAIRO=${MAKE_CAIRO} \
MACHINE_ARCH=${MACHINE_ARCH} \
- MOTIF_HOME=${X11_HOME}
+ MOTIF_HOME=${X11_HOME} \
+ GECKO_CONFIG=${GECKO_CONFIG}
PLIST_FILES= bin/eclipse share/applications/eclipse.desktop
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 251e7a375b20..91873ea14ba1 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -10,7 +10,7 @@
DEFAULT_JAVA_HOME=%%PREFIX%%
ECLIPSE_HOME=%%ECLIPSE_HOME%%
DEFAULT_JAVA_CMD=java
-export MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%%
+export MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
index c618b3f236be..f1829709a0c9 100644
--- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
+++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh
@@ -8,10 +8,10 @@
+ CC=gcc
+ LD=gcc
+ XTEST_LIB_PATH=$X11BASE/lib
-+ GECKO_I=${X11BASE}/include/${BROWSER}
++ GECKO_I=`${GECKO_CONFIG} --cflags gtkmozembed`
+ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
-+ GECKO_L=${X11BASE}/lib/${BROWSER}
-+ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
++ GECKO_L=`${GECKO_CONFIG} --libs gtkmozembed`
++ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib"
+ case $MODEL in
+ "amd64")
+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 16e49df97887..46459bebf0dd 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -61,7 +61,7 @@ MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \
_JAVA_BOOTSTRAP_VERSION="1.3.1"
.if defined(WITH_PLUGIN)
MAKE_ENV += LIBG_HDRS="${LOCALBASE}/include/glib12" \
- GTK_HDRS="${X11BASE}/include/gtk12" \
+ GTK_HDRS="${LOCALBASE}/include/gtk12" \
LIBIDL_HDRS= \
INTL_DIR="${LOCALBASE}"
.endif
@@ -308,7 +308,7 @@ post-install:
@${ECHO_MSG}
@${ECHO_MSG} to your Mozilla plugins directory, which is usually found at
@${ECHO_MSG}
- @${ECHO_MSG} ${X11BASE}/lib/mozilla/plugins
+ @${ECHO_MSG} ${LOCALBASE}/lib/mozilla/plugins
@${ECHO_MSG}
.endif
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index feb89cff29c6..948ad8bf8a3d 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -104,7 +104,7 @@ USE_GECKO= mozilla # firefox and seamonkey do not work
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
MAKE_ENV+= BROWSER=${GECKO}
USE_GNOME= desktopfileutils
-MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
+MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include"
.endif
ONLY_FOR_ARCHS= i386 amd64
diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in
index 85c89b9d0a51..167d5bd28893 100644
--- a/java/jdk15/files/pkg-deinstall.in
+++ b/java/jdk15/files/pkg-deinstall.in
@@ -12,7 +12,7 @@ fi
# Remove the plugin
# Plugin location variables
-BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7"
PLUGIN=libjavaplugin_oji.so
diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in
index 5868aca50c32..c5f4a70db1df 100644
--- a/java/jdk15/files/pkg-install.in
+++ b/java/jdk15/files/pkg-install.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then
fi
# Install the plugin
- BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+ BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7"
PLUGIN=libjavaplugin_oji.so
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index feb89cff29c6..948ad8bf8a3d 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -104,7 +104,7 @@ USE_GECKO= mozilla # firefox and seamonkey do not work
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
MAKE_ENV+= BROWSER=${GECKO}
USE_GNOME= desktopfileutils
-MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
+MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${LOCALBASE}/include"
.endif
ONLY_FOR_ARCHS= i386 amd64
diff --git a/java/jdk16/files/pkg-deinstall.in b/java/jdk16/files/pkg-deinstall.in
index 85c89b9d0a51..167d5bd28893 100644
--- a/java/jdk16/files/pkg-deinstall.in
+++ b/java/jdk16/files/pkg-deinstall.in
@@ -12,7 +12,7 @@ fi
# Remove the plugin
# Plugin location variables
-BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7"
PLUGIN=libjavaplugin_oji.so
diff --git a/java/jdk16/files/pkg-install.in b/java/jdk16/files/pkg-install.in
index 5868aca50c32..c5f4a70db1df 100644
--- a/java/jdk16/files/pkg-install.in
+++ b/java/jdk16/files/pkg-install.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then
fi
# Install the plugin
- BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+ BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7"
PLUGIN=libjavaplugin_oji.so
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 1860d7b13358..d6e95dd47886 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ami
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= korean x11
MASTER_SITES= http://download.kldp.net/ami/ \
http://www.kr.freebsd.org/~hwang/ami/:hjdic \
@@ -20,14 +20,13 @@ COMMENT= Well-known Korean X11 Input Method
USE_GETTEXT= yes
USE_ICONV= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12 gdkpixbuf
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-hangul-keyboard=2 --datadir=${PREFIX}/${DATADIR} \
--with-libiconv-prefix=${LOCALBASE} \
- --with-gdk-pixbuf-prefix=${X11BASE} \
+ --with-gdk-pixbuf-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
DATADIR= share
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 8e20309b0d9f..2314f358c553 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -70,3 +70,5 @@ share/locale/ko/LC_MESSAGES/ami.mo
@dirrm %%DATADIR%%/ami/pix/woody
@dirrm %%DATADIR%%/ami/pix
@dirrm %%DATADIR%%/ami
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/korean/gdick/Makefile b/korean/gdick/Makefile
index aa620142d22b..d8314c4a0569 100644
--- a/korean/gdick/Makefile
+++ b/korean/gdick/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdick
PORTVERSION= 0.9.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= korean python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gdick
@@ -29,7 +29,7 @@ post-patch:
's,/usr/share/gdick/gdick.glade,${PREFIX}/share/gdick/gdick.glade,g' \
${WRKSRC}/lib/gdick/gdick.py
${REINPLACE_CMD} \
- -e 's,lib/bonobo,${X11BASE}/libdata/bonobo,g' \
+ -e 's,lib/bonobo,${LOCALBASE}/libdata/bonobo,g' \
${WRKSRC}/setup.py
${REINPLACE_CMD} -e 's,/usr/bin/gdick,${PREFIX}/bin/gdick,g' \
${WRKSRC}/GNOME_GDick.server
diff --git a/korean/gdick/pkg-plist b/korean/gdick/pkg-plist
index 40f21398e077..0e1160f997c4 100644
--- a/korean/gdick/pkg-plist
+++ b/korean/gdick/pkg-plist
@@ -18,10 +18,9 @@ bin/gdick_applet
%%PYTHON_SITELIBDIR%%/gdick/gdick.py
%%PYTHON_SITELIBDIR%%/gdick/gdick.pyc
%%PYTHON_SITELIBDIR%%/gdick/gdick.pyo
+libdata/bonobo/servers/GNOME_GDick.server
@dirrm %%PYTHON_SITELIBDIR%%/gdick
share/gdick/gdick.glade
share/gdick/gdick.png
share/gdick/gdick_icon.png
@dirrm share/gdick
-@cwd %%X11BASE%%
-libdata/bonobo/servers/GNOME_GDick.server
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index c4509089bbf8..72ebc624616c 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imhangul
PORTVERSION= 0.9.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean x11-toolkits
MASTER_SITES= http://kldp.net/frs/download.php/2808/
@@ -15,7 +15,7 @@ MAINTAINER= cjh@FreeBSD.org
COMMENT= GTK+-2.0 hangul input module
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index e5e3a74cdd10..90dcb59ac01c 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-hangul
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT= SCIM IMEngine module for Korean(Hangul) input
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/korean/scim-hangul/pkg-plist b/korean/scim-hangul/pkg-plist
index e3cbcf17bcd8..1c066ad060f0 100644
--- a/korean/scim-hangul/pkg-plist
+++ b/korean/scim-hangul/pkg-plist
@@ -11,3 +11,7 @@ share/scim/icons/scim-hangul.png
@dirrmtry share/scim/icons
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index a8816f4710ea..3d8da8c243c2 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -3,11 +3,11 @@
# Whom: Jie Gao <gaoj@cpsc.ucalgary.ca>
#
# $FreeBSD$
-#
+# $MCom: ports/korean/scim-tables/Makefile,v 1.1 2006/09/30 03:44:11 ahze Exp $
PORTNAME= scim-tables
PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT= SCIM table based Korean input methods
BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index b6b982dcea0e..c74f8575120f 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/lang/librep/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
PORTNAME= librep
PORTVERSION= 0.16.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang elisp gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= librep
@@ -21,7 +21,7 @@ PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
USE_GETTEXT= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
@@ -30,14 +30,6 @@ CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
INFO= librep
-# Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
-# The reason why it should be in X11BASE is that sawfish (primary user of
-# librep) installs shared object into one of the librep's directories, so
-# they have to live in the same BASE to make PLISTs working.
-# This looks like a little hack, because we have to tweak MTREE_FILE as well,
-# thus partially duplicating bsd.port.mk, but what other choices do we have???
-PREFIX?= ${X11BASE}
-
.include <bsd.port.pre.mk>
.if ${ARCH} == ia64
@@ -50,12 +42,6 @@ LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
EXTRA_PATCHES+= ${FILESDIR}/stable-patch-src_numbers.c
.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
post-extract:
@${RM} ${WRKSRC}/test
diff --git a/lang/librep/files/patch-aa b/lang/librep/files/patch-aa
index 997a2290722a..9894354ed64b 100644
--- a/lang/librep/files/patch-aa
+++ b/lang/librep/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- configure.orig Mon Oct 29 06:19:47 2001
+++ configure Thu Jan 24 17:54:12 2002
@@ -4659,7 +4659,7 @@
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index e86f45f928e0..60a9b399a251 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,7 +3,7 @@
# Whom: Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD$
-# $MCom: ports-stable/mail/balsa/Makefile,v 1.1 2006/03/05 06:57:58 marcus Exp $
+# $MCom: ports/mail/balsa/Makefile,v 1.7 2006/07/27 17:09:22 mezz Exp $
#
PORTNAME= balsa
@@ -23,7 +23,7 @@ LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \
USE_GMAKE= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PERL5= yes
@@ -52,7 +52,7 @@ OPTIONS= LDAP "Enable LDAP support" on \
.include <bsd.port.pre.mk>
.if defined(WITH_GPG)
-LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}/bin/gpgme-config
.endif
@@ -66,7 +66,7 @@ LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
CONFIGURE_ARGS+=--with-gtkspell
.endif
-.if ${PREFIX}==${X11BASE}
+.if ${PREFIX}==${LOCALBASE}
PLIST_SUB+= GTKICON="@comment "
.else
PLIST_SUB+= GTKICON=""
@@ -81,7 +81,7 @@ post-patch:
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
post-install:
- @${X11BASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
+ @${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
${PREFIX}/share/gnome/balsa/hicolor
.include <bsd.port.post.mk>
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index fa72e9b4255a..86029ee2af71 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -136,10 +136,6 @@ share/locale/wa/LC_MESSAGES/balsa.mo
share/locale/zh_CN/LC_MESSAGES/balsa.mo
share/locale/zh_HK/LC_MESSAGES/balsa.mo
share/locale/zh_TW/LC_MESSAGES/balsa.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/sounds/balsa
@dirrm share/gnome/omf/balsa
%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
@@ -153,3 +149,39 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
@dirrm share/gnome/balsa/hicolor/16x16
@dirrm share/gnome/balsa/hicolor
@dirrm share/gnome/balsa
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index a5c8c971ede6..caa00ee5137d 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -3,10 +3,11 @@
# Whom: kwm@rainbow-runner.nl
#
# $FreeBSD$
-#
+# $MCom: ports/mail/contact-lookup-applet/Makefile,v 1.13 2006/09/30 23:58:38 ahze Exp $
PORTNAME= contact
PORTVERSION= 0.14
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://www.burtonini.com/computing/
PKGNAMESUFFIX= -lookup-applet
diff --git a/mail/contact-lookup-applet/files/patch-src_contact-dialog.c b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
new file mode 100644
index 000000000000..52ab8653e75d
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_contact-dialog.c
@@ -0,0 +1,11 @@
+--- src/contact-dialog.c.orig Sat Sep 30 19:56:51 2006
++++ src/contact-dialog.c Sat Sep 30 19:57:14 2006
+@@ -260,7 +260,7 @@
+
+ loader = gdk_pixbuf_loader_new ();
+
+- if (!gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL)) {
++ if (!gdk_pixbuf_loader_write (loader, photo->data.inlined.data, photo->data.inlined.length, NULL)) {
+ gtk_widget_hide (photo_frame);
+ } else if( (pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)) != NULL ) {
+ GdkPixbuf *tmp;
diff --git a/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
new file mode 100644
index 000000000000..2ce6c8e62ca4
--- /dev/null
+++ b/mail/contact-lookup-applet/files/patch-src_e-contact-entry.c
@@ -0,0 +1,13 @@
+--- src/e-contact-entry.c.orig Sat Sep 30 19:54:33 2006
++++ src/e-contact-entry.c Sat Sep 30 19:56:09 2006
+@@ -261,8 +261,8 @@
+
+ loader = gdk_pixbuf_loader_new ();
+
+- if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+- photo->length, NULL))
++ if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
++ photo->data.inlined.length, NULL))
+ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+
+ if (pixbuf) {
diff --git a/mail/contact-lookup-applet/pkg-plist b/mail/contact-lookup-applet/pkg-plist
index 21f5ef334861..7c6a8865f85e 100644
--- a/mail/contact-lookup-applet/pkg-plist
+++ b/mail/contact-lookup-applet/pkg-plist
@@ -31,7 +31,25 @@ share/locale/vi/LC_MESSAGES/contact-lookup-applet.mo
share/locale/xh/LC_MESSAGES/contact-lookup-applet.mo
share/locale/zh_CN/LC_MESSAGES/contact-lookup-applet.mo
@dirrm share/gnome/lookup-applet
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index 6457613c0d4a..aed7a9ef1a3b 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enigmail
PORTVERSION= 0.94.1
+PORTREVISION= 1
CATEGORIES= mail security
MASTER_SITES= http://www.mozilla-enigmail.org/downloads/src/
PKGNAMEPREFIX?= thunderbird-
@@ -33,13 +34,12 @@ GECKO_PORTDIR= www/${GECKO}
GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
WRKSRC= ${WRKDIR}/mozilla
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4+
USE_GNOME= gtk20 libidl desktopfileutils
HAS_CONFIGURE= yes
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-CFLAGS+= -I${X11BASE}/include
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
XPI_FILE= ${DISTNAME}-${GECKO}-freebsd-${ARCH}.xpi
PLIST_FILES= %%DATADIR%%/${XPI_FILE}
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 7a719a85eb1c..ecd5167654e8 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enigmail
PORTVERSION?= 0.93.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= mail security
MASTER_SITES= \
http://mozdev.secsup.org/enigmail/src/ \
@@ -34,7 +34,6 @@ RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
IPCVERSION?= 1.1.3
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 79409eb5cbbc..342e67e36c68 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -8,6 +8,7 @@
PORTNAME= evolution-sharp
PORTVERSION= 0.11.1
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11
@@ -28,8 +29,9 @@ USE_GMAKE= yes
INSTALLS_SHLIB= yes
post-patch:
- @${REINPLACE_CMD} 's|evolution-shell-2.2|evolution-shell-2.6|g' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} 's|eshellver="2.6"|eshellver="2.8"|g ; \
+ s|evolution-shell-2.6|evolution-shell-2.8|g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} 's|.@EBOOK_SOVERSION@||g ; \
s|.@ECAL_SOVERSION@||g ; \
s|.@EDS_SOVERSION@||g' \
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 122062a2e9b2..56a00868b5a9 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnubiff
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +17,6 @@ COMMENT= A mail notification program for Gnome
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
USE_GNOME= intlhack libglade2 esound
USE_GMAKE= yes
USE_FAM= yes
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 3472a484a00e..07d5924bafd7 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -30,10 +30,13 @@ bin/gnubiff
%%SHAREDIR%%/pixmaps/gnubiff.png
%%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server
%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
-@dirrmtry share/locale/fr_CA/LC_MESSAGES
-@dirrmtry share/locale/fr_CA
@dirrmtry %%BONOBODIR%%/servers
@dirrmtry %%BONOBODIR%%
@dirrmtry %%SHAREDIR%%/gnome-2.0/ui
@dirrmtry %%SHAREDIR%%/gnome-2.0
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fr_CA/LC_MESSAGES
+@dirrmtry share/locale/fr_CA
@dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 5dcb946c41da..c0d382f05ddf 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mail-notification
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= mailnotify
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= mailnotify
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A mail notification for freedesktop.org-compliant system trays
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack eel2
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -67,9 +68,9 @@ PLIST_SUB+= GMAIL=""
CONFIGURE_ARGS+=--disable-evolution
PLIST_SUB+= EVOLUTION="@comment "
.else
-BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
-PLIST_SUB+= EVOLUTION="" LITERAL_PREFIX="${PREFIX}"
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+PLIST_SUB+= EVOLUTION=""
.endif
.if defined(WITHOUT_SYLPHEED)
CONFIGURE_ARGS+=--disable-sylpheed
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index a5a268dd4002..052b49975ff8 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -30,12 +30,10 @@ share/locale/ru/LC_MESSAGES/mail-notification.mo
share/locale/sr/LC_MESSAGES/mail-notification.mo
share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
share/locale/sv/LC_MESSAGES/mail-notification.mo
-%%EVOLUTION%%@cwd %%X11BASE%%
%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.a
%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.la
%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.so
%%EVOLUTION%%lib/evolution/2.6/plugins/org-gnome-mail-notification.eplug
-%%EVOLUTION%%@cwd %%LITERAL_PREFIX%%
@dirrm share/gnome/omf/mail-notification
@dirrm share/gnome/mail-notification/ui
@dirrm share/gnome/mail-notification
@@ -43,3 +41,11 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
@dirrm share/gnome/help/mail-notification/C
@dirrm share/gnome/help/mail-notification
@dirrmtry etc/xdg/autostart
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index 8fb9ed0a14be..0ed0f8efe69a 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mboxcheck-applet
PORTVERSION= 0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= http://perso.orange.fr/seb128/fichiers/
@@ -15,20 +15,20 @@ COMMENT= Mailbox checking applet for GNOME 2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
NO_BUILD= yes
do-patch:
@${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/*.py
- @${REINPLACE_CMD} 's|/usr/share/pixmaps/|${X11BASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
- @${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${X11BASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
+ @${REINPLACE_CMD} 's|/usr/share/pixmaps/|${LOCALBASE}/share/gnome/pixmaps/|' ${WRKSRC}/mboxcheck.py
+ @${REINPLACE_CMD} 's|/usr/lib/gnome-panel/mboxcheck|${LOCALBASE}/libexec/mboxcheck.py|' ${WRKSRC}/GNOME_MboxCheck.server
@${REINPLACE_CMD} 's|mbox.png|mboxcheck.png|' ${WRKSRC}/GNOME_MboxCheck.server
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${X11BASE}/libexec
- ${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${X11BASE}/libexec
- ${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${X11BASE}/share/gnome/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${X11BASE}/libdata/bonobo/servers
+ ${INSTALL_SCRIPT} ${WRKSRC}/mboxcheck.py ${LOCALBASE}/libexec
+ ${INSTALL_SCRIPT} ${WRKSRC}/configmbox.py ${LOCALBASE}/libexec
+ ${INSTALL_DATA} ${WRKSRC}/mboxcheck.png ${LOCALBASE}/share/gnome/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/GNOME_MboxCheck.server ${LOCALBASE}/libdata/bonobo/servers
.include <bsd.port.mk>
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile
index 91f6c1d4190d..8c0ea2a195d3 100644
--- a/mail/moztraybiff/Makefile
+++ b/mail/moztraybiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moztraybiff
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,9 +16,9 @@ DISTNAME= mozTrayBiff-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= New mail tray icon for Thunderbird
-BUILD_DEPENDS= ${X11BASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \
+BUILD_DEPENDS= ${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \
zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS= ${X11BASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS= ${LOCALBASE}/lib/thunderbird/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird
.if !exists(../thunderbird/Makefile)
BROKEN= ${PORTNAME} needs the Thunderbird port in order to build
@@ -26,7 +26,7 @@ BROKEN= ${PORTNAME} needs the Thunderbird port in order to build
TBVER!= cd ../thunderbird && ${MAKE} -V PORTVERSION
.endif
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= libgnome
MAKE_ARGS+= MOZILLA_PLATFORM=tbird TBVER=${TBVER} MOZ_TRUNK=0
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 2ce8f26c791d..f5769a404b55 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -8,6 +8,7 @@
PORTNAME= thunderbird-dictionaries
PORTVERSION= 20060220
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= dictionaries
@@ -17,9 +18,8 @@ DIST_SUBDIR= thunderbird
MAINTAINER= mjl@luckie.org.nz
COMMENT= Dictionaries for Mozilla Thunderbird
-RUN_DEPENDS= ${X11BASE}/bin/thunderbird:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS= thunderbird:${PORTSDIR}/mail/thunderbird
-USE_X_PREFIX= yes
USE_ZIP= yes
WRKSRC= ${WRKDIR}/dictionaries
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 974536802ed1..3ba3f7553106 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
#
PORTNAME= thunderbird
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
@@ -22,7 +23,6 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
- --enable-application=mail -enable-official-branding
+ --enable-application=mail --enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS=
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
IGNORE= core dumps at runtime
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 974536802ed1..3ba3f7553106 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
#
PORTNAME= thunderbird
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
@@ -22,7 +23,6 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
- --enable-application=mail -enable-official-branding
+ --enable-application=mail --enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS=
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
IGNORE= core dumps at runtime
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 974536802ed1..3ba3f7553106 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.16 2005/11/27 18:53:59 marcus Exp $
+# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $
#
PORTNAME= thunderbird
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
@@ -22,7 +23,6 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GCC= 3.4+
CFLAGS+= -I${X11BASE}/include
@@ -30,7 +30,7 @@ MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices
MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \
- --enable-application=mail -enable-official-branding
+ --enable-application=mail --enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1
@@ -42,7 +42,7 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS=
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
IGNORE= core dumps at runtime
diff --git a/math/gdcalc/Makefile b/math/gdcalc/Makefile
index 09c74143c228..d254234727c7 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -3,11 +3,11 @@
# Whom: Jan Srocker <Jan.Stocker@t-online.de>
#
# $FreeBSD$
-#
+# $MCom: ports/math/gdcalc/Makefile,v 1.1 2006/10/04 15:51:37 ahze Exp $
PORTNAME= gdcalc
PORTVERSION= 2.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= http://bhepple.freeshell.org/dcalc/unix/
@@ -16,7 +16,7 @@ COMMENT= Gnome-based scientific calculator
RUN_DEPENDS= ${LOCALBASE}/bin/gunits:${PORTSDIR}/math/units
-USE_GNOME= gnomelibs
+USE_GNOME= gnomelibs gnomehier
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/math/gdcalc/pkg-plist b/math/gdcalc/pkg-plist
index 55382829322e..adb73b1fd539 100644
--- a/math/gdcalc/pkg-plist
+++ b/math/gdcalc/pkg-plist
@@ -7,8 +7,5 @@ share/pixmaps/HP-16C-48.xpm
share/pixmaps/mini-HP-16C-48.xpm
@dirrmtry share/pixmaps
@dirrmtry share/icons
-@dirrmtry share/gnome/apps/Utilities
-@dirrmtry share/gnome/apps
-@dirrmtry share/gnome/
@dirrmtry share/applnk/Applications
@dirrmtry share/applnk
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 9661cc5e03c4..43b85248505a 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -18,7 +18,7 @@ COMMENT= Visualise multiple 2D-functions of one variable
USE_X_PREFIX= yes
USE_GNOME= gtk12
-USE_AUTOTOOLS= automake:14 autoconf:213
+USE_AUTOTOOLS= automake:15 autoconf:253
AUTOMAKE_ARGS= -a -i
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -27,6 +27,6 @@ MAN1= geg.1
PLIST_FILES= bin/geg
pre-configure:
- @cd ${WRKSRC}; ${ACLOCAL} -I ${X11BASE}/share/aclocal
+ @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ${X11BASE}/share/aclocal
.include <bsd.port.mk>
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 473550df3365..9c6a59c39562 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guppi
PORTVERSION= 0.40.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/Guppi/0.40
@@ -20,14 +20,14 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal gnometarget
USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gnumeric --enable-explicit-python-linking
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/libglade-1.0" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
GNUMERIC_IDLDIR="${WRKDIR}/gnumeric"
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index a69ce37d6014..266ca186aa74 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -309,3 +309,17 @@ share/locale/zh_CN/LC_MESSAGES/Guppi.mo
@dirrm lib/guppi
@dirrm include/gnome-1.0/libguppitank
@dirrm include/gnome-1.0/libguppi
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 418925cf2ef7..93cac6eea74a 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomesword
PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,15 +15,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dboudrot@yahoo.com
COMMENT= A bible interface utilizing the sword framework
-BUILD_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+BUILD_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
LIB_DEPENDS= sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
BROKEN= Configure fails
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2006-12-01
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
USE_GMAKE= yes
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index b58325062c34..fbad65b19c46 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -63,6 +63,10 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
@dirrmtry share/locale/de_DE/LC_MESSAGES
@dirrmtry share/locale/de_DE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 5ae4162ca9fb..d4164a1d5740 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-appfinder
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -21,7 +21,6 @@ COMMENT= Find application in the system supporting Desktop entry format
LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 5d632837b961..d3ed37db40fa 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -14,6 +14,7 @@ share/xfce4/doc/he/images/appfinder-item-popup.png
share/xfce4/doc/he/images/default_appfinder.png
share/xfce4/doc/he/xfce4-appfinder.html
@dirrmtry share/applications
+@dirrmtry share/pixmaps
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -22,4 +23,3 @@ share/xfce4/doc/he/xfce4-appfinder.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
-
diff --git a/misc/xfce4-artwork/Makefile b/misc/xfce4-artwork/Makefile
index ae45634e68f3..bf64642f2e22 100644
--- a/misc/xfce4-artwork/Makefile
+++ b/misc/xfce4-artwork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-artwork
PORTVERSION= 0.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -15,9 +15,8 @@ DIST_SUBDIR= xfce4
MAINTAINER= demon@FreeBSD.org
COMMENT= Additional artwork for the XFce4 desktop environment
-RUN_DEPENDS= ${X11BASE}/bin/xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop
+RUN_DEPENDS= xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 47d01fc0ae4d..17abd6451583 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-iconbox
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -24,7 +24,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index 06ca32b19d59..1d171066b84c 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -50,11 +50,35 @@ share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index c3ec420e7dbd..38402259a4ee 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-weather-plugin
PORTVERSION= 0.4.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
@@ -22,7 +22,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index 05529980445b..074241282ff0 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-wm-themes
PORTVERSION= 4.2.3
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -18,7 +19,6 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 window decoration themes for xfwm4
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 418925cf2ef7..93cac6eea74a 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomesword
PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,15 +15,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dboudrot@yahoo.com
COMMENT= A bible interface utilizing the sword framework
-BUILD_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+BUILD_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
LIB_DEPENDS= sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
BROKEN= Configure fails
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2006-12-01
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix gnometarget gal2 gtkhtml3 intlhack
USE_GMAKE= yes
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index b58325062c34..fbad65b19c46 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -63,6 +63,10 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
@dirrmtry share/locale/de_DE/LC_MESSAGES
@dirrmtry share/locale/de_DE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index b0a2e5a1cae2..48ad9166ba82 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bmpx
PORTVERSION= 0.32.0
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://files.beep-media-player.org/releases/0.30/
@@ -14,13 +15,13 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= Media player geared towards usability, technical efficiency and looks
LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \
- cairomm-1.0.0:${PORTSDIR}/graphics/cairomm \
+ cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
neon.25:${PORTSDIR}/www/neon \
glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
boost_date_time.3:${PORTSDIR}/devel/boost \
- dbus-1.2:${PORTSDIR}/devel/dbus
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
CONFLICTS= bmpx-devel-[0-9]*
@@ -33,7 +34,6 @@ USE_GMAKE= yes
USE_GNOME= gtk20 libglade2 desktopfileutils
INSTALLS_ICONS= yes
USE_GSTREAMER= good mad ogg vorbis
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index af232bf1d65c..baad9db113a4 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= camserv
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -24,11 +24,12 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ONLY_FOR_ARCHS= i386 alpha
USE_XLIB= yes
-USE_AUTOTOOLS= autoconf:259 libtool:15
+USE_AUTOTOOLS= autoconf:259 libtool:15 libltdl:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
- -I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
+ -I${LOCALBASE}/include/gtk12 \
+ -I${LOCALBASE}/include/gdk-pixbuf-1.0 \
-I${LOCALBASE}/include/glib12" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index c4366c616c48..2bec588bcf86 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gaim-xmms-remote
PORTVERSION= 1.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= guifications
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= guifications
MAINTAINER= danielshafer@gmail.com
COMMENT= Plugin to display current XMMS song in Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 871a7988ad0c..4192a690b1f0 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxine
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xine
@@ -17,7 +18,6 @@ COMMENT= An alternative GUI for the Xine media player
LIB_DEPENDS= xine.15:${PORTSDIR}/multimedia/libxine
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gtk20 gnomehier
USE_GMAKE= yes
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 59e3d66de768..9cf8ef3166ba 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -3,10 +3,12 @@
# Whom: arved
#
# $FreeBSD$
+# $MCom: ports/multimedia/kaffeine-mozilla/Makefile,v 1.3 2006/10/08 16:54:34 mezz Exp $
+#
PORTNAME= kaffeine-mozilla
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kaffeine
@@ -16,11 +18,10 @@ COMMENT= Kaffeine Mozilla plugin
RUN_DEPENDS= kaffeine:${PORTSDIR}/multimedia/kaffeine
+USE_XLIB= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
-USE_XLIB= yes
-USE_X_PREFIX= yes
post-patch:
${REINPLACE_CMD} -e "s,prefix)/plugins,prefix)/lib/browser_plugins," ${WRKSRC}/src/Makefile.in
diff --git a/multimedia/kaffeine-mozilla/pkg-plist b/multimedia/kaffeine-mozilla/pkg-plist
index 81adf1f26a03..6e4c057ecce4 100644
--- a/multimedia/kaffeine-mozilla/pkg-plist
+++ b/multimedia/kaffeine-mozilla/pkg-plist
@@ -1,3 +1,4 @@
lib/browser_plugins/kaffeineplugin.so
lib/browser_plugins/kaffeineplugin.la
lib/browser_plugins/kaffeineplugin.a
+@dirrmtry lib/browser_plugins
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 9fa62bd55157..34cb710d9f18 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= linux-realplayer
DISTVERSION= 10.0.7.785-20060201
+PORTREVISION= 1
CATEGORIES= multimedia audio linux
MASTER_SITES= https://helixcommunity.org/download.php/1917/:player \
ftp://rpmfind.net/linux/sourceforge/m/mp/mplayer-tru/:codecs
@@ -38,14 +39,14 @@ PLIST_SUB+= NLS=""
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/share/icons)
+.if exists(${LOCALBASE}/share/icons)
WITH_ICONS= yes
PLIST_SUB+= ICONS=""
.else
PLIST_SUB+= ICONS="@comment "
.endif
-.if exists(${X11BASE}/share/gnome)
+.if exists(${LOCALBASE}/share/gnome)
WITH_GNOME= yes
PLIST_SUB+= GNOME=""
.else
@@ -101,32 +102,33 @@ do-install:
.if defined(WITH_ICONS)
. for size in 16x16 32x32 48x48 192x192
- @${MKDIR} ${X11BASE}/share/icons/hicolor/${size}/apps
+ @${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/apps
${INSTALL_DATA} ${WRKSRC}/share/icons/realplay_${size}.png \
- ${X11BASE}/share/icons/hicolor/${size}/apps
+ ${LOCALBASE}/share/icons/hicolor/${size}/apps
. endfor
. for size in 48x48 192x192
- @${MKDIR} ${X11BASE}/share/icons/hicolor/${size}/mimetypes
+ @${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/mimetypes
${INSTALL_DATA} ${WRKSRC}/share/icons/mime-*_${size}.png \
- ${X11BASE}/share/icons/hicolor/${size}/mimetypes
+ ${LOCALBASE}/share/icons/hicolor/${size}/mimetypes
. endfor
.endif
.if defined(WITH_GNOME)
- @${MKDIR} ${X11BASE}/share/gnome/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/share/realplay.png ${X11BASE}/share/gnome/pixmaps
+ @${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/share/realplay.png \
+ ${LOCALBASE}/share/gnome/pixmaps
- @${MKDIR} ${X11BASE}/share/gnome/applications
+ @${MKDIR} ${LOCALBASE}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/share/realplay.desktop \
- ${X11BASE}/share/gnome/applications
+ ${LOCALBASE}/share/gnome/applications
- @${MKDIR} ${X11BASE}/share/gnome/application-registry
+ @${MKDIR} ${LOCALBASE}/share/gnome/application-registry
${INSTALL_DATA} ${WRKSRC}/share/realplay.applications \
- ${X11BASE}/share/gnome/application-registry
+ ${LOCALBASE}/share/gnome/application-registry
- @${MKDIR} ${X11BASE}/share/gnome/mime-info
+ @${MKDIR} ${LOCALBASE}/share/gnome/mime-info
${INSTALL_DATA} ${WRKSRC}/share/realplay.keys ${WRKSRC}/share/realplay.mime \
- ${X11BASE}/share/gnome/mime-info
+ ${LOCALBASE}/share/gnome/mime-info
.endif
.include <bsd.port.post.mk>
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 373ac43a74f7..2324fa7c2ea4 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -179,7 +179,7 @@ lib/linux-mozilla/plugins/nphelix.xpt
@dirrm lib/RealPlayer
@dirrmtry lib/linux-mozilla/plugins
@dirrmtry lib/linux-mozilla
-%%X11%%@cwd %%X11BASE%%
+%%X11%%@cwd %%LOCALBASE%%
%%GNOME%%share/gnome/application-registry/realplay.applications
%%GNOME%%share/gnome/applications/realplay.desktop
%%GNOME%%share/gnome/mime-info/realplay.keys
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 8c3a6a8caebc..ae588423dbaf 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogle
PORTVERSION= 0.9.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia gnome
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
PKGNAMESUFFIX= -gui
@@ -22,7 +22,7 @@ LIB_DEPENDS= glade-2.0:${PORTSDIR}/devel/libglade2 \
RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack \
gnomehier \
gnomeprefix \
@@ -35,7 +35,7 @@ CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \
--with-dvdcontrol=${LOCALBASE} \
--without-included-gettext \
--enable-gtk2 \
- --with-gtk-prefix=${X11BASE} \
+ --with-gtk-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE} \
--with-xml-prefix=${LOCALBASE}
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 54127ed0efb0..21e36a02bdfa 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -28,18 +28,8 @@ share/locale/fr/LC_MESSAGES/ogle_gui.mo
share/locale/nl/LC_MESSAGES/ogle_gui.mo
share/locale/pt/LC_MESSAGES/ogle_gui.mo
share/locale/sv/LC_MESSAGES/ogle_gui.mo
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/nl
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/da/LC_MESSAGES
-@dirrmtry share/locale/da
@dirrmtry share/locale
@dirrm share/gnome/ogle_gui
@dirrm lib/ogle
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index a8c30b5c2db1..7e8eb3037323 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ogmrip
DISTVERSION= 0.10.0-rc4
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -31,9 +32,9 @@ LIB_DEPENDS= xvidcore:${PORTSDIR}/multimedia/xvid \
USE_LDCONFIG= yes
USE_GETTEXT= yes
-USE_GNOME= gtk20 glib20 gconf2 libglade2 intlhack
+USE_GNOME= gnomehack gnomeprefix gtk20 glib20 gconf2 libglade2 intlhack
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GCONF_SCHEMAS= ogmrip.schemas
@@ -65,10 +66,6 @@ pre-extract:
@${ECHO_MSG} ""
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/data/Makefile.in
-
pre-configure:
@if ${LOCALBASE}/mencoder -ovc help 2> /dev/null | ${GREP} -q "^ *xvid *- .*" ; then \
${ECHO_MSG} "" ; \
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index dfad22f465ff..5f9adbbd4f4a 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -64,20 +64,19 @@ lib/libogmjob.so.0
libdata/pkgconfig/ogmdvd.pc
libdata/pkgconfig/ogmrip.pc
libdata/pkgconfig/ogmjob.pc
-share/applications/ogmrip.desktop
-%%DATADIR%%/ogmrip-crop.glade
-%%DATADIR%%/ogmrip-main.glade
-%%DATADIR%%/ogmrip-options.glade
-%%DATADIR%%/ogmrip-pref.glade
-%%DATADIR%%/ogmrip-progress.glade
-%%DATADIR%%/ogmrip-spell.glade
-%%DATADIR%%/ogmrip-ui.xml
-%%DATADIR%%/ogmrip.xml
-%%DATADIR%%/ogmrip.xsd
-%%DATADIR%%/xml.xsd
-share/pixmaps/ogmrip.png
+share/gnome/applications/ogmrip.desktop
+share/gnome/ogmrip/ogmrip-crop.glade
+share/gnome/ogmrip/ogmrip-main.glade
+share/gnome/ogmrip/ogmrip-options.glade
+share/gnome/ogmrip/ogmrip-pref.glade
+share/gnome/ogmrip/ogmrip-progress.glade
+share/gnome/ogmrip/ogmrip-spell.glade
+share/gnome/ogmrip/ogmrip-ui.xml
+share/gnome/ogmrip/ogmrip.xml
+share/gnome/ogmrip/ogmrip.xsd
+share/gnome/ogmrip/xml.xsd
+share/gnome/pixmaps/ogmrip.png
+@dirrm share/gnome/ogmrip
@dirrm include/ogmrip
@dirrm include/ogmjob
@dirrm include/ogmdvd
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 05a1b301afbf..64b287fc2de9 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,14 +3,14 @@
# Whom: Brian Somers <brian@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.9 2006/05/15 02:56:23 ahze Exp $
-#
+# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.21 2006/10/01 18:16:43 ahze Exp $
+# $Id: Makefile 6 2006-09-27 14:05:34Z buhnux $
# *** PLEASE READ Makefile.inc for more information on knobs ***
#
PORTNAME= vlc
-DISTVERSION= 0.8.6.20060621
-PORTREVISION= 5
+DISTVERSION= 0.9.0.20060926
+PORTREVISION= 0
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://nightlies.videolan.org/build/source/
# http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -18,21 +18,21 @@ MASTER_SITES= http://nightlies.videolan.org/build/source/
# ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
# ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-snapshot-${DISTVERSION:S/0.8.6.//}
+DISTNAME= ${PORTNAME}-snapshot-${DISTVERSION:S/0.9.0.//}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Multimedia streaming server and player for various audio/video formats
+LIB_DEPENDS= notify.2:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
CONFLICTS= vlc-[0-9]*
-WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.6-svn
+WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.0-svn
WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
#USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GETOPT_LONG=yes
USE_GETTEXT= yes
USE_GMAKE= yes
@@ -42,13 +42,13 @@ WANT_SDL= yes
USE_ICONV= yes
USE_PERL5_BUILD=yes
-FAKEDIR= ${WRKDIR}/fake
+FAKEDIR= ${WRKDIR}/fake/${PREFIX}
PLIST= ${WRKDIR}/plist
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --enable-ffmpeg \
--with-ffmpeg=${LOCALBASE} \
@@ -169,6 +169,13 @@ CONFIGURE_ENV+= WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
CONFIGURE_ARGS+=--disable-wxwidgets
.endif
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
CONFIGURE_ARGS+= --enable-arts
@@ -187,8 +194,7 @@ CONFIGUE_ARGS+= --disable-bonjour
LIB_DEPENDS+= vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
cdio.7:${PORTSDIR}/sysutils/libcdio
CONFIGURE_ARGS+=--enable-vcd \
- --disable-libcdio \
- --disable-libcddb \
+ --enable-libcddb \
--disable-cddax
.else
CONFIGURE_ARGS+=--disable-vcd \
@@ -373,7 +379,7 @@ CONFIGURE_ARGS+=--enable-libmpeg2
CONFIGURE_ARGS+=--disable-libmpeg2
.endif
-.if defined(WITH_REALAUDIO)
+.if !defined(WITHOUT_REALAUDIO)
CONFIGURE_ARGS+= --enable-real \
--enable-realrtsp
.endif
@@ -392,10 +398,10 @@ CONFIGURE_ARGS+=--disable-theora
.if (defined(WITH_LIVEMEDIA) || exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)) && !defined(WITHOUT_LIVEMEDIA)
BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-CONFIGURE_ARGS+=--enable-livedotcom \
- --with-livedotcom-tree=${LOCALBASE}/live
+CONFIGURE_ARGS+=--enable-live555 \
+ --with-live555-tree=${LOCALBASE}/live
.else
-CONFIGURE_ARGS+=--disable-livedotcom
+CONFIGURE_ARGS+=--disable-live555
.endif
.if !defined(WITHOUT_MAD)
@@ -407,6 +413,20 @@ CONFIGURE_ARGS+=--enable-mad \
CONFIGURE_ARGS+=--disable-mad
.endif
+.if !defined(WITHOUT_MODDEMUX)
+LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=--enable-mod
+.else
+CONFIGURE_ARGS+=--disable-mod
+.endif
+
+.if !defined(WITHOUT_MPCDEMUX)
+LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
+CONFIGURE_ARGS+=--enable-mpc
+.else
+CONFIGURE_ARGS+=--disable-mpc
+.endif
+
.if !defined(WITHOUT_OGG)
LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
CONFIGURE_ARGS+=--enable-ogg
@@ -444,7 +464,7 @@ CONFIGURE_ARGS+=--disable-sdl
RUN_DEPENDS+= transcode:${PORTSDIR}/multimedia/transcode
.endif
-.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
+.if !defined(WITHOUT_HTTPD)
LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=--enable-gnutls
.else
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 84d12775eac4..1e542a6cf6e1 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -5,8 +5,8 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.2 2006/05/15 02:46:26 ahze Exp $
-#
+# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.8 2006/10/01 18:16:43 ahze Exp $
+# $Id: Makefile.inc 6 2006-09-27 14:05:34Z buhnux $
# If you define for example WITH_FAAD and WITHOUT_FAAD
# the WITHOUT_ will always over ride the WITH_.
#
@@ -61,9 +61,15 @@
# ** NOT DEFINED if PACKAGE_BUILDING is defined **
#
# WITHOUT_A52=yes
-# liba52 audio Support
+# liba52 audio support
+#
+# WITHOUT_MODDEMUX
+# ModPlug mod-like music support
#
-# WITH_REALAUDIO
+# WITHOUT_MPCDEMUX
+# Musepack audio compression support
+#
+# WITHOUT_REALAUDIO
# Real audio(R) support
#
# WITH_SHOUT
@@ -187,6 +193,9 @@
# WITHOUT_GNOMEVFS
# GnomeVFS support
#
+# WITHOUT_HAL=yes
+# Disable HAL support
+#
# WITH_OPENGL=yes
# Enable OpenGL visual plugin (not playback, play back is default with X11)
#
@@ -277,7 +286,7 @@ pre-build:
@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
${WRKSRC}/vlc-config
-pre-install:
+pre-install: build
${RM} -rf ${PLIST} ${FAKEDIR}
${MKDIR} ${FAKEDIR}
${TOUCH} -f ${PLIST}
@@ -294,6 +303,7 @@ pre-install:
.endif
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+ ${RM} -f ${FAKEDIR}/share/locale/locale.alias
cd ${FAKEDIR}/bin && ${FIND} -s * | \
${SED} -e 's|^|bin/|' >> ${PLIST}
cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -310,6 +320,7 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
.endfor
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(NOPORTDOCS)
cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 4913ff2e88a0..55306aab015a 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20060621.tar.gz) = ad07e1b97b1d275d51d3d6554e27e3d7
-SHA256 (vlc-snapshot-20060621.tar.gz) = 19f8bbebe6656e79dbb0d62c9648bab94bc4b48b887cc9d3ff6f3d6b40d60e29
-SIZE (vlc-snapshot-20060621.tar.gz) = 12535187
+MD5 (vlc-snapshot-20060926.tar.gz) = a4ecdcc79e6f5ce756858b767ec284af
+SHA256 (vlc-snapshot-20060926.tar.gz) = f633b5c50d0330a1ed8b477a0bda0f36f7f45e86b08760a9b897efbd32c40d5b
+SIZE (vlc-snapshot-20060926.tar.gz) = 13327513
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_x264.c b/multimedia/vlc-devel/files/patch-modules_codec_x264.c
deleted file mode 100644
index 2ff0294a2ab2..000000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_x264.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/codec/x264.c.orig Wed Aug 9 21:24:08 2006
-+++ modules/codec/x264.c Wed Aug 9 21:24:27 2006
-@@ -588,7 +588,7 @@
-
- /* cbr = 1 overrides qp or crf and sets an average bitrate
- but maxrate = average bitrate is needed for "real" CBR */
-- if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
-+ if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
- if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ab43d0fe3aff..c544495a7fb1 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
# Whom: Brian Somers <brian@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.5 2006/05/06 06:06:47 ahze Exp $
+# $MCom: ports/multimedia/vlc/Makefile,v 1.4 2006/10/01 16:05:06 ahze Exp $
#
# *** PLEASE READ Makefile.inc for more information on knobs ***
#
@@ -27,7 +27,6 @@ CONFLICTS= vlc-devel-[0-9]*
WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GETOPT_LONG=yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 63d77f5d7c97..36f81c870e66 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -5,7 +5,7 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.1 2006/05/06 06:06:47 ahze Exp $
+# $MCom: ports/multimedia/vlc/Makefile.inc,v 1.3 2006/09/30 18:15:02 ahze Exp $
#
# If you define for example WITH_FAAD and WITHOUT_FAAD
# the WITHOUT_ will always over ride the WITH_.
@@ -294,6 +294,7 @@ pre-install:
.endif
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+ ${RM} -f ${FAKEDIR}/share/locale/locale.alias
cd ${FAKEDIR}/bin && ${FIND} -s * | \
${SED} -e 's|^|bin/|' >> ${PLIST}
cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -310,6 +311,7 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
.endfor
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(NOPORTDOCS)
cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 445d014430a2..8a549088c9bb 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-media
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= multimedia xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/
DISTNAME= xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index 15f1c103f890..6f6117f24e92 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -51,14 +51,16 @@ share/xfmedia/doc/xfce.css
@dirrm share/xfmedia/doc
@dirrm share/xfmedia
@dirrm etc/xdg/xfmedia
+@dirrmtry etc/xdg
@dirrm include/xfmedia
@dirrm lib/xfmedia/plugins
@dirrm lib/xfmedia
-@dirrmtry etc/xdg
@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index b78aa0610022..98e594372878 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xmms-controller-plugin
PORTVERSION= 1.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio xfce
MASTER_SITES= http://eoin.angrystickman.com/files/
DIST_SUBDIR= xfce4
@@ -22,7 +22,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index a0767abe617a..b4b29f178815 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= multimedia audio xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/ \
http://download2.berlios.de/xfce-goodies/
@@ -26,7 +27,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 591aa12c7c57..54c513600da8 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -19,3 +19,5 @@ share/xfce4/xmms-plugin/xmms-plugin-stop.png
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
@dirrm share/xfce4/xmms-plugin
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index d11a1fc9ee19..67fbf31fd448 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Mario S F Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/xmps-win32-plugin/Makefile,v 1.1 2006/10/11 23:24:13 ahze Exp $
PORTNAME= xmps-win32-plugin
PORTVERSION= 0.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
@@ -21,7 +21,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LDCONFIG= yes
#CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
diff --git a/net-im/gaim-assistant/Makefile b/net-im/gaim-assistant/Makefile
index 27091dc9e88a..89e7047095ba 100644
--- a/net-im/gaim-assistant/Makefile
+++ b/net-im/gaim-assistant/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gaim-assistant
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= MrL0Lz@gmail.com
COMMENT= Plugin that forwards messages to a different screen name
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_GCC= 3.4+
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index efeeadb58b84..1740b734838a 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bangexec
PORTVERSION= 1.3.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MASTER_SITES= http://thefnords.googlepages.com/
PKGNAMEPREFIX= gaim-
@@ -20,7 +20,6 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
DEPRECATED= The author has taken down his site and has ceased developing this program
-USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/net-im/gaim-extprefs/Makefile b/net-im/gaim-extprefs/Makefile
index 970cf21e5c81..1db0b358f2f1 100644
--- a/net-im/gaim-extprefs/Makefile
+++ b/net-im/gaim-extprefs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gaim-extprefs
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gaim-extprefs
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR= gaim-extprefs
MAINTAINER= semionov@mail.bg
COMMENT= A gaim plugin that provides additional preferences
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-static=no
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 3ad48ac4aa42..72c418630e08 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guifications
PORTVERSION= 2.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +16,10 @@ PKGNAMEPREFIX= gaim-
MAINTAINER= ports@c0decafe.net
COMMENT= Plugin to add msn style "toaster" popups to Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index ba932da38c86..bba7aa20af45 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ignorance
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= http://thefnords.googlepages.com/
PKGNAMEPREFIX= gaim-
@@ -20,7 +20,6 @@ RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
DEPRECATED= The author has taken down his site and has ceased developing this program
-USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/net-im/gaim-latex/Makefile b/net-im/gaim-latex/Makefile
index f01ff954655d..16c2a6ceb90d 100644
--- a/net-im/gaim-latex/Makefile
+++ b/net-im/gaim-latex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex
PORTVERSION= 0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -17,13 +17,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= mainland@apeiron.net
COMMENT= Display LaTeX output in your IMs
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \
latex:${PORTSDIR}/print/teTeX \
convert:${PORTSDIR}/graphics/ImageMagick
CFLAGS+= "-fPIC"
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_BZIP2= yes
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 6dfafb772f49..808b8e32f591 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openq
PORTVERSION= 0.3.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,10 +20,10 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= liu_yinghong@yahoo.com.cn
COMMENT= A QQ-liked protocol plugin for Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist
index 9c1104fd2fef..4a67c5d0c8bc 100644
--- a/net-im/gaim-openq/pkg-plist
+++ b/net-im/gaim-openq/pkg-plist
@@ -531,3 +531,5 @@ share/locale/zh_CN/LC_MESSAGES/openq.mo
@dirrm share/gnome/pixmaps/gaim/smileys/2003iii
@dirrmtry share/gnome/doc
@dirrmtry share/gnome/gaim
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/net-im/gaim-rss-reader/Makefile b/net-im/gaim-rss-reader/Makefile
index 1310f3b1e080..ecad2ca0876e 100644
--- a/net-im/gaim-rss-reader/Makefile
+++ b/net-im/gaim-rss-reader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rss-reader
PORTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -17,18 +17,18 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= mycroft@virgaria.org
COMMENT= Provides Rss support for Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
IGNORE= Requires update to work with Gaim 0.82.1
DEPRECATED= ${IGNORE}
EXPIRATION_DATE=2006-12-01
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= "--with-gaim=${X11BASE}/include/gaim"
+CONFIGURE_ARGS= "--with-gaim=${LOCALBASE}/include/gaim"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/gaim-slashexec/Makefile b/net-im/gaim-slashexec/Makefile
index 1ec0dde0b87b..4e69fc4d7007 100644
--- a/net-im/gaim-slashexec/Makefile
+++ b/net-im/gaim-slashexec/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slashexec
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= guifications
@@ -19,7 +19,6 @@ COMMENT= Execute commands inside gaim
BUILD_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
PLIST_FILES= lib/gaim/se.la lib/gaim/se.so
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index eee05da08cdd..72ebf1f0d840 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gaim
PORTVERSION= 1.5.0
-PORTREVISION= 6
+PORTREVISION= 8
CATEGORIES?= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,9 +17,9 @@ COMMENT= Multi-protocol instant messaging client
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFLICTS?= ja-gaim-[0-9]*
+CONFLICTS?= ja-gaim-[0-9]* gaim-devel-2*
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
@@ -81,6 +81,8 @@ CONFIGURE_ARGS+= --disable-nss
USE_PERL5= yes
CONFIGURE_ARGS+= --with-perl-lib=site
PLIST_SUB+= PERL:=""
+MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3+= Gaim.3
.else
CONFIGURE_ARGS+= --disable-perl
PLIST_SUB+= PERL:="@comment "
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 3273a6cf9720..1e669c973126 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -164,6 +164,11 @@ lib/libgaim-remote.a
lib/libgaim-remote.la
lib/libgaim-remote.so
lib/libgaim-remote.so.0
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
libdata/pkgconfig/gaim.pc
share/gnome/applications/gaim.desktop
share/gnome/pixmaps/gaim.png
@@ -476,8 +481,6 @@ share/locale/vi/LC_MESSAGES/gaim.mo
share/locale/xh/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@unexec /bin/rmdir %D/share/locale/my_MM/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/my_MM 2>/dev/null || /usr/bin/true
@dirrm share/gnome/sounds/gaim
@dirrm share/gnome/pixmaps/gaim/status/default
@dirrm share/gnome/pixmaps/gaim/status
@@ -488,13 +491,40 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
@dirrm share/gnome/pixmaps/gaim/dialogs
@dirrm share/gnome/pixmaps/gaim/buttons
@dirrm share/gnome/pixmaps/gaim
+%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
@dirrm lib/gaim
@dirrm include/gaim
-%%PERL:%%@cwd %%LOCALBASE%%
-%%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/my_MM/LC_MESSAGES
+@dirrmtry share/locale/my_MM
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 51f22ada66ca..e68ed6852a48 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gossip
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES= net-im gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,12 +18,12 @@ COMMENT= GTK2 Jabber Instant Messaging client
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
aspell.16:${PORTSDIR}/textproc/aspell
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index 44939cf02435..0ae318dfdc1c 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -108,8 +108,6 @@ share/locale/vi/LC_MESSAGES/gossip.mo
share/locale/zh_CN/LC_MESSAGES/gossip.mo
share/locale/zh_HK/LC_MESSAGES/gossip.mo
share/locale/zh_TW/LC_MESSAGES/gossip.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/gossip
@dirrm share/gnome/help/gossip/sv/figures
@dirrm share/gnome/help/gossip/sv
@@ -119,3 +117,25 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
@dirrm share/gnome/sounds/gossip
@dirrm share/gnome/gossip/protocols
@dirrm share/gnome/gossip
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index dba452ad9a93..26a82c322aa3 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -4,11 +4,11 @@
# Whom: ijliao
#
# $FreeBSD$
-#
+# $MCom: ports/net-im/ickle/Makefile,v 1.1 2006/10/04 15:40:14 ahze Exp $
PORTNAME= ickle
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -26,7 +26,7 @@ USE_ICONV= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \
- --with-gtkmm-prefix=${X11BASE}
+ --with-gtkmm-prefix=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
post-patch:
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 682545151c45..514d90ad7b1e 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= meanwhile
PORTVERSION= 1.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
COMMENT= Provides Lotus Sametime support for Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= meanwhile.1:${PORTSDIR}/net-im/meanwhile
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 3ad48ac4aa42..72c418630e08 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guifications
PORTVERSION= 2.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +16,10 @@ PKGNAMEPREFIX= gaim-
MAINTAINER= ports@c0decafe.net
COMMENT= Plugin to add msn style "toaster" popups to Gaim
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index f01ff954655d..16c2a6ceb90d 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex
PORTVERSION= 0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -17,13 +17,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= mainland@apeiron.net
COMMENT= Display LaTeX output in your IMs
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim \
latex:${PORTSDIR}/print/teTeX \
convert:${PORTSDIR}/graphics/ImageMagick
CFLAGS+= "-fPIC"
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_BZIP2= yes
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 7508ee712ecf..a933c8721c3d 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= skype
PORTVERSION= 1.3.0.30
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.skype.com/linux/
PKGNAMESUFFIX= -devel
@@ -30,33 +31,25 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
USE_BZIP2= yes
USE_LINUX= yes
USE_X_PREFIX= yes
-WANT_GNOME= yes
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution not allowed yet.
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
+ ${MKDIR} ${PREFIX}/share/applications
${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
- ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
- ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index e2b5f3707078..54578dd55be3 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -39,5 +39,6 @@ bin/skype_bin
@dirrm %%DATADIR%%/sound
%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skype
PORTVERSION= 1.2.0.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://download.skype.com/linux/
DISTNAME= skype_staticQT-${PORTVERSION}
@@ -29,33 +29,25 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
USE_BZIP2= yes
USE_LINUX= yes
USE_X_PREFIX= yes
-WANT_GNOME= yes
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution not allowed yet.
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
+ @${MKDIR} ${PREFIX}/share/applications
${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
- ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
- ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -35,5 +35,6 @@ bin/skype_bin
@dirrm %%DATADIR%%/sound
%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skype
PORTVERSION= 1.2.0.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://download.skype.com/linux/
DISTNAME= skype_staticQT-${PORTVERSION}
@@ -29,33 +29,25 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
USE_BZIP2= yes
USE_LINUX= yes
USE_X_PREFIX= yes
-WANT_GNOME= yes
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution not allowed yet.
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
+ @${MKDIR} ${PREFIX}/share/applications
${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
- ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
- ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -35,5 +35,6 @@ bin/skype_bin
@dirrm %%DATADIR%%/sound
%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index c7b1436d2097..db0e278941c0 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,6 +7,7 @@
PORTNAME= etherape
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= net-mgmt gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,9 +16,9 @@ MAINTAINER= sbahra@kerneled.org
COMMENT= A graphical network traffic visualization tool for gnome
USE_GETTEXT= yes
-USE_GNOME= libglade2 libgnomeui gnomehack
+USE_GNOME= libglade2 libgnomeui gnomehack gnomeprefix
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -25,7 +26,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= etherape.1
-post-patch:
- @${REINPLACE_CMD} -e 's|$$(datadir)/omf|$$(prefix)/share/gnome/omf|g' ${WRKSRC}/doc/C/Makefile.in
-
.include <bsd.port.mk>
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index b855233c199a..0990c1762afa 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,35 +1,34 @@
bin/etherape
etc/etherape/services
-share/applications/etherape.desktop
-%%DATADIR%%/doc/etherape/C/etherape.xml
-%%DATADIR%%/doc/etherape/C/figures/appmain.png
-%%DATADIR%%/doc/etherape/C/figures/capture_file_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/color_select_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/eth_toolbar.png
-%%DATADIR%%/doc/etherape/C/figures/link_info.png
-%%DATADIR%%/doc/etherape/C/figures/node_info.png
-%%DATADIR%%/doc/etherape/C/figures/pref_colors_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_diagram_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_timings_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/proto_info.png
-%%DATADIR%%/doc/etherape/C/figures/protocol_edit_dlg.png
-%%DATADIR%%/glade/etherape.glade2
-%%DATADIR%%/glade/etherape.png
-%%DATADIR%%/glade/pause.xpm
-%%DATADIR%%/glade/play.xpm
-%%DATADIR%%/glade/stop.xpm
+share/gnome/applications/etherape.desktop
+share/gnome/etherape/doc/etherape/C/etherape.xml
+share/gnome/etherape/doc/etherape/C/figures/appmain.png
+share/gnome/etherape/doc/etherape/C/figures/capture_file_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/color_select_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/eth_toolbar.png
+share/gnome/etherape/doc/etherape/C/figures/link_info.png
+share/gnome/etherape/doc/etherape/C/figures/node_info.png
+share/gnome/etherape/doc/etherape/C/figures/pref_colors_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/pref_diagram_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/pref_timings_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/proto_info.png
+share/gnome/etherape/doc/etherape/C/figures/protocol_edit_dlg.png
+share/gnome/etherape/glade/etherape.glade2
+share/gnome/etherape/glade/etherape.png
+share/gnome/etherape/glade/pause.xpm
+share/gnome/etherape/glade/play.xpm
+share/gnome/etherape/glade/stop.xpm
share/gnome/omf/etherape/etherape-C.omf
+share/gnome/pixmaps/etherape.png
share/locale/es/LC_MESSAGES/etherape.mo
share/locale/fr/LC_MESSAGES/etherape.mo
share/locale/nl/LC_MESSAGES/etherape.mo
share/locale/tr/LC_MESSAGES/etherape.mo
-share/pixmaps/etherape.png
-@dirrm etc/etherape
@dirrm share/gnome/omf/etherape
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/doc/etherape/C/figures
-@dirrm %%DATADIR%%/doc/etherape/C
-@dirrm %%DATADIR%%/doc/etherape
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
+@dirrm share/gnome/etherape/glade
+@dirrm share/gnome/etherape/doc/etherape/C/figures
+@dirrm share/gnome/etherape/doc/etherape/C
+@dirrm share/gnome/etherape/doc/etherape
+@dirrm share/gnome/etherape/doc
+@dirrm share/gnome/etherape
+@dirrm etc/etherape
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index b4b718d010af..46da7dd5fb8e 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -3,11 +3,11 @@
# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com>
#
# $FreeBSD$
-#
+# $MCom: ports/net-p2p/amule1/Makefile,v 1.1 2006/10/04 23:22:32 ahze Exp $
PORTNAME= aMule
PORTVERSION= 1.2.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
#MASTER_SITES= http://download.berlios.de/amule/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,6 @@ LATEST_LINK= aMule1
CONFLICTS= aMule-2.* aMule-devel-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
USE_GMAKE= yes
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 69e7a99512d6..2f21e5ba0dbc 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -75,7 +75,11 @@ share/locale/pt_BR/LC_MESSAGES/amule.mo
share/locale/ru/LC_MESSAGES/amule.mo
@dirrm share/gnome/doc/aMule-1.2.8
@dirrmtry share/gnome/doc
-@dirrmtry share/locale/ee/LC_MESSAGES
-@dirrmtry share/locale/ee
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 182f3391ea8b..9441d712ca2c 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.66
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p gnome
MASTER_SITES= http://unixpages.org/distfiles/
PKGNAMESUFFIX= -gui
@@ -20,12 +20,12 @@ BUILD_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ARGS= --with-gnome=${X11BASE} \
+CONFIGURE_ARGS= --with-gnome=${LOCALBASE} \
--with-gtk-prefix=${LOCALBASE} \
--enable-manual-db-detect \
--with-libiconv-prefix=${LOCALBASE}
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index b6dd22a66558..eb60ea1bbdb2 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -3,11 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/net-p2p/edonkey-gui-gtk/Makefile,v 1.2 2006/10/05 05:04:46 mezz Exp $
#
PORTNAME= edonkey
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ed2k-gtk-gui
@@ -20,9 +21,10 @@ COMMENT= GTK GUI to eDonkey2000 'core' command line client
LIB_DEPENDS= gnet-2.0:${PORTSDIR}/net/gnet2
RUN_DEPENDS= donkey:${PORTSDIR}/net-p2p/linux-edonkey-core
+USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomehier gnometarget gtk20
+USE_XLIB= yes
+USE_GNOME= gnometarget gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -35,8 +37,6 @@ CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
post-patch:
- @${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app|g' \
- ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|^SUBDIRS =.*$$|SUBDIRS =|g' \
${WRKSRC}/docs/Makefile.in
@${REINPLACE_CMD} -e 's|-Wall -g||g ; \
diff --git a/net-p2p/edonkey-gui-gtk/pkg-plist b/net-p2p/edonkey-gui-gtk/pkg-plist
index f415e1a22edf..83756e75f3c1 100644
--- a/net-p2p/edonkey-gui-gtk/pkg-plist
+++ b/net-p2p/edonkey-gui-gtk/pkg-plist
@@ -449,7 +449,7 @@ bin/edonkey-gui-gtk
%%DATADIR%%/icons/orbit/toolbar-overnet-logo.png
%%DATADIR%%/icons/orbit/toolbar-server.png
%%DATADIR%%/ui/ui-connect-dialog.glade
-share/gnome/applications/ed2k_gui.desktop
+share/applications/ed2k_gui.desktop
share/locale/ca/LC_MESSAGES/ed2k_gui.mo
share/locale/de/LC_MESSAGES/ed2k_gui.mo
share/locale/es/LC_MESSAGES/ed2k_gui.mo
@@ -472,3 +472,10 @@ share/locale/sk/LC_MESSAGES/ed2k_gui.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/espanol
%%PORTDOCS%%@dirrm %%DOCSDIR%%/deutsch
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index 448fce5f5f12..c63ffa54eded 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giFTui
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= giftui
@@ -19,8 +19,8 @@ COMMENT= GTK2 client for giFT daemon
LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= gconf2 gtk20
+USE_XLIB= yes
+USE_GNOME= gnomehack gnomeprefix gconf2 gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -31,10 +31,13 @@ PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=${DATADIR}|g' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=$${datadir}/giftui|g ; \
+ s|^giftuiicondir=.*|giftuiicondir=$${datadir}/pixmaps|g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^giftuidocdir =.*|giftuidocdir =${DOCSDIR}|g' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|/usr/share/pixmaps/||g' \
+ ${WRKSRC}/data/giftui.desktop
post-install:
.if !defined(NOPORTDOCS)
diff --git a/net-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index f28e3b132356..c52cc2709cdb 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/giftui/pkg-plist
@@ -1,22 +1,21 @@
bin/giftui
-share/applications/giftui.desktop
-@dirrm share/applications
-%%DATADIR%%/icons/fasttrack-down.png
-%%DATADIR%%/icons/fasttrack-network.png
-%%DATADIR%%/icons/fasttrack-search.png
-%%DATADIR%%/icons/fasttrack-up.png
-%%DATADIR%%/icons/gnutella-down.png
-%%DATADIR%%/icons/gnutella-network.png
-%%DATADIR%%/icons/gnutella-search.png
-%%DATADIR%%/icons/gnutella-up.png
-%%DATADIR%%/icons/openft-down.png
-%%DATADIR%%/icons/openft-network.png
-%%DATADIR%%/icons/openft-search.png
-%%DATADIR%%/icons/openft-up.png
-%%DATADIR%%/icons/opennap-down.png
-%%DATADIR%%/icons/opennap-network.png
-%%DATADIR%%/icons/opennap-search.png
-%%DATADIR%%/icons/opennap-up.png
-share/pixmaps/giftui.png
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
+share/gnome/applications/giftui.desktop
+share/gnome/giftui/icons/fasttrack-down.png
+share/gnome/giftui/icons/fasttrack-network.png
+share/gnome/giftui/icons/fasttrack-search.png
+share/gnome/giftui/icons/fasttrack-up.png
+share/gnome/giftui/icons/gnutella-down.png
+share/gnome/giftui/icons/gnutella-network.png
+share/gnome/giftui/icons/gnutella-search.png
+share/gnome/giftui/icons/gnutella-up.png
+share/gnome/giftui/icons/openft-down.png
+share/gnome/giftui/icons/openft-network.png
+share/gnome/giftui/icons/openft-search.png
+share/gnome/giftui/icons/openft-up.png
+share/gnome/giftui/icons/opennap-down.png
+share/gnome/giftui/icons/opennap-network.png
+share/gnome/giftui/icons/opennap-search.png
+share/gnome/giftui/icons/opennap-up.png
+share/gnome/pixmaps/giftui.png
+@dirrm share/gnome/giftui/icons
+@dirrm share/gnome/giftui
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 3b156911b87f..06b3d9ea895e 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@ahze.net>
#
# $FreeBSD$
-#
+# $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.2 2006/09/30 01:22:35 ahze Exp $
PORTNAME= gtorrentviewer
PORTVERSION= 0.2b
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,8 +19,8 @@ COMMENT= GTK+2 viewer and editor for BitTorrent meta files
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
USE_GNOME= gtk20 gnomehier intlhack
+USE_XLIB= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GETOPT_LONG=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 0b90f61d9409..f9fd3e4f2c2f 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmule
PORTVERSION= 1.12.2
-PORTREVISION= 1
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
#MASTER_SITES= http://download.berlios.de/%SUBDIR%/
@@ -22,7 +22,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomehier \
gnomehack \
@@ -31,7 +31,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-included-gettext \
--with-cryptopp-prefix=${LOCALBASE} \
- --with-gtk-prefix=${X11BASE} \
+ --with-gtk-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE} \
--enable-debug \
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index d659dc5859ab..adec38f91fad 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -11,7 +11,8 @@ share/locale/it/LC_MESSAGES/xmule.mo
share/locale/ko/LC_MESSAGES/xmule.mo
share/locale/pl/LC_MESSAGES/xmule.mo
share/locale/tr/LC_MESSAGES/xmule.mo
-@dirrmtry share/locale/ee/LC_MESSAGES
-@dirrmtry share/locale/ee
-@dirrmtry share/locale
@dirrmtry share/gnome/locale
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 837d108c081b..b33a9645676d 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -3,10 +3,12 @@
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+# $MCom: ports/net/crescendo/Makefile,v 1.2 2006/10/07 16:29:01 mezz Exp $
+#
PORTNAME= crescendo
PORTVERSION= 1.1.7
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= net gnome
# Master Site broken
#MASTER_SITES= http://crescendo.lyrical.net/files/
@@ -18,7 +20,6 @@ COMMENT= A gnome frontend for tinyfuge
RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-compile-warnings=yes
@@ -28,7 +29,7 @@ CFLAGS+= -g
PLIST_SUB= DOCDIR=share/doc/${PORTNAME}
MODIFY= Makefile.in data/Makefile.in
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomelibs
post-patch:
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index c157095d9aef..bd738bb268d7 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= diradmin
PORTVERSION= 1.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://diradmin.open-it.org/releases/ \
http://diradmin.open-it.org/releases/old/
@@ -19,7 +19,6 @@ COMMENT= A smart LDAP directory management tool
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomelibs
USE_OPENLDAP= yes
USE_OPENSSL= yes
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index e0730fa846d9..4f9a2fcf290b 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.0.23
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= liferea
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= liferea
MAINTAINER= pav@FreeBSD.org
COMMENT= Simple RSS/RDF feed reader
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GECKO= mozilla firefox
USE_GNOME= gnomeprefix gnomehack libgtkhtml
USE_GMAKE= yes
@@ -62,7 +63,7 @@ PLIST_SUB+= XUL="@comment "
.ifdef WITHOUT_DBUS
CONFIGURE_ARGS+=--disable-dbus
.else
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
.endif
post-patch:
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 9f2f0a3c96e2..94c9fe82d478 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -114,3 +114,21 @@ share/locale/zh_TW/LC_MESSAGES/liferea.mo
@dirrm lib/liferea
%%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
%%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index 7728bb7e9853..45e640f1ba6b 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -6,6 +6,7 @@
PORTNAME= PenguinTV
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= net audio multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= penguintv
@@ -24,9 +25,11 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
OPTIONS= MOZILLA "Use Mozilla rendered (experimental)" OFF
-USE_GNOME= pygnomeextras pygnome2
+USE_GNOME= gnomehier pygnomeextras pygnome2
USE_PYTHON= yes
+GCONF_SCHEMAS= penguintv.schema
+
CONFLICTS= PenguinTV-devel-[0-9]*
.include <bsd.port.pre.mk>
@@ -51,4 +54,9 @@ do-build:
do-install:
cd ${WRKSRC} && ${PYTHON_CMD} setup.py install
+post-install:
+ @${MKDIR} ${LOCALBASE}/etc/gconf/schemas
+ @${INSTALL_DATA} ${WRKSRC}/share/penguintv.schema \
+ ${LOCALBASE}/etc/gconf/schemas/
+
.include <bsd.port.post.mk>
diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist
index da8ae4f09c41..5f6ffd532031 100644
--- a/net/penguintv/pkg-plist
+++ b/net/penguintv/pkg-plist
@@ -120,14 +120,11 @@ share/penguintv/defaultsubs.opml
share/penguintv/penguintv.glade
share/penguintv/penguintvicon.png
share/pixmaps/penguintvicon.png
-
@dirrmtry share/pixmaps
@dirrmtry share/applications
@dirrm share/penguintv
@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
%%WITH_MOZILLA%%@dirrm %%PYTHON_SITELIBDIR%%/penguintv/democracy_moz
@dirrm %%PYTHON_SITELIBDIR%%/penguintv
-
-@comment @cwd %%X11BASE%%
-@comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml
-@comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index 7614f7529b6b..c64157694c3f 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -3,21 +3,22 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/net/service-discovery-applet/Makefile,v 1.3 2006/10/11 05:53:39 marcus Exp $
#
PORTNAME= service-discovery-applet
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= net dns gnome
MASTER_SITES= http://0pointer.de/~sebest/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME applet that shows available network services using mDNS
-BUILD_DEPENDS= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-RUN_DEPENDS= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_PYTHON= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnomedesktop
@@ -31,10 +32,10 @@ GCONF_SCHEMAS= service-discovery-applet.schemas
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/plugins/gconfterminal.py.in
+ ${WRKSRC}/plugins/gconfterminal.py.in
post-install:
- @${X11BASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
+ @${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
${PREFIX}/share/gnome/service-discovery-applet/icons
.include <bsd.port.mk>
diff --git a/net/service-discovery-applet/files/patch-servers_Makefile.in b/net/service-discovery-applet/files/patch-servers_Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/service-discovery-applet/files/patch-servers_Makefile.in
+++ /dev/null
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index 9f426d622478..0f040570e11d 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -45,3 +45,5 @@ share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
@dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
@dirrmtry lib/%%PYTHON_VERSION%%
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/silky/Makefile b/net/silky/Makefile
index 4806b1c64d3d..f92b13814308 100644
--- a/net/silky/Makefile
+++ b/net/silky/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silky
PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://rusunix.org/pub/FreeBSD/distfiles/
@@ -31,7 +31,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
USE_GNOME= gtk20 libglade2 gnomelibs
USE_GMAKE= yes
USE_PERL5= yes
-USE_X_PREFIX= yes
post-patch:
@${PERL} -pi -e 's/ include / /' ${WRKSRC}/Makefile.in
diff --git a/net/silky/pkg-plist b/net/silky/pkg-plist
index 160d5da0079e..571d6e23706a 100644
--- a/net/silky/pkg-plist
+++ b/net/silky/pkg-plist
@@ -33,3 +33,11 @@ share/locale/zh_CN/LC_MESSAGES/silky.mo
share/gnome/apps/Applications/silky.desktop
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
index 7508ee712ecf..a933c8721c3d 100644
--- a/net/skype-devel/Makefile
+++ b/net/skype-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= skype
PORTVERSION= 1.3.0.30
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.skype.com/linux/
PKGNAMESUFFIX= -devel
@@ -30,33 +31,25 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
USE_BZIP2= yes
USE_LINUX= yes
USE_X_PREFIX= yes
-WANT_GNOME= yes
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution not allowed yet.
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
+ ${MKDIR} ${PREFIX}/share/applications
${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
- ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
- ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist
index e2b5f3707078..54578dd55be3 100644
--- a/net/skype-devel/pkg-plist
+++ b/net/skype-devel/pkg-plist
@@ -39,5 +39,6 @@ bin/skype_bin
@dirrm %%DATADIR%%/sound
%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skype
PORTVERSION= 1.2.0.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://download.skype.com/linux/
DISTNAME= skype_staticQT-${PORTVERSION}
@@ -29,33 +29,25 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
USE_BZIP2= yes
USE_LINUX= yes
USE_X_PREFIX= yes
-WANT_GNOME= yes
ONLY_FOR_ARCHS= i386 amd64
RESTRICTED= Redistribution not allowed yet.
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+= GNOME=""
-.else
-PLIST_SUB+= GNOME="@comment "
-.endif
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
+ @${MKDIR} ${PREFIX}/share/applications
${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
- ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
- ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net/skype/pkg-plist b/net/skype/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net/skype/pkg-plist
+++ b/net/skype/pkg-plist
@@ -35,5 +35,6 @@ bin/skype_bin
@dirrm %%DATADIR%%/sound
%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 45a0f1e8377c..5b1531ce87f9 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= straw
PORTVERSION= 0.25.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,9 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A GNOME 2 desktop weblog aggregator written in Python
+BROKEN= Does not work with the newer GTK/GNOME python bindings
+
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_GNOME= libglade2 pygnome2 pygnomeextras
+USE_XLIB= yes
+USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 930d800d13d9..21b0117293db 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -149,3 +149,13 @@ share/locale/sr/LC_MESSAGES/straw.mo
share/locale/sr@Latn/LC_MESSAGES/straw.mo
share/locale/sv/LC_MESSAGES/straw.mo
@dirrm share/gnome/straw
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index cf6374306b4d..cfdb1e1f05cf 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tapidbus
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tapioca-voip
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= tapioca-voip
MAINTAINER= babak@farrokhi.net
COMMENT= Abstraction layer for interprocess communication
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/news/pan/Makefile b/news/pan/Makefile
index f479040534b1..962fee2862bd 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -3,27 +3,25 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/news/pan/Makefile,v 1.4 2006/10/11 11:55:59 ahze Exp $
#
PORTNAME= pan
-PORTVERSION= 0.14.2.91
-PORTREVISION= 4
+PORTVERSION= 0.116
CATEGORIES= news gnome
-MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/SOURCE/ \
- http://pan.rebelbase.com/download/obsolete/${PORTVERSION}/SOURCE/
-DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
+MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Threaded GNOME 2 newsreader based on Agent for Windows
+COMMENT= Threaded GTK+2 newsreader based on Agent for Windows
-LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2 \
- pcre.0:${PORTSDIR}/devel/pcre-utf8
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 \
+ gmime-2.0.4:${PORTSDIR}/mail/gmime2
+USE_XLIB= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnometarget libxml2 gtk20
+USE_GNOME= gnomehack gnometarget gtk20 intlhack
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -34,13 +32,10 @@ OPTIONS= GTKSPELL "Enable spell checking support" on
.include <bsd.port.pre.mk>
.if defined(WITHOUT_GTKSPELL)
-CONFIGURE_ARGS+= --disable-gtkspell
+CONFIGURE_ARGS+= --without-gtkspell
.else
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
+CONFIGURE_ARGS+= --with-gtkspell
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|apps/Internet|applications|g' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.post.mk>
diff --git a/news/pan/distinfo b/news/pan/distinfo
index 8f6d26a61224..e12076ec4dd2 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pan-0.14.2.91.tar.bz2) = 4770d899a1c1ba968ce96bc5aeb07b62
-SHA256 (gnome2/pan-0.14.2.91.tar.bz2) = 1658c22fbe29ac0b88d2ae8e487247bad40618809719819297ecf0b7ae69a9ab
-SIZE (gnome2/pan-0.14.2.91.tar.bz2) = 1919099
+MD5 (gnome2/pan-0.116.tar.bz2) = 590587dea07f23f5e87562fdddd67d4a
+SHA256 (gnome2/pan-0.116.tar.bz2) = 77965bcceff35ae591ee477ac3229d22eb5998687cd8f1f6eb95b8abc0ce760b
+SIZE (gnome2/pan-0.116.tar.bz2) = 1402968
diff --git a/news/pan/files/patch-Makefile.in b/news/pan/files/patch-Makefile.in
deleted file mode 100644
index 1ffb18687e4c..000000000000
--- a/news/pan/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Thu Jul 24 22:49:46 2003
-+++ Makefile.in Thu Jul 24 22:49:56 2003
-@@ -116,7 +116,7 @@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
-
--SUBDIRS = po gmime pan docs tests
-+SUBDIRS = po gmime pan docs
-
- DESKTOP_IN_FILES = pan.desktop.in
- DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
diff --git a/news/pan/files/patch-pan.desktop.in b/news/pan/files/patch-pan.desktop.in
deleted file mode 100644
index 19781ac29ab6..000000000000
--- a/news/pan/files/patch-pan.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- pan.desktop.in.orig Sun Feb 27 16:13:23 2005
-+++ pan.desktop.in Sun Feb 27 16:14:07 2005
-@@ -6,3 +6,4 @@
- Icon=pan.png
- Terminal=false
- Type=Application
-+Categories=Application;Network;News;
diff --git a/news/pan/files/patch-pan_base_text-massager.c b/news/pan/files/patch-pan_base_text-massager.c
deleted file mode 100644
index 0d17a321bdb0..000000000000
--- a/news/pan/files/patch-pan_base_text-massager.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- pan/base/text-massager.c.orig Mon Jan 26 00:51:26 2004
-+++ pan/base/text-massager.c Mon Jan 26 00:55:48 2004
-@@ -250,23 +250,29 @@
- char * pch;
- char * line_start;
- char * end;
-+ int pos;
-
- /* walk through the entire string */
- linefeed_here = NULL;
-- for (line_start=pch=str->str, end=line_start+str->len; pch!=end; )
-+ for (pos = 0, line_start=pch=str->str, end=line_start+str->len; pch<end; )
- {
- /* a linefeed could go here; remember this space */
-- if (isspace((guchar)*pch) || *pch=='\n')
-+ if (g_unichar_isspace(g_utf8_get_char (pch)) || *pch=='\n')
- linefeed_here = pch;
-
- /* line's too long; add a linefeed if we can */
-- if (pch-line_start>=column && linefeed_here!=NULL)
-+ if (pos>=column && linefeed_here!=NULL)
- {
- *linefeed_here = '\n';
- pch = line_start = linefeed_here + 1;
- linefeed_here = NULL;
-+ pos = 0;
-+ }
-+ else
-+ {
-+ pch = g_utf8_next_char (pch);
-+ ++ pos;
- }
-- else ++pch;
- }
- }
-
diff --git a/news/pan/pkg-descr b/news/pan/pkg-descr
index 7dba56b05697..9f09a421f788 100644
--- a/news/pan/pkg-descr
+++ b/news/pan/pkg-descr
@@ -1,6 +1,6 @@
-A powerful and easy to use newsreader for GNOME 2.
-
-Pan has many features for easy reading and posting, displaying
-and saving attachments, and offline newsreading.
+Pan is a newsreader, loosely based on Agent and Gravity, which attempts to
+be pleasant to use for new and advanced users alike. It has all the typical
+features found in newsreaders, and also supports offline reading, multiple
+connections, and a number of features for power users and alt.binaries fans.
WWW: http://pan.rebelbase.com/
diff --git a/news/pan/pkg-plist b/news/pan/pkg-plist
index bc80927dfa34..6f56a3218ff3 100644
--- a/news/pan/pkg-plist
+++ b/news/pan/pkg-plist
@@ -1,13 +1,14 @@
bin/pan
-share/gnome/applications/pan.desktop
-share/gnome/pixmaps/pan.png
+share/applications/pan.desktop
share/locale/am/LC_MESSAGES/pan.mo
share/locale/az/LC_MESSAGES/pan.mo
+share/locale/bg/LC_MESSAGES/pan.mo
share/locale/ca/LC_MESSAGES/pan.mo
share/locale/cs/LC_MESSAGES/pan.mo
share/locale/da/LC_MESSAGES/pan.mo
share/locale/de/LC_MESSAGES/pan.mo
share/locale/el/LC_MESSAGES/pan.mo
+share/locale/en_CA/LC_MESSAGES/pan.mo
share/locale/en_GB/LC_MESSAGES/pan.mo
share/locale/es/LC_MESSAGES/pan.mo
share/locale/et/LC_MESSAGES/pan.mo
@@ -15,6 +16,7 @@ share/locale/fi/LC_MESSAGES/pan.mo
share/locale/fr/LC_MESSAGES/pan.mo
share/locale/ga/LC_MESSAGES/pan.mo
share/locale/gl/LC_MESSAGES/pan.mo
+share/locale/hr/LC_MESSAGES/pan.mo
share/locale/hu/LC_MESSAGES/pan.mo
share/locale/it/LC_MESSAGES/pan.mo
share/locale/ja/LC_MESSAGES/pan.mo
@@ -22,14 +24,17 @@ share/locale/ko/LC_MESSAGES/pan.mo
share/locale/lt/LC_MESSAGES/pan.mo
share/locale/lv/LC_MESSAGES/pan.mo
share/locale/ms/LC_MESSAGES/pan.mo
+share/locale/nb/LC_MESSAGES/pan.mo
share/locale/nl/LC_MESSAGES/pan.mo
share/locale/no/LC_MESSAGES/pan.mo
share/locale/pl/LC_MESSAGES/pan.mo
share/locale/pt/LC_MESSAGES/pan.mo
share/locale/pt_BR/LC_MESSAGES/pan.mo
+share/locale/ro/LC_MESSAGES/pan.mo
share/locale/ru/LC_MESSAGES/pan.mo
share/locale/sk/LC_MESSAGES/pan.mo
share/locale/sl/LC_MESSAGES/pan.mo
+share/locale/sq/LC_MESSAGES/pan.mo
share/locale/sr/LC_MESSAGES/pan.mo
share/locale/sr@Latn/LC_MESSAGES/pan.mo
share/locale/sv/LC_MESSAGES/pan.mo
@@ -37,3 +42,39 @@ share/locale/tr/LC_MESSAGES/pan.mo
share/locale/uk/LC_MESSAGES/pan.mo
share/locale/vi/LC_MESSAGES/pan.mo
share/locale/zh_CN/LC_MESSAGES/pan.mo
+share/locale/zh_TW/LC_MESSAGES/pan.mo
+share/pixmaps/pan.png
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index 5111ac9ea869..0c47fc1bf064 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -22,3 +22,5 @@ share/applications/jpilot.desktop
%%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo
@dirrmtry share/applications
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/palm/synce-multisync/Makefile b/palm/synce-multisync/Makefile
index 9fa2983b50cd..be1ba358622a 100644
--- a/palm/synce-multisync/Makefile
+++ b/palm/synce-multisync/Makefile
@@ -6,7 +6,7 @@
PORTNAME= synce-multisync_plugin
PORTVERSION= 0.9.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= palm deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= synce
@@ -20,11 +20,11 @@ RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync
USE_GNOME= gnomeprefix gnometarget gnomevfs2
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} \
--with-libsynce=${LOCALBASE} \
--with-librra=${LOCALBASE} \
- --with-multisync-include=${X11BASE}/include/multisync
+ --with-multisync-include=${LOCALBASE}/include/multisync
.include <bsd.port.mk>
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 36c8760e9fcb..ebb760ccf19e 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -6,7 +6,7 @@
PORTNAME= synce-trayicon
PORTVERSION= 0.9.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= palm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= synce
@@ -14,15 +14,15 @@ MASTER_SITE_SUBDIR= synce
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME tray icon showing battery and storage status of a WinCE device
-BUILD_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
-RUN_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
+BUILD_DEPENDS= ${LOCALBASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
+RUN_DEPENDS= ${LOCALBASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_GMAKE= yes
USE_GNOME= libgnomeui gnometarget
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} \
--with-librapi2=${LOCALBASE}
diff --git a/palm/synce-trayicon/pkg-plist b/palm/synce-trayicon/pkg-plist
index 165fb37ed135..4597fbf66577 100644
--- a/palm/synce-trayicon/pkg-plist
+++ b/palm/synce-trayicon/pkg-plist
@@ -5,4 +5,5 @@ share/pixmaps/synce/synce-color-small.png
share/pixmaps/synce/synce-gray-small.png
share/synce/synce_trayicon_properties.glade
@dirrm share/pixmaps/synce
+@dirrmtry share/pixmaps
@dirrmtry share/synce
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index ab8d52a23c50..b6fdf20110b2 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -3,9 +3,11 @@
# Whom: smyru@heron.pl
#
# $FreeBSD$
+#
PORTNAME= gnugadu2
PORTVERSION= 2.2.9
+PORTREVISION= 2
CATEGORIES= polish net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggadu
@@ -68,7 +70,7 @@ WITH_ESOUND= yes
WITH_DBUS= yes
.endif
-.if exists(${X11BASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL)
+.if exists(${LOCALBASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL)
WITH_GTKSPELL= yes
.endif
@@ -114,7 +116,7 @@ CONFIGURE_ARGS+= --without-gtkspell
.endif
.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --with-dbus \
--with-dbus-dir=${PREFIX}/share/dbus-1/services
PLIST_SUB+= DBUS:=""
@@ -171,8 +173,8 @@ post-patch:
post-install:
.if (${HAVE_GNOME:Mgnomehier}!="")
- ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${PREFIX}/share/gnome/apps/Internet
- ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${PREFIX}/share/gnome/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/gnome/apps/Internet
+ ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${LOCALBASE}/share/gnome/pixmaps
.endif
.if exists(${LOCALBASE}/lib/libkdecore.so)
${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index 536cd957e473..276b1c9d88dd 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -321,8 +321,6 @@ share/gg2/themes/vblue2.theme
share/gg2/themes/vgreen2.theme
share/gg2/themes/vred2.theme
share/gg2/themes/white2.theme
-%%GNOME:%%share/gnome/apps/Internet/gg2.desktop
-%%GNOME:%%share/gnome/pixmaps/gg2.png
share/locale/nl/LC_MESSAGES/gg2.mo
share/locale/pl/LC_MESSAGES/gg2.mo
share/pixmaps/gg2.png
@@ -338,5 +336,8 @@ share/pixmaps/gg2.png
@dirrm share/gg2/pixmaps
@dirrm share/gg2
@dirrm lib/gg2
+%%GNOME:%%@cwd %%LOCALBASE%%
+%%GNOME:%%share/gnome/apps/Internet/gg2.desktop
+%%GNOME:%%share/gnome/pixmaps/gg2.png
%%KDE:%%@cwd %%LOCALBASE%%
%%KDE:%%share/applnk/Internet/gg2.desktop
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index f32465ff9719..ddf8f080c4f9 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -6,7 +6,8 @@
#
PORTNAME= ft2demos
-PORTVERSION= 2.1.10
+PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -32,7 +33,7 @@ MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}"
FREETYPE_WRKSRC!= cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC
-FT_PROGRAMS= ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview testname
+FT_PROGRAMS= ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview
do-install:
@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${PREFIX}/bin)
diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo
index adc556814c0c..411d2d5f0d24 100644
--- a/print/ft2demos/distinfo
+++ b/print/ft2demos/distinfo
@@ -1,3 +1,3 @@
-MD5 (ft2demos-2.1.10.tar.bz2) = 4edaff5721fedcf1932e76935f3029b3
-SHA256 (ft2demos-2.1.10.tar.bz2) = e1ceeb1e2fd62e2212d6eec1fea299a30d4c53da2abdf728ae09456436e5bf0f
-SIZE (ft2demos-2.1.10.tar.bz2) = 122842
+MD5 (ft2demos-2.2.1.tar.bz2) = 64f5fa4425cd8241b130c0be35ba6760
+SHA256 (ft2demos-2.2.1.tar.bz2) = 1c4349ed98f2c6384cb99399f16572e1049c2c15e9691e9dc2cef2ba137acd3e
+SIZE (ft2demos-2.2.1.tar.bz2) = 138604
diff --git a/print/ft2demos/pkg-plist b/print/ft2demos/pkg-plist
index 5d0bd211674b..6d8f1a045ad3 100644
--- a/print/ft2demos/pkg-plist
+++ b/print/ft2demos/pkg-plist
@@ -9,4 +9,3 @@ bin/ftstring
bin/fttimer
bin/ftvalid
bin/ftview
-bin/testname
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 921f0ad61893..ab97e549da2e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -3,11 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/print/gnome-print/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
#
PORTNAME= gnome-print
PORTVERSION= 0.37
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-print/0.37
@@ -25,12 +26,12 @@ USE_GHOSTSCRIPT_RUN= yes
PLIST_SUB= VERSION=${PORTVERSION}
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index 0ebdefdb5faa..f1ffc683a34e 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -119,3 +119,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
@dirrm share/gnome/fonts/afms
@dirrm include/gnome-1.0/libgnomeprint
@dirrm etc/gnome/fonts
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index e20c5ad2dba1..77804d185461 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 7ec2cc8277ec..304354469591 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -90,10 +90,6 @@ share/xfce4/doc/he/xfprint.html
@dirrmtry lib/xfce4/xfprint-plugins
@dirrmtry lib/xfce4
@dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -102,3 +98,35 @@ share/xfce4/doc/he/xfprint.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 6ac05337156d..8095d5c2b1f1 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -3,10 +3,12 @@
# Whom: Andreas Fehlner <fehlner@gmx.de>
#
# $FreeBSD$
+# $MCom: ports/science/gramps/Makefile,v 1.2 2006/10/10 20:22:19 mezz Exp $
#
PORTNAME= gramps
PORTVERSION= 2.0.11
+PORTREVISION= 1
CATEGORIES= science gnome python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gramps
@@ -17,7 +19,7 @@ COMMENT= A GTK/GNOME-based genealogy program written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
${PYTHON_LIBDIR}/site-packages/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/science/gramps/pkg-plist b/science/gramps/pkg-plist
index a6373ce27f73..49cc751d7a0d 100644
--- a/science/gramps/pkg-plist
+++ b/science/gramps/pkg-plist
@@ -580,7 +580,6 @@ share/gnome/help/gramps/sk/cmdline.xml
share/gnome/help/gramps/sk/cmdplug.xml
share/gnome/help/gramps/sk/custom.xml
share/gnome/help/gramps/sk/faq.xml
-share/gnome/help/gramps/sk/figures
share/gnome/help/gramps/sk/figures/bookreport.png
share/gnome/help/gramps/sk/figures/cfe-ar.png
share/gnome/help/gramps/sk/figures/cfe-df.png
@@ -677,22 +676,38 @@ share/mime/application/x-gramps-package.xml
share/mime/application/x-gramps-xml.xml
share/mime/application/x-gramps.xml
share/mime/packages/gramps.xml
-@dirrm share/gnome/gramps/data/templates
-@dirrm share/gnome/gramps/data
-@dirrm share/gnome/gramps/dates
-@dirrm share/gnome/gramps/docgen
-@dirrm share/gnome/gramps/example
-@dirrm share/gnome/gramps/plugins
-@dirrm share/gnome/gramps
-@dirrm share/gnome/help/gramps/C/figures
-@dirrm share/gnome/help/gramps/C
-@dirrm share/gnome/help/gramps/fr/figures
-@dirrm share/gnome/help/gramps/fr
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrm share/gnome/omf/gramps
@dirrm share/gnome/help/gramps/sk/figures
@dirrm share/gnome/help/gramps/sk
+@dirrm share/gnome/help/gramps/fr/figures
+@dirrm share/gnome/help/gramps/fr
+@dirrm share/gnome/help/gramps/C/figures
+@dirrm share/gnome/help/gramps/C
@dirrm share/gnome/help/gramps
-@dirrm share/gnome/omf/gramps
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm share/gnome/gramps/plugins
+@dirrm share/gnome/gramps/example
+@dirrm share/gnome/gramps/docgen
+@dirrm share/gnome/gramps/dates
+@dirrm share/gnome/gramps/data/templates
+@dirrm share/gnome/gramps/data
+@dirrm share/gnome/gramps
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index f25f0ee6091b..18a7736ed54f 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -48,6 +48,8 @@ pre-configure:
-e 's|CFLAGS="-O2"|#CFLAGS="-O2"|;s|Werror ansi pedantic-errors||' \
${WRKSRC}/${CONFIGURE_SCRIPT}
${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/src/Makefile.in
+ ${REINPLACE_CMD} -e 's|-pedantic-errors||' \
+ ${WRKSRC}/src/extraGtkFunctions/Makefile.in
.if defined(WITHOUT_NLS)
${REINPLACE_CMD} -e 's|etc po Documentation|etc Documentation|' \
${WRKSRC}/Makefile.in
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 3f76beae1c13..e60530de650e 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -7,7 +7,7 @@
PORTNAME= encryption
PORTVERSION= 2.38
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@c0decafe.net
COMMENT= Provides transparent RSA encryption as a Gaim plugin
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= nss3:${PORTSDIR}/security/nss
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile
index 995776b40f72..d1ddf1b3b2ae 100644
--- a/security/gaim-otr/Makefile
+++ b/security/gaim-otr/Makefile
@@ -8,6 +8,7 @@
PORTNAME= otr
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= http://www.cypherpunks.ca/otr/ \
http://www.xelerance.com/mirror/otr/
@@ -17,13 +18,14 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@mcdermottroe.com
COMMENT= Allows deniable private conversations using GAIM
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= otr:${PORTSDIR}/security/libotr \
gcrypt:${PORTSDIR}/security/libgcrypt
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
+CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib \
+ --with-libotr-inc-prefix=${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 90e2ee44eb78..0f962c91e9e6 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcipher
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT= A simple encryption tool
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= libgnomeui
GCIPHER_PREFIX= ${PREFIX}/share/gnome/gcipher
diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index 917ffd148879..196c123f4edf 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-password-generator
PORTVERSION= 1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security gnome python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnome-password
@@ -17,7 +17,6 @@ COMMENT= GNOME 2 password generator
USE_GNOME= pygnome2
USE_PYTHON= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
post-patch:
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index a76dde347d67..ada98217f6a8 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpass
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security gnome
MASTER_SITES= http://projects.netlab.jp/gpass/release/
@@ -17,14 +17,14 @@ COMMENT= A password manager for GNOME2
LIB_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
mhash:${PORTSDIR}/security/mhash
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
USE_GMAKE= yes
-MAN1= gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
+MAN1= gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
-USE_GNOME= gtk20 libgnomeui intltool libglade2
+USE_GNOME= gnomehack gnomeprefix gtk20 libgnomeui intltool libglade2
GCONF_SCHEMAS= gpass.schemas
.include <bsd.port.pre.mk>
@@ -33,4 +33,11 @@ GCONF_SCHEMAS= gpass.schemas
BROKEN= Does not compile
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|{packageprefix}/share|{datadir}|g' \
+ ${WRKSRC}/configure
+
+post-install:
+ @-update-desktop-database
+
.include <bsd.port.post.mk>
diff --git a/security/gpass/pkg-plist b/security/gpass/pkg-plist
index 6bcc03316d17..9910308dc5b2 100644
--- a/security/gpass/pkg-plist
+++ b/security/gpass/pkg-plist
@@ -1,16 +1,17 @@
bin/gpass
bin/gpass-convert
-share/applications/gpass.desktop
-%%DATADIR%%/welcome.glade
-%%DATADIR%%/intergradation.glade
-%%DATADIR%%/authentication.glade
-%%DATADIR%%/window.glade
+share/gnome/applications/gpass.desktop
+share/gnome/pixmaps/gpass-icon.png
%%DATADIR%%/attribute-editor.glade
-%%DATADIR%%/confirm-quit.glade
+%%DATADIR%%/authentication.glade
%%DATADIR%%/change-master-password.glade
+%%DATADIR%%/confirm-quit.glade
+%%DATADIR%%/intergradation.glade
+%%DATADIR%%/lock.glade
%%DATADIR%%/password-generator.glade
%%DATADIR%%/preferences.glade
-%%DATADIR%%/lock.glade
-share/pixmaps/gpass-icon.png
-@dirrmtry share/applications
+%%DATADIR%%/welcome.glade
+%%DATADIR%%/window.glade
@dirrm %%DATADIR%%
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index b64b5b967f52..299e82cc75a6 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -21,13 +21,14 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:14 aclocal:14 autoconf:213
+USE_AUTOTOOLS= automake:15 aclocal:15 autoconf:259
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
DOCS= README src/gpasman4.sample
PLIST_FILES= bin/gtkpasman
+ACLOCAL_ARGS?= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
.if !defined(NOPORTDOCS)
PORTDOCS= README gpasman4.sample
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 83c1b38ecc2b..e125b617e7f5 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= babak@farrokhi.net
COMMENT= A secure (encrypted) remote shell compatible with ssh 2.0
BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 \
- ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
+ ${LOCALBASE}/share/guile/1.6/slibcat:${PORTSDIR}/lang/slib-guile
LIB_DEPENDS+= oop:${PORTSDIR}/devel/liboop
GNU_CONFIGURE= yes
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index 607509161439..1ccff747e6f3 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,6 +8,7 @@
PORTNAME= nofgpg
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= security python
MASTER_SITES= http://www.cgabriel.org/download/nofgpg/
@@ -24,7 +25,8 @@ MAN1= nofgpg.1
PLIST_FILES= bin/nofgpg
post-patch:
- @${REINPLACE_CMD} -e "s,/usr/share,${X11BASE}/share/gnome,g" ${WRKSRC}/nofgpg
+ @${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share/gnome,g" \
+ ${WRKSRC}/nofgpg
do-install:
@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 3f76beae1c13..e60530de650e 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,7 +7,7 @@
PORTNAME= encryption
PORTVERSION= 2.38
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@c0decafe.net
COMMENT= Provides transparent RSA encryption as a Gaim plugin
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= nss3:${PORTSDIR}/security/nss
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 995776b40f72..d1ddf1b3b2ae 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -8,6 +8,7 @@
PORTNAME= otr
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= http://www.cypherpunks.ca/otr/ \
http://www.xelerance.com/mirror/otr/
@@ -17,13 +18,14 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@mcdermottroe.com
COMMENT= Allows deniable private conversations using GAIM
-BUILD_DEPENDS= ${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS= ${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
RUN_DEPENDS= gaim:${PORTSDIR}/net-im/gaim
LIB_DEPENDS= otr:${PORTSDIR}/security/libotr \
gcrypt:${PORTSDIR}/security/libgcrypt
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib --with-libotr-inc-prefix=${LOCALBASE}/include
+CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib \
+ --with-libotr-inc-prefix=${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 3819c0ea8041..ce0e158e664b 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,7 +3,7 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.16 2006/03/05 21:52:25 marcus Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.18 2006/10/01 01:56:57 ahze Exp $
#
PORTNAME= seahorse
@@ -21,6 +21,7 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
+USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_X_PREFIX= yes
@@ -28,7 +29,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gpg-check
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -37,11 +37,13 @@ GCONF_SCHEMAS= seahorse.schemas
OPTIONS= NAUTILUS "Enable the Nautilus component" on \
LDAP "Enable LDAP support" on \
- GEDIT "Enable GEdit plug-in support" on \
HKP "Enable HKP keyserver interface" on
+# GEDIT "Enable GEdit plug-in support" on
.include <bsd.port.pre.mk>
+# Gedit not working right now..
+WITHOUT_GEDIT= yes
.if !defined(WITHOUT_GEDIT)
BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 5b17b6dc13fe..363cf20d0408 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -112,3 +112,29 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index ba90dfc188a4..70db8301fe6f 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yersinia
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.yersinia.net/download/
@@ -16,7 +17,7 @@ COMMENT= Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
.if !defined(WITHOUT_GTK)
-.if exists(${X11BASE}/include/gtk-2.0/gtk/gtk.h)
+.if exists(${LOCALBASE}/include/gtk-2.0/gtk/gtk.h)
WITH_GTK= true
.endif
.endif
@@ -41,7 +42,7 @@ MAN8= yersinia.8
PLIST_FILES= sbin/yersinia
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${TARGETDIR}/sbin/
- ${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${TARGETDIR}/man/man8/
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/
+ ${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${PREFIX}/man/man8/
.include <bsd.port.post.mk>
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 88f40b39403e..da8c1f77aff9 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -103,7 +103,7 @@ post-patch:
's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \
${WRKSRC}/xdao/Settings.cc
@${REINPLACE_CMD} -E -e \
- 's|(icon-filename=).+(gcdmaster-doc.png)|\1${X11BASE}\/share\/gnome\/pixmaps\/document-icons\/\2|g' \
+ 's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/gnome\/pixmaps\/document-icons\/\2|g' \
${WRKSRC}/xdao/gcdmaster.keys
.else
.for i in cdrdao.man main.cc
@@ -119,19 +119,19 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
${PREFIX}/man/man1/gcdmaster.1
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \
- ${X11BASE}/share/gnome/pixmaps/document-icons
+ ${LOCALBASE}/share/gnome/pixmaps/document-icons
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \
- ${X11BASE}/share/gnome/application-registry
+ ${LOCALBASE}/share/gnome/application-registry
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
- ${X11BASE}/share/gnome/applications
+ ${LOCALBASE}/share/gnome/applications
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \
- ${X11BASE}/share/gnome/mime-info
+ ${LOCALBASE}/share/gnome/mime-info
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \
- ${X11BASE}/share/gnome/mime-info
+ ${LOCALBASE}/share/gnome/mime-info
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
- ${X11BASE}/share/gnome/pixmaps
+ ${LOCALBASE}/share/gnome/pixmaps
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
- ${X11BASE}/share/mime/packages
+ ${LOCALBASE}/share/mime/packages
@${MKDIR} ${DATADIR}
@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${DATADIR}
.else
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index d36af48f57e1..9e2c4b31e933 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -31,7 +31,7 @@ PORTDOCS= README AUTHORS ChangeLog TODO \
.if defined(WITH_BMPX)
BUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
RUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-bmpx
.else
CONFIGURE_ARGS+= --disable-bmpx
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index d36af48f57e1..9e2c4b31e933 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -31,7 +31,7 @@ PORTDOCS= README AUTHORS ChangeLog TODO \
.if defined(WITH_BMPX)
BUILD_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
RUN_DEPENDS+= beep-media-player-2:${PORTSDIR}/multimedia/bmpx
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-bmpx
.else
CONFIGURE_ARGS+= --disable-bmpx
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 964467b3c04b..707d8fb68f73 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eroaster
PORTVERSION= 2.2.0.0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= eroaster
@@ -30,7 +30,6 @@ BUILD_DEPENDS+= bchunk:${PORTSDIR}/sysutils/bchunk \
${PYTHON_SITELIBDIR}/cdrom.so:${PORTSDIR}/audio/py-cddb
.endif
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_PYTHON= yes
diff --git a/sysutils/eroaster/pkg-plist b/sysutils/eroaster/pkg-plist
index a9a77d0ba203..895bbf433903 100644
--- a/sysutils/eroaster/pkg-plist
+++ b/sysutils/eroaster/pkg-plist
@@ -91,5 +91,6 @@ share/locale/es/LC_MESSAGES/es.mo
@dirrm lib/eroaster/glade
@dirrm lib/eroaster/xml
@dirrm lib/eroaster
+@dirrmtry share/pixmaps
@dirrm share/eroaster/pixmaps
@dirrm share/eroaster
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 1f37a98e5b12..cfd05499582f 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gcdmaster
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= GNOME frontend for cdrdao
diff --git a/sysutils/gcdmaster/pkg-plist b/sysutils/gcdmaster/pkg-plist
index f3de4baec3cb..acf062b72b5e 100644
--- a/sysutils/gcdmaster/pkg-plist
+++ b/sysutils/gcdmaster/pkg-plist
@@ -1,7 +1,5 @@
bin/gcdmaster
%%DATADIR%%/ProjectChooser.glade
-@dirrm %%DATADIR%%
-@cwd %%X11BASE%%
share/gnome/application-registry/gcdmaster.applications
share/gnome/applications/gcdmaster.desktop
share/gnome/mime-info/gcdmaster.keys
@@ -9,6 +7,6 @@ share/gnome/mime-info/gcdmaster.mime
share/gnome/pixmaps/document-icons/gcdmaster-doc.png
share/gnome/pixmaps/gcdmaster.png
share/mime/packages/gcdmaster.xml
+@dirrm %%DATADIR%%
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@cwd %%LOCALBASE%%
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 00313f86f9d3..b06ed466b5c3 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-schedule/Makefile,v 1.1 2005/08/13 14:02:49 ahze Exp $
+# $MCom: ports/sysutils/gnome-schedule/Makefile,v 1.3 2006/07/27 17:55:58 mezz Exp $
#
PORTNAME= gnome-schedule
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
USE_GNOME= gnomeprefix pygnome2
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
DATADIR= ${PREFIX}/share/gnome
@@ -39,11 +39,11 @@ post-patch:
@${REINPLACE_CMD} -e 's|gnome-schedule-$$(VERSION)|gnome-schedule|' \
${WRKSRC}/doc/Makefile.in
.endif
- @${REINPLACE_CMD} -e 's|/usr/share/icons|${X11BASE}/share/icons|; \
+ @${REINPLACE_CMD} -e 's|/usr/share/icons|${LOCALBASE}/share/icons|; \
s|@prefix@/share|${DATADIR}|; \
s|/usr/local/share/|${DATADIR}|; \
s|/usr/share/|${DATADIR}|; \
- s|/usr/bin/gnome-help|${X11BASE}/bin/gnome-help|; \
+ s|/usr/bin/gnome-help|${LOCALBASE}/bin/gnome-help|; \
s|$$(prefix)/share/|$$(datadir)/|' \
${WRKSRC}/src/*.* ${WRKSRC}/Makefile.in \
${WRKSRC}/pixmaps/Makefile.in
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 743e4ebf2f78..a6a3b87785cf 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,10 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.45 2006/07/27 00:40:38 marcus Exp $
#
PORTNAME= gnome-system-tools
PORTVERSION= 2.14.0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,13 +18,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to configure workstations
-BUILD_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+BUILD_DEPENDS= ${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+RUN_DEPENDS= ${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
USE_AUTOTOOLS= libtool:15
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 7954d30d14a0..3f9b6a1a9832 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -185,10 +185,6 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
@dirrm share/gnome/omf/users-admin
@dirrm share/gnome/omf/time-admin
@dirrm share/gnome/omf/services-admin
@@ -227,3 +223,45 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/interfaces
@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 2a72e29f1e63..a9cd9023c3d4 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gnomebaker
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomebaker
@@ -17,7 +18,7 @@ COMMENT= A CD/DVD recording GUI for Gnome
OPTIONS= DVD "Enable DVD support" off \
CJK "Use cdrtools-cjk instead of cdrtools" off
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils
GNU_CONFIGURE= yes
diff --git a/sysutils/gnomebaker/pkg-plist b/sysutils/gnomebaker/pkg-plist
index e088ec566698..b86fab8cde0f 100644
--- a/sysutils/gnomebaker/pkg-plist
+++ b/sysutils/gnomebaker/pkg-plist
@@ -118,38 +118,6 @@ share/locale/zh/LC_MESSAGES/gnomebaker.mo
share/locale/zh_CN/LC_MESSAGES/gnomebaker.mo
share/locale/zh_HK/LC_MESSAGES/gnomebaker.mo
share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
-@dirrmtry share/locale/bo/LC_MESSAGES
-@dirrmtry share/locale/bo
-@dirrmtry share/locale/de_CH/LC_MESSAGES
-@dirrmtry share/locale/de_CH
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/locale/es_AR/LC_MESSAGES
-@dirrmtry share/locale/es_AR
-@dirrmtry share/locale/es_CO/LC_MESSAGES
-@dirrmtry share/locale/es_CO
-@dirrmtry share/locale/es_CR/LC_MESSAGES
-@dirrmtry share/locale/es_CR
-@dirrmtry share/locale/eu_ES/LC_MESSAGES
-@dirrmtry share/locale/eu_ES
-@dirrmtry share/locale/fr_CH/LC_MESSAGES
-@dirrmtry share/locale/fr_CH
-@dirrmtry share/locale/it_IT/LC_MESSAGES
-@dirrmtry share/locale/it_IT
-@dirrmtry share/locale/st/LC_MESSAGES
-@dirrmtry share/locale/st
-@dirrmtry share/locale/nl_BE/LC_MESSAGES
-@dirrmtry share/locale/nl_BE
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/urd/LC_MESSAGES
-@dirrmtry share/locale/urd
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
-@dirrmtry share/locale/nl_NL/LC_MESSAGES
-@dirrmtry share/locale/nl_NL
-@dirrmtry share/locale/sv_SE/LC_MESSAGES
-@dirrmtry share/locale/sv_SE
@dirrm share/gnome/omf/gnomebaker
@dirrm share/gnome/help/gnomebaker/C/figures
@dirrm share/gnome/help/gnomebaker/C
@@ -157,3 +125,79 @@ share/locale/zh_TW/LC_MESSAGES/gnomebaker.mo
@dirrm share/gnome/gnomebaker
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/urd/LC_MESSAGES
+@dirrmtry share/locale/urd
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/st/LC_MESSAGES
+@dirrmtry share/locale/st
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/nl_BE/LC_MESSAGES
+@dirrmtry share/locale/nl_BE
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fr_CH/LC_MESSAGES
+@dirrmtry share/locale/fr_CH
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/eu_ES/LC_MESSAGES
+@dirrmtry share/locale/eu_ES
+@dirrmtry share/locale/es_CR/LC_MESSAGES
+@dirrmtry share/locale/es_CR
+@dirrmtry share/locale/es_CO/LC_MESSAGES
+@dirrmtry share/locale/es_CO
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/de_CH/LC_MESSAGES
+@dirrmtry share/locale/de_CH
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bo/LC_MESSAGES
+@dirrmtry share/locale/bo
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 10b8b24edf3b..4a0ffbdd4898 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-imonc
PORTVERSION= 0.6.4.1
-PORTREVISION= 1
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GNOME= gtk20 gnomehier
-USE_X_PREFIX= yes
+USE_XLIB= yes
post-patch:
@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|' \
diff --git a/sysutils/gtk-imonc/pkg-plist b/sysutils/gtk-imonc/pkg-plist
index 844509e1a2cc..31192335ed37 100644
--- a/sysutils/gtk-imonc/pkg-plist
+++ b/sysutils/gtk-imonc/pkg-plist
@@ -12,5 +12,6 @@ share/gtk-imonc/pixmaps/reboot.png
share/gtk-imonc/pixmaps/shutdown.png
share/locale/de/LC_MESSAGES/gtk-imonc.mo
share/pixmaps/gtk-imonc.png
+@dirrmtry share/pixmaps
@dirrm share/gtk-imonc/pixmaps
@dirrm share/gtk-imonc
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 344a9d5772db..8ba6536a065c 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -7,17 +7,16 @@
PORTNAME= gupsc
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= http://heim.ifi.uio.no/~hennikul/gupsc/download/
MAINTAINER= demon@FreeBSD.org
COMMENT= A free Gnome client for the Network UPS Tools
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomelibs
+USE_GNOME= gnomelibs gnomehier
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -25,6 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|/usr/local|${PREFIX}|; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \
${WRKSRC}/src/Makefile.in
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
diff --git a/sysutils/gupsc/pkg-plist b/sysutils/gupsc/pkg-plist
index 213dcb215695..b78d831db818 100644
--- a/sysutils/gupsc/pkg-plist
+++ b/sysutils/gupsc/pkg-plist
@@ -3,3 +3,5 @@ share/locale/no/LC_MESSAGES/gupsc.mo
share/gnome/pixmaps/gupsc/ups.png
share/gnome/apps/System/gupsc.desktop
@dirrm share/gnome/pixmaps/gupsc
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 453bb73c150e..530aa003995a 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/serpentine/Makefile,v 1.2 2006/04/25 15:17:05 ahze Exp $
+# $MCom: ports/sysutils/serpentine/Makefile,v 1.4 2006/08/31 05:21:45 marcus Exp $
PORTNAME= serpentine
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,10 +18,10 @@ COMMENT= Gnome Audio Cd Buner
BUILD_DEPENDS= xmlproc_parse:${PORTSDIR}/textproc/py-xml
RUN_DEPENDS= xmlproc_parse:${PORTSDIR}/textproc/py-xml
-USE_X_PREFIX= yes
+USE_ZLIB= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GNOME= pygnomeextras intlhack
+USE_GNOME= pygnomedesktop intlhack
USE_GMAKE= yes
USE_GSTREAMER= core gnomevfs python
USE_PYTHON= 2.4+
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 2a204728d78e..91a3b0ee85fb 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-battery-plugin
PORTVERSION= 0.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -24,7 +24,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
ONLY_FOR_ARCHS= i386
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 2aa89edceb04..7658b4045156 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 0.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= xfce-goodies
@@ -24,7 +24,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GCC= 3.4
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 788f2c649c71..55c97fdbfdb0 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/ \
http://ftp.lug.udel.edu/pub/NetBSD/packages/distfiles/ \
@@ -25,7 +26,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index fc9286fccf91..d8ee434f6f14 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/sysutils/xfce4-genmon-plugin/Makefile,v 1.1 2006/10/02 20:33:19 ahze Exp $
PORTNAME= xfce4-genmon-plugin
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -22,7 +22,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 3f5a51b4d6f0..a240aff02c25 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mcs-manager
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GETTEXT= yes
USE_GNOME= glib20 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist
index cd1e82880aa6..cfb9f5505029 100644
--- a/sysutils/xfce4-mcs-manager/pkg-plist
+++ b/sysutils/xfce4-mcs-manager/pkg-plist
@@ -69,12 +69,6 @@ share/xfce4/doc/he/xfce-mcs-manager.html
@dirrmtry include/xfce4
@dirrmtry share/applications
@dirrmtry share/icons/hicolor
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -83,3 +77,37 @@ share/xfce4/doc/he/xfce-mcs-manager.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 8e05660dd16c..cf22c1383bc4 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mcs-plugins
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist
index 4369677d30b2..ba7285dd4bc0 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-plist
+++ b/sysutils/xfce4-mcs-plugins/pkg-plist
@@ -93,10 +93,6 @@ share/xfce4/doc/he/images/user_interface_settings.png
share/xfce4/doc/he/xfce-mcs-plugins.html
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -105,3 +101,35 @@ share/xfce4/doc/he/xfce-mcs-plugins.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index de82603fdfba..14e17358af1f 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-minicmd-plugin
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -15,9 +16,8 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= Displays a mini-command line on the xfce4-panel
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 07731e8316d5..e7b7d079cf54 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-netload-plugin
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -23,7 +23,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_BZIP2= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index a51cd11bdc05..3db5601a1fd0 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-showdesktop-plugin
PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -23,7 +23,6 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index c8a8bd68d461..b12e5df04504 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-systemload-plugin
PORTVERSION= 0.3.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -22,7 +22,6 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index b6afdf3d4f78..729365eddd81 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-utils
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 112448f76f68..b91838a57283 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -185,10 +185,6 @@ share/xfce4/doc/xfce-rtl.css
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
@dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -197,3 +193,37 @@ share/xfce4/doc/xfce-rtl.css
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 0712dbcd91ff..32f8f8cad235 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Manuel Rabade Garica <mig@mig-29.net>
#
# $FreeBSD$
-#
+# $MCom: ports/sysutils/xfce4-wavelan-plugin/Makefile,v 1.1 2006/10/02 20:43:59 ahze Exp $
PORTNAME= xfce4-wavelan-plugin
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -22,7 +22,6 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 438b3fad8cd8..ced321b586d4 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -3,11 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/textproc/aiksaurus/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
PORTNAME= aiksaurus
PORTVERSION= 1.2.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= aiksaurus
@@ -17,8 +17,7 @@ COMMENT?= A set of libraries and applications which provide a thesaurus
USE_GMAKE= yes
USE_GNOME?= gnomehack gnometarget
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?=--without-gtk
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index e9b15ac8512c..4626b1e27068 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-translate
PORTVERSION= 0.99
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= libtranslate
diff --git a/textproc/gnome-translate/pkg-plist b/textproc/gnome-translate/pkg-plist
index 142bf96db56e..1c1ba0431126 100644
--- a/textproc/gnome-translate/pkg-plist
+++ b/textproc/gnome-translate/pkg-plist
@@ -30,5 +30,3 @@ share/locale/fr/LC_MESSAGES/gnome-translate.mo
@dirrm share/gnome/help/gnome-translate/C
@dirrm share/gnome/help/gnome-translate
@dirrm share/gnome/omf/gnome-translate
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 93d6e135ec47..3812ac0928cd 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/textproc/gtkspell/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
#
PORTNAME= gtkspell
PORTVERSION= 2.0.11
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= textproc gnome
MASTER_SITES= http://gtkspell.sourceforge.net/download/
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
@@ -24,8 +25,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist
index 9670f1c00ad4..a04d2eb94863 100644
--- a/textproc/gtkspell/pkg-plist
+++ b/textproc/gtkspell/pkg-plist
@@ -30,5 +30,23 @@ share/locale/zh_CN/LC_MESSAGES/gtkspell.mo
share/locale/zh_TW/LC_MESSAGES/gtkspell.mo
@dirrm include/gtkspell-2.0/gtkspell
@dirrm include/gtkspell-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/rm/LC_MESSAGES
@dirrmtry share/locale/rm
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index d517ddcfcb90..65336caa31b8 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gxmlviewer
PORTVERSION= 1.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An xmlviewer with a netscape plugin, and now a bonobo control as well
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= bonobo gnomehack gnomelibs gnomeprefix libxml2
USE_GETTEXT= yes
GNU_CONFIGURE= yes
@@ -28,8 +28,8 @@ post-patch:
s|/netscape/|/gxmlviewer/|g' ${WRKSRC}/src/nsplugin/Makefile.in
post-install:
- @${MKDIR} ${X11BASE}/lib/browser_plugins
+ @${MKDIR} ${LOCALBASE}/lib/browser_plugins
@${LN} -sf ${PREFIX}/lib/gxmlviewer/plugins/npgxmlviewer.so \
- ${X11BASE}/lib/browser_plugins/npgxmlviewer.so
+ ${LOCALBASE}/lib/browser_plugins/npgxmlviewer.so
.include <bsd.port.mk>
diff --git a/textproc/gxmlviewer/pkg-plist b/textproc/gxmlviewer/pkg-plist
index 0fe3f1ea37ca..88fc21b80912 100644
--- a/textproc/gxmlviewer/pkg-plist
+++ b/textproc/gxmlviewer/pkg-plist
@@ -3,9 +3,9 @@ bin/xmlview-control
bin/xmlformatter
lib/gxmlviewer/plugins/npgxmlviewer.so
share/gnome/oaf/GNOME_XMLView.oaf
-@unexec rm -f %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
-@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec mkdir -p %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
+@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
+@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
+@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
+@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
@dirrm lib/gxmlviewer/plugins
@dirrm lib/gxmlviewer
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index fc944b59d4ad..f5cfe7517793 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-im-switcher
PORTVERSION= 12.2
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@@ -18,16 +18,19 @@ COMMENT= IIIMF gnome input method switcher
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-
+USE_XLIB= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= intltool gconf2 libglade2 libgnomeui \
gnomepanel gnomeprefix gnomehack
+INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env
WANT_AUTOHEADER_VER= 259
+GCONF_SCHEMAS= gnome-im-properties.schemas gnome-im-switcher.schemas
+
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/gnome-im-switcher
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index e8643cb990c5..73fe96d5a5d0 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -1,6 +1,19 @@
bin/gnome-im-properties
bin/gnome-im-settings-daemon
+libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
libexec/gnome-im-switcher-applet
+share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
+share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
+share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+share/gnome/help/imswitcher/C/imswitcher.xml
+share/gnome/help/imswitcher/C/legal.xml
+share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
+share/gnome/pixmaps/gimlet-disable.png
+share/gnome/pixmaps/gimlet-off.png
+share/gnome/pixmaps/gimlet-on.png
+share/gnome/pixmaps/gnome-settings-im.png
+share/icons/hicolor/48x48/apps/gnome-settings-im.png
share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
@@ -19,44 +32,23 @@ share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-share/icons/hicolor/48x48/apps/gnome-settings-im.png
-share/gnome/pixmaps/gnome-settings-im.png
-share/gnome/pixmaps/gimlet-off.png
-share/gnome/pixmaps/gimlet-on.png
-share/gnome/pixmaps/gimlet-disable.png
-share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
-share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-@dirrmtry share/gnome/control-center-2.0/interfaces
-share/gnome/help/imswitcher/C/legal.xml
-share/gnome/help/imswitcher/C/imswitcher.xml
-@dirrm share/gnome/help/imswitcher/C
-@dirrm share/gnome/help/imswitcher
-share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
+@dirrm share/gnome/omf/iiimf-im-switcher
@dirrm share/gnome/iiimf-im-switcher/glade
@dirrm share/gnome/iiimf-im-switcher
-share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
-@comment
-@comment 'do scrollkeeper'
-@comment
-share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
-@exec %D/bin/scrollkeeper-install -q %D/share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
-@unexec %D/bin/scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
-@dirrm share/gnome/omf/iiimf-im-switcher
-@comment
-@comment 'do gconftool-2'
-@comment
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
-etc/gconf/schemas/gnome-im-switcher.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
-etc/gconf/schemas/gnome-im-properties.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
-@comment
-@comment 'rm files in LOCALBASE.'
-@comment
-@cwd %%LOCALBASE%%
-libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
+@dirrm share/gnome/help/imswitcher/C
+@dirrm share/gnome/help/imswitcher
+@dirrmtry share/gnome/control-center-2.0/interfaces
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 32b8cbf67c9a..969868b485a0 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk
PORTVERSION= 12.2
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@@ -21,8 +21,7 @@ LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
-
+USE_XLIB= yes
USE_BZIP2= yes
USE_ICONV= yes
USE_GETTEXT= yes
@@ -59,7 +58,7 @@ do-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
post-install:
- ${X11BASE}/bin/gtk-query-immodules-2.0 > \
- ${X11BASE}/etc/gtk-2.0/gtk.immodules
+ ${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
+ ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
.include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index 34ee650d9127..76f956b133db 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -1,6 +1,6 @@
-lib/gtk-2.0/2.4.0/immodules/im-iiim.a
-lib/gtk-2.0/2.4.0/immodules/im-iiim.la
-lib/gtk-2.0/2.4.0/immodules/im-iiim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.so
@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
share/locale/ja/LC_MESSAGES/iiimgcf.mo
@@ -8,5 +8,11 @@ share/locale/ko/LC_MESSAGES/iiimgcf.mo
share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo
share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo
share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index ee9cc9dca610..8610713e2ed6 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,7 +7,7 @@
PORTNAME= meld
PORTVERSION= 0.9.4.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -18,7 +18,6 @@ COMMENT= GNOME 2 visual diff and merge tool
USE_BZIP2= yes
USE_GNOME= pygnome2
USE_PYTHON= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GMAKE= yes
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index ea49d682b0da..07b68e8481c7 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -88,6 +88,15 @@ share/pixmaps/meld.png
@dirrm share/meld/glade2/pixmaps
@dirrm share/meld/glade2
@dirrm share/meld
-@dirrm share/applications
-@dirrm share/application-registry
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
+@dirrmtry share/application-registry
@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index f4f4ad4f6cff..46d655752df1 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openvanilla-modules
PORTVERSION= 0.7.2.b20060214
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.csie.org/~llwang/ \
http://www.infor.org/~llwang/
@@ -16,9 +17,8 @@ MAINTAINER= llwang@infor.org
COMMENT= Input method modules for OpenVanilla
BUILD_DEPENDS= ${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
-RUN_DEPENDS= ${X11BASE}/lib/scim-1.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
+RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15:env
USE_GMAKE= yes
USE_PERL5_BUILD= yes
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 554418dd74c7..f8ab33c6e21f 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-input-pad
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT= SCIM add-on to input various symbols with on-screen pad
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index ed961a7a90bd..ce3140e5282d 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-openvanilla
PORTVERSION= 0.7.2.b20060214
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.csie.org/~llwang/ \
http://www.infor.org/~llwang/
@@ -19,7 +20,6 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
${X11BASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libltdl:15
WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM
USE_GMAKE= yes
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 88a76413a41b..4440a3aaa06d 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-table-imengine
PORTVERSION= 0.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -19,7 +19,6 @@ COMMENT= SCIM table based input method engine
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= intlhack
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index af08215854a2..b93d72c4218f 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -33,6 +33,11 @@ share/locale/pa/LC_MESSAGES/scim-tables.mo
%%SKIM%%@dirrmtry share/apps/skim
%%SKIM%%@dirrmtry share/config.kcfg
%%SKIM%%@dirrmtry share/services/skimconfiguredialog
-%%SKIM%%@cwd %%X11BASE%%
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 684e351eb81f..4de2ac4beca8 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim
PORTVERSION= 1.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -17,7 +17,7 @@ COMMENT= Smart Common Input Method platform
USE_GNOME= gnomehack gnomehier gtk20 intlhack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ICONV= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
@@ -48,7 +48,7 @@ post-patch:
${WRKSRC}/extras/setup/Makefile.in
post-install:
- @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+ @gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
@${CAT} ${PKGMESSAGE}
@${ECHO} To display this message again, type pkg_info -D ${PKGNAME}
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index dd22c48a4531..22b95e8475c6 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -150,3 +150,11 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
@dirrm %%DATADIR%%
@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 0238aa901be9..db683b279335 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= skim
PORTVERSION= 1.4.4
+PORTREVISION= 1
CATEGORIES= textproc kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scim
diff --git a/textproc/skim/pkg-plist b/textproc/skim/pkg-plist
index 1995354a791e..016d28e80342 100644
--- a/textproc/skim/pkg-plist
+++ b/textproc/skim/pkg-plist
@@ -137,7 +137,7 @@ share/servicetypes/skimkcmplugin.desktop
share/servicetypes/skimplugin.desktop
share/servicetypes/skimsetupcategory.desktop
share/servicetypes/skimui.desktop
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
lib/scim-1.0/1.4.0/Config/kconfig.la
lib/scim-1.0/1.4.0/Config/kconfig.so
@cwd %%LOCALBASE%%
@@ -148,3 +148,9 @@ lib/scim-1.0/1.4.0/Config/kconfig.so
@dirrm share/doc/HTML/de/skim
@dirrm share/apps/skim/pics
@dirrm share/apps/skim
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index b02f0a61f092..f5bec3499e45 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -19,7 +19,6 @@ COMMENT= Dictionaries from www.mova.org for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index 59eaa1149875..a6e98023a794 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -19,7 +19,6 @@ COMMENT= Dictionaries from Quick for StarDict
RUN_DEPENDS= stardict:${PORTSDIR}/textproc/stardict2
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 3302c4fd7296..437f420b9099 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
PKGNAMESUFFIX= -gtk
COMMENT= GTK+ modules of uim input method
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 0dde94188390..93c6650cdb02 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -3,8 +3,8 @@ bin/uim-input-pad-ja
bin/uim-pref-gtk
bin/uim-toolbar-gtk
bin/uim-toolbar-gtk-systray
-lib/gtk-2.0/2.4.0/immodules/im-uim.a
-lib/gtk-2.0/2.4.0/immodules/im-uim.la
-lib/gtk-2.0/2.4.0/immodules/im-uim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 9a877f17aa82..cb3f35446c8c 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -34,10 +34,6 @@ do-install:
${GMAKE} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES)
post-install:
-.if defined(WITHOUT_X11)
${LOCALBASE}/bin/uim-module-manager --register m17nlib
-.else
- ${X11BASE}/bin/uim-module-manager --register m17nlib
-.endif
.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d0a53950b99f..b0252a9e2a73 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uim
PORTVERSION= 1.2.1
+PORTREVISION?= 1
CATEGORIES?= textproc
MASTER_SITES= http://uim.freedesktop.org/releases/
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
@@ -26,7 +27,6 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
-USE_X_PREFIX= yes
LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
CONFIGURE_ARGS+= --with-x --with-xft
.endif
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index d3ff2e315178..475f2f0900b3 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -197,3 +197,5 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/www/adblock/Makefile b/www/adblock/Makefile
index 12b2dc219122..1403cc14f5b5 100644
--- a/www/adblock/Makefile
+++ b/www/adblock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adblock
DISTVERSION= 0.5-dev
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= thierry
@@ -16,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= A content filtering plug-in for ${GECKO}
-USE_X_PREFIX= yes
-
PLIST_FILES= %%MOZDIR%%/chrome/adblock.jar
.include <bsd.port.pre.mk>
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 543f55c0b1ba..b7add880c6bd 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -3,11 +3,12 @@
# Whom: Koop Mast <einekoai@chello.nl>
#
# $FreeBSD$
-# $MCom: ports-stable/www/bluefish/Makefile,v 1.2 2005/08/21 20:03:36 kwm Exp $
+# $MCom: ports/www/bluefish/Makefile,v 1.1 2006/09/30 03:21:27 ahze Exp $
#
PORTNAME= bluefish
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= www editors
MASTER_SITES= http://pkedu.fbt.wur.nl/~olivier/${DOWNLOAD}/ \
http://bluefish.mrball.net/${DOWNLOAD}/ \
@@ -30,9 +31,9 @@ RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy
DOWNLOAD= downloads
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_GNOME= gnomehier gtk20 gnomevfs2
WANT_GNOME= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 98753d37e35f..47400723d38b 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -54,3 +54,21 @@ share/mime/packages/bluefish.xml
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile
index 24431a38dff3..97cde4c64093 100644
--- a/www/bugmenot/Makefile
+++ b/www/bugmenot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugmenot
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://extensions.roachfiend.com/
DISTNAME= ${PORTNAME}
@@ -15,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${PORTREVISION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= ${GECKO} extension to bypass compulsory web registration
-USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>.
-
PLIST_FILES= %%MOZDIR%%/chrome/bugmenot.jar
.include <bsd.port.pre.mk>
diff --git a/www/bugmenot/distinfo b/www/bugmenot/distinfo
index 4b6d6cdca957..b5874e6ad0a2 100644
--- a/www/bugmenot/distinfo
+++ b/www/bugmenot/distinfo
@@ -1,3 +1,3 @@
-MD5 (bugmenot-1.3_0/bugmenot.xpi) = f446463062b623004db61563eab815c2
-SHA256 (bugmenot-1.3_0/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
-SIZE (bugmenot-1.3_0/bugmenot.xpi) = 19249
+MD5 (bugmenot-1.3_1/bugmenot.xpi) = f446463062b623004db61563eab815c2
+SHA256 (bugmenot-1.3_1/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
+SIZE (bugmenot-1.3_1/bugmenot.xpi) = 19249
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 7aba8c75f6db..88cdf524b8de 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= -devel
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/'
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -84,6 +83,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox-devel/files/patch-nothreads-sqlite b/www/firefox-devel/files/patch-nothreads-sqlite
new file mode 100644
index 000000000000..1b1bbbcbda15
--- /dev/null
+++ b/www/firefox-devel/files/patch-nothreads-sqlite
@@ -0,0 +1,12 @@
+--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006
++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006
+@@ -99,7 +99,8 @@
+ # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
+ # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
+ # don't have to vacuum to make sure the data is not visible in the file.
+-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
++# -DTHREADSAFE=1
+
+ ifdef ENABLE_TESTS
+ ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/www/firefox-remote/Makefile b/www/firefox-remote/Makefile
index ce55b553ee5b..e580beba8bf8 100644
--- a/www/firefox-remote/Makefile
+++ b/www/firefox-remote/Makefile
@@ -7,6 +7,7 @@
PORTNAME= firefox
PORTVERSION= 20040803
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.webonaut.com/distfiles/${PORTNAME}${PKGNAMESUFFIX}/
PKGNAMESUFFIX= -remote
@@ -16,15 +17,14 @@ MAINTAINER= klammer@webonaut.com
COMMENT= Wrapper scripts for firefox web browser
USE_BZIP2= yes
-USE_X_PREFIX= yes
UTF8_HACK= no
FIREFOX_REMOTE= ${PORTNAME}${PKGNAMESUFFIX}
THUNDERBIRD_REMOTE= thunderbird${PKGNAMESUFFIX}
OPTIONS=UTF8_LOCALE "Use UTF8 locale (read Makefile for details)" off \
- MENU_FIREFOX "Add GNOME menu entry for firefox" off \
- MENU_THUNDERBIRD "Add GNOME menu entry for thunderbird" off
+ MENU_FIREFOX "Add menu entry for firefox" off \
+ MENU_THUNDERBIRD "Add menu entry for thunderbird" off
.include <bsd.port.pre.mk>
@@ -62,15 +62,15 @@ do-install:
${PREFIX}/bin/${THUNDERBIRD_REMOTE}
.if defined (WITH_MENU_FIREFOX)
${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \
- ${X11BASE}/share/gnome/applications/
+ ${X11BASE}/share/applications/
${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \
- ${X11BASE}/share/gnome/pixmaps/
+ ${X11BASE}/share/pixmaps/
.endif
.if defined (WITH_MENU_THUNDERBIRD)
${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \
- ${X11BASE}/share/gnome/applications/
+ ${X11BASE}/share/applications/
${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \
- ${X11BASE}/share/gnome/pixmaps/
+ ${X11BASE}/share/pixmaps/
.endif
${CAT} ${PKGMESSAGE}
diff --git a/www/firefox-remote/pkg-plist b/www/firefox-remote/pkg-plist
index 6898e0e433c2..fa3626ff6426 100644
--- a/www/firefox-remote/pkg-plist
+++ b/www/firefox-remote/pkg-plist
@@ -1,6 +1,7 @@
bin/firefox-remote
bin/thunderbird-remote
-%%MENU_FIREFOX%%share/gnome/applications/mozilla_firefox.desktop
-%%MENU_THUNDERBIRD%%share/gnome/applications/mozilla_thunderbird.desktop
-%%MENU_FIREFOX%%share/gnome/pixmaps/mozilla_firefox.png
-%%MENU_THUNDERBIRD%%share/gnome/pixmaps/mozilla_thunderbird.png
+%%MENU_FIREFOX%%share/applications/mozilla_firefox.desktop
+%%MENU_THUNDERBIRD%%share/applications/mozilla_thunderbird.desktop
+%%MENU_FIREFOX%%share/pixmaps/mozilla_firefox.png
+%%MENU_THUNDERBIRD%%share/pixmaps/mozilla_thunderbird.png
+@dirrmtry share/applications
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 7aba8c75f6db..88cdf524b8de 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= -devel
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/'
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -84,6 +83,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox3-devel/files/patch-nothreads-sqlite b/www/firefox3-devel/files/patch-nothreads-sqlite
new file mode 100644
index 000000000000..1b1bbbcbda15
--- /dev/null
+++ b/www/firefox3-devel/files/patch-nothreads-sqlite
@@ -0,0 +1,12 @@
+--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006
++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006
+@@ -99,7 +99,8 @@
+ # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
+ # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
+ # don't have to vacuum to make sure the data is not visible in the file.
+-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
++# -DTHREADSAFE=1
+
+ ifdef ENABLE_TESTS
+ ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 7aba8c75f6db..88cdf524b8de 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= -devel
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/'
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -84,6 +83,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/firefox35/files/patch-nothreads-sqlite b/www/firefox35/files/patch-nothreads-sqlite
new file mode 100644
index 000000000000..1b1bbbcbda15
--- /dev/null
+++ b/www/firefox35/files/patch-nothreads-sqlite
@@ -0,0 +1,12 @@
+--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006
++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006
+@@ -99,7 +99,8 @@
+ # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
+ # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
+ # don't have to vacuum to make sure the data is not visible in the file.
+-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
++# -DTHREADSAFE=1
+
+ ifdef ENABLE_TESTS
+ ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 701b3236aa53..376b5a3381ea 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -3,11 +3,12 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
+# $MCom: ports/www/flock/Makefile,v 1.2 2006/10/05 21:37:18 mezz Exp $
#
PORTNAME= flock
DISTVERSION= 0.7
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_LOCAL}
# http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock
@@ -23,7 +24,6 @@ LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \
MOZILLA_NAME= Flock
CLUCENE_WRKSRC= ${WRKDIR}/clucene
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -52,10 +52,6 @@ OPTIONS= SMB "Enable smb:// URI support using gnomevfs" off
.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-BROKEN= Does not build on amd64
-.endif
-
.if ${ARCH}=="alpha" || ${ARCH}=="ia64"
IGNORE= core dumps on ${ARCH}
.endif
@@ -89,6 +85,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
do-install:
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
@@ -108,5 +105,5 @@ post-install:
${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/share/pixmaps/${FLOCK_ICON}
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index be224b724f2b..3ba83e11a968 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/galeon/Makefile,v 1.7 2005/11/28 17:45:54 ahze Exp $
+# $MCom: ports/www/galeon/Makefile,v 1.9 2006/07/27 18:09:47 mezz Exp $
#
PORTNAME= galeon
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -19,7 +20,7 @@ COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
USE_GECKO= firefox mozilla seamonkey xulrunner
WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \
gnomedesktop
@@ -54,7 +55,7 @@ post-patch:
's|malloc\.h|stdlib.h|g'
@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
- @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${X11BASE}/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+ @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \
${WRKSRC}/mozilla/mozilla-embed-shell.cpp
.include <bsd.port.post.mk>
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index ec5501e7ebee..bdd8285031b2 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -218,10 +218,6 @@ share/locale/wa/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/sounds/galeon
@dirrm share/gnome/omf/galeon
@dirrm share/gnome/help/galeon/es/figures
@@ -235,3 +231,43 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
@dirrm share/gnome/galeon
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index ebc6a1e2a114..242a3a4c0a3e 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glibwww
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/glibwww/0.2
@@ -17,11 +17,10 @@ COMMENT= A library for people wanting to use libwww with gtk/gnome
LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index 8594ff3e50b1..6d0214a61d58 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gnome-web-photo/Makefile,v 1.1 2005/12/01 06:25:42 ahze Exp $
+# $MCom: ports/www/gnome-web-photo/Makefile,v 1.3 2006/08/20 01:51:48 mezz Exp $
#
PORTNAME= gnome-web-photo
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
@@ -20,8 +21,8 @@ USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gecko=${GECKO}
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomevfs2 gnomehack
+USE_XLIB= yes
+USE_GNOME= gnomevfs2 gnomehack gnomeprefix
GCONF_SCHEMAS= thumbnailer.schemas
.include <bsd.port.pre.mk>
diff --git a/www/gnome-web-photo/pkg-plist b/www/gnome-web-photo/pkg-plist
index a24099dfbeaf..816a430a88e0 100644
--- a/www/gnome-web-photo/pkg-plist
+++ b/www/gnome-web-photo/pkg-plist
@@ -1,6 +1,6 @@
bin/gnome-web-photo
bin/gnome-web-print
bin/gnome-web-thumbnail
-%%DATADIR%%/prefs.js
-%%DATADIR%%/style.css
-@dirrm %%DATADIR%%
+share/gnome/gnome-web-photo/prefs.js
+share/gnome/gnome-web-photo/style.css
+@dirrm share/gnome/gnome-web-photo
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 783d3f2c934e..cfec1ebda39c 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
@@ -19,11 +19,11 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh
index 4f45451884d8..4dc806a68c1b 100644
--- a/www/gtkhtml/files/gtkhtmlConf.sh
+++ b/www/gtkhtml/files/gtkhtmlConf.sh
@@ -1,5 +1,5 @@
GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
-GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%X11BASE%%/include/gdk-pixbuf-1.0 -I%%X11BASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%X11BASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%X11BASE%%/include/libglade-1.0 -I%%X11BASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
+GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 4eae08527c73..43c5598eeee2 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -202,3 +202,33 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
@dirrm %%DOCSDIR%%
@dirrm include/gtkhtml-1.1/gtkhtml
@dirrm include/gtkhtml-1.1
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 4a027c033473..6286b38a095d 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.10.3
+PORTVERSION= 3.12.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,11 +21,11 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 88125d5b0785..f4e41067dd8b 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.10.3.tar.bz2) = 90b1807db0ef0e5d69442e1f85610ec4
-SHA256 (gnome2/gtkhtml-3.10.3.tar.bz2) = 182eac40325c7d279a3b48bbc53ed8299d97e5d75479ca553a62e2200a9eab27
-SIZE (gnome2/gtkhtml-3.10.3.tar.bz2) = 1269807
+MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa
+SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f
+SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 9bb8dfce8c6f..b8be05dbf59f 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -89,6 +89,7 @@ share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -119,14 +120,17 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -149,12 +153,60 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 4a027c033473..6286b38a095d 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.10.3
+PORTVERSION= 3.12.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,11 +21,11 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 88125d5b0785..f4e41067dd8b 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.10.3.tar.bz2) = 90b1807db0ef0e5d69442e1f85610ec4
-SHA256 (gnome2/gtkhtml-3.10.3.tar.bz2) = 182eac40325c7d279a3b48bbc53ed8299d97e5d75479ca553a62e2200a9eab27
-SIZE (gnome2/gtkhtml-3.10.3.tar.bz2) = 1269807
+MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa
+SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f
+SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 9bb8dfce8c6f..b8be05dbf59f 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -89,6 +89,7 @@ share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -119,14 +120,17 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -149,12 +153,60 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index 767996edfc03..d356e0f13757 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -3,12 +3,11 @@
# Whom: Thierry Thomas <thierry@pompo.net>
#
# $FreeBSD$
-# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $
-#
+# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
PORTNAME= nvu
DISTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://cvs.nvu.com/download/
DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
@@ -16,7 +15,6 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
MAINTAINER= gnome@FreeBSD.org
COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage
-USE_X_PREFIX= yes
USE_BZIP2= yes
WANT_GNOME= yes
USE_GMAKE= yes
@@ -27,7 +25,7 @@ PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux
CFLAGS+= -I${X11BASE}/include
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${ARCH} == "ia64"
BROKEN= does not build
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 8d4fdf387621..64796c8b248e 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/libgtkhtml/Makefile,v 1.36 2005/10/14 20:39:58 adamw Exp $
+# $MCom: ports/www/libgtkhtml/Makefile,v 1.39 2006/09/10 00:51:14 mezz Exp $
#
PORTNAME= libgtkhtml
PORTVERSION= 2.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11
@@ -18,10 +18,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight HTML rendering/printing/editing engine
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/mozex/Makefile b/www/mozex/Makefile
index 8bac7822c053..fb274c784eb7 100644
--- a/www/mozex/Makefile
+++ b/www/mozex/Makefile
@@ -3,11 +3,12 @@
# Whom: Thierry Thomas (<thierry@pompo.net>)
#
# $FreeBSD$
+# $MCom: ports/www/mozex/Makefile,v 1.2 2006/09/22 19:52:59 mezz Exp $
#
PORTNAME= mozex
PORTVERSION= 1.07
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www mail news ftp
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,8 +16,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Mozex allows users of ${GEKO} to use external programs for mail, news, etc.
-USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>.
-
SUB_FILES= pkg-message
SUB_LIST= GECKO=${GECKO}
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi
index 2ad122c92d2f..434c9d0eb4ce 100644
--- a/www/mozex/Makefile.xpi
+++ b/www/mozex/Makefile.xpi
@@ -16,7 +16,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${PKGINSTALL}
MOZLDIR= lib/${GECKO}
-MOZDIR= ${X11BASE}/${MOZLDIR}
+MOZDIR= ${LOCALBASE}/${MOZLDIR}
PLIST_SUB= MOZDIR=${MOZLDIR}
pre-configure:
@@ -25,9 +25,9 @@ pre-configure:
> ${PKGINSTALL}
pre-install:
-.if ${PREFIX} != ${X11BASE}
+.if ${PREFIX} != ${LOCALBASE}
@${ECHO_MSG} ""
- @${ECHO_MSG} "${PREFIX} invalid - must be installed under ${X11BASE}."
+ @${ECHO_MSG} "${PREFIX} invalid - must be installed under ${LOCALBASE}."
@${ECHO_MSG} ""
@${FALSE}
.else
diff --git a/www/mozex/pkg-install.xpi b/www/mozex/pkg-install.xpi
index 2315d7a8490d..511847138987 100644
--- a/www/mozex/pkg-install.xpi
+++ b/www/mozex/pkg-install.xpi
@@ -13,7 +13,7 @@ PATH=/bin:/usr/bin
[ "x$2" = "xPRE-INSTALL" ] && exit 0
[ "x$2" = "xDEINSTALL" ] && exit 0
-PREFIX=${PKG_PREFIX:-/usr/X11R6}
+PREFIX=${PKG_PREFIX:-/usr/local}
PKG_NAME=${1%%-[0-9._]*}
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index b73fb9346220..43ff04711727 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mplayerplug-in
PORTVERSION= 3.31
+PORTREVISION= 1
CATEGORIES= www multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mplayerplug-in
@@ -17,7 +18,6 @@ COMMENT= A Mozilla plugin for the MPlayer media player
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GECKO= firefox mozilla seamonkey
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index 6622d496f65e..5af28f14081c 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -28,8 +28,12 @@ share/locale/pl/LC_MESSAGES/mplayerplug-in.mo
share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo
share/locale/ru/LC_MESSAGES/mplayerplug-in.mo
share/locale/se/LC_MESSAGES/mplayerplug-in.mo
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
+@dirrmtry lib/browser_plugins
@dirrmtry share/locale/se/LC_MESSAGES
@dirrmtry share/locale/se
-@dirrmtry lib/browser_plugins
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 0c2680e9a1cd..14c9b0c3218f 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -3,11 +3,11 @@
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/www/nscache/Makefile,v 1.1 2006/10/04 11:49:18 ahze Exp $
PORTNAME= nscache
PORTVERSION= 0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.idata.sk/~ondrej/sw/
@@ -17,7 +17,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Netscape cache browser
-USE_X_PREFIX= yes
USE_GNOME= gnomehier gtk12
USE_GETOPT_LONG= yes
USE_GMAKE= yes
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index c67f02bef6d8..50d9f91a1031 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -9,3 +9,5 @@ share/locale/sk/LC_MESSAGES/nscache.mo
share/locale/tr/LC_MESSAGES/nscache.mo
share/gnome/apps/Internet/nscache.desktop
share/gnome/pixmaps/nscache.xpm
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 767996edfc03..d356e0f13757 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -3,12 +3,11 @@
# Whom: Thierry Thomas <thierry@pompo.net>
#
# $FreeBSD$
-# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $
-#
+# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
PORTNAME= nvu
DISTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://cvs.nvu.com/download/
DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
@@ -16,7 +15,6 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-sources
MAINTAINER= gnome@FreeBSD.org
COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage
-USE_X_PREFIX= yes
USE_BZIP2= yes
WANT_GNOME= yes
USE_GMAKE= yes
@@ -27,7 +25,7 @@ PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux
CFLAGS+= -I${X11BASE}/include
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${ARCH} == "ia64"
BROKEN= does not build
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index c410e680c8b7..94590321b1ea 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openvrml
PORTVERSION= 0.15.10
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= www graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,23 +15,22 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= VRML97 runtime and browser ("lookat")
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \
${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla
USE_GL= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gtk20
USE_SDL= sdl
USE_GCC= 3.4
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${X11BASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
- XPIDLFLAGS="-I${X11BASE}/share/idl/mozilla"
+ LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${LOCALBASE}/lib/mozilla -L${X11BASE}/lib -lXext" \
+ XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/www/openvrml/files/lookat.sh.in b/www/openvrml/files/lookat.sh.in
index 163a887c2561..0f3d2f823315 100644
--- a/www/openvrml/files/lookat.sh.in
+++ b/www/openvrml/files/lookat.sh.in
@@ -1,4 +1,4 @@
#! /bin/sh
# $FreeBSD$
-LD_LIBRARY_PATH=%%X11BASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1
+LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1
diff --git a/www/openvrml/files/patch-030_freetype_prototypes b/www/openvrml/files/patch-030_freetype_prototypes
new file mode 100644
index 000000000000..5f6dc6700380
--- /dev/null
+++ b/www/openvrml/files/patch-030_freetype_prototypes
@@ -0,0 +1,50 @@
+Index: openvrml-0.15.10/src/libopenvrml/openvrml/vrml97node.cpp
+===================================================================
+--- src/libopenvrml/openvrml/vrml97node.cpp.orig 2006-06-11 14:23:00.000000000 +0200
++++ src/libopenvrml/openvrml/vrml97node.cpp 2006-06-11 15:12:02.000000000 +0200
+@@ -16604,7 +16604,7 @@
+
+ const float stepSize_ = 0.2;
+
+- int moveTo_(FT_Vector * const to, void * const user) throw ()
++ int moveTo_(const FT_Vector * to, void * user)
+ {
+ using std::vector;
+ assert(user);
+@@ -16620,7 +16620,7 @@
+ return 0;
+ }
+
+- int lineTo_(FT_Vector * const to, void * const user) throw ()
++ int lineTo_(const FT_Vector * to, void * user)
+ {
+ assert(user);
+ GlyphContours_ & c = *static_cast<GlyphContours_ *>(user);
+@@ -16682,10 +16682,9 @@
+ }
+ }
+
+- int conicTo_(FT_Vector * const control,
+- FT_Vector * const to,
++ int conicTo_(const FT_Vector * control,
++ const FT_Vector * to,
+ void * const user)
+- throw ()
+ {
+ using std::vector;
+
+@@ -16716,11 +16715,10 @@
+ return 0;
+ }
+
+- int cubicTo_(FT_Vector * const control1,
+- FT_Vector * const control2,
+- FT_Vector * const to,
++ int cubicTo_(const FT_Vector * control1,
++ const FT_Vector * control2,
++ const FT_Vector * to,
+ void * const user)
+- throw ()
+ {
+ using std::vector;
+
diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist
index ca4e10060b88..ac860cb3607b 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -59,3 +59,4 @@ lib/mozilla/plugins/openvrml.xpt
@dirrmtry share/gtk-doc/html/gtkglext
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
+@dirrmtry share/pixmaps
diff --git a/www/plugger-plugins-hubbe/Makefile b/www/plugger-plugins-hubbe/Makefile
index eee9dc85b0f7..88f9d82212d8 100644
--- a/www/plugger-plugins-hubbe/Makefile
+++ b/www/plugger-plugins-hubbe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plugger-plugins-hubbe
PORTVERSION= 5.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www multimedia audio graphics print editors
MASTER_SITES= # empty
DISTFILES= # empty
@@ -29,7 +29,7 @@ RUN_DEPENDS= sidplay:${PORTSDIR}/audio/sidplay \
plugger-controller:${PORTSDIR}/www/plugger \
gv:${PORTSDIR}/print/gv \
xmp:${PORTSDIR}/audio/xmp \
- ${X11BASE}/bin/xscreensaver-hacks/molecule:${PORTSDIR}/x11/xscreensaver-gnome \
+ ${LOCALBASE}/bin/xscreensaver-hacks/molecule:${PORTSDIR}/x11/xscreensaver-gnome \
mplayer:${PORTSDIR}/multimedia/mplayer \
gnumeric:${PORTSDIR}/math/gnumeric \
abiword:${PORTSDIR}/editors/abiword \
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index ad6de8985fc3..fa02ac1445ac 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plugger
PORTVERSION= 5.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www audio graphics multimedia
MASTER_SITES= http://fredrik.hubbe.net/plugger/
@@ -24,7 +24,7 @@ PKGDEINSTALL= ${PKGINSTALL}
post-patch:
@${REINPLACE_CMD} -e \
- 's|/usr/X11R6/lib/xscreensaver|${X11BASE}/bin/xscreensaver-hacks|g ; \
+ 's|/usr/X11R6/lib/xscreensaver|${LOCALBASE}/bin/xscreensaver-hacks|g ; \
s|acroread|acroread7|g ; s|+useFrontEndProgram||g' \
${WRKSRC}/pluggerrc
diff --git a/www/preferential/Makefile b/www/preferential/Makefile
index eaece5814d54..43f1565d6a78 100644
--- a/www/preferential/Makefile
+++ b/www/preferential/Makefile
@@ -7,7 +7,7 @@
PORTNAME= preferential
PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= ${PORTNAME}/versions
@@ -16,8 +16,6 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI interface to view & edit all ${GECKO} prefs
-USE_X_PREFIX= yes # Cannot be included after <bsd.port.pre.mk>.
-
PLIST_FILES= %%MOZDIR%%/chrome/preferential.jar
.include <bsd.port.pre.mk>
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index b9ee5b4c4e4d..5b3668020c82 100644
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@@ -3,11 +3,12 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/ruby-gtkmozembed/Makefile,v 1.2 2005/10/17 07:05:42 mezz Exp $
+# $MCom: ports/www/ruby-gtkmozembed/Makefile,v 1.4 2006/08/01 04:53:58 mezz Exp $
#
PORTNAME= gtkmozembed
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= www ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -36,7 +37,7 @@ DOCS= COPYING.LIB ChangeLog README
post-patch:
@${REINPLACE_CMD} -e 's|xulrunner-|${GECKO}-|g ; \
- s|%%GECKO_PATH%%|${X11BASE}/lib/${GECKO}|g' \
+ s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \
${WRKSRC}/extconf.rb
post-install:
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 6ee69795b7b3..551d4616db4b 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.16.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -33,7 +33,7 @@ GCONF_SCHEMAS= screem.schemas
.if defined(WITHOUT_DBUS)
CONFIGURE_ARGS+= --disable-dbus
.else
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-dbus
.endif
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index b78d729b40d9..a51df3a2b1fb 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -247,5 +247,21 @@ share/mime/packages/screem.xml
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 6ee69795b7b3..551d4616db4b 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.16.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -33,7 +33,7 @@ GCONF_SCHEMAS= screem.schemas
.if defined(WITHOUT_DBUS)
CONFIGURE_ARGS+= --disable-dbus
.else
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+= --enable-dbus
.endif
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index b78d729b40d9..a51df3a2b1fb 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -247,5 +247,21 @@ share/mime/packages/screem.xml
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 160536861e4b..a09312b5ddbc 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,11 +3,12 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports-stable/www/seamonkey/Makefile,v 1.1 2006/03/09 21:26:46 ahze Exp $
+# $MCom: ports/www/seamonkey/Makefile,v 1.40 2006/09/15 16:11:00 ahze Exp $
#
PORTNAME= seamonkey
DISTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}
@@ -21,7 +22,6 @@ USE_GMAKE= yes
WANT_GNOME= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
-USE_X_PREFIX= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo"
@@ -57,9 +57,8 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz
IGNORE= core dumps on ${ARCH} during post-build
.endif
-.if ${ARCH}=="sparc64" # && ${OSVERSION} < 601101
-#IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
-BROKEN= regchrome core dumps in sparc64
+.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
+IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
.endif
.if ${OSVERSION} < 500000
@@ -132,5 +131,5 @@ do-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 160536861e4b..a09312b5ddbc 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -3,11 +3,12 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports-stable/www/seamonkey/Makefile,v 1.1 2006/03/09 21:26:46 ahze Exp $
+# $MCom: ports/www/seamonkey/Makefile,v 1.40 2006/09/15 16:11:00 ahze Exp $
#
PORTNAME= seamonkey
DISTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}
@@ -21,7 +22,6 @@ USE_GMAKE= yes
WANT_GNOME= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
-USE_X_PREFIX= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo"
@@ -57,9 +57,8 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz
IGNORE= core dumps on ${ARCH} during post-build
.endif
-.if ${ARCH}=="sparc64" # && ${OSVERSION} < 601101
-#IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
-BROKEN= regchrome core dumps in sparc64
+.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
+IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101
.endif
.if ${OSVERSION} < 500000
@@ -132,5 +131,5 @@ do-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 17dfd288ee30..c96f33368583 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= swfdec-plugin
PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.schleef.org/swfdec/download/
DISTNAME= swfdec-${PORTVERSION}
@@ -17,18 +17,17 @@ COMMENT= Flash rendering plugin
LIB_DEPENDS= swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
.else
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
.endif
BROKEN= Does not compile
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2006-12-01
-USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehack gtk20 libartlgpl2
USE_GSTREAMER80= gconf
@@ -38,9 +37,9 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-CONFIGURE_ENV+= MOZILLA_CONFIG="${X11BASE}/bin/firefox-config"
+CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/firefox-config"
.else
-CONFIGURE_ENV+= MOZILLA_CONFIG="${X11BASE}/lib/mozilla/mozilla-config"
+CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/lib/mozilla/mozilla-config"
.endif
INSTALLS_SHLIB= yes
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 0e53a57c581d..9722d9de2875 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -4,9 +4,11 @@
# Whom: ijliao
#
# $FreeBSD$
+# $MCom: ports/www/syndigator/Makefile,v 1.1 2006/09/30 18:31:24 ahze Exp $
PORTNAME= syndigator
PORTVERSION= 0.15.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +26,7 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-T
${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2
-USE_X_PREFIX= yes
+USE_X_LIB= yes
USE_GNOME= gnomehier
USE_PERL5= yes
NO_BUILD= yes
diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile
index cfdd31b60342..f809c09324d6 100644
--- a/www/xulrunner/Makefile
+++ b/www/xulrunner/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/xulrunner/Makefile,v 1.6 2006/02/26 16:58:29 ahze Exp $
+# $MCom: ports/www/xulrunner/Makefile,v 1.13 2006/10/12 12:22:03 ahze Exp $
PORTNAME= xulrunner
PORTVERSION= 1.8.0.4
-PORTREVISION?= 1
+PORTREVISION?= 4
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/
@@ -16,7 +16,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
HAS_CONFIGURE= yes
@@ -25,12 +24,14 @@ USE_GMAKE= yes
USE_GCC= 3.4+
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
-MOZ_OPTIONS?= --disable-javaxpcom
+MOZ_OPTIONS?= --disable-javaxpcom --enable-canvas \
+ --enable-system-cairo
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS= # Empty, used for generic gecko OPTIONS
+USE_GECKO_OPTIONS= java debug logging optimized_cflags
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${OSVERSION} < 500000
BROKEN= does not build
diff --git a/www/xulrunner/files/patch-xulrunner_app_mozilla.in b/www/xulrunner/files/patch-xulrunner_app_mozilla.in
new file mode 100644
index 000000000000..1839a79d7d0a
--- /dev/null
+++ b/www/xulrunner/files/patch-xulrunner_app_mozilla.in
@@ -0,0 +1,18 @@
+--- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006
++++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006
+@@ -193,12 +193,12 @@
+ done #others arg
+
+ #???: needs check if othersopt begin with -* ?
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ # Last argument seems to be a local file/directory
+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ # If it is just "relatively" (./file) specified, make it absolutely
+- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before...
+ _NEW_WINDOW=1
+ fi
+
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index 65b5c4a9cd0a..d03a8db83f9c 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clock
PORTVERSION= 0.32
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -20,7 +20,7 @@ RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_BZIP2= yes
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= Clock
DATADIR= ${PREFIX}/share/gnome
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index b174ba3c620e..23ad6a4ac60b 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
PORTNAME= countdown
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -19,7 +19,7 @@ COMMENT= Countdown the remaining time until a configurable date
RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
NAME= Countdown
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 6ee0488d8263..64504157606e 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Lancereau <matt@rimasec.net>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-clocks/xfce4-datetime-plugin/Makefile,v 1.1 2006/10/02 20:46:24 ahze Exp $
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-clocks xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
@@ -23,7 +23,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index fae1d5d82a29..5dc18f8d77d6 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= velocity
PORTVERSION= 0.1.0b
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-fm
MASTER_SITES= http://www.jarrodkoehler.com/velocity/
DISTNAME= velocity-0.1.0beta
@@ -17,7 +17,6 @@ COMMENT= GNOME file and desktop manager
WRKSRC= ${WRKDIR}/velocity-0.1.0
USE_AUTOTOOLS= libtool:15
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= libgnomeui gnomedesktop librsvg2
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index e27a59a3e80f..8399dc40da28 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= workplace
PORTVERSION= 1.0.a3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/glib12 \
- -I${X11BASE}/include/gtk12" \
+ -I${LOCALBASE}/include/gtk12" \
LIBS="-L${LOCALBASE}/lib"
pre-configure:
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 0165519f237c..eb735350deeb 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-fm
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,6 @@ LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
USE_GETTEXT= yes
USE_GNOME= gtk20 gnomehack
-USE_X_PREFIX= yes
USE_XPM= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index 8baa8c7caa82..e90c4f059b53 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -322,12 +322,6 @@ share/xfce4/xffm/xffm.spec.in
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -340,3 +334,31 @@ share/xfce4/xffm/xffm.spec.in
@dirrmtry share/xfce4
@dirrm share/xffm/pixmaps
@dirrm share/xffm
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index 70c6a9d81f91..7f1cc2de3a75 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-fonts/dejavu/Makefile,v 1.2 2005/08/14 23:38:07 ahze Exp $
+# $MCom: ports/x11-fonts/dejavu/Makefile,v 1.1 2006/10/13 23:29:09 ahze Exp $
#
PORTNAME= dejavu
-DISTVERSION= 2.9
+DISTVERSION= 2.10
CATEGORIES= x11-fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-fonts/dejavu/distinfo b/x11-fonts/dejavu/distinfo
index 1ec2012f2304..2ca3ae505a36 100644
--- a/x11-fonts/dejavu/distinfo
+++ b/x11-fonts/dejavu/distinfo
@@ -1,3 +1,3 @@
-MD5 (dejavu-ttf-2.9.tar.gz) = 21fc0170070fb401b8657c22d23dbfe9
-SHA256 (dejavu-ttf-2.9.tar.gz) = 81ca3c9ce1c3b80f4e647005a26cf27e177cc83539ea94b1e74919ac77bd276b
-SIZE (dejavu-ttf-2.9.tar.gz) = 3189260
+MD5 (dejavu-ttf-2.10.tar.gz) = 615f401af2f582d8de36d42641b012d3
+SHA256 (dejavu-ttf-2.10.tar.gz) = 22b9e65f2f3d99bd4f27fa4e2815b44ffe472937f7408e564638d302ca3baaa6
+SIZE (dejavu-ttf-2.10.tar.gz) = 3268925
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 8782a9c7e091..68cf583fc857 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -21,7 +21,10 @@ COMMENT= XFree86-4 nested X server
CONFLICTS= xorg-nestserver-[0-9]*
-EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c
+EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c
MAN1= Xnest.1
PLIST_FILES= bin/Xnest
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index cdd1f4f68a6b..849acd257e34 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -21,7 +21,10 @@ COMMENT= XFree86-4 print server
CONFLICTS= xorg-printserver-*
-EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c
+EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c
PLIST_FILES= bin/Xprt
XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans
diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c
new file mode 100644
index 000000000000..65e0a748702e
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c
@@ -0,0 +1,238 @@
+--- lib/font/FreeType/ftfuncs.c.orig Wed Apr 14 11:32:43 2004
++++ lib/font/FreeType/ftfuncs.c Sun Aug 27 14:35:48 2006
+@@ -50,10 +50,7 @@ THE SOFTWARE.
+ #include FT_TYPE1_TABLES_H
+ #include FT_XFREE86_H
+ #include FT_BBOX_H
+-#include FT_INTERNAL_TRUETYPE_TYPES_H
+ #include FT_TRUETYPE_TAGS_H
+-#include FT_INTERNAL_SFNT_H
+-#include FT_INTERNAL_STREAM_H
+ /*
+ * If you want to use FT_Outline_Get_CBox instead of
+ * FT_Outline_Get_BBox, define here.
+@@ -119,6 +116,46 @@ static char *xlfd_props[] = {
+ };
+
+
++/* read 2-byte value from a SFNT table */
++static FT_UShort
++sfnt_get_ushort( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[2];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
++ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
++
++ return result;
++}
++
++#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
++
++
++#if 0
++static FT_ULong
++sfnt_get_ulong( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[4];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
++ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
++ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
++
++ return result;
++}
++#endif
++
++
++
++
+ static int ftypeInitP = 0; /* is the engine initialised? */
+ static FT_Library ftypeLibrary;
+
+@@ -207,6 +244,10 @@ FreeTypeOpenFace(FTFacePtr *facep, char
+ if(maxp && maxp->maxContours == 0)
+ face->bitmap = 1;
+ }
++
++ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
++ TTAG_hhea, 34 );
++
+ /* Insert face in hashtable and return it */
+ face->next = faceTable[bucket];
+ faceTable[bucket] = face;
+@@ -458,6 +499,29 @@ FreeTypeOpenInstance(FTInstancePtr *inst
+ }
+
+ if( FT_IS_SFNT( face->face ) ) {
++#if 1
++ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
++ FT_UInt nn;
++
++ instance->strike_index=0xFFFFU;
++
++ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
++ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
++
++ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64;
++ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
++
++ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
++ {
++ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
++
++ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
++ {
++ instance->strike_index = nn;
++ break;
++ }
++ }
++#else
+ /* See Set_Char_Sizes() in ttdriver.c */
+ FT_Error err;
+ TT_Face tt_face;
+@@ -482,6 +546,7 @@ FreeTypeOpenInstance(FTInstancePtr *inst
+ sfnt = (SFNT_Service)tt_face->sfnt;
+ err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
+ if ( err ) instance->strike_index=0xFFFFU;
++#endif
+ }
+
+ /* maintain a linked list of instances */
+@@ -799,31 +864,36 @@ ft_make_up_italic_bitmap( char *raster,
+ * parse the htmx field in TrueType font.
+ */
+
+-/* from src/truetype/ttgload.c */
+ static void
+-tt_get_metrics( TT_HoriHeader* header,
++tt_get_metrics( FT_Face face,
+ FT_UInt idx,
++ FT_UInt num_hmetrics,
+ FT_Short* bearing,
+ FT_UShort* advance )
+-/* Copyright 1996-2001, 2002 by */
+-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+ {
+- TT_LongMetrics longs_m;
+- FT_UShort k = header->number_Of_HMetrics;
++ /* read the metrics directly from the horizontal header, we
++ * parse the SFNT table directly through the standard FreeType API.
++ * this works with any version of the library and doesn't need to
++ * peek at its internals. Maybe a bit less
++ */
++ FT_UInt count = num_hmetrics;
+
+- if ( k == 0 ) {
+- *bearing = *advance = 0;
+- return;
++ if ( count == 0 )
++ {
++ *advance = 0;
++ *bearing = 0;
+ }
++ else if ( idx < count )
++ {
++ FT_ULong offset = idx*4;
+
+- if ( idx < (FT_UInt)k ) {
+- longs_m = (TT_LongMetrics )header->long_metrics + idx;
+- *bearing = longs_m->bearing;
+- *advance = longs_m->advance;
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
+ }
+- else {
+- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
+- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
++ else
++ {
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
+ }
+ }
+
+@@ -831,6 +901,7 @@ static int
+ ft_get_very_lazy_bbox( FT_UInt index,
+ FT_Face face,
+ FT_Size size,
++ FT_UInt num_hmetrics,
+ double slant,
+ FT_Matrix *matrix,
+ FT_BBox *bbox,
+@@ -838,14 +909,13 @@ ft_get_very_lazy_bbox( FT_UInt index,
+ FT_Long *vertAdvance)
+ {
+ if ( FT_IS_SFNT( face ) ) {
+- TT_Face ttface = (TT_Face)face;
+ FT_Size_Metrics *smetrics = &size->metrics;
+ FT_Short leftBearing = 0;
+ FT_UShort advance = 0;
+ FT_Vector p0, p1, p2, p3;
+
+ /* horizontal */
+- tt_get_metrics(&ttface->horizontal, index,
++ tt_get_metrics( face, num_hmetrics, index,
+ &leftBearing, &advance);
+
+ #if 0
+@@ -905,6 +975,27 @@ static FT_Error
+ FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index,
+ FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return )
+ {
++#if 1
++ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
++ {
++ FT_Error error;
++ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
++
++ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
++ if ( !error )
++ {
++ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
++ if ( !error )
++ {
++ if ( metrics_return != NULL )
++ *metrics_return = ft_face->glyph->metrics;
++
++ return 0;
++ }
++ }
++ }
++ return -1;
++#elif (FREETYPE_VERSION >= 2001008)
+ SFNT_Service sfnt;
+ TT_Face face;
+ FT_Error error;
+@@ -968,6 +1059,7 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_
+
+ Exit:
+ return error;
++#endif
+ }
+
+ int
+@@ -1023,6 +1115,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int
+ if( bitmap_metrics == NULL ) {
+ if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) {
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
+@@ -1197,6 +1290,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int
+ if( is_outline == 1 ){
+ if( correct ){
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h
new file mode 100644
index 000000000000..925263c0009e
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100
++++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100
+@@ -47,6 +47,7 @@
+ char *filename;
+ FT_Face face;
+ int bitmap;
++ FT_UInt num_hmetrics;
+ struct _FTInstance *instances;
+ struct _FTInstance *active_instance;
+ struct _FTFace *next; /* link to next face in bucket */
diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c
new file mode 100644
index 000000000000..df7c97dce67a
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100
++++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100
+@@ -35,7 +35,6 @@
+ #endif
+ #include <ft2build.h>
+ #include FT_CONFIG_CONFIG_H
+-#include FT_INTERNAL_DEBUG_H
+ #include FT_SYSTEM_H
+ #include FT_ERRORS_H
+ #include FT_TYPES_H
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 8fd6a015f035..a124b1632bb8 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -21,7 +21,10 @@ COMMENT= XFree86-4 virtual framebuffer server
CONFLICTS= xorg-vfbserver-[0-9]*
-EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c
+EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h \
+ ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c
MAN1= Xvfb.1
PLIST_FILES= bin/Xvfb
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 1e430318a4dc..38907d90fe68 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 6.8.99.903
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/snapshots/
DISTNAME= xorg-x11-${PORTVERSION}
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
new file mode 100644
index 000000000000..68e18f831ec7
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
@@ -0,0 +1,231 @@
+--- lib/font/FreeType/ftfuncs.c.orig 2005-10-23 19:32:05.000000000 +0100
++++ lib/font/FreeType/ftfuncs.c 2006-06-01 23:21:34.000000000 +0100
+@@ -54,10 +54,7 @@
+ #include FT_TYPE1_TABLES_H
+ #include FT_XFREE86_H
+ #include FT_BBOX_H
+-#include FT_INTERNAL_TRUETYPE_TYPES_H
+ #include FT_TRUETYPE_TAGS_H
+-#include FT_INTERNAL_SFNT_H
+-#include FT_INTERNAL_STREAM_H
+ /*
+ * If you want to use FT_Outline_Get_CBox instead of
+ * FT_Outline_Get_BBox, define here.
+@@ -123,6 +120,46 @@
+ };
+
+
++/* read 2-byte value from a SFNT table */
++static FT_UShort
++sfnt_get_ushort( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[2];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
++ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
++
++ return result;
++}
++
++#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
++
++
++#if 0
++static FT_ULong
++sfnt_get_ulong( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[4];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
++ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
++ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
++
++ return result;
++}
++#endif
++
++
++
++
+ static int ftypeInitP = 0; /* is the engine initialised? */
+ FT_Library ftypeLibrary;
+
+@@ -211,6 +248,10 @@
+ if(maxp && maxp->maxContours == 0)
+ face->bitmap = 1;
+ }
++
++ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
++ TTAG_hhea, 34 );
++
+ /* Insert face in hashtable and return it */
+ face->next = faceTable[bucket];
+ faceTable[bucket] = face;
+@@ -462,6 +503,29 @@
+ }
+
+ if( FT_IS_SFNT( face->face ) ) {
++#if 1
++ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
++ FT_UInt nn;
++
++ instance->strike_index=0xFFFFU;
++
++ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
++ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
++
++ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64;
++ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
++
++ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
++ {
++ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
++
++ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
++ {
++ instance->strike_index = nn;
++ break;
++ }
++ }
++#else
+ /* See Set_Char_Sizes() in ttdriver.c */
+ FT_Error err;
+ TT_Face tt_face;
+@@ -486,6 +550,7 @@
+ sfnt = (SFNT_Service)tt_face->sfnt;
+ err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
+ if ( err ) instance->strike_index=0xFFFFU;
++#endif
+ }
+
+ /* maintain a linked list of instances */
+@@ -803,31 +868,36 @@
+ * parse the htmx field in TrueType font.
+ */
+
+-/* from src/truetype/ttgload.c */
+ static void
+-tt_get_metrics( TT_HoriHeader* header,
++tt_get_metrics( FT_Face face,
+ FT_UInt idx,
++ FT_UInt num_hmetrics,
+ FT_Short* bearing,
+ FT_UShort* advance )
+-/* Copyright 1996-2001, 2002 by */
+-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+ {
+- TT_LongMetrics longs_m;
+- FT_UShort k = header->number_Of_HMetrics;
++ /* read the metrics directly from the horizontal header, we
++ * parse the SFNT table directly through the standard FreeType API.
++ * this works with any version of the library and doesn't need to
++ * peek at its internals. Maybe a bit less
++ */
++ FT_UInt count = num_hmetrics;
+
+- if ( k == 0 ) {
+- *bearing = *advance = 0;
+- return;
++ if ( count == 0 )
++ {
++ *advance = 0;
++ *bearing = 0;
+ }
++ else if ( idx < count )
++ {
++ FT_ULong offset = idx*4;
+
+- if ( idx < (FT_UInt)k ) {
+- longs_m = (TT_LongMetrics )header->long_metrics + idx;
+- *bearing = longs_m->bearing;
+- *advance = longs_m->advance;
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
+ }
+- else {
+- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
+- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
++ else
++ {
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
+ }
+ }
+
+@@ -835,6 +905,7 @@
+ ft_get_very_lazy_bbox( FT_UInt index,
+ FT_Face face,
+ FT_Size size,
++ FT_UInt num_hmetrics,
+ double slant,
+ FT_Matrix *matrix,
+ FT_BBox *bbox,
+@@ -842,14 +913,13 @@
+ FT_Long *vertAdvance)
+ {
+ if ( FT_IS_SFNT( face ) ) {
+- TT_Face ttface = (TT_Face)face;
+ FT_Size_Metrics *smetrics = &size->metrics;
+ FT_Short leftBearing = 0;
+ FT_UShort advance = 0;
+ FT_Vector p0, p1, p2, p3;
+
+ /* horizontal */
+- tt_get_metrics(&ttface->horizontal, index,
++ tt_get_metrics( face, num_hmetrics, index,
+ &leftBearing, &advance);
+
+ #if 0
+@@ -910,7 +980,27 @@
+ FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
+ int *sbitchk_incomplete_but_exist )
+ {
+-#if (FREETYPE_VERSION >= 2001008)
++#if 1
++ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
++ {
++ FT_Error error;
++ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
++
++ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
++ if ( !error )
++ {
++ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
++ if ( !error )
++ {
++ if ( metrics_return != NULL )
++ *metrics_return = ft_face->glyph->metrics;
++
++ return 0;
++ }
++ }
++ }
++ return -1;
++#elif (FREETYPE_VERSION >= 2001008)
+ SFNT_Service sfnt;
+ TT_Face face;
+ FT_Error error;
+@@ -1043,6 +1133,7 @@
+ if( bitmap_metrics == NULL ) {
+ if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
+@@ -1221,6 +1312,7 @@
+ if( is_outline == 1 ){
+ if( correct ){
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
new file mode 100644
index 000000000000..925263c0009e
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100
++++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100
+@@ -47,6 +47,7 @@
+ char *filename;
+ FT_Face face;
+ int bitmap;
++ FT_UInt num_hmetrics;
+ struct _FTInstance *instances;
+ struct _FTInstance *active_instance;
+ struct _FTFace *next; /* link to next face in bucket */
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
new file mode 100644
index 000000000000..df7c97dce67a
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100
++++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100
+@@ -35,7 +35,6 @@
+ #endif
+ #include <ft2build.h>
+ #include FT_CONFIG_CONFIG_H
+-#include FT_INTERNAL_DEBUG_H
+ #include FT_SYSTEM_H
+ #include FT_ERRORS_H
+ #include FT_TYPES_H
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index 4cb271384125..7506c2e628a6 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -39,7 +39,10 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c
new file mode 100644
index 000000000000..68e18f831ec7
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c
@@ -0,0 +1,231 @@
+--- lib/font/FreeType/ftfuncs.c.orig 2005-10-23 19:32:05.000000000 +0100
++++ lib/font/FreeType/ftfuncs.c 2006-06-01 23:21:34.000000000 +0100
+@@ -54,10 +54,7 @@
+ #include FT_TYPE1_TABLES_H
+ #include FT_XFREE86_H
+ #include FT_BBOX_H
+-#include FT_INTERNAL_TRUETYPE_TYPES_H
+ #include FT_TRUETYPE_TAGS_H
+-#include FT_INTERNAL_SFNT_H
+-#include FT_INTERNAL_STREAM_H
+ /*
+ * If you want to use FT_Outline_Get_CBox instead of
+ * FT_Outline_Get_BBox, define here.
+@@ -123,6 +120,46 @@
+ };
+
+
++/* read 2-byte value from a SFNT table */
++static FT_UShort
++sfnt_get_ushort( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[2];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
++ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
++
++ return result;
++}
++
++#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
++
++
++#if 0
++static FT_ULong
++sfnt_get_ulong( FT_Face face,
++ FT_ULong table_tag,
++ FT_ULong table_offset )
++{
++ FT_Byte buff[4];
++ FT_ULong len = sizeof(buff);
++ FT_UShort result = 0;
++
++ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
++ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
++ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
++
++ return result;
++}
++#endif
++
++
++
++
+ static int ftypeInitP = 0; /* is the engine initialised? */
+ FT_Library ftypeLibrary;
+
+@@ -211,6 +248,10 @@
+ if(maxp && maxp->maxContours == 0)
+ face->bitmap = 1;
+ }
++
++ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
++ TTAG_hhea, 34 );
++
+ /* Insert face in hashtable and return it */
+ face->next = faceTable[bucket];
+ faceTable[bucket] = face;
+@@ -462,6 +503,29 @@
+ }
+
+ if( FT_IS_SFNT( face->face ) ) {
++#if 1
++ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
++ FT_UInt nn;
++
++ instance->strike_index=0xFFFFU;
++
++ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
++ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
++
++ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64;
++ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
++
++ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
++ {
++ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
++
++ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
++ {
++ instance->strike_index = nn;
++ break;
++ }
++ }
++#else
+ /* See Set_Char_Sizes() in ttdriver.c */
+ FT_Error err;
+ TT_Face tt_face;
+@@ -486,6 +550,7 @@
+ sfnt = (SFNT_Service)tt_face->sfnt;
+ err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
+ if ( err ) instance->strike_index=0xFFFFU;
++#endif
+ }
+
+ /* maintain a linked list of instances */
+@@ -803,31 +868,36 @@
+ * parse the htmx field in TrueType font.
+ */
+
+-/* from src/truetype/ttgload.c */
+ static void
+-tt_get_metrics( TT_HoriHeader* header,
++tt_get_metrics( FT_Face face,
+ FT_UInt idx,
++ FT_UInt num_hmetrics,
+ FT_Short* bearing,
+ FT_UShort* advance )
+-/* Copyright 1996-2001, 2002 by */
+-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+ {
+- TT_LongMetrics longs_m;
+- FT_UShort k = header->number_Of_HMetrics;
++ /* read the metrics directly from the horizontal header, we
++ * parse the SFNT table directly through the standard FreeType API.
++ * this works with any version of the library and doesn't need to
++ * peek at its internals. Maybe a bit less
++ */
++ FT_UInt count = num_hmetrics;
+
+- if ( k == 0 ) {
+- *bearing = *advance = 0;
+- return;
++ if ( count == 0 )
++ {
++ *advance = 0;
++ *bearing = 0;
+ }
++ else if ( idx < count )
++ {
++ FT_ULong offset = idx*4;
+
+- if ( idx < (FT_UInt)k ) {
+- longs_m = (TT_LongMetrics )header->long_metrics + idx;
+- *bearing = longs_m->bearing;
+- *advance = longs_m->advance;
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
+ }
+- else {
+- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
+- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
++ else
++ {
++ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
++ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
+ }
+ }
+
+@@ -835,6 +905,7 @@
+ ft_get_very_lazy_bbox( FT_UInt index,
+ FT_Face face,
+ FT_Size size,
++ FT_UInt num_hmetrics,
+ double slant,
+ FT_Matrix *matrix,
+ FT_BBox *bbox,
+@@ -842,14 +913,13 @@
+ FT_Long *vertAdvance)
+ {
+ if ( FT_IS_SFNT( face ) ) {
+- TT_Face ttface = (TT_Face)face;
+ FT_Size_Metrics *smetrics = &size->metrics;
+ FT_Short leftBearing = 0;
+ FT_UShort advance = 0;
+ FT_Vector p0, p1, p2, p3;
+
+ /* horizontal */
+- tt_get_metrics(&ttface->horizontal, index,
++ tt_get_metrics( face, num_hmetrics, index,
+ &leftBearing, &advance);
+
+ #if 0
+@@ -910,7 +980,27 @@
+ FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
+ int *sbitchk_incomplete_but_exist )
+ {
+-#if (FREETYPE_VERSION >= 2001008)
++#if 1
++ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
++ {
++ FT_Error error;
++ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
++
++ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
++ if ( !error )
++ {
++ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
++ if ( !error )
++ {
++ if ( metrics_return != NULL )
++ *metrics_return = ft_face->glyph->metrics;
++
++ return 0;
++ }
++ }
++ }
++ return -1;
++#elif (FREETYPE_VERSION >= 2001008)
+ SFNT_Service sfnt;
+ TT_Face face;
+ FT_Error error;
+@@ -1043,6 +1133,7 @@
+ if( bitmap_metrics == NULL ) {
+ if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
+@@ -1221,6 +1312,7 @@
+ if( is_outline == 1 ){
+ if( correct ){
+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
++ face->num_hmetrics,
+ instance->ttcap.vl_slant,
+ &instance->transformation.matrix,
+ &bbox, &outline_hori_advance,
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h
new file mode 100644
index 000000000000..925263c0009e
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100
++++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100
+@@ -47,6 +47,7 @@
+ char *filename;
+ FT_Face face;
+ int bitmap;
++ FT_UInt num_hmetrics;
+ struct _FTInstance *instances;
+ struct _FTInstance *active_instance;
+ struct _FTFace *next; /* link to next face in bucket */
diff --git a/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
new file mode 100644
index 000000000000..df7c97dce67a
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100
++++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100
+@@ -35,7 +35,6 @@
+ #endif
+ #include <ft2build.h>
+ #include FT_CONFIG_CONFIG_H
+-#include FT_INTERNAL_DEBUG_H
+ #include FT_SYSTEM_H
+ #include FT_ERRORS_H
+ #include FT_TYPES_H
diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile
index d43963f8938c..f1839bf1ee48 100644
--- a/x11-themes/beastie/Makefile
+++ b/x11-themes/beastie/Makefile
@@ -3,22 +3,25 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/beastie/Makefile,v 1.6 2005/10/26 04:36:11 ahze Exp $
+# $MCom: ports/x11-themes/beastie/Makefile,v 1.10 2006/07/18 11:56:12 ahze Exp $
#
PORTNAME= beastie
-PORTVERSION= 05.10.26
+PORTVERSION= 06.05.03
PORTREVISION= 1
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_LOCAL} \
+ http://people.freebsd.org/~ahze/distfiles/
MASTER_SITE_SUBDIR= ahze
DISTNAME= Beastie-${PORTVERSION}
MAINTAINER= ahze@FreeBSD.org
COMMENT= Gnome theme with FreeBSD Colors
+RUN_DEPENDS+= gtk-engines2>=2.7.4_1:${PORTSDIR}/x11-themes/gtk-engines2 \
+ gnome-themes>=2.11.91:${PORTSDIR}/x11-themes/gnome-themes
+
WRKSRC= ${WRKDIR}/Beastie
-USE_X_PREFIX= yes
NO_BUILD= yes
THEME_FILES= README index.theme gtk-2.0/gtkrc
@@ -28,26 +31,6 @@ PLIST_DIRS= ${THEME_DIR}/gtk-2.0 ${THEME_DIR}
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc)
-WITH_GTKENGINES= yes
-.endif
-
-.if !defined(WITHOUT_GTKENGINES) || defined(WITH_GTKENGINES)
-RUN_DEPENDS+= gtk-engines2>=2.6.4:${PORTSDIR}/x11-themes/gtk-engines2 \
- gnome-themes>=2.11.91:${PORTSDIR}/x11-themes/gnome-themes
-.else
-RUN_DEPENDS+= clearlooks>=0.6.0:${PORTSDIR}/x11-themes/clearlooks \
- clearlooks-metacity>=0.6:${PORTSDIR}/x11-themes/clearlooks-metacity
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_GTKENGINES) && !defined(WITH_GTKENGINES)
- @${ECHO_MSG} "You can disable gtk-engines support (clearlooks)"
- @${ECHO_MSG} "and use x11-themes/clearlooks for the clearlooks"
- @${ECHO_MSG} "engine by defining"
- @${ECHO_MSG} "WITHOUT_GTKENGINES=yes"
-.endif
-
do-install:
${MKDIR} ${PREFIX}/${THEME_DIR}/gtk-2.0
.for f in ${THEME_FILES}
diff --git a/x11-themes/beastie/distinfo b/x11-themes/beastie/distinfo
index e710e8553af3..c18b3bc4668c 100644
--- a/x11-themes/beastie/distinfo
+++ b/x11-themes/beastie/distinfo
@@ -1,3 +1,3 @@
-MD5 (Beastie-05.10.26.tar.gz) = bede1d1a6cfa0f203d4439377a046e35
-SHA256 (Beastie-05.10.26.tar.gz) = 070509bfe9bbd4529e24cee4f78b5e9718fa578620ddfb9167c59b2cee05434d
-SIZE (Beastie-05.10.26.tar.gz) = 1838
+MD5 (Beastie-06.05.03.tar.gz) = 6da7232a4e3b81e6dd5ec1f65d679ea9
+SHA256 (Beastie-06.05.03.tar.gz) = e1bce9bdb62a860bc85aa5fce1011077db397760cb8653d53b89a56f089b511c
+SIZE (Beastie-06.05.03.tar.gz) = 1868
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 57ab39e318b7..fc443ede3a5d 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= bluecurve-themes
-PORTREVISION?= 0
+PORTREVISION?= 3
CATEGORIES= x11-themes
MAINTAINER= jylefort@FreeBSD.org
@@ -21,7 +21,7 @@ EXTRACT_ONLY= # empty
# note: gtk-/icon-/metacity- are brought in by gnome-
RUN_DEPENDS= ${X11BASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \
- ${X11BASE}/share/themes/Bluecurve/index.theme:${PORTSDIR}/x11-themes/gnome-bluecurve-theme \
+ ${LOCALBASE}/share/themes/Bluecurve/index.theme:${PORTSDIR}/x11-themes/gnome-bluecurve-theme \
${LINUXBASE}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/linux-gtk-bluecurve-theme \
${X11BASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \
${X11BASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme
@@ -42,7 +42,6 @@ DISTFILES= redhat-artwork-${PORTVERSION}-${RPMREVISION}.src.rpm:fedora,local
EXTRACT_DEPENDS+= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION}
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
# the slave ports use their own pkg files and dirs
DESCR?= ${.CURDIR}/pkg-descr
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 2abf0ee5da9b..b242c298d6c2 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-themes/buffy/Makefile,v 1.2 2006/09/24 04:12:51 mezz Exp $
#
PORTNAME= buffy
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= buffy02
@@ -18,7 +19,6 @@ COMMENT= A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index a45e0c1bdd90..d4c2c4aabb0e 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/clean-theme-gtk/Makefile,v 1.1 2006/07/19 19:56:11 ahze Exp $
PORTNAME= clean-theme-gtk
PORTVERSION= 1.2.x
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= clean___
@@ -18,7 +18,6 @@ COMMENT= The Clean GTK theme engine
WRKSRC= ${WRKDIR}/gtk-clean-theme
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/x11-themes/clearlooks-themes-extras/Makefile b/x11-themes/clearlooks-themes-extras/Makefile
index b00a42f2bf45..088a96436d25 100644
--- a/x11-themes/clearlooks-themes-extras/Makefile
+++ b/x11-themes/clearlooks-themes-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clearlooks-themes-extras
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://www.kernow-webhosting.com/~bvc/theme/gtk/clearlooks/
DISTNAME= Clearlooks-Big_Pack-${PORTVERSION}.x
@@ -17,16 +17,15 @@ COMMENT= Extras colour schemes for Clearlooks engine theme
NO_BUILD= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
THEME_DIR= ${PREFIX}/share/themes
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc) || defined(WITH_GTKENGINE)
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+.if exists(${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc) || defined(WITH_GTKENGINE)
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
.else
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libclearlooks.so:${PORTSDIR}/x11-themes/clearlooks
+RUN_DEPENDS= ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libclearlooks.so:${PORTSDIR}/x11-themes/clearlooks
.endif
do-extract:
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 27c7d0789577..6b9ff7e61936 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/clearlooks/Makefile,v 1.4 2005/10/14 20:39:59 adamw Exp $
+# $MCom: ports/x11-themes/clearlooks/Makefile,v 1.6 2006/07/19 19:56:11 ahze Exp $
#
PORTNAME?= clearlooks
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= clearlooks
@@ -21,7 +21,6 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20
INSTALLS_ICONS= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
@@ -39,8 +38,8 @@ PLIST_SUB+= ENGINE=""
.else
CONFLICTS+= clearlooks-[0-9]*
-BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS+= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS+= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
BUILD_WRKSRC= ${WRKSRC}/themes
INSTALL_WRKSRC= ${WRKSRC}/themes
@@ -49,7 +48,7 @@ PLIST_SUB+= ENGINE="@comment "
.endif
.if !defined(WITHOUT_METACITY) && ${PORTNAME}=="clearlooks"
-RUN_DEPENDS+= ${X11BASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
+RUN_DEPENDS+= ${LOCALBASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
.endif
.if defined(WITH_ANIMATION)
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index 2526bd96be1b..0d65c2ef8d40 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/colorstep/Makefile,v 1.1 2006/07/19 19:56:12 ahze Exp $
PORTNAME= colorstep
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= colorstep
@@ -18,7 +18,6 @@ COMMENT= A theme engine based on GtkStep and Step-pastel
WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_AUTOTOOLS= libtool:15
diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile
index 9c355e0299d3..4a63b7e927e3 100644
--- a/x11-themes/cursor-bluecurve-theme/Makefile
+++ b/x11-themes/cursor-bluecurve-theme/Makefile
@@ -6,14 +6,17 @@
#
PORTNAME= cursor-bluecurve-theme
+PORTREVISION= 2
COMMENT= The Bluecurve X cursor themes
# we only need gdk-pixbuf for building cursorthemegen, so do not USE_GNOME
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20
MASTERDIR= ${.CURDIR}/../bluecurve-themes
+PREFIX= ${X11BASE}
+
THEMES= Bluecurve Bluecurve-inverse
.for t in ${THEMES}
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 6f073dfe60b0..dd10e598c24c 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/engradient/Makefile,v 1.1 2006/10/04 11:46:56 ahze Exp $
PORTNAME= engradient
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= engradient
@@ -18,7 +18,6 @@ COMMENT= A GTK+ engine-gradient theme based off of the IceGradient theme
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 9089aaf3518b..693d2ea765f5 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -7,6 +7,7 @@
PORTNAME= geramik
PORTVERSION= 0.27
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://www.kde-look.org/content/files/ \
http://distfiles.towardex.com/
@@ -15,12 +16,11 @@ DISTNAME= 3952-Geramik-${PORTVERSION}
MAINTAINER= haesu@TowardEX.com
COMMENT= A Keramik KDE styled theme for GTK
-RUN_DEPENDS= ${X11BASE}/lib/gtk/themes/engines/libqtpixmap.so:${PORTSDIR}/x11-toolkits/qtpixmap
+RUN_DEPENDS= ${LOCALBASE}/lib/gtk/themes/engines/libqtpixmap.so:${PORTSDIR}/x11-toolkits/qtpixmap
WRKSRC= ${WRKDIR}/Geramik-${PORTVERSION}
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-bluecurve-theme/Makefile b/x11-themes/gnome-bluecurve-theme/Makefile
index b2d2e7734131..c4e08e5d6778 100644
--- a/x11-themes/gnome-bluecurve-theme/Makefile
+++ b/x11-themes/gnome-bluecurve-theme/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= gnome-bluecurve-theme
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= The Bluecurve GNOME meta-theme
-RUN_DEPENDS= ${X11BASE}/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gtk-bluecurve-theme \
- ${X11BASE}/share/icons/Bluecurve/index.theme:${PORTSDIR}/x11-themes/icon-bluecurve-theme \
- ${X11BASE}/share/gnome/themes/Bluecurve/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-bluecurve-theme
+RUN_DEPENDS= ${LOCALBASE}/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gtk-bluecurve-theme \
+ ${LOCALBASE}/share/icons/Bluecurve/index.theme:${PORTSDIR}/x11-themes/icon-bluecurve-theme \
+ ${LOCALBASE}/share/gnome/themes/Bluecurve/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-bluecurve-theme
MASTERDIR= ${.CURDIR}/../bluecurve-themes
diff --git a/x11-themes/gnome-icons/Makefile b/x11-themes/gnome-icons/Makefile
index 93b80d8c6896..0c3df8dfceef 100644
--- a/x11-themes/gnome-icons/Makefile
+++ b/x11-themes/gnome-icons/Makefile
@@ -11,6 +11,7 @@
PORTNAME= gnome-icons
PORTVERSION= 20060914
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -19,22 +20,22 @@ EXTRACT_ONLY= # empty
MAINTAINER= tmclaugh@FreeBSD.org
COMMENT= Meta-port for Gnome iconsets
-RUN_DEPENDS= ${X11BASE}/share/icons/AquaFusion/index.theme:${PORTSDIR}/x11-themes/gnome-icons-aqua-fusion \
- ${X11BASE}/share/icons/CoolGorilla-ICONS/index.theme:${PORTSDIR}/x11-themes/gnome-icons-cool-gorilla \
- ${X11BASE}/share/icons/CfG-Crystal-SVG-1.2.0/index.theme:${PORTSDIR}/x11-themes/gnome-icons-crystal \
- ${X11BASE}/share/icons/Edge-Icons-0.6/index.theme:${PORTSDIR}/x11-themes/gnome-icons-edge \
- ${X11BASE}/share/icons/Gentoo-test/index.theme:${PORTSDIR}/x11-themes/gnome-icons-gentoo-test \
- ${X11BASE}/share/icons/Iris/index.theme:${PORTSDIR}/x11-themes/gnome-icons-iris \
- ${X11BASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila \
- ${X11BASE}/share/icons/Noia/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-full \
- ${X11BASE}/share/icons/NoiaWarm/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-warm \
- ${X11BASE}/share/icons/gnome-rh8/index.theme:${PORTSDIR}/x11-themes/gnome-icons-refined \
- ${X11BASE}/share/icons/Slick/index.theme:${PORTSDIR}/x11-themes/gnome-icons-slick \
- ${X11BASE}/share/icons/Snow-Apple/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snow-apple \
- ${X11BASE}/share/icons/SnowIsh-1.0_PNG/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snowish \
- ${X11BASE}/share/icons/stylish/index.theme:${PORTSDIR}/x11-themes/gnome-icons-stylish \
- ${X11BASE}/share/icons/ximian-south/index.theme:${PORTSDIR}/x11-themes/gnome-icons-ximian-south \
- ${X11BASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila
+RUN_DEPENDS= ${LOCALBASE}/share/icons/AquaFusion/index.theme:${PORTSDIR}/x11-themes/gnome-icons-aqua-fusion \
+ ${LOCALBASE}/share/icons/CoolGorilla-ICONS/index.theme:${PORTSDIR}/x11-themes/gnome-icons-cool-gorilla \
+ ${LOCALBASE}/share/icons/CfG-Crystal-SVG-1.2.0/index.theme:${PORTSDIR}/x11-themes/gnome-icons-crystal \
+ ${LOCALBASE}/share/icons/Edge-Icons-0.6/index.theme:${PORTSDIR}/x11-themes/gnome-icons-edge \
+ ${LOCALBASE}/share/icons/Gentoo-test/index.theme:${PORTSDIR}/x11-themes/gnome-icons-gentoo-test \
+ ${LOCALBASE}/share/icons/Iris/index.theme:${PORTSDIR}/x11-themes/gnome-icons-iris \
+ ${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila \
+ ${LOCALBASE}/share/icons/Noia/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-full \
+ ${LOCALBASE}/share/icons/NoiaWarm/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-warm \
+ ${LOCALBASE}/share/icons/gnome-rh8/index.theme:${PORTSDIR}/x11-themes/gnome-icons-refined \
+ ${LOCALBASE}/share/icons/Slick/index.theme:${PORTSDIR}/x11-themes/gnome-icons-slick \
+ ${LOCALBASE}/share/icons/Snow-Apple/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snow-apple \
+ ${LOCALBASE}/share/icons/SnowIsh-1.0_PNG/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snowish \
+ ${LOCALBASE}/share/icons/stylish/index.theme:${PORTSDIR}/x11-themes/gnome-icons-stylish \
+ ${LOCALBASE}/share/icons/ximian-south/index.theme:${PORTSDIR}/x11-themes/gnome-icons-ximian-south \
+ ${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila
NO_BUILD= yes
diff --git a/x11-themes/gnome-icons/bsd.gnome-icons.mk b/x11-themes/gnome-icons/bsd.gnome-icons.mk
index 5d8909cd3be9..60576a0f7e3c 100644
--- a/x11-themes/gnome-icons/bsd.gnome-icons.mk
+++ b/x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -15,8 +15,6 @@ NO_BUILD= yes
REASON= Themes may contain artwork not done by the author. \
Keep FreeBSD safe if theme author violated copyrights.
-USE_X_PREFIX= yes
-
WANT_GNOME= yes
INSTALLS_ICONS= yes
diff --git a/x11-themes/gnome-industrial-theme/Makefile b/x11-themes/gnome-industrial-theme/Makefile
index a2fc60b1c0ed..3f4b108fe797 100644
--- a/x11-themes/gnome-industrial-theme/Makefile
+++ b/x11-themes/gnome-industrial-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-industrial-theme
PORTVERSION= 0.2.29
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
@@ -18,11 +18,10 @@ MAINTAINER= stoerte@dreamwarrior.net
COMMENT= Slick GNOME2 theme from Ximian
EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
-RUN_DEPENDS= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
+RUN_DEPENDS= ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras
NO_BUILD= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack libgnomeui
WRKSRC= ${WRKDIR}/ximian-artwork-${PORTVERSION}
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 71e44c6d60a3..d67d92d723bc 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -3,19 +3,18 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gnome-look/Makefile,v 1.1 2006/07/19 19:56:14 ahze Exp $
PORTNAME= gnome-look
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-COMMENT= A GTK theme engine designed to look nice with the GNOME desktop environment
+COMMENT= A GTK theme engine designed to look nice with the GNOME desktop
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
diff --git a/x11-themes/gnome-splashscreen-manager/Makefile b/x11-themes/gnome-splashscreen-manager/Makefile
index d91c5d952f65..d18e4fc23785 100644
--- a/x11-themes/gnome-splashscreen-manager/Makefile
+++ b/x11-themes/gnome-splashscreen-manager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-splashscreen-manager
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://www.miketech.net/gnome-art/download/
DISTNAME= gnome-art-${PORTVERSION}
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/gnome-art/${PORTNAME}
USE_RUBY= yes
USE_RUBY_SETUP= yes
-GSPLASH= ${X11BASE}/share/gnome/pixmaps/splash
+GSPLASH= ${LOCALBASE}/share/gnome/pixmaps/splash
SPLASH_ICON= ${DATADIR}/glade/gnome-graphics.png
post-patch:
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index e7e781caf0d7..0f2ea4a30068 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gtk-Mac2-theme/Makefile,v 1.1 2006/07/19 19:56:14 ahze Exp $
PORTNAME= gtk-Mac2-theme
PORTVERSION= 200003050858
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= mac2
@@ -18,7 +18,6 @@ COMMENT= GTK+ engine theme based on the look of MacOS
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 3143211bada4..4a8e73868d12 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aluminumalloy
PORTVERSION?= 2004.01.04
+PORTREVISION?= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
@@ -23,7 +24,6 @@ THEME_NAME= AluminumAlloy-${FLAVOR:U:C/^(.).*$/\1/g}${FLAVOR:C/^(.)//}
WRKSRC= ${WRKDIR}/${THEME_NAME}
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-ana-theme/Makefile b/x11-themes/gtk-ana-theme/Makefile
index d26cd8113819..cd910832e496 100644
--- a/x11-themes/gtk-ana-theme/Makefile
+++ b/x11-themes/gtk-ana-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ana
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes gnome
MASTER_SITES= http://ana.netart.eu.org/
PKGNAMEPREFIX= ${TYPE}-
@@ -18,13 +18,12 @@ MAINTAINER= netchild@FreeBSD.org
COMMENT= Clean and white GTK engine
LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2
-RUN_DEPENDS= ${X11BASE}/share/themes/Gorilla/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras
+RUN_DEPENDS= ${LOCALBASE}/share/themes/Gorilla/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras
TYPE?= gtk
THEME_NAME= Ana
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-aquaextremesunken-theme/Makefile b/x11-themes/gtk-aquaextremesunken-theme/Makefile
index 0bdeb961cb4b..7e80ebeff1c5 100644
--- a/x11-themes/gtk-aquaextremesunken-theme/Makefile
+++ b/x11-themes/gtk-aquaextremesunken-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aquaextremesunken
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
@@ -20,7 +21,6 @@ TYPE?= gtk
THEME_NAME= ${DISTNAME}
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-aqualightblue-theme/Makefile b/x11-themes/gtk-aqualightblue-theme/Makefile
index e915737d2889..376b1157a2c5 100644
--- a/x11-themes/gtk-aqualightblue-theme/Makefile
+++ b/x11-themes/gtk-aqualightblue-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-aqualightblue-theme
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= aqualightblue-gtk2
@@ -18,7 +18,6 @@ COMMENT= A port of the GTK+ AquaLightBlue theme to GTK+ 2.0
WRKSRC= ${WRKDIR}/AquaLightBlue
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GNOME= gtk20
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 77f75d95af68..45226e7d0807 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gtk-bluecurve-theme
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= The Bluecurve GTK+ 1.x and 2.x themes
@@ -17,8 +17,8 @@ PATCH_STRIP= -p1
# GTK+ 1.x theme engine
USE_GNOME+= gdkpixbuf
-GTK1_CFLAGS= `${X11BASE}/bin/gdk-pixbuf-config --cflags`
-GTK1_LIBS= `${X11BASE}/bin/gdk-pixbuf-config --libs`
+GTK1_CFLAGS= `${LOCALBASE}/bin/gdk-pixbuf-config --cflags`
+GTK1_LIBS= `${LOCALBASE}/bin/gdk-pixbuf-config --libs`
GTK1_WRKSRC= ${WRKSRC}/art/gtk/Bluecurve1
GTK1_RCDIR= gtk
GTK1_SOURCES= bluecurve1_theme_main.c bluecurve1_theme_draw.c
@@ -39,7 +39,7 @@ EXTRA_STYLES= BerriesAndCream Gnome Grape Lime Slate Strawberry Tangerine
post-patch:
.for v in 1 2
. for s in ${EXTRA_STYLES}
- @${REINPLACE_CMD} -e 's|/usr|${X11BASE}|' \
+ @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|' \
${WRKSRC}/art/gtk/Bluecurve-${s}/${GTK${v}_RCDIR}/gtkrc
. endfor
.endfor
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 6d0330f16d2d..cb822710ad5c 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-cleanice-engine
PORTVERSION= 2.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= elysium-project
@@ -18,7 +18,6 @@ DISTFILES= ${DISTNAME}.tar.gz \
MAINTAINER= philip@FreeBSD.org
COMMENT= A simplistic GTK+ 2.x theme engine
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-themes/gtk-digital-cream-theme/Makefile b/x11-themes/gtk-digital-cream-theme/Makefile
index 1c4eff399769..7634918c0116 100644
--- a/x11-themes/gtk-digital-cream-theme/Makefile
+++ b/x11-themes/gtk-digital-cream-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= digital-cream
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX= ${TYPE}-
@@ -21,7 +22,6 @@ TYPE?= gtk
THEME_NAME= ${DISTNAME}
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-digital-harmony-theme/Makefile b/x11-themes/gtk-digital-harmony-theme/Makefile
index 54ccab8a3a30..5ff17d233de8 100644
--- a/x11-themes/gtk-digital-harmony-theme/Makefile
+++ b/x11-themes/gtk-digital-harmony-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= digital-harmony
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX= ${TYPE}-
@@ -20,7 +21,6 @@ TYPE?= gtk
THEME_NAME= ${DISTNAME}
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-engines-collection/Makefile b/x11-themes/gtk-engines-collection/Makefile
index ae1e90cd51df..ffe2d9f7288d 100644
--- a/x11-themes/gtk-engines-collection/Makefile
+++ b/x11-themes/gtk-engines-collection/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-engines-collection
PORTVERSION= 1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= # empty
DISTFILES= # empty
@@ -35,7 +35,7 @@ RUN_DEPENDS= ${THEMESBASE}/libbuffy.so:${PORTSDIR}/x11-themes/buffy \
${THEMESBASE}/libxeno.so:${PORTSDIR}/x11-themes/xenophilia \
${THEMESBASE}/libwhistler.so:${PORTSDIR}/x11-themes/whistlerk
-THEMESBASE= ${X11BASE}/lib/gtk/themes/engines
+THEMESBASE= ${LOCALBASE}/lib/gtk/themes/engines
NO_BUILD= yes
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index f3ef04c56bab..341be292ed82 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -3,11 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gtk-engines/Makefile,v 1.1 2006/07/18 16:32:36 ahze Exp $
PORTNAME= gtk-engines
PORTVERSION= 0.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
MAINTAINER= gnome@FreeBSD.org
COMMENT= Theme engine for gtk+ toolkits
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= imlib
GNU_CONFIGURE= yes
diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index 4e0075f18b0b..346094d3c68c 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-envy-theme
PORTVERSION= 1.0.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.gnome-look.org/content/files/
DISTNAME= 35093-Envy
@@ -14,10 +15,9 @@ DISTNAME= 35093-Envy
MAINTAINER= babak@farrokhi.net
COMMENT= Envy theme for GTK+ 2.0
-#RUN_DEPENDS= ${X11BASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
+#RUN_DEPENDS= ${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
SNAPSHOT= 20060211
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GNOME= gtk20
WRKSRC= ${WRKDIR}/Envy
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 35b8a6f03868..0930fa1679af 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gtk-flat-theme/Makefile,v 1.1 2006/07/19 19:56:17 ahze Exp $
PORTNAME= gtk-flat-theme
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= flat
@@ -18,7 +18,6 @@ COMMENT= A GTK+ theme engine which gives GTK+ a flattened appearance
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 7966f44c2fc1..ed043551b46c 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-flat-theme2
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= gtk2flat
@@ -18,7 +18,6 @@ COMMENT= A port of the Flat GTK+ engine to GTK+ 2.0
WRKSRC= ${WRKDIR}/gtk-flat-theme-2.0
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 81bd11446089..60802c22146f 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-gray-theme
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.gnome-look.org/content/files/
DISTNAME= 34132-Gray
@@ -14,9 +15,8 @@ DISTNAME= 34132-Gray
MAINTAINER= babak@farrokhi.net
COMMENT= Gray theme for GTK+ 2.0
-RUN_DEPENDS= ${X11BASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
+RUN_DEPENDS= ${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GNOME= gtk20
diff --git a/x11-themes/gtk-industrial-theme/Makefile b/x11-themes/gtk-industrial-theme/Makefile
index 9c06638158f2..72767ead262b 100644
--- a/x11-themes/gtk-industrial-theme/Makefile
+++ b/x11-themes/gtk-industrial-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-industrial-theme
PORTVERSION= 0.2.29
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes
MASTER_SITES= http://ftp.ximian.com/pub/xd2/redhat-9-i386/source/ \
${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
@@ -21,7 +21,6 @@ EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
WRKSRC= ${WRKDIR}/ximian-artwork-${PORTVERSION}
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf
USE_AUTOTOOLS= libtool:15
diff --git a/x11-themes/gtk-lila-theme-extras/Makefile b/x11-themes/gtk-lila-theme-extras/Makefile
index e6a2b8f244a0..fc6153758125 100644
--- a/x11-themes/gtk-lila-theme-extras/Makefile
+++ b/x11-themes/gtk-lila-theme-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-lila-theme-extras
PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes gnome
MASTER_SITES= http://lila-theme.uni.cc/files/tarballs/
DISTNAME= lila-gtk-extras-${PORTVERSION}
@@ -17,7 +17,6 @@ COMMENT= GTK+ 2.0 Lila additional themes
WRKSRC= ${WRKDIR}/lila-gtk-extras
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GNOME= gtk20
USE_BZIP2= yes
diff --git a/x11-themes/gtk-lila-theme/Makefile b/x11-themes/gtk-lila-theme/Makefile
index c0a0a2e073b7..d2224edcdc4a 100644
--- a/x11-themes/gtk-lila-theme/Makefile
+++ b/x11-themes/gtk-lila-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-lila-theme
PORTVERSION= 0.5.5
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://lila-theme.uni.cc/files/tarballs/
DISTNAME= lila-gtk-${PORTVERSION}
@@ -16,13 +17,13 @@ COMMENT= GTK+ 2.0 Lila theme
WRKSRC= ${WRKDIR}
-USE_X_PREFIX= yes
NO_BUILD= yes
USE_GNOME= gtk20
USE_BZIP2= yes
do-install:
- @${CP} -R ${WRKDIR}/lila-gtk/GorLila ${X11BASE}/share/themes
- @${CP} -R ${WRKDIR}/lila-gtk/SimpLila ${X11BASE}/share/themes
+ @${MKDIR} ${PREFIX}/share/themes
+ @${CP} -R ${WRKDIR}/lila-gtk/GorLila ${PREFIX}/share/themes
+ @${CP} -R ${WRKDIR}/lila-gtk/SimpLila ${PREFIX}/share/themes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-longhorninspirat-theme/Makefile b/x11-themes/gtk-longhorninspirat-theme/Makefile
index 6e36b97dfdbb..cd00cc59f17b 100644
--- a/x11-themes/gtk-longhorninspirat-theme/Makefile
+++ b/x11-themes/gtk-longhorninspirat-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= longhorninspirat
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX= ${TYPE}-
@@ -23,7 +23,6 @@ THEME_NAME= "${DISTNAME:S/_/ /}"
WRKSRC= ${WRKDIR}/${THEME_NAME}
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-milk-theme/Makefile b/x11-themes/gtk-milk-theme/Makefile
index 709aabb9de06..d82f9f93e5f2 100644
--- a/x11-themes/gtk-milk-theme/Makefile
+++ b/x11-themes/gtk-milk-theme/Makefile
@@ -3,10 +3,12 @@
# Whom: Alexey Dokuchaev <danfe@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-themes/gtk-milk-theme/Makefile,v 1.2 2006/09/22 19:53:01 mezz Exp $
#
PORTNAME= milk
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.users.monornet.hu/linux/gtk2/oldies/
PKGNAMEPREFIX?= ${TYPE}-
@@ -21,7 +23,6 @@ TYPE?= gtk
THEME_NAME= Milk
USE_BZIP2= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
.if ${TYPE} == "gtk"
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index b4632dee27ad..1781b685fe85 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qn-x11-theme
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= qnx11__
@@ -18,7 +18,6 @@ COMMENT= The QN-X11 GTK theme engine
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 444e0a40e33c..095eae51eba9 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qnxtheme
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= qnxtheme
@@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= QNX-inspired theme for GTK1 and GTK2
WANT_GNOME= yes
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/QNX
@@ -37,20 +36,20 @@ post-extract:
@${ECHO_CMD} "all:" > ${WRKSRC}/Makefile
do-install:
- @${REINPLACE_CMD} -e 's@/usr@${X11BASE}@g' ${WRKSRC}/gtk/gtkrc
+ @${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk/gtkrc
@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk/gtkrc
@${RM} -f ${WRKSRC}/gtk/gtkrc.bak
- @${MKDIR} ${X11BASE}/share/themes/qnxtheme/gtk
+ @${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk
@for i in ${WRKSRC}/gtk/*; do \
- ${INSTALL_DATA} $$i ${X11BASE}/share/themes/qnxtheme/gtk; \
+ ${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk; \
done
.if defined(WITH_GTK2)
- @${REINPLACE_CMD} -e 's@/usr@${X11BASE}@g' ${WRKSRC}/gtk-2.0/gtkrc
+ @${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk-2.0/gtkrc
@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk-2.0/gtkrc
@${RM} -f ${WRKSRC}/gtk-2.0/gtkrc.bak
- @${MKDIR} ${X11BASE}/share/themes/qnxtheme/gtk-2.0
+ @${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0
@for i in ${WRKSRC}/gtk-2.0/*; do \
- ${INSTALL_DATA} $$i ${X11BASE}/share/themes/qnxtheme/gtk-2.0; \
+ ${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0; \
done
.endif
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 20fc1c3370a7..6e042621c112 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qt-engine
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://people.freedesktop.org/~davidsansome/ \
http://freebsd.ricin.com/ports/distfiles/
@@ -25,7 +25,7 @@ USE_QT_VER= 3
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_SUB= GTK_VER=${GTK2_VERSION}
-PLIST_SUB+= X11BASE=${X11BASE}
+PLIST_SUB+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
@@ -38,7 +38,7 @@ LIB_DEPENDS+= bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
.endif
pre-configure:
- @${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
+ @${REINPLACE_CMD} -e "s|/share/themes/|${LOCALBASE}/share/themes/|" \
${WRKSRC}/kcm_gtk/kcmgtk.cpp
post-configure:
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index fbfae219df35..5be5974ed5c8 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -6,7 +6,7 @@ share/locale/de/LC_MESSAGES/gtkqtengine.mo
share/locale/es/LC_MESSAGES/gtkqtengine.mo
share/locale/fr/LC_MESSAGES/gtkqtengine.mo
share/locale/nn/LC_MESSAGES/gtkqtengine.mo
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
@@ -15,3 +15,5 @@ share/themes/Qt/gtk-2.0/gtkrc
@dirrm share/themes/Qt/gtk-2.0
@dirrm share/themes/Qt
@dirrm share/gtk-qt-engine
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 20fc1c3370a7..6e042621c112 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qt-engine
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://people.freedesktop.org/~davidsansome/ \
http://freebsd.ricin.com/ports/distfiles/
@@ -25,7 +25,7 @@ USE_QT_VER= 3
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_SUB= GTK_VER=${GTK2_VERSION}
-PLIST_SUB+= X11BASE=${X11BASE}
+PLIST_SUB+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
@@ -38,7 +38,7 @@ LIB_DEPENDS+= bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
.endif
pre-configure:
- @${REINPLACE_CMD} -e "s|/share/themes/|/X11R6/share/themes/|" \
+ @${REINPLACE_CMD} -e "s|/share/themes/|${LOCALBASE}/share/themes/|" \
${WRKSRC}/kcm_gtk/kcmgtk.cpp
post-configure:
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index fbfae219df35..5be5974ed5c8 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -6,7 +6,7 @@ share/locale/de/LC_MESSAGES/gtkqtengine.mo
share/locale/es/LC_MESSAGES/gtkqtengine.mo
share/locale/fr/LC_MESSAGES/gtkqtengine.mo
share/locale/nn/LC_MESSAGES/gtkqtengine.mo
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.a
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.la
lib/gtk-2.0/%%GTK_VER%%/engines/libqtengine.so
@@ -15,3 +15,5 @@ share/themes/Qt/gtk-2.0/gtkrc
@dirrm share/themes/Qt/gtk-2.0
@dirrm share/themes/Qt
@dirrm share/gtk-qt-engine
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
diff --git a/x11-themes/gtk-smooth-engine/Makefile b/x11-themes/gtk-smooth-engine/Makefile
index 39cef4383d79..b68a696440be 100644
--- a/x11-themes/gtk-smooth-engine/Makefile
+++ b/x11-themes/gtk-smooth-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-smooth-engine
PORTVERSION= 0.6.0.1
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= smooth-engine
@@ -14,7 +15,6 @@ MASTER_SITE_SUBDIR= smooth-engine
MAINTAINER= amistry@am-productions.biz
COMMENT= Flexible GTK Theme Engine
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
WANT_GNOME= yes
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 2dbeaae38ac8..dd2aca3509d7 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-xfce-engine
PORTVERSION= 2.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-4.2.3.2/src/ \
http://www.ca-us.xfce.org/archive/xfce-4.2.3.2/src/ \
@@ -18,6 +18,5 @@ COMMENT= An XFCE engine for GTK 2.0
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
-USE_X_PREFIX= yes
.include <bsd.port.mk>
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index b200b42f4ccd..dc9e23887828 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-zenith-theme
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= zenith
@@ -18,7 +18,6 @@ COMMENT= The Zenith GTK theme engine
WRKSRC= ${WRKDIR}/zenith-1.0
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index a5600339b09e..0fd4cff21b81 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkbe
PORTVERSION= 200007091019
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= gtkbe
@@ -18,7 +18,6 @@ COMMENT= BeOS look-alike GTK+ theme engine
WRKSRC= ${WRKDIR}/GTKBeEngine
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 1c366d7859c1..b654c729737a 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gtkstep-pastel/Makefile,v 1.1 2006/07/20 11:38:25 ahze Exp $
PORTNAME= gtkstep-pastel
PORTVERSION= 0.10.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= gtksteppastel
@@ -18,7 +18,6 @@ COMMENT= Theme engine based on GtkStep to make GTK+ look nicier
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 1d6d14a7556c..1ecdabee66bf 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -3,11 +3,11 @@
# Whom: Gilad Rom
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/gtkstep/Makefile,v 1.1 2006/07/20 11:38:24 ahze Exp $
PORTNAME= gtkstep
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/g/gtk-engines-gtkstep
@@ -18,7 +18,6 @@ COMMENT= A theme module to make GTK+ look like the NeXTSTEP(tm) interface
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 37caba27a212..017adaa57c9f 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/icegradient/Makefile,v 1.1 2006/07/20 11:38:25 ahze Exp $
PORTNAME= icegradient
PORTVERSION= 200012290259
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ftp://ftp.themes.org/pub/themes/gtk/ \
${MASTER_SITE_LOCAL}
@@ -19,7 +19,6 @@ COMMENT= A GTK+ gradient theme engine based on ThinIce
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.5
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/icons-human-azul/Makefile b/x11-themes/icons-human-azul/Makefile
index 859df252ca5f..a4db19c8edfc 100644
--- a/x11-themes/icons-human-azul/Makefile
+++ b/x11-themes/icons-human-azul/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icons-human-azul
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://www.gnome-look.org/content/files/
DISTNAME= 37099-HumanAzul
@@ -14,7 +15,6 @@ DISTNAME= 37099-HumanAzul
MAINTAINER= pneumann@gmail.com
COMMENT= A set of icons from the Ubuntu human look
-USE_X_PREFIX= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/HumanAzul
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index c4279abd407a..bce2f878729f 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icons-tango
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://tango-project.org/releases/ \
${MASTER_SITE_GENTOO}
@@ -22,7 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/libexec/icon-name-mapping:${PORTSDIR}/x11-themes/ico
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_GNOME= intlhack
.include <bsd.port.mk>
diff --git a/x11-themes/icons-tango/pkg-plist b/x11-themes/icons-tango/pkg-plist
index 295ce34557cb..27cd421de011 100644
--- a/x11-themes/icons-tango/pkg-plist
+++ b/x11-themes/icons-tango/pkg-plist
@@ -82,6 +82,7 @@ share/icons/Tango/16x16/actions/gtk-cut.png
share/icons/Tango/16x16/actions/gtk-delete.png
share/icons/Tango/16x16/actions/gtk-find-and-replace.png
share/icons/Tango/16x16/actions/gtk-find.png
+share/icons/Tango/16x16/actions/gtk-fullscreen.png
share/icons/Tango/16x16/actions/gtk-go-back-ltr.png
share/icons/Tango/16x16/actions/gtk-go-back-rtl.png
share/icons/Tango/16x16/actions/gtk-go-down.png
@@ -188,6 +189,7 @@ share/icons/Tango/16x16/actions/stock_delete.png
share/icons/Tango/16x16/actions/stock_down.png
share/icons/Tango/16x16/actions/stock_file-properites.png
share/icons/Tango/16x16/actions/stock_first.png
+share/icons/Tango/16x16/actions/stock_fullscreen.png
share/icons/Tango/16x16/actions/stock_help-add-bookmark.png
share/icons/Tango/16x16/actions/stock_home.png
share/icons/Tango/16x16/actions/stock_last.png
@@ -224,6 +226,7 @@ share/icons/Tango/16x16/actions/stock_save-as.png
share/icons/Tango/16x16/actions/stock_save.png
share/icons/Tango/16x16/actions/stock_search-and-replace.png
share/icons/Tango/16x16/actions/stock_search.png
+share/icons/Tango/16x16/actions/stock_select-all.png
share/icons/Tango/16x16/actions/stock_spam.png
share/icons/Tango/16x16/actions/stock_stop.png
share/icons/Tango/16x16/actions/stock_text-strikethrough.png
@@ -256,7 +259,9 @@ share/icons/Tango/16x16/actions/up.png
share/icons/Tango/16x16/actions/view-fullscreen.png
share/icons/Tango/16x16/actions/view-refresh.png
share/icons/Tango/16x16/actions/window-new.png
+share/icons/Tango/16x16/actions/window_fullscreen.png
share/icons/Tango/16x16/actions/window_new.png
+share/icons/Tango/16x16/actions/xfce-system-lock.png
share/icons/Tango/16x16/animations/gnome-spinner.png
share/icons/Tango/16x16/animations/process-working.png
share/icons/Tango/16x16/apps/access.png
@@ -348,6 +353,14 @@ share/icons/Tango/16x16/apps/utilities-system-monitor.png
share/icons/Tango/16x16/apps/utilities-terminal.png
share/icons/Tango/16x16/apps/wallpaper.png
share/icons/Tango/16x16/apps/web-browser.png
+share/icons/Tango/16x16/apps/xfcalendar.png
+share/icons/Tango/16x16/apps/xfce-filemanager.png
+share/icons/Tango/16x16/apps/xfce-mail.png
+share/icons/Tango/16x16/apps/xfce-terminal.png
+share/icons/Tango/16x16/apps/xfce4-backdrop.png
+share/icons/Tango/16x16/apps/xfce4-session.png
+share/icons/Tango/16x16/apps/xfce4-sound.png
+share/icons/Tango/16x16/apps/xfwm4.png
share/icons/Tango/16x16/apps/ximian-evolution-calendar.png
share/icons/Tango/16x16/apps/xscreensaver.png
share/icons/Tango/16x16/apps/zen-icon.png
@@ -396,6 +409,14 @@ share/icons/Tango/16x16/categories/redhat-sound_video.png
share/icons/Tango/16x16/categories/redhat-system_settings.png
share/icons/Tango/16x16/categories/redhat-system_tools.png
share/icons/Tango/16x16/categories/stock_internet.png
+share/icons/Tango/16x16/categories/xfce-games.png
+share/icons/Tango/16x16/categories/xfce-graphics.png
+share/icons/Tango/16x16/categories/xfce-internet.png
+share/icons/Tango/16x16/categories/xfce-multimedia.png
+share/icons/Tango/16x16/categories/xfce-office.png
+share/icons/Tango/16x16/categories/xfce-system-settings.png
+share/icons/Tango/16x16/categories/xfce-utils.png
+share/icons/Tango/16x16/categories/xfce4-settings.png
share/icons/Tango/16x16/devices/3floppy_unmount.png
share/icons/Tango/16x16/devices/audio-card.png
share/icons/Tango/16x16/devices/audio-input-microphone.png
@@ -404,27 +425,14 @@ share/icons/Tango/16x16/devices/camera-photo.png
share/icons/Tango/16x16/devices/camera-video.png
share/icons/Tango/16x16/devices/camera.png
share/icons/Tango/16x16/devices/camera_unmount.png
-share/icons/Tango/16x16/devices/cdrom_unmount.png
-share/icons/Tango/16x16/devices/cdwriter_unmount.png
share/icons/Tango/16x16/devices/chardevice.png
share/icons/Tango/16x16/devices/computer.png
share/icons/Tango/16x16/devices/display.png
share/icons/Tango/16x16/devices/drive-cdrom.png
share/icons/Tango/16x16/devices/drive-harddisk.png
share/icons/Tango/16x16/devices/drive-removable-media.png
-share/icons/Tango/16x16/devices/dvd_unmount.png
share/icons/Tango/16x16/devices/gnome-dev-battery.png
-share/icons/Tango/16x16/devices/gnome-dev-cdrom-audio.png
-share/icons/Tango/16x16/devices/gnome-dev-cdrom.png
share/icons/Tango/16x16/devices/gnome-dev-computer.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-cdr.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-cdrw.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-dvdr-plus.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-dvdr.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-dvdram.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-dvdrom.png
-share/icons/Tango/16x16/devices/gnome-dev-disc-dvdrw.png
-share/icons/Tango/16x16/devices/gnome-dev-dvd.png
share/icons/Tango/16x16/devices/gnome-dev-ethernet.png
share/icons/Tango/16x16/devices/gnome-dev-floppy.png
share/icons/Tango/16x16/devices/gnome-dev-harddisk-1394.png
@@ -432,11 +440,6 @@ share/icons/Tango/16x16/devices/gnome-dev-harddisk-usb.png
share/icons/Tango/16x16/devices/gnome-dev-harddisk.png
share/icons/Tango/16x16/devices/gnome-dev-ipod.png
share/icons/Tango/16x16/devices/gnome-dev-keyboard.png
-share/icons/Tango/16x16/devices/gnome-dev-media-cf.png
-share/icons/Tango/16x16/devices/gnome-dev-media-memory.png
-share/icons/Tango/16x16/devices/gnome-dev-media-ms.png
-share/icons/Tango/16x16/devices/gnome-dev-media-sdmmc.png
-share/icons/Tango/16x16/devices/gnome-dev-media-sm.png
share/icons/Tango/16x16/devices/gnome-dev-mouse-ball.png
share/icons/Tango/16x16/devices/gnome-dev-mouse-optical.png
share/icons/Tango/16x16/devices/gnome-dev-printer.png
@@ -446,7 +449,6 @@ share/icons/Tango/16x16/devices/gnome-dev-removable.png
share/icons/Tango/16x16/devices/gnome-dev-wavelan.png
share/icons/Tango/16x16/devices/gnome-fs-client.png
share/icons/Tango/16x16/devices/gnome-stock-mic.png
-share/icons/Tango/16x16/devices/gtk-cdrom.png
share/icons/Tango/16x16/devices/gtk-floppy.png
share/icons/Tango/16x16/devices/gtk-harddisk.png
share/icons/Tango/16x16/devices/harddrive.png
@@ -475,6 +477,10 @@ share/icons/Tango/16x16/devices/system-floppy.png
share/icons/Tango/16x16/devices/system.png
share/icons/Tango/16x16/devices/usbpendrive_unmount.png
share/icons/Tango/16x16/devices/video-display.png
+share/icons/Tango/16x16/devices/xfce-printer.png
+share/icons/Tango/16x16/devices/xfce4-display.png
+share/icons/Tango/16x16/devices/xfce4-keyboard.png
+share/icons/Tango/16x16/devices/xfce4-mouse.png
share/icons/Tango/16x16/devices/yast_HD.png
share/icons/Tango/16x16/devices/yast_idetude.png
share/icons/Tango/16x16/devices/yast_joystick.png
@@ -513,6 +519,10 @@ share/icons/Tango/16x16/mimetypes/empty.png
share/icons/Tango/16x16/mimetypes/exec.png
share/icons/Tango/16x16/mimetypes/folder_tar.png
share/icons/Tango/16x16/mimetypes/font-x-generic.png
+share/icons/Tango/16x16/mimetypes/font.png
+share/icons/Tango/16x16/mimetypes/font_bitmap.png
+share/icons/Tango/16x16/mimetypes/font_truetype.png
+share/icons/Tango/16x16/mimetypes/font_type1.png
share/icons/Tango/16x16/mimetypes/gnome-fs-executable.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-magicpoint.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-msword.png
@@ -533,6 +543,9 @@ share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
@@ -568,6 +581,7 @@ share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-font-sunos-news.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-font-ttf.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-gnumeric.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-gzpostscript.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-jar.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-killustrator.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-kpresenter.png
@@ -581,6 +595,7 @@ share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-php.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-python-bytecode.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-rar.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-scribus.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-shellscript.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-shockwave-flash.png
share/icons/Tango/16x16/mimetypes/gnome-mime-application-x-stuffit.png
@@ -606,6 +621,7 @@ share/icons/Tango/16x16/mimetypes/gnome-package.png
share/icons/Tango/16x16/mimetypes/html.png
share/icons/Tango/16x16/mimetypes/image-x-generic.png
share/icons/Tango/16x16/mimetypes/image.png
+share/icons/Tango/16x16/mimetypes/kpresenter_kpr.png
share/icons/Tango/16x16/mimetypes/mime_ascii.png
share/icons/Tango/16x16/mimetypes/misc.png
share/icons/Tango/16x16/mimetypes/package-x-generic.png
@@ -619,6 +635,7 @@ share/icons/Tango/16x16/mimetypes/sound.png
share/icons/Tango/16x16/mimetypes/spreadsheet.png
share/icons/Tango/16x16/mimetypes/stock_addressbook.png
share/icons/Tango/16x16/mimetypes/stock_calendar.png
+share/icons/Tango/16x16/mimetypes/stock_certificate.png
share/icons/Tango/16x16/mimetypes/stock_script.png
share/icons/Tango/16x16/mimetypes/tar.png
share/icons/Tango/16x16/mimetypes/template_source.png
@@ -631,8 +648,10 @@ share/icons/Tango/16x16/mimetypes/txt.png
share/icons/Tango/16x16/mimetypes/txt2.png
share/icons/Tango/16x16/mimetypes/unknown.png
share/icons/Tango/16x16/mimetypes/vcalendar.png
+share/icons/Tango/16x16/mimetypes/vcard.png
share/icons/Tango/16x16/mimetypes/video-x-generic.png
share/icons/Tango/16x16/mimetypes/video.png
+share/icons/Tango/16x16/mimetypes/wordprocessing.png
share/icons/Tango/16x16/mimetypes/www.png
share/icons/Tango/16x16/mimetypes/x-office-address-book.png
share/icons/Tango/16x16/mimetypes/x-office-calendar.png
@@ -684,12 +703,15 @@ share/icons/Tango/16x16/places/trashcan_empty.png
share/icons/Tango/16x16/places/user-desktop.png
share/icons/Tango/16x16/places/user-home.png
share/icons/Tango/16x16/places/user-trash.png
+share/icons/Tango/16x16/places/xfce-trash_empty.png
share/icons/Tango/16x16/status/audio-volume-high.png
share/icons/Tango/16x16/status/audio-volume-low.png
share/icons/Tango/16x16/status/audio-volume-medium.png
share/icons/Tango/16x16/status/audio-volume-muted.png
share/icons/Tango/16x16/status/battery-caution.png
-share/icons/Tango/16x16/status/cloudy1.png
+share/icons/Tango/16x16/status/connect_creating.png
+share/icons/Tango/16x16/status/connect_established.png
+share/icons/Tango/16x16/status/connect_no.png
share/icons/Tango/16x16/status/dialog-error.png
share/icons/Tango/16x16/status/dialog-information.png
share/icons/Tango/16x16/status/dialog-warning.png
@@ -719,7 +741,6 @@ share/icons/Tango/16x16/status/image-loading.png
share/icons/Tango/16x16/status/image-missing.png
share/icons/Tango/16x16/status/important.png
share/icons/Tango/16x16/status/info.png
-share/icons/Tango/16x16/status/light_rain.png
share/icons/Tango/16x16/status/mail-attachment.png
share/icons/Tango/16x16/status/messagebox_critical.png
share/icons/Tango/16x16/status/messagebox_info.png
@@ -735,10 +756,7 @@ share/icons/Tango/16x16/status/nm-adhoc.png
share/icons/Tango/16x16/status/nm-device-wired.png
share/icons/Tango/16x16/status/nm-device-wireless.png
share/icons/Tango/16x16/status/nm-no-connection.png
-share/icons/Tango/16x16/status/overcast.png
share/icons/Tango/16x16/status/printer-error.png
-share/icons/Tango/16x16/status/shower3.png
-share/icons/Tango/16x16/status/snow4.png
share/icons/Tango/16x16/status/stock_dialog-error.png
share/icons/Tango/16x16/status/stock_dialog-info.png
share/icons/Tango/16x16/status/stock_dialog-warning.png
@@ -760,7 +778,6 @@ share/icons/Tango/16x16/status/stock_weather-storm.png
share/icons/Tango/16x16/status/stock_weather-sunny.png
share/icons/Tango/16x16/status/sunny.png
share/icons/Tango/16x16/status/trashcan_full.png
-share/icons/Tango/16x16/status/tstorm3.png
share/icons/Tango/16x16/status/user-trash-full.png
share/icons/Tango/16x16/status/weather-clear-night.png
share/icons/Tango/16x16/status/weather-clear.png
@@ -772,6 +789,7 @@ share/icons/Tango/16x16/status/weather-showers-scattered.png
share/icons/Tango/16x16/status/weather-showers.png
share/icons/Tango/16x16/status/weather-snow.png
share/icons/Tango/16x16/status/weather-storm.png
+share/icons/Tango/16x16/status/xfce-trash_full.png
share/icons/Tango/22x22/actions/add.png
share/icons/Tango/22x22/actions/address-book-new.png
share/icons/Tango/22x22/actions/appointment-new.png
@@ -856,6 +874,7 @@ share/icons/Tango/22x22/actions/gtk-cut.png
share/icons/Tango/22x22/actions/gtk-delete.png
share/icons/Tango/22x22/actions/gtk-find-and-replace.png
share/icons/Tango/22x22/actions/gtk-find.png
+share/icons/Tango/22x22/actions/gtk-fullscreen.png
share/icons/Tango/22x22/actions/gtk-go-back-ltr.png
share/icons/Tango/22x22/actions/gtk-go-back-rtl.png
share/icons/Tango/22x22/actions/gtk-go-down.png
@@ -962,6 +981,7 @@ share/icons/Tango/22x22/actions/stock_delete.png
share/icons/Tango/22x22/actions/stock_down.png
share/icons/Tango/22x22/actions/stock_file-properites.png
share/icons/Tango/22x22/actions/stock_first.png
+share/icons/Tango/22x22/actions/stock_fullscreen.png
share/icons/Tango/22x22/actions/stock_help-add-bookmark.png
share/icons/Tango/22x22/actions/stock_home.png
share/icons/Tango/22x22/actions/stock_last.png
@@ -998,6 +1018,7 @@ share/icons/Tango/22x22/actions/stock_save-as.png
share/icons/Tango/22x22/actions/stock_save.png
share/icons/Tango/22x22/actions/stock_search-and-replace.png
share/icons/Tango/22x22/actions/stock_search.png
+share/icons/Tango/22x22/actions/stock_select-all.png
share/icons/Tango/22x22/actions/stock_spam.png
share/icons/Tango/22x22/actions/stock_stop.png
share/icons/Tango/22x22/actions/stock_text-strikethrough.png
@@ -1030,7 +1051,9 @@ share/icons/Tango/22x22/actions/up.png
share/icons/Tango/22x22/actions/view-fullscreen.png
share/icons/Tango/22x22/actions/view-refresh.png
share/icons/Tango/22x22/actions/window-new.png
+share/icons/Tango/22x22/actions/window_fullscreen.png
share/icons/Tango/22x22/actions/window_new.png
+share/icons/Tango/22x22/actions/xfce-system-lock.png
share/icons/Tango/22x22/animations/gnome-spinner.png
share/icons/Tango/22x22/animations/process-working.png
share/icons/Tango/22x22/apps/access.png
@@ -1122,6 +1145,14 @@ share/icons/Tango/22x22/apps/utilities-system-monitor.png
share/icons/Tango/22x22/apps/utilities-terminal.png
share/icons/Tango/22x22/apps/wallpaper.png
share/icons/Tango/22x22/apps/web-browser.png
+share/icons/Tango/22x22/apps/xfcalendar.png
+share/icons/Tango/22x22/apps/xfce-filemanager.png
+share/icons/Tango/22x22/apps/xfce-mail.png
+share/icons/Tango/22x22/apps/xfce-terminal.png
+share/icons/Tango/22x22/apps/xfce4-backdrop.png
+share/icons/Tango/22x22/apps/xfce4-session.png
+share/icons/Tango/22x22/apps/xfce4-sound.png
+share/icons/Tango/22x22/apps/xfwm4.png
share/icons/Tango/22x22/apps/ximian-evolution-calendar.png
share/icons/Tango/22x22/apps/xscreensaver.png
share/icons/Tango/22x22/apps/zen-icon.png
@@ -1170,6 +1201,14 @@ share/icons/Tango/22x22/categories/redhat-sound_video.png
share/icons/Tango/22x22/categories/redhat-system_settings.png
share/icons/Tango/22x22/categories/redhat-system_tools.png
share/icons/Tango/22x22/categories/stock_internet.png
+share/icons/Tango/22x22/categories/xfce-games.png
+share/icons/Tango/22x22/categories/xfce-graphics.png
+share/icons/Tango/22x22/categories/xfce-internet.png
+share/icons/Tango/22x22/categories/xfce-multimedia.png
+share/icons/Tango/22x22/categories/xfce-office.png
+share/icons/Tango/22x22/categories/xfce-system-settings.png
+share/icons/Tango/22x22/categories/xfce-utils.png
+share/icons/Tango/22x22/categories/xfce4-settings.png
share/icons/Tango/22x22/devices/3floppy_unmount.png
share/icons/Tango/22x22/devices/audio-card.png
share/icons/Tango/22x22/devices/audio-input-microphone.png
@@ -1178,27 +1217,14 @@ share/icons/Tango/22x22/devices/camera-photo.png
share/icons/Tango/22x22/devices/camera-video.png
share/icons/Tango/22x22/devices/camera.png
share/icons/Tango/22x22/devices/camera_unmount.png
-share/icons/Tango/22x22/devices/cdrom_unmount.png
-share/icons/Tango/22x22/devices/cdwriter_unmount.png
share/icons/Tango/22x22/devices/chardevice.png
share/icons/Tango/22x22/devices/computer.png
share/icons/Tango/22x22/devices/display.png
share/icons/Tango/22x22/devices/drive-cdrom.png
share/icons/Tango/22x22/devices/drive-harddisk.png
share/icons/Tango/22x22/devices/drive-removable-media.png
-share/icons/Tango/22x22/devices/dvd_unmount.png
share/icons/Tango/22x22/devices/gnome-dev-battery.png
-share/icons/Tango/22x22/devices/gnome-dev-cdrom-audio.png
-share/icons/Tango/22x22/devices/gnome-dev-cdrom.png
share/icons/Tango/22x22/devices/gnome-dev-computer.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-cdr.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-cdrw.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-dvdr-plus.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-dvdr.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-dvdram.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-dvdrom.png
-share/icons/Tango/22x22/devices/gnome-dev-disc-dvdrw.png
-share/icons/Tango/22x22/devices/gnome-dev-dvd.png
share/icons/Tango/22x22/devices/gnome-dev-ethernet.png
share/icons/Tango/22x22/devices/gnome-dev-floppy.png
share/icons/Tango/22x22/devices/gnome-dev-harddisk-1394.png
@@ -1206,11 +1232,6 @@ share/icons/Tango/22x22/devices/gnome-dev-harddisk-usb.png
share/icons/Tango/22x22/devices/gnome-dev-harddisk.png
share/icons/Tango/22x22/devices/gnome-dev-ipod.png
share/icons/Tango/22x22/devices/gnome-dev-keyboard.png
-share/icons/Tango/22x22/devices/gnome-dev-media-cf.png
-share/icons/Tango/22x22/devices/gnome-dev-media-memory.png
-share/icons/Tango/22x22/devices/gnome-dev-media-ms.png
-share/icons/Tango/22x22/devices/gnome-dev-media-sdmmc.png
-share/icons/Tango/22x22/devices/gnome-dev-media-sm.png
share/icons/Tango/22x22/devices/gnome-dev-mouse-ball.png
share/icons/Tango/22x22/devices/gnome-dev-mouse-optical.png
share/icons/Tango/22x22/devices/gnome-dev-printer.png
@@ -1220,7 +1241,6 @@ share/icons/Tango/22x22/devices/gnome-dev-removable.png
share/icons/Tango/22x22/devices/gnome-dev-wavelan.png
share/icons/Tango/22x22/devices/gnome-fs-client.png
share/icons/Tango/22x22/devices/gnome-stock-mic.png
-share/icons/Tango/22x22/devices/gtk-cdrom.png
share/icons/Tango/22x22/devices/gtk-floppy.png
share/icons/Tango/22x22/devices/gtk-harddisk.png
share/icons/Tango/22x22/devices/harddrive.png
@@ -1249,6 +1269,10 @@ share/icons/Tango/22x22/devices/system-floppy.png
share/icons/Tango/22x22/devices/system.png
share/icons/Tango/22x22/devices/usbpendrive_unmount.png
share/icons/Tango/22x22/devices/video-display.png
+share/icons/Tango/22x22/devices/xfce-printer.png
+share/icons/Tango/22x22/devices/xfce4-display.png
+share/icons/Tango/22x22/devices/xfce4-keyboard.png
+share/icons/Tango/22x22/devices/xfce4-mouse.png
share/icons/Tango/22x22/devices/yast_HD.png
share/icons/Tango/22x22/devices/yast_idetude.png
share/icons/Tango/22x22/devices/yast_joystick.png
@@ -1287,6 +1311,10 @@ share/icons/Tango/22x22/mimetypes/empty.png
share/icons/Tango/22x22/mimetypes/exec.png
share/icons/Tango/22x22/mimetypes/folder_tar.png
share/icons/Tango/22x22/mimetypes/font-x-generic.png
+share/icons/Tango/22x22/mimetypes/font.png
+share/icons/Tango/22x22/mimetypes/font_bitmap.png
+share/icons/Tango/22x22/mimetypes/font_truetype.png
+share/icons/Tango/22x22/mimetypes/font_type1.png
share/icons/Tango/22x22/mimetypes/gnome-fs-executable.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-magicpoint.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-msword.png
@@ -1307,6 +1335,9 @@ share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
@@ -1342,6 +1373,7 @@ share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-font-sunos-news.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-font-ttf.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-gnumeric.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-gzpostscript.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-jar.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-killustrator.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-kpresenter.png
@@ -1355,6 +1387,7 @@ share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-php.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-python-bytecode.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-rar.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-scribus.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-shellscript.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-shockwave-flash.png
share/icons/Tango/22x22/mimetypes/gnome-mime-application-x-stuffit.png
@@ -1380,6 +1413,7 @@ share/icons/Tango/22x22/mimetypes/gnome-package.png
share/icons/Tango/22x22/mimetypes/html.png
share/icons/Tango/22x22/mimetypes/image-x-generic.png
share/icons/Tango/22x22/mimetypes/image.png
+share/icons/Tango/22x22/mimetypes/kpresenter_kpr.png
share/icons/Tango/22x22/mimetypes/mime_ascii.png
share/icons/Tango/22x22/mimetypes/misc.png
share/icons/Tango/22x22/mimetypes/package-x-generic.png
@@ -1393,6 +1427,7 @@ share/icons/Tango/22x22/mimetypes/sound.png
share/icons/Tango/22x22/mimetypes/spreadsheet.png
share/icons/Tango/22x22/mimetypes/stock_addressbook.png
share/icons/Tango/22x22/mimetypes/stock_calendar.png
+share/icons/Tango/22x22/mimetypes/stock_certificate.png
share/icons/Tango/22x22/mimetypes/stock_script.png
share/icons/Tango/22x22/mimetypes/tar.png
share/icons/Tango/22x22/mimetypes/template_source.png
@@ -1405,8 +1440,10 @@ share/icons/Tango/22x22/mimetypes/txt.png
share/icons/Tango/22x22/mimetypes/txt2.png
share/icons/Tango/22x22/mimetypes/unknown.png
share/icons/Tango/22x22/mimetypes/vcalendar.png
+share/icons/Tango/22x22/mimetypes/vcard.png
share/icons/Tango/22x22/mimetypes/video-x-generic.png
share/icons/Tango/22x22/mimetypes/video.png
+share/icons/Tango/22x22/mimetypes/wordprocessing.png
share/icons/Tango/22x22/mimetypes/www.png
share/icons/Tango/22x22/mimetypes/x-office-address-book.png
share/icons/Tango/22x22/mimetypes/x-office-calendar.png
@@ -1458,12 +1495,15 @@ share/icons/Tango/22x22/places/trashcan_empty.png
share/icons/Tango/22x22/places/user-desktop.png
share/icons/Tango/22x22/places/user-home.png
share/icons/Tango/22x22/places/user-trash.png
+share/icons/Tango/22x22/places/xfce-trash_empty.png
share/icons/Tango/22x22/status/audio-volume-high.png
share/icons/Tango/22x22/status/audio-volume-low.png
share/icons/Tango/22x22/status/audio-volume-medium.png
share/icons/Tango/22x22/status/audio-volume-muted.png
share/icons/Tango/22x22/status/battery-caution.png
-share/icons/Tango/22x22/status/cloudy1.png
+share/icons/Tango/22x22/status/connect_creating.png
+share/icons/Tango/22x22/status/connect_established.png
+share/icons/Tango/22x22/status/connect_no.png
share/icons/Tango/22x22/status/dialog-error.png
share/icons/Tango/22x22/status/dialog-information.png
share/icons/Tango/22x22/status/dialog-warning.png
@@ -1493,7 +1533,6 @@ share/icons/Tango/22x22/status/image-loading.png
share/icons/Tango/22x22/status/image-missing.png
share/icons/Tango/22x22/status/important.png
share/icons/Tango/22x22/status/info.png
-share/icons/Tango/22x22/status/light_rain.png
share/icons/Tango/22x22/status/mail-attachment.png
share/icons/Tango/22x22/status/messagebox_critical.png
share/icons/Tango/22x22/status/messagebox_info.png
@@ -1509,10 +1548,7 @@ share/icons/Tango/22x22/status/nm-adhoc.png
share/icons/Tango/22x22/status/nm-device-wired.png
share/icons/Tango/22x22/status/nm-device-wireless.png
share/icons/Tango/22x22/status/nm-no-connection.png
-share/icons/Tango/22x22/status/overcast.png
share/icons/Tango/22x22/status/printer-error.png
-share/icons/Tango/22x22/status/shower3.png
-share/icons/Tango/22x22/status/snow4.png
share/icons/Tango/22x22/status/stock_dialog-error.png
share/icons/Tango/22x22/status/stock_dialog-info.png
share/icons/Tango/22x22/status/stock_dialog-warning.png
@@ -1534,7 +1570,6 @@ share/icons/Tango/22x22/status/stock_weather-storm.png
share/icons/Tango/22x22/status/stock_weather-sunny.png
share/icons/Tango/22x22/status/sunny.png
share/icons/Tango/22x22/status/trashcan_full.png
-share/icons/Tango/22x22/status/tstorm3.png
share/icons/Tango/22x22/status/user-trash-full.png
share/icons/Tango/22x22/status/weather-clear-night.png
share/icons/Tango/22x22/status/weather-clear.png
@@ -1546,6 +1581,7 @@ share/icons/Tango/22x22/status/weather-showers-scattered.png
share/icons/Tango/22x22/status/weather-showers.png
share/icons/Tango/22x22/status/weather-snow.png
share/icons/Tango/22x22/status/weather-storm.png
+share/icons/Tango/22x22/status/xfce-trash_full.png
share/icons/Tango/24x24/actions/add.png
share/icons/Tango/24x24/actions/address-book-new.png
share/icons/Tango/24x24/actions/appointment-new.png
@@ -1630,6 +1666,7 @@ share/icons/Tango/24x24/actions/gtk-cut.png
share/icons/Tango/24x24/actions/gtk-delete.png
share/icons/Tango/24x24/actions/gtk-find-and-replace.png
share/icons/Tango/24x24/actions/gtk-find.png
+share/icons/Tango/24x24/actions/gtk-fullscreen.png
share/icons/Tango/24x24/actions/gtk-go-back-ltr.png
share/icons/Tango/24x24/actions/gtk-go-back-rtl.png
share/icons/Tango/24x24/actions/gtk-go-down.png
@@ -1736,6 +1773,7 @@ share/icons/Tango/24x24/actions/stock_delete.png
share/icons/Tango/24x24/actions/stock_down.png
share/icons/Tango/24x24/actions/stock_file-properites.png
share/icons/Tango/24x24/actions/stock_first.png
+share/icons/Tango/24x24/actions/stock_fullscreen.png
share/icons/Tango/24x24/actions/stock_help-add-bookmark.png
share/icons/Tango/24x24/actions/stock_home.png
share/icons/Tango/24x24/actions/stock_last.png
@@ -1772,6 +1810,7 @@ share/icons/Tango/24x24/actions/stock_save-as.png
share/icons/Tango/24x24/actions/stock_save.png
share/icons/Tango/24x24/actions/stock_search-and-replace.png
share/icons/Tango/24x24/actions/stock_search.png
+share/icons/Tango/24x24/actions/stock_select-all.png
share/icons/Tango/24x24/actions/stock_spam.png
share/icons/Tango/24x24/actions/stock_stop.png
share/icons/Tango/24x24/actions/stock_text-strikethrough.png
@@ -1804,7 +1843,9 @@ share/icons/Tango/24x24/actions/up.png
share/icons/Tango/24x24/actions/view-fullscreen.png
share/icons/Tango/24x24/actions/view-refresh.png
share/icons/Tango/24x24/actions/window-new.png
+share/icons/Tango/24x24/actions/window_fullscreen.png
share/icons/Tango/24x24/actions/window_new.png
+share/icons/Tango/24x24/actions/xfce-system-lock.png
share/icons/Tango/24x24/apps/access.png
share/icons/Tango/24x24/apps/accessibility-directory.png
share/icons/Tango/24x24/apps/accessories-calculator.png
@@ -1894,6 +1935,14 @@ share/icons/Tango/24x24/apps/utilities-system-monitor.png
share/icons/Tango/24x24/apps/utilities-terminal.png
share/icons/Tango/24x24/apps/wallpaper.png
share/icons/Tango/24x24/apps/web-browser.png
+share/icons/Tango/24x24/apps/xfcalendar.png
+share/icons/Tango/24x24/apps/xfce-filemanager.png
+share/icons/Tango/24x24/apps/xfce-mail.png
+share/icons/Tango/24x24/apps/xfce-terminal.png
+share/icons/Tango/24x24/apps/xfce4-backdrop.png
+share/icons/Tango/24x24/apps/xfce4-session.png
+share/icons/Tango/24x24/apps/xfce4-sound.png
+share/icons/Tango/24x24/apps/xfwm4.png
share/icons/Tango/24x24/apps/ximian-evolution-calendar.png
share/icons/Tango/24x24/apps/xscreensaver.png
share/icons/Tango/24x24/apps/zen-icon.png
@@ -1942,6 +1991,14 @@ share/icons/Tango/24x24/categories/redhat-sound_video.png
share/icons/Tango/24x24/categories/redhat-system_settings.png
share/icons/Tango/24x24/categories/redhat-system_tools.png
share/icons/Tango/24x24/categories/stock_internet.png
+share/icons/Tango/24x24/categories/xfce-games.png
+share/icons/Tango/24x24/categories/xfce-graphics.png
+share/icons/Tango/24x24/categories/xfce-internet.png
+share/icons/Tango/24x24/categories/xfce-multimedia.png
+share/icons/Tango/24x24/categories/xfce-office.png
+share/icons/Tango/24x24/categories/xfce-system-settings.png
+share/icons/Tango/24x24/categories/xfce-utils.png
+share/icons/Tango/24x24/categories/xfce4-settings.png
share/icons/Tango/24x24/devices/3floppy_unmount.png
share/icons/Tango/24x24/devices/audio-card.png
share/icons/Tango/24x24/devices/audio-input-microphone.png
@@ -1950,27 +2007,14 @@ share/icons/Tango/24x24/devices/camera-photo.png
share/icons/Tango/24x24/devices/camera-video.png
share/icons/Tango/24x24/devices/camera.png
share/icons/Tango/24x24/devices/camera_unmount.png
-share/icons/Tango/24x24/devices/cdrom_unmount.png
-share/icons/Tango/24x24/devices/cdwriter_unmount.png
share/icons/Tango/24x24/devices/chardevice.png
share/icons/Tango/24x24/devices/computer.png
share/icons/Tango/24x24/devices/display.png
share/icons/Tango/24x24/devices/drive-cdrom.png
share/icons/Tango/24x24/devices/drive-harddisk.png
share/icons/Tango/24x24/devices/drive-removable-media.png
-share/icons/Tango/24x24/devices/dvd_unmount.png
share/icons/Tango/24x24/devices/gnome-dev-battery.png
-share/icons/Tango/24x24/devices/gnome-dev-cdrom-audio.png
-share/icons/Tango/24x24/devices/gnome-dev-cdrom.png
share/icons/Tango/24x24/devices/gnome-dev-computer.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-cdr.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-cdrw.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-dvdr-plus.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-dvdr.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-dvdram.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-dvdrom.png
-share/icons/Tango/24x24/devices/gnome-dev-disc-dvdrw.png
-share/icons/Tango/24x24/devices/gnome-dev-dvd.png
share/icons/Tango/24x24/devices/gnome-dev-ethernet.png
share/icons/Tango/24x24/devices/gnome-dev-floppy.png
share/icons/Tango/24x24/devices/gnome-dev-harddisk-1394.png
@@ -1978,11 +2022,6 @@ share/icons/Tango/24x24/devices/gnome-dev-harddisk-usb.png
share/icons/Tango/24x24/devices/gnome-dev-harddisk.png
share/icons/Tango/24x24/devices/gnome-dev-ipod.png
share/icons/Tango/24x24/devices/gnome-dev-keyboard.png
-share/icons/Tango/24x24/devices/gnome-dev-media-cf.png
-share/icons/Tango/24x24/devices/gnome-dev-media-memory.png
-share/icons/Tango/24x24/devices/gnome-dev-media-ms.png
-share/icons/Tango/24x24/devices/gnome-dev-media-sdmmc.png
-share/icons/Tango/24x24/devices/gnome-dev-media-sm.png
share/icons/Tango/24x24/devices/gnome-dev-mouse-ball.png
share/icons/Tango/24x24/devices/gnome-dev-mouse-optical.png
share/icons/Tango/24x24/devices/gnome-dev-printer.png
@@ -1992,7 +2031,6 @@ share/icons/Tango/24x24/devices/gnome-dev-removable.png
share/icons/Tango/24x24/devices/gnome-dev-wavelan.png
share/icons/Tango/24x24/devices/gnome-fs-client.png
share/icons/Tango/24x24/devices/gnome-stock-mic.png
-share/icons/Tango/24x24/devices/gtk-cdrom.png
share/icons/Tango/24x24/devices/gtk-floppy.png
share/icons/Tango/24x24/devices/gtk-harddisk.png
share/icons/Tango/24x24/devices/harddrive.png
@@ -2021,6 +2059,10 @@ share/icons/Tango/24x24/devices/system-floppy.png
share/icons/Tango/24x24/devices/system.png
share/icons/Tango/24x24/devices/usbpendrive_unmount.png
share/icons/Tango/24x24/devices/video-display.png
+share/icons/Tango/24x24/devices/xfce-printer.png
+share/icons/Tango/24x24/devices/xfce4-display.png
+share/icons/Tango/24x24/devices/xfce4-keyboard.png
+share/icons/Tango/24x24/devices/xfce4-mouse.png
share/icons/Tango/24x24/devices/yast_HD.png
share/icons/Tango/24x24/devices/yast_idetude.png
share/icons/Tango/24x24/devices/yast_joystick.png
@@ -2059,6 +2101,10 @@ share/icons/Tango/24x24/mimetypes/empty.png
share/icons/Tango/24x24/mimetypes/exec.png
share/icons/Tango/24x24/mimetypes/folder_tar.png
share/icons/Tango/24x24/mimetypes/font-x-generic.png
+share/icons/Tango/24x24/mimetypes/font.png
+share/icons/Tango/24x24/mimetypes/font_bitmap.png
+share/icons/Tango/24x24/mimetypes/font_truetype.png
+share/icons/Tango/24x24/mimetypes/font_type1.png
share/icons/Tango/24x24/mimetypes/gnome-fs-executable.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-magicpoint.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-msword.png
@@ -2079,6 +2125,9 @@ share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
@@ -2114,6 +2163,7 @@ share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-font-sunos-news.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-font-ttf.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-gnumeric.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-gzpostscript.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-jar.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-killustrator.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-kpresenter.png
@@ -2127,6 +2177,7 @@ share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-php.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-python-bytecode.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-rar.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-scribus.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-shellscript.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-shockwave-flash.png
share/icons/Tango/24x24/mimetypes/gnome-mime-application-x-stuffit.png
@@ -2152,6 +2203,7 @@ share/icons/Tango/24x24/mimetypes/gnome-package.png
share/icons/Tango/24x24/mimetypes/html.png
share/icons/Tango/24x24/mimetypes/image-x-generic.png
share/icons/Tango/24x24/mimetypes/image.png
+share/icons/Tango/24x24/mimetypes/kpresenter_kpr.png
share/icons/Tango/24x24/mimetypes/mime_ascii.png
share/icons/Tango/24x24/mimetypes/misc.png
share/icons/Tango/24x24/mimetypes/package-x-generic.png
@@ -2165,6 +2217,7 @@ share/icons/Tango/24x24/mimetypes/sound.png
share/icons/Tango/24x24/mimetypes/spreadsheet.png
share/icons/Tango/24x24/mimetypes/stock_addressbook.png
share/icons/Tango/24x24/mimetypes/stock_calendar.png
+share/icons/Tango/24x24/mimetypes/stock_certificate.png
share/icons/Tango/24x24/mimetypes/stock_script.png
share/icons/Tango/24x24/mimetypes/tar.png
share/icons/Tango/24x24/mimetypes/template_source.png
@@ -2177,8 +2230,10 @@ share/icons/Tango/24x24/mimetypes/txt.png
share/icons/Tango/24x24/mimetypes/txt2.png
share/icons/Tango/24x24/mimetypes/unknown.png
share/icons/Tango/24x24/mimetypes/vcalendar.png
+share/icons/Tango/24x24/mimetypes/vcard.png
share/icons/Tango/24x24/mimetypes/video-x-generic.png
share/icons/Tango/24x24/mimetypes/video.png
+share/icons/Tango/24x24/mimetypes/wordprocessing.png
share/icons/Tango/24x24/mimetypes/www.png
share/icons/Tango/24x24/mimetypes/x-office-address-book.png
share/icons/Tango/24x24/mimetypes/x-office-calendar.png
@@ -2230,12 +2285,15 @@ share/icons/Tango/24x24/places/trashcan_empty.png
share/icons/Tango/24x24/places/user-desktop.png
share/icons/Tango/24x24/places/user-home.png
share/icons/Tango/24x24/places/user-trash.png
+share/icons/Tango/24x24/places/xfce-trash_empty.png
share/icons/Tango/24x24/status/audio-volume-high.png
share/icons/Tango/24x24/status/audio-volume-low.png
share/icons/Tango/24x24/status/audio-volume-medium.png
share/icons/Tango/24x24/status/audio-volume-muted.png
share/icons/Tango/24x24/status/battery-caution.png
-share/icons/Tango/24x24/status/cloudy1.png
+share/icons/Tango/24x24/status/connect_creating.png
+share/icons/Tango/24x24/status/connect_established.png
+share/icons/Tango/24x24/status/connect_no.png
share/icons/Tango/24x24/status/dialog-error.png
share/icons/Tango/24x24/status/dialog-information.png
share/icons/Tango/24x24/status/dialog-warning.png
@@ -2265,7 +2323,6 @@ share/icons/Tango/24x24/status/image-loading.png
share/icons/Tango/24x24/status/image-missing.png
share/icons/Tango/24x24/status/important.png
share/icons/Tango/24x24/status/info.png
-share/icons/Tango/24x24/status/light_rain.png
share/icons/Tango/24x24/status/mail-attachment.png
share/icons/Tango/24x24/status/messagebox_critical.png
share/icons/Tango/24x24/status/messagebox_info.png
@@ -2281,10 +2338,7 @@ share/icons/Tango/24x24/status/nm-adhoc.png
share/icons/Tango/24x24/status/nm-device-wired.png
share/icons/Tango/24x24/status/nm-device-wireless.png
share/icons/Tango/24x24/status/nm-no-connection.png
-share/icons/Tango/24x24/status/overcast.png
share/icons/Tango/24x24/status/printer-error.png
-share/icons/Tango/24x24/status/shower3.png
-share/icons/Tango/24x24/status/snow4.png
share/icons/Tango/24x24/status/stock_dialog-error.png
share/icons/Tango/24x24/status/stock_dialog-info.png
share/icons/Tango/24x24/status/stock_dialog-warning.png
@@ -2306,7 +2360,6 @@ share/icons/Tango/24x24/status/stock_weather-storm.png
share/icons/Tango/24x24/status/stock_weather-sunny.png
share/icons/Tango/24x24/status/sunny.png
share/icons/Tango/24x24/status/trashcan_full.png
-share/icons/Tango/24x24/status/tstorm3.png
share/icons/Tango/24x24/status/user-trash-full.png
share/icons/Tango/24x24/status/weather-clear-night.png
share/icons/Tango/24x24/status/weather-clear.png
@@ -2318,6 +2371,7 @@ share/icons/Tango/24x24/status/weather-showers-scattered.png
share/icons/Tango/24x24/status/weather-showers.png
share/icons/Tango/24x24/status/weather-snow.png
share/icons/Tango/24x24/status/weather-storm.png
+share/icons/Tango/24x24/status/xfce-trash_full.png
share/icons/Tango/index.theme
share/icons/Tango/scalable/actions/add.svg
share/icons/Tango/scalable/actions/address-book-new.svg
@@ -2403,6 +2457,7 @@ share/icons/Tango/scalable/actions/gtk-cut.svg
share/icons/Tango/scalable/actions/gtk-delete.svg
share/icons/Tango/scalable/actions/gtk-find-and-replace.svg
share/icons/Tango/scalable/actions/gtk-find.svg
+share/icons/Tango/scalable/actions/gtk-fullscreen.svg
share/icons/Tango/scalable/actions/gtk-go-back-ltr.svg
share/icons/Tango/scalable/actions/gtk-go-back-rtl.svg
share/icons/Tango/scalable/actions/gtk-go-down.svg
@@ -2508,6 +2563,7 @@ share/icons/Tango/scalable/actions/stock_delete.svg
share/icons/Tango/scalable/actions/stock_down.svg
share/icons/Tango/scalable/actions/stock_file-properites.svg
share/icons/Tango/scalable/actions/stock_first.svg
+share/icons/Tango/scalable/actions/stock_fullscreen.svg
share/icons/Tango/scalable/actions/stock_help-add-bookmark.svg
share/icons/Tango/scalable/actions/stock_home.svg
share/icons/Tango/scalable/actions/stock_last.svg
@@ -2543,6 +2599,7 @@ share/icons/Tango/scalable/actions/stock_save-as.svg
share/icons/Tango/scalable/actions/stock_save.svg
share/icons/Tango/scalable/actions/stock_search-and-replace.svg
share/icons/Tango/scalable/actions/stock_search.svg
+share/icons/Tango/scalable/actions/stock_select-all.svg
share/icons/Tango/scalable/actions/stock_spam.svg
share/icons/Tango/scalable/actions/stock_stop.svg
share/icons/Tango/scalable/actions/stock_text-strikethrough.svg
@@ -2575,7 +2632,9 @@ share/icons/Tango/scalable/actions/up.svg
share/icons/Tango/scalable/actions/view-fullscreen.svg
share/icons/Tango/scalable/actions/view-refresh.svg
share/icons/Tango/scalable/actions/window-new.svg
+share/icons/Tango/scalable/actions/window_fullscreen.svg
share/icons/Tango/scalable/actions/window_new.svg
+share/icons/Tango/scalable/actions/xfce-system-lock.svg
share/icons/Tango/scalable/apps/access.svg
share/icons/Tango/scalable/apps/accessibility-directory.svg
share/icons/Tango/scalable/apps/accessories-calculator.svg
@@ -2665,6 +2724,14 @@ share/icons/Tango/scalable/apps/utilities-system-monitor.svg
share/icons/Tango/scalable/apps/utilities-terminal.svg
share/icons/Tango/scalable/apps/wallpaper.svg
share/icons/Tango/scalable/apps/web-browser.svg
+share/icons/Tango/scalable/apps/xfcalendar.svg
+share/icons/Tango/scalable/apps/xfce-filemanager.svg
+share/icons/Tango/scalable/apps/xfce-mail.svg
+share/icons/Tango/scalable/apps/xfce-terminal.svg
+share/icons/Tango/scalable/apps/xfce4-backdrop.svg
+share/icons/Tango/scalable/apps/xfce4-session.svg
+share/icons/Tango/scalable/apps/xfce4-sound.svg
+share/icons/Tango/scalable/apps/xfwm4.svg
share/icons/Tango/scalable/apps/ximian-evolution-calendar.svg
share/icons/Tango/scalable/apps/xscreensaver.svg
share/icons/Tango/scalable/apps/zen-icon.svg
@@ -2713,6 +2780,14 @@ share/icons/Tango/scalable/categories/redhat-sound_video.svg
share/icons/Tango/scalable/categories/redhat-system_settings.svg
share/icons/Tango/scalable/categories/redhat-system_tools.svg
share/icons/Tango/scalable/categories/stock_internet.svg
+share/icons/Tango/scalable/categories/xfce-games.svg
+share/icons/Tango/scalable/categories/xfce-graphics.svg
+share/icons/Tango/scalable/categories/xfce-internet.svg
+share/icons/Tango/scalable/categories/xfce-multimedia.svg
+share/icons/Tango/scalable/categories/xfce-office.svg
+share/icons/Tango/scalable/categories/xfce-system-settings.svg
+share/icons/Tango/scalable/categories/xfce-utils.svg
+share/icons/Tango/scalable/categories/xfce4-settings.svg
share/icons/Tango/scalable/devices/3floppy_unmount.svg
share/icons/Tango/scalable/devices/audio-card.svg
share/icons/Tango/scalable/devices/audio-input-microphone.svg
@@ -2721,27 +2796,14 @@ share/icons/Tango/scalable/devices/camera-photo.svg
share/icons/Tango/scalable/devices/camera-video.svg
share/icons/Tango/scalable/devices/camera.svg
share/icons/Tango/scalable/devices/camera_unmount.svg
-share/icons/Tango/scalable/devices/cdrom_unmount.svg
-share/icons/Tango/scalable/devices/cdwriter_unmount.svg
share/icons/Tango/scalable/devices/chardevice.svg
share/icons/Tango/scalable/devices/computer.svg
share/icons/Tango/scalable/devices/display.svg
share/icons/Tango/scalable/devices/drive-cdrom.svg
share/icons/Tango/scalable/devices/drive-harddisk.svg
share/icons/Tango/scalable/devices/drive-removable-media.svg
-share/icons/Tango/scalable/devices/dvd_unmount.svg
share/icons/Tango/scalable/devices/gnome-dev-battery.svg
-share/icons/Tango/scalable/devices/gnome-dev-cdrom-audio.svg
-share/icons/Tango/scalable/devices/gnome-dev-cdrom.svg
share/icons/Tango/scalable/devices/gnome-dev-computer.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-cdr.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-cdrw.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-dvdr-plus.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-dvdr.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-dvdram.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-dvdrom.svg
-share/icons/Tango/scalable/devices/gnome-dev-disc-dvdrw.svg
-share/icons/Tango/scalable/devices/gnome-dev-dvd.svg
share/icons/Tango/scalable/devices/gnome-dev-ethernet.svg
share/icons/Tango/scalable/devices/gnome-dev-floppy.svg
share/icons/Tango/scalable/devices/gnome-dev-harddisk-1394.svg
@@ -2749,11 +2811,6 @@ share/icons/Tango/scalable/devices/gnome-dev-harddisk-usb.svg
share/icons/Tango/scalable/devices/gnome-dev-harddisk.svg
share/icons/Tango/scalable/devices/gnome-dev-ipod.svg
share/icons/Tango/scalable/devices/gnome-dev-keyboard.svg
-share/icons/Tango/scalable/devices/gnome-dev-media-cf.svg
-share/icons/Tango/scalable/devices/gnome-dev-media-memory.svg
-share/icons/Tango/scalable/devices/gnome-dev-media-ms.svg
-share/icons/Tango/scalable/devices/gnome-dev-media-sdmmc.svg
-share/icons/Tango/scalable/devices/gnome-dev-media-sm.svg
share/icons/Tango/scalable/devices/gnome-dev-mouse-ball.svg
share/icons/Tango/scalable/devices/gnome-dev-mouse-optical.svg
share/icons/Tango/scalable/devices/gnome-dev-printer.svg
@@ -2763,7 +2820,6 @@ share/icons/Tango/scalable/devices/gnome-dev-removable.svg
share/icons/Tango/scalable/devices/gnome-dev-wavelan.svg
share/icons/Tango/scalable/devices/gnome-fs-client.svg
share/icons/Tango/scalable/devices/gnome-stock-mic.svg
-share/icons/Tango/scalable/devices/gtk-cdrom.svg
share/icons/Tango/scalable/devices/gtk-floppy.svg
share/icons/Tango/scalable/devices/gtk-harddisk.svg
share/icons/Tango/scalable/devices/harddrive.svg
@@ -2792,6 +2848,10 @@ share/icons/Tango/scalable/devices/system-floppy.svg
share/icons/Tango/scalable/devices/system.svg
share/icons/Tango/scalable/devices/usbpendrive_unmount.svg
share/icons/Tango/scalable/devices/video-display.svg
+share/icons/Tango/scalable/devices/xfce-printer.svg
+share/icons/Tango/scalable/devices/xfce4-display.svg
+share/icons/Tango/scalable/devices/xfce4-keyboard.svg
+share/icons/Tango/scalable/devices/xfce4-mouse.svg
share/icons/Tango/scalable/devices/yast_HD.svg
share/icons/Tango/scalable/devices/yast_idetude.svg
share/icons/Tango/scalable/devices/yast_joystick.svg
@@ -2830,6 +2890,10 @@ share/icons/Tango/scalable/mimetypes/empty.svg
share/icons/Tango/scalable/mimetypes/exec.svg
share/icons/Tango/scalable/mimetypes/folder_tar.svg
share/icons/Tango/scalable/mimetypes/font-x-generic.svg
+share/icons/Tango/scalable/mimetypes/font.svg
+share/icons/Tango/scalable/mimetypes/font_bitmap.svg
+share/icons/Tango/scalable/mimetypes/font_truetype.svg
+share/icons/Tango/scalable/mimetypes/font_type1.svg
share/icons/Tango/scalable/mimetypes/gnome-fs-executable.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-magicpoint.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-msword.svg
@@ -2850,6 +2914,9 @@ share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocume
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg
+share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg
+share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg
+share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.stardivision.impress.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg
@@ -2885,6 +2952,7 @@ share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.sv
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-gzip.svg
+share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-jar.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
@@ -2898,6 +2966,7 @@ share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-php.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-rar.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-scribus.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg
share/icons/Tango/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
@@ -2923,6 +2992,7 @@ share/icons/Tango/scalable/mimetypes/gnome-package.svg
share/icons/Tango/scalable/mimetypes/html.svg
share/icons/Tango/scalable/mimetypes/image-x-generic.svg
share/icons/Tango/scalable/mimetypes/image.svg
+share/icons/Tango/scalable/mimetypes/kpresenter_kpr.svg
share/icons/Tango/scalable/mimetypes/mime_ascii.svg
share/icons/Tango/scalable/mimetypes/misc.svg
share/icons/Tango/scalable/mimetypes/package-x-generic.svg
@@ -2936,6 +3006,7 @@ share/icons/Tango/scalable/mimetypes/sound.svg
share/icons/Tango/scalable/mimetypes/spreadsheet.svg
share/icons/Tango/scalable/mimetypes/stock_addressbook.svg
share/icons/Tango/scalable/mimetypes/stock_calendar.svg
+share/icons/Tango/scalable/mimetypes/stock_certificate.svg
share/icons/Tango/scalable/mimetypes/stock_script.svg
share/icons/Tango/scalable/mimetypes/tar.svg
share/icons/Tango/scalable/mimetypes/template_source.svg
@@ -2948,8 +3019,10 @@ share/icons/Tango/scalable/mimetypes/txt.svg
share/icons/Tango/scalable/mimetypes/txt2.svg
share/icons/Tango/scalable/mimetypes/unknown.svg
share/icons/Tango/scalable/mimetypes/vcalendar.svg
+share/icons/Tango/scalable/mimetypes/vcard.svg
share/icons/Tango/scalable/mimetypes/video-x-generic.svg
share/icons/Tango/scalable/mimetypes/video.svg
+share/icons/Tango/scalable/mimetypes/wordprocessing.svg
share/icons/Tango/scalable/mimetypes/www.svg
share/icons/Tango/scalable/mimetypes/x-office-address-book.svg
share/icons/Tango/scalable/mimetypes/x-office-calendar.svg
@@ -3004,12 +3077,15 @@ share/icons/Tango/scalable/places/trashcan_empty.svg
share/icons/Tango/scalable/places/user-desktop.svg
share/icons/Tango/scalable/places/user-home.svg
share/icons/Tango/scalable/places/user-trash.svg
+share/icons/Tango/scalable/places/xfce-trash_empty.svg
share/icons/Tango/scalable/status/audio-volume-high.svg
share/icons/Tango/scalable/status/audio-volume-low.svg
share/icons/Tango/scalable/status/audio-volume-medium.svg
share/icons/Tango/scalable/status/audio-volume-muted.svg
share/icons/Tango/scalable/status/battery-caution.svg
-share/icons/Tango/scalable/status/cloudy1.svg
+share/icons/Tango/scalable/status/connect_creating.svg
+share/icons/Tango/scalable/status/connect_established.svg
+share/icons/Tango/scalable/status/connect_no.svg
share/icons/Tango/scalable/status/dialog-error.svg
share/icons/Tango/scalable/status/dialog-information.svg
share/icons/Tango/scalable/status/dialog-warning.svg
@@ -3043,7 +3119,6 @@ share/icons/Tango/scalable/status/image-loading.svg
share/icons/Tango/scalable/status/image-missing.svg
share/icons/Tango/scalable/status/important.svg
share/icons/Tango/scalable/status/info.svg
-share/icons/Tango/scalable/status/light_rain.svg
share/icons/Tango/scalable/status/mail-attachment.svg
share/icons/Tango/scalable/status/messagebox_critical.svg
share/icons/Tango/scalable/status/messagebox_info.svg
@@ -3059,10 +3134,7 @@ share/icons/Tango/scalable/status/nm-adhoc.svg
share/icons/Tango/scalable/status/nm-device-wired.svg
share/icons/Tango/scalable/status/nm-device-wireless.svg
share/icons/Tango/scalable/status/nm-no-connection.svg
-share/icons/Tango/scalable/status/overcast.svg
share/icons/Tango/scalable/status/printer-error.svg
-share/icons/Tango/scalable/status/shower3.svg
-share/icons/Tango/scalable/status/snow4.svg
share/icons/Tango/scalable/status/stock_dialog-error.svg
share/icons/Tango/scalable/status/stock_dialog-info.svg
share/icons/Tango/scalable/status/stock_dialog-warning.svg
@@ -3084,7 +3156,6 @@ share/icons/Tango/scalable/status/stock_weather-storm.svg
share/icons/Tango/scalable/status/stock_weather-sunny.svg
share/icons/Tango/scalable/status/sunny.svg
share/icons/Tango/scalable/status/trashcan_full.svg
-share/icons/Tango/scalable/status/tstorm3.svg
share/icons/Tango/scalable/status/user-trash-full.svg
share/icons/Tango/scalable/status/weather-clear-night.svg
share/icons/Tango/scalable/status/weather-clear.svg
@@ -3096,6 +3167,7 @@ share/icons/Tango/scalable/status/weather-showers-scattered.svg
share/icons/Tango/scalable/status/weather-showers.svg
share/icons/Tango/scalable/status/weather-snow.svg
share/icons/Tango/scalable/status/weather-storm.svg
+share/icons/Tango/scalable/status/xfce-trash_full.svg
@dirrm share/icons/Tango/scalable/status
@dirrm share/icons/Tango/scalable/places
@dirrm share/icons/Tango/scalable/mimetypes
diff --git a/x11-themes/indubstrial/Makefile b/x11-themes/indubstrial/Makefile
index bb40d2b0bc6f..b3ad27c2b47c 100644
--- a/x11-themes/indubstrial/Makefile
+++ b/x11-themes/indubstrial/Makefile
@@ -7,19 +7,19 @@
PORTNAME= indubstrial
PORTVERSION= 0.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes gnome
MASTER_SITES= http://www.gnome.org/~jdub/2004/indubstrial/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A clean, clear modification on the Industrial GTK+ and Metacity themes
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \
- ${X11BASE}/lib/gtk/themes/engines/libindustrial.so:${PORTSDIR}/x11-themes/gtk-industrial-theme
+RUN_DEPENDS= ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \
+ ${LOCALBASE}/lib/gtk/themes/engines/libindustrial.so:${PORTSDIR}/x11-themes/gtk-industrial-theme
WRKSRC= ${WRKDIR}/Indubstrial
NO_BUILD= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix metacity
do-install:
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 4532be6a936e..438c8d98fed1 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdeartwork
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 2
CATEGORIES= x11-themes kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -32,13 +33,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/xscreensaver)
+.if exists(${LOCALBASE}/bin/xscreensaver)
WITH_XS= yes
-.endif # exists(${X11BASE}/bin/xscreensaver)
+.endif # exists(${LOCALBASE}/bin/xscreensaver)
-.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
WITH_XSGNOME= yes
-.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
+.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
.if defined(WITH_XS) && !defined(WITH_XSGNOME)
RUN_DEPENDS+= kxsconfig:${PORTSDIR}/x11/xscreensaver-kde
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 4532be6a936e..438c8d98fed1 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdeartwork
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 2
CATEGORIES= x11-themes kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -32,13 +33,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/xscreensaver)
+.if exists(${LOCALBASE}/bin/xscreensaver)
WITH_XS= yes
-.endif # exists(${X11BASE}/bin/xscreensaver)
+.endif # exists(${LOCALBASE}/bin/xscreensaver)
-.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop)
WITH_XSGNOME= yes
-.endif # exists(${X11BASE}/bin/screensaver-properties-capplet)
+.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet)
.if defined(WITH_XS) && !defined(WITH_XSGNOME)
RUN_DEPENDS+= kxsconfig:${PORTSDIR}/x11/xscreensaver-kde
diff --git a/x11-themes/lila-xfwm4/Makefile b/x11-themes/lila-xfwm4/Makefile
index 88b16d7dbf2c..79f2a2a0c00c 100644
--- a/x11-themes/lila-xfwm4/Makefile
+++ b/x11-themes/lila-xfwm4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Lila-xfwm4
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes xfce
MASTER_SITES= http://stief.tnux.net/Lila/
DIST_SUBDIR= xfce4
@@ -17,8 +17,6 @@ COMMENT= XFce 4 Lila window decoration theme for xfwm4
RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
-USE_X_PREFIX= yes
-
NO_BUILD= yes
do-install:
diff --git a/x11-themes/linux-f10-hicolor-icon-theme/Makefile b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
index 62295bdcf697..de1f24d0d80d 100644
--- a/x11-themes/linux-f10-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hicolor-icon-theme
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= x11-themes linux
MASTER_SITES= # empty
PKGNAMEPREFIX= linux-
@@ -15,7 +16,7 @@ DISTFILES= # empty
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= A high-color icon theme shell from the FreeDesktop project
-RUN_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
NO_BUILD= yes
USE_LINUX= yes
@@ -25,6 +26,6 @@ PLIST_DIRS= usr/share/icons
do-install:
${INSTALL} -d ${PREFIX}/usr/share/icons
- ${LN} -fs ${X11BASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
+ ${LN} -fs ${LOCALBASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
.include <bsd.port.mk>
diff --git a/x11-themes/linux-f8-hicolor-icon-theme/Makefile b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
index 62295bdcf697..de1f24d0d80d 100644
--- a/x11-themes/linux-f8-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hicolor-icon-theme
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= x11-themes linux
MASTER_SITES= # empty
PKGNAMEPREFIX= linux-
@@ -15,7 +16,7 @@ DISTFILES= # empty
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= A high-color icon theme shell from the FreeDesktop project
-RUN_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
NO_BUILD= yes
USE_LINUX= yes
@@ -25,6 +26,6 @@ PLIST_DIRS= usr/share/icons
do-install:
${INSTALL} -d ${PREFIX}/usr/share/icons
- ${LN} -fs ${X11BASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
+ ${LN} -fs ${LOCALBASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
.include <bsd.port.mk>
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index 62295bdcf697..de1f24d0d80d 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hicolor-icon-theme
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= x11-themes linux
MASTER_SITES= # empty
PKGNAMEPREFIX= linux-
@@ -15,7 +16,7 @@ DISTFILES= # empty
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= A high-color icon theme shell from the FreeDesktop project
-RUN_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
NO_BUILD= yes
USE_LINUX= yes
@@ -25,6 +26,6 @@ PLIST_DIRS= usr/share/icons
do-install:
${INSTALL} -d ${PREFIX}/usr/share/icons
- ${LN} -fs ${X11BASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
+ ${LN} -fs ${LOCALBASE}/share/icons/hicolor ${PREFIX}/usr/share/icons
.include <bsd.port.mk>
diff --git a/x11-themes/metacity-themes/Makefile b/x11-themes/metacity-themes/Makefile
index 83a63a19f585..7e75955fcab0 100644
--- a/x11-themes/metacity-themes/Makefile
+++ b/x11-themes/metacity-themes/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY= # Empty
MAINTAINER= MrL0Lz@gmail.com
COMMENT= Meta-port for Gnome Metacity themes
-RUN_DEPENDS= ${X11BASE}/share/gnome/themes/microgui/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-theme-microgui
+RUN_DEPENDS= ${LOCALBASE}/share/gnome/themes/microgui/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-theme-microgui
NO_BUILD= yes
diff --git a/x11-themes/metacity-themes/Makefile.metacity b/x11-themes/metacity-themes/Makefile.metacity
index 44efd93b7956..9a8e68dd6c5c 100644
--- a/x11-themes/metacity-themes/Makefile.metacity
+++ b/x11-themes/metacity-themes/Makefile.metacity
@@ -7,7 +7,6 @@ NO_BUILD= yes
REASON= Themes may contain artwork not done by the author. \
Keep FreeBSD safe if the theme author violated copyrights.
-USE_X_PREFIX= yes
do-install:
${MKDIR} ${PREFIX}/share/gnome/themes/${PORTNAME}
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index e661a6142419..4eb41d82ff89 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -3,11 +3,11 @@
# Whom: Cyrille Lefevre <clefevre@citeweb.net>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/notif2/Makefile,v 1.1 2006/07/20 11:38:26 ahze Exp $
PORTNAME= notif2
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= notif210
@@ -18,7 +18,6 @@ COMMENT= The Notif2 GTK theme engine following the new Motif look and feel
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 6d7171e36f54..4cd58dce5875 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= qt-bluecurve-theme
+PORTREVISION= 1
COMMENT= The Bluecurve QT theme
@@ -16,6 +17,7 @@ BUILD_WRKSRC= ${WRKSRC}/art/qt/Bluecurve
QT_CFLAGS= -I${X11BASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
QT_LIBS= -L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
+USE_X_PREFIX= yes
SUB_FILES= pkg-message
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index 5e0edbb3a748..0aff86d76f6e 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rezlooks
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://www.gnome-look.org/content/files/
DISTNAME= 39179-rezlooks-${PORTVERSION}
@@ -18,7 +19,6 @@ WRKSRC= ${WRKDIR}/rezlooks-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
OPTIONS+= ANIMATION "Animation support" On
diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index 9e94a9e7e8ba..3683bd077240 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sawfish-themes
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://ftp.debian.org/debian/pool/main/s/${PORTNAME}/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -16,8 +17,6 @@ COMMENT= Themes for Sawfish window manager
RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
-USE_X_PREFIX= yes
-
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
NO_BUILD= yes
@@ -30,7 +29,7 @@ DATA_DIRS= 2YearsToNever Anonymous Aquiline BWM Big Blackwindow Bubbles_Exact \
bluefoo gorilla gorillaz mxflat typo
do-install:
- @${MKDIR} ${X11BASE}/share/sawfish/1.3/themes
+ @${MKDIR} ${PREFIX}/share/sawfish/1.3/themes
.for d in ${DATA_DIRS}
@${MKDIR} ${PREFIX}/share/sawfish/1.3/themes/${d}
@cd ${WRKSRC}/${d} && ${FIND} . | \
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index de60a3258e8e..fc4325c712fc 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thinice
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= thinice
@@ -18,7 +18,6 @@ COMMENT= A clean-looking GTK Theme Engine
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/x11-themes/ubuntulooks/Makefile b/x11-themes/ubuntulooks/Makefile
index 5c5d2226a985..aef8657f8bb7 100644
--- a/x11-themes/ubuntulooks/Makefile
+++ b/x11-themes/ubuntulooks/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ubuntulooks
-PORTVERSION= 0.9.11
+PORTVERSION= 0.9.12
CATEGORIES= x11-themes
MASTER_SITES= http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntulooks/
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -14,14 +14,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= pneumann@gmail.com
COMMENT= GTK+ 2.x engine from Ubuntu Dapper
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/x11-themes/ubuntulooks/distinfo b/x11-themes/ubuntulooks/distinfo
index c819f6437e60..d12899ae2c3e 100644
--- a/x11-themes/ubuntulooks/distinfo
+++ b/x11-themes/ubuntulooks/distinfo
@@ -1,3 +1,3 @@
-MD5 (ubuntulooks_0.9.11.orig.tar.gz) = 60d07980b2fe059cbecc38e704079793
-SHA256 (ubuntulooks_0.9.11.orig.tar.gz) = 36b1b9be526a9bfb5a913a5f22f8b50116973951e2d6dc3baad5fe54c96507fc
-SIZE (ubuntulooks_0.9.11.orig.tar.gz) = 345591
+MD5 (ubuntulooks_0.9.12.orig.tar.gz) = 5ba7d915abe31870103aab5847278d13
+SHA256 (ubuntulooks_0.9.12.orig.tar.gz) = 88e3535c3c7a12c24b09fb057c2a6b52eb0d13f1b2fbdabb4a13bb7e164877fa
+SIZE (ubuntulooks_0.9.12.orig.tar.gz) = 345833
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index b73890b9076e..def7b26137d0 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/whistlerk/Makefile,v 1.1 2006/07/20 11:38:27 ahze Exp $
PORTNAME= WhistlerK
PORTVERSION= 200010142358
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= whistlerk
@@ -18,7 +18,6 @@ COMMENT= A GTK theme engine inspired by the Windows Whistler
WRKSRC= ${WRKDIR}/gtk-theme-WhistlerK
-USE_X_PREFIX= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index e069e7f59e11..bfdbc08131c6 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xenophilia
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= A theme module to make GTK+ look nicer
WRKSRC= ${WRKDIR}/Xenophilia-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index 627e11afbda9..ac06a94ddf0d 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-themes/xenostep/Makefile,v 1.1 2006/07/20 11:38:28 ahze Exp $
PORTNAME= xenostep
PORTVERSION= 200011270836
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= xenostep
@@ -18,7 +18,6 @@ COMMENT= A GTK+ theme engine based on the Xenophilia and Interface engines
WRKSRC= ${WRKDIR}/XenoStep
-USE_X_PREFIX= yes
USE_GNOME= gtk12
ALL_TARGET= # empty
MAKE_ENV= MKDIR="${MKDIR}"
diff --git a/x11-themes/xenostep/files/patch-XenoStep_theme_draw.c b/x11-themes/xenostep/files/patch-XenoStep_theme_draw.c
index 1f1fbf29712a..b709bd38c718 100644
--- a/x11-themes/xenostep/files/patch-XenoStep_theme_draw.c
+++ b/x11-themes/xenostep/files/patch-XenoStep_theme_draw.c
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- XenoStep_theme_draw.c 2002/08/30 16:16:48 1.1
+++ XenoStep_theme_draw.c 2002/08/30 16:17:08
@@ -604,7 +604,7 @@
diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile
index 3a172bbdf398..ad995ab33be4 100644
--- a/x11-themes/xfce4-icon-theme/Makefile
+++ b/x11-themes/xfce4-icon-theme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-icon-theme
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 2
CATEGORIES= x11-themes xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -18,7 +18,6 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Icon themes for XFce 4
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-themes/xmms-bluecurve-theme/Makefile b/x11-themes/xmms-bluecurve-theme/Makefile
index 591621490ce5..f0f43adf73eb 100644
--- a/x11-themes/xmms-bluecurve-theme/Makefile
+++ b/x11-themes/xmms-bluecurve-theme/Makefile
@@ -17,6 +17,8 @@ MASTERDIR= ${.CURDIR}/../bluecurve-themes
NO_BUILD= yes
+PREFIX= ${X11BASE}
+
SKIN= Bluecurve-xmms.zip
PLIST_FILES= share/xmms/Skins/${SKIN}
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 3819445a6d9e..046302a84dc7 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -3,10 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/bakery/Makefile,v 1.8 2006/09/10 00:51:16 mezz Exp $
#
PORTNAME= bakery
PORTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
@@ -24,9 +26,9 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 5ad7006d4826..f3f664dbbef3 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -49,8 +49,6 @@ share/locale/vi/LC_MESSAGES/bakery.mo
share/locale/uk/LC_MESSAGES/bakery.mo
share/locale/zh_CN/LC_MESSAGES/bakery.mo
share/locale/zh_TW/LC_MESSAGES/bakery.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm include/bakery-%%API_VERSION%%/bakery/View
@dirrm include/bakery-%%API_VERSION%%/bakery/Utilities
@dirrm include/bakery-%%API_VERSION%%/bakery/Document
@@ -60,3 +58,21 @@ share/locale/zh_TW/LC_MESSAGES/bakery.mo
@dirrm include/bakery-%%API_VERSION%%/bakery/App
@dirrm include/bakery-%%API_VERSION%%/bakery
@dirrm include/bakery-%%API_VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index e28b99c9bbfc..0ea1bd841aa0 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= easygtk
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= sobomax
diff --git a/x11-toolkits/easygtk/files/patch-Makefile b/x11-toolkits/easygtk/files/patch-Makefile
index f1797cb26c20..a47ac184106b 100644
--- a/x11-toolkits/easygtk/files/patch-Makefile
+++ b/x11-toolkits/easygtk/files/patch-Makefile
@@ -4,8 +4,8 @@
-CFLAGS = -Wall -O -I. -I/usr/X11R6/include -I/usr/lib/glib/include -I/usr/X11R6/include/X11 -DUSE_IMLIB -DUSE_GNOME -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include
-LIBS = -L. -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm -lgdk_imlib -L/usr/lib -lImlib -ljpeg -ltiff -lungif -lpng -lz -lm -lXext -L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -I/usr/include/glib -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
-CC = gcc
-+GNOME_CFLAGS != $(X11BASE)/bin/gnome-config --cflags gnomeui
-+GNOME_LIBS != $(X11BASE)/bin/gnome-config --libs gnomeui
++GNOME_CFLAGS != $(LOCALBASE)/bin/gnome-config --cflags gnomeui
++GNOME_LIBS != $(LOCALBASE)/bin/gnome-config --libs gnomeui
+CFLAGS += -I. -DUSE_IMLIB -DUSE_GNOME $(GNOME_CFLAGS)
+LIBS = $(GNOME_LIBS)
+CC ?= gcc
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 7b868dbd26db..cbbf35a03e45 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,10 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.4 2006/09/10 00:51:16 mezz Exp $
#
PORTNAME= gdl
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -15,11 +17,11 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 392114d26f7c..faf1a0b70644 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -64,3 +64,25 @@ share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
@dirrm %%DATADIR%%
@dirrm include/libgdl-1.0/gdl
@dirrm include/libgdl-1.0
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 326efdb569f9..005bf3fd2ec4 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -3,11 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/gtk12/Makefile,v 1.3 2006/10/09 19:31:53 ahze Exp $
PORTNAME= gtk
PORTVERSION= 1.2.10
-PORTREVISION= 15
+PORTREVISION= 17
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk+/1.2
@@ -16,10 +16,10 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PERL5= yes
USE_GNOME= glib12
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
--with-xinput=xfree
diff --git a/x11-toolkits/gtk12/files/patch-gtk+.pc.in b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
index 6ef64656dbc5..d9ab159ec758 100644
--- a/x11-toolkits/gtk12/files/patch-gtk+.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- gtk+.pc.in 2002/06/10 15:32:34 1.1
+++ gtk+.pc.in 2002/06/10 15:32:40
@@ -7,5 +7,5 @@
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index cd82a7f61b8e..30ebe17aaee8 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -3,10 +3,11 @@
# Whom: Marc Recht <marc@informatik.uni-bremen.de>
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/gtkglarea2/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
PORTNAME= gtkglarea
PORTVERSION= 1.99.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkglarea/1.99
@@ -17,12 +18,11 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An OpenGL widget for the GTK+2 GUI toolkit
LATEST_LINK= gtkglarea2
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gtk20
USE_BZIP2= yes
USE_GL= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-lib-GL
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 1999a1e29a7d..247c893b0e36 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/gtkmm12/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
PORTNAME= gtkmm
PORTVERSION= 1.2.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkmm/1.2
@@ -20,11 +20,10 @@ LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome \
--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 026ec2bc4a8e..181ee815841a 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index ab5a09757626..7fa612e887a7 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_SOURCEFORGE}
@@ -27,9 +27,8 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack lthack gtk20
CONFIGURE_ARGS= --enable-static=yes \
--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index 98eb6c409b89..186f1f3dec97 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index fdd2b8f73eb6..eed9bdca8398 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.8 2005/10/20 16:16:50 marcus Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.20 2006/08/22 03:45:28 marcus Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.8.8
+PORTVERSION= 2.10.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -22,15 +22,17 @@ LATEST_LINK= gtkmm24
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
+ cairomm-1.0.1:${PORTSDIR}/graphics/cairomm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
USE_GCC= 3.4
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack gtk20
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-demos \
--disable-docs \
--disable-examples \
@@ -42,6 +44,8 @@ PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|demo[$$][(]EXEEXT[)]|gtkmm-demo$$(EXEEXT)|g' \
+ ${WRKSRC}/demos/gtk-demo/Makefile.in
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index c5fdc67d91c7..ca6061cbedff 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.8.8.tar.bz2) = 319a7847f67c5099a78afb495e148143
-SHA256 (gnome2/gtkmm-2.8.8.tar.bz2) = e86b42f59d9928ed73435a0f33ac3334be2a87a9371bc1ba09e834996a8bb292
-SIZE (gnome2/gtkmm-2.8.8.tar.bz2) = 6203479
+MD5 (gnome2/gtkmm-2.10.1.tar.bz2) = d661420297e7486a0e0f715f352b4100
+SHA256 (gnome2/gtkmm-2.10.1.tar.bz2) = 855c2b44c472b9c85ededa96ed3082917da3162941032acd716ec2505eba5696
+SIZE (gnome2/gtkmm-2.10.1.tar.bz2) = 7259967
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
deleted file mode 100644
index 7422f5718de3..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gdkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/gdkmm/Makefile.in.orig Fri Apr 14 17:13:13 2006
-+++ gdk/gdkmm/Makefile.in Fri Apr 14 17:13:31 2006
-@@ -329,8 +329,7 @@
-
- @PLATFORM_WIN32_FALSE@no_undefined =
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs =
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in b/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
deleted file mode 100644
index 9823a9db77d0..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk__gtkmm__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/gtkmm/Makefile.in.orig Fri Apr 14 17:14:20 2006
-+++ gtk/gtkmm/Makefile.in Fri Apr 14 17:14:41 2006
-@@ -425,8 +425,7 @@
-
- @PLATFORM_WIN32_FALSE@no_undefined =
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols
--@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs =
--@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-+win32_dlls_extra_libs = $(sublib_win32_dlls_libs)
-
- # Only export lines that do not contain _GLOBAL_
- # ?! is "negative lookahead" - it stops looking on the line if it finds the regex.
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 9df2d7989273..b04bd7c370da 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtkmm-demo
include/atkmm-1.6/atkmm.h
include/atkmm-1.6/atkmm/action.h
include/atkmm-1.6/atkmm/component.h
@@ -106,6 +107,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
include/gtkmm-%%API_VERSION%%/gtkmm/alignment.h
include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h
include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h
+include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
include/gtkmm-%%API_VERSION%%/gtkmm/base.h
include/gtkmm-%%API_VERSION%%/gtkmm/bin.h
include/gtkmm-%%API_VERSION%%/gtkmm/box.h
@@ -116,9 +118,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/celleditable.h
include/gtkmm-%%API_VERSION%%/gtkmm/celllayout.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderer_generation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendereraccel.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderercombo.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererpixbuf.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererprogress.h
+include/gtkmm-%%API_VERSION%%/gtkmm/cellrendererspin.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertext.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellrenderertoggle.h
include/gtkmm-%%API_VERSION%%/gtkmm/cellview.h
@@ -166,7 +170,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
include/gtkmm-%%API_VERSION%%/gtkmm/item.h
include/gtkmm-%%API_VERSION%%/gtkmm/label.h
include/gtkmm-%%API_VERSION%%/gtkmm/layout.h
+include/gtkmm-%%API_VERSION%%/gtkmm/linkbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/liststore.h
+include/gtkmm-%%API_VERSION%%/gtkmm/listviewtext.h
include/gtkmm-%%API_VERSION%%/gtkmm/main.h
include/gtkmm-%%API_VERSION%%/gtkmm/menu.h
include/gtkmm-%%API_VERSION%%/gtkmm/menu_elems.h
@@ -179,8 +185,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
include/gtkmm-%%API_VERSION%%/gtkmm/object.h
include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/paned.h
+include/gtkmm-%%API_VERSION%%/gtkmm/papersize.h
include/gtkmm-%%API_VERSION%%/gtkmm/plug.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printcontext.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printer.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printjob.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperation.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printoperationpreview.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printsettings.h
+include/gtkmm-%%API_VERSION%%/gtkmm/printunixdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/aboutdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
@@ -190,6 +206,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/alignment_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/bin_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/box_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/button_p.h
@@ -198,9 +215,11 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/calendar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/celleditable_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/celllayout_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendereraccel_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderercombo_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererpixbuf_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererprogress_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrendererspin_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertext_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellrenderertoggle_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cellview_p.h
@@ -246,6 +265,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/label_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/layout_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/linkbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/liststore_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/main_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/menu_p.h
@@ -258,8 +278,18 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/papersize_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/plug_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printcontext_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printer_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printjob_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperation_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printoperationpreview_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printsettings_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/printunixdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/progressbar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/radioaction_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/radiobutton_p.h
@@ -267,6 +297,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/radiomenuitem_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/radiotoolbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/range_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/rc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooser_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserdialog_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchoosermenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentchooserwidget_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentfilter_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/ruler_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
@@ -280,6 +317,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/style_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/table_p.h
@@ -325,6 +363,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/radiomenuitem.h
include/gtkmm-%%API_VERSION%%/gtkmm/radiotoolbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/range.h
include/gtkmm-%%API_VERSION%%/gtkmm/rc.h
+include/gtkmm-2.4/gtkmm/recentchooser.h
+include/gtkmm-2.4/gtkmm/recentchooserdialog.h
+include/gtkmm-2.4/gtkmm/recentchoosermenu.h
+include/gtkmm-2.4/gtkmm/recentchooserwidget.h
+include/gtkmm-2.4/gtkmm/recentfilter.h
+include/gtkmm-2.4/gtkmm/recentinfo.h
+include/gtkmm-2.4/gtkmm/recentmanager.h
include/gtkmm-%%API_VERSION%%/gtkmm/ruler.h
include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
@@ -339,6 +384,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
+include/gtkmm-2.4/gtkmm/statusicon.h
include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
include/gtkmm-%%API_VERSION%%/gtkmm/stockid.h
include/gtkmm-%%API_VERSION%%/gtkmm/stockitem.h
@@ -386,6 +432,7 @@ include/pangomm-1.4/pangomm.h
include/pangomm-1.4/pangomm/attributes.h
include/pangomm-1.4/pangomm/attriter.h
include/pangomm-1.4/pangomm/attrlist.h
+include/pangomm-1.4/pangomm/cairofontmap.h
include/pangomm-1.4/pangomm/color.h
include/pangomm-1.4/pangomm/context.h
include/pangomm-1.4/pangomm/coverage.h
@@ -408,6 +455,7 @@ include/pangomm-1.4/pangomm/layoutrun.h
include/pangomm-1.4/pangomm/private/attributes_p.h
include/pangomm-1.4/pangomm/private/attriter_p.h
include/pangomm-1.4/pangomm/private/attrlist_p.h
+include/pangomm-1.4/pangomm/private/cairofontmap_p.h
include/pangomm-1.4/pangomm/private/color_p.h
include/pangomm-1.4/pangomm/private/context_p.h
include/pangomm-1.4/pangomm/private/coverage_p.h
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 026ec2bc4a8e..181ee815841a 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index ab5a09757626..7fa612e887a7 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_SOURCEFORGE}
@@ -27,9 +27,8 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack lthack gtk20
CONFIGURE_ARGS= --enable-static=yes \
--with-sigc-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index f53dfa6763de..f63e7236f65b 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/gtkscintilla/Makefile,v 1.1 2006/10/04 15:42:01 ahze Exp $
PORTNAME= gtkscintilla
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= moleskine
@@ -18,7 +18,6 @@ COMMENT= A wrapper for the Scintilla editing component
LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_LDCONFIG= yes
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 60bb20060f4c..6e9ffc23ee12 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Braithwaite <mab@red-bean.com>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/guile-gtk/Makefile,v 1.2 2006/09/10 00:51:17 mezz Exp $
PORTNAME= guile-gtk
PORTVERSION= 0.41
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits scheme
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,11 +17,11 @@ COMMENT= Guile binding library for GTK+
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gdkpixbuf libglade
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-gtkgl=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 4d59d80ec874..107c6f8a9f33 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk2hs
PORTVERSION= 0.9.10
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ MAINTAINER= haskell@FreeBSD.org
COMMENT= A GTK2 Binding for Haskell
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- ${X11BASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla
+ ${LOCALBASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_GNOME= gtk20 libglade2 gtksourceview gconf2
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index 595b2265f1d4..d1ea59d1ccb8 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -8,7 +8,7 @@
PORTNAME= inti
PORTVERSION= 1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= inti
@@ -29,6 +29,10 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
+post-patch:
+ @${REINPLACE_CMD} -e 's|_gtk_window_get_group|gtk_window_get_group|' \
+ ${WRKSRC}/inti/gtk/window.cc
+
post-configure:
@${TOUCH} ${WRKSRC}/inti-config.h.in
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index d4ba8f20cd88..415072b80698 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxfce4gui
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -23,7 +23,6 @@ LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
xfce4util.1:${PORTSDIR}/x11/libxfce4util
USE_GNOME= gtk20 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index e49c01e399fa..e97eca71fc44 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= lablgtk2
PORTVERSION= 2.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
@@ -43,7 +43,7 @@ PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
-.if (exists(${LOCALBASE}/bin/lablgl) && exists(${X11BASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
+.if (exists(${LOCALBASE}/bin/lablgl) && exists(${LOCALBASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
CONFIGURE_ARGS+= --with-gl
BUILD_DEPENDS+= lablgl:${PORTSDIR}/graphics/ocaml-lablgl
RUN_DEPENDS+= lablgl:${PORTSDIR}/graphics/ocaml-lablgl
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --without-gl
PLIST_SUB+= GL="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
CONFIGURE_ARGS+= --with-glade
USE_GNOME+= libglade2
WITH_GLADE= yes
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --without-glade
PLIST_SUB+= GLADE="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
CONFIGURE_ARGS+= --with-gnomeui
USE_GNOME+= libgnomeui
WITH_GNOMEUI= yes
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+= --without-gnomeui
PLIST_SUB+= GNOMEUI="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
CONFIGURE_ARGS+= --with-gnomecanvas
USE_GNOME+= libgnomecanvas
PLIST_SUB+= GNOMECANVAS=""
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --without-gnomecanvas
PLIST_SUB+= GNOMECANVAS="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
CONFIGURE_ARGS+= --with-rsvg
USE_GNOME+= librsvg2
WITH_RSVG= yes
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --without-rsvg
PLIST_SUB+= RSVG="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
CONFIGURE_ARGS+= --with-panel
USE_GNOME+= gnomepanel
WITH_PANEL= yes
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --without-panel
PLIST_SUB+= PANEL="@comment "
.endif
-.if (exists(${X11BASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
CONFIGURE_ARGS+= --with-gtkspell
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 6cce9fce5fc2..089a00f73d94 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= py-gnome
PORTVERSION= 1.4.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python/1.4
@@ -26,7 +26,7 @@ USE_PYTHON= yes
USE_GNOME= gtkhtml gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
- --with-gnome-config=${X11BASE}/bin/gnome-config \
+ --with-gnome-config=${LOCALBASE}/bin/gnome-config \
--with-gtkhtml
EG_SRC_DIR= ${WRKSRC}/pygnome/examples
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index ea685065c142..f3d223429171 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/py-gtkscintilla/Makefile,v 1.1 2006/10/07 15:53:59 ahze Exp $
PORTNAME= py-gtkscintilla
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= moleskine
diff --git a/x11-toolkits/py-gtkscintilla/files/patch-aa b/x11-toolkits/py-gtkscintilla/files/patch-aa
index 77de76125add..d0a8b14ed2ff 100644
--- a/x11-toolkits/py-gtkscintilla/files/patch-aa
+++ b/x11-toolkits/py-gtkscintilla/files/patch-aa
@@ -19,7 +19,7 @@
+GTK_LDFLAGS != $(GTK_CONFIG) --libs
+GTK_CFLAGS != $(GTK_CONFIG) --cflags
+LDFLAGS = -pthread -shared $(GTK_LDFLAGS) -lgtkscintilla
-+CFLAGS += -D_THREAD_SAFE -fPIC $(GTK_CFLAGS) -I$(PYTHON_INCLUDE) -I${X11BASE}/include/scintilla
++CFLAGS += -D_THREAD_SAFE -fPIC $(GTK_CFLAGS) -I$(PYTHON_INCLUDE) -I${LOCALBASE}/include/scintilla
all: _gtkscintillamodule.so
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index d80b905e3462..9493433992a1 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -3,10 +3,12 @@
# Whom: arved
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/qtpixmap/Makefile,v 1.2 2006/09/30 01:16:13 mezz Exp $
+#
PORTNAME= qtpixmap
PORTVERSION= 0.28
-PORTREVISION= 5
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.cpdrummond.freeuk.com/
DISTNAME= QtPixmap-${PORTVERSION}
@@ -15,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Modifed GTK pixmap engine to obtain Theme information from Qt
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/7043-//}
diff --git a/x11-toolkits/qtpixmap/pkg-plist b/x11-toolkits/qtpixmap/pkg-plist
index 56d180510b38..383126f8ac63 100644
--- a/x11-toolkits/qtpixmap/pkg-plist
+++ b/x11-toolkits/qtpixmap/pkg-plist
@@ -1,4 +1,4 @@
%%GTK1%%lib/gtk/themes/engines/libqtpixmap.la
%%GTK1%%lib/gtk/themes/engines/libqtpixmap.so
-lib/gtk-2.0/2.4.0/engines/libqtpixmap.la
-lib/gtk-2.0/2.4.0/engines/libqtpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtpixmap.so
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 23c7b85143e6..54715fef16ae 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/rep-gtk/Makefile,v 1.1 2006/07/18 16:49:16 ahze Exp $
PORTNAME= rep-gtk
PORTVERSION= 0.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/rep-gtk/0.15
@@ -20,7 +20,6 @@ LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index b5f55180732a..312bc4990cb7 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/rep-gtk2/Makefile,v 1.8 2006/07/18 16:50:28 ahze Exp $
PORTNAME= rep-gtk2
PORTVERSION= 0.18
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,7 @@ LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= libglade2
WANT_GNOME= yes
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index f200738b9b82..fa544879d50c 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -3,10 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
PORTNAME= scintilla
PORTVERSION= 1.71
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
@@ -19,7 +20,7 @@ COMMENT= A full-featured free source code editing component for GTK+
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_ICONV= yes
MAKEFILE= makefile
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index ec635fe73947..cd97ff2f906b 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -7,6 +7,7 @@
PORTNAME= swt
PORTVERSION= 3.1.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel java
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR= R-${PORTVERSION}-200509290840
@@ -51,15 +52,12 @@ DISTNAME= swt-${PORTVERSION}-gtk-linux-x86
.endif
.if !defined(WITHOUT_MOZILLA)
+USE_GECKO= firefox mozilla seamonkey xulrunner
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
PLIST_FILES+= lib/libswt-mozilla-gtk-%%BUILD%%.so
MAKE_MOZILLA= make_mozilla
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"
-BROWSER= ${WITH_MOZILLA}
-BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
-.else
-BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla
-BROWSER= mozilla
-.endif
+BROWSER= ${GECKO}
+MAKE_ENV+= GECKO_CONFIG="${GECKO_CONFIG}"
.else
BROWSER=
MAKE_MOZILLA=
@@ -78,7 +76,8 @@ MAKE_ENV+= BROWSER="${BROWSER}" \
MAKE_GNOME=${MAKE_GNOME} \
MAKE_MOZILLA=${MAKE_MOZILLA} \
MAKE_CAIRO=${MAKE_CAIRO} \
- MACHINE_ARCH=${MACHINE_ARCH}
+ MACHINE_ARCH=${MACHINE_ARCH} \
+ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
post-extract:
@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh
index 26d351c751f9..9a0767cf0f7c 100644
--- a/x11-toolkits/swt31/files/patch-build.sh
+++ b/x11-toolkits/swt31/files/patch-build.sh
@@ -1,6 +1,6 @@
---- build.sh.orig Wed May 4 19:44:42 2005
-+++ build.sh Wed Jan 4 08:43:08 2006
-@@ -100,6 +100,34 @@
+--- build.sh.orig Wed May 4 19:45:04 2005
++++ build.sh Sat Sep 30 20:54:52 2006
+@@ -100,6 +100,32 @@
;;
esac
;;
@@ -9,10 +9,8 @@
+ CXX=%%CXX%%
+ LD=%%CC%%
+ XTEST_LIB_PATH=$X11BASE/lib
-+ GECKO_I=${X11BASE}/include/${BROWSER}
-+ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
-+ GECKO_L=${X11BASE}/lib/${BROWSER}
-+ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz"
++ GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr"
++ GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib"
+ case $MODEL in
+ "amd64")
+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
@@ -35,7 +33,7 @@
"SunOS")
CC=gcc
LD=gcc
-@@ -126,6 +154,6 @@
+@@ -126,6 +152,6 @@
;;
esac
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 733f98fbe798..eb114972717c 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.4.2
-PORTREVISION?= 10
+PORTREVISION?= 11
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
new file mode 100644
index 000000000000..2de14ab24295
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src_generic_dcpsg.cpp
@@ -0,0 +1,44 @@
+--- src/generic/dcpsg.cpp.orig Fri Sep 29 19:57:20 2006
++++ src/generic/dcpsg.cpp Fri Sep 29 19:58:00 2006
+@@ -1146,7 +1146,7 @@
+ FILE *file;
+ };
+
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1156,7 +1156,7 @@
+ return 0;
+ }
+
+-static int paps_line_to( FT_Vector* to,
++static int paps_line_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1166,8 +1166,8 @@
+ return 0;
+ }
+
+-static int paps_conic_to( FT_Vector* control,
+- FT_Vector* to,
++static int paps_conic_to( const FT_Vector* control,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1179,9 +1179,9 @@
+ return 0;
+ }
+
+-static int paps_cubic_to( FT_Vector* control1,
+- FT_Vector* control2,
+- FT_Vector* to,
++static int paps_cubic_to( const FT_Vector* control1,
++ const FT_Vector* control2,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 273edcb5ba35..6224b250af40 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icewm
PORTVERSION= 1.2.28
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= SF
@@ -112,9 +113,9 @@ post-patch:
.endfor
.for file in src/gnome2.cc
@${REINPLACE_CMD} -e \
- 's|/usr/share/control|${X11BASE}/share/gnome/control|g ; \
- s|/usr/share/app|${X11BASE}/share/gnome/app|g ; \
- s|/usr/share/gnome|${X11BASE}/share/gnome|g' ${WRKSRC}/${file}
+ 's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \
+ s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \
+ s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' ${WRKSRC}/${file}
.endfor
post-install:
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 437c83136369..5c266eeee40f 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pager
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://mirror2.unixfreunde.de/
@@ -16,14 +16,14 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ebert@informatik.unibw-muenchen.de
COMMENT= A pager for sawfish without GNOME
-BUILD_DEPENDS= ${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
-RUN_DEPENDS= ${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
+BUILD_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
+RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
USE_GMAKE= yes
MAKEFILE= GNUmakefile
-USE_X_PREFIX= yes
+USE_XLIB= yes
-SAWFISH_VERSION= `${X11BASE}/bin/sawfish --version 2>&1 | \
+SAWFISH_VERSION= `${LOCALBASE}/bin/sawfish --version 2>&1 | \
${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
PLIST_SUB+= SAWFISH_VERSION="${SAWFISH_VERSION}"
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index d0ed1c41e51e..e75f354ccf80 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $
PORTNAME= sawfish
PORTVERSION= 1.3
-PORTREVISION= 12
+PORTREVISION= 13
PORTEPOCH= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -18,13 +18,13 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Lisp configurable window manager
LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep
-BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
-RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+BUILD_DEPENDS= ${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+RUN_DEPENDS= ${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehier gnomehack esound
WANT_GNOME= yes
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
index 232fd5e6bc62..af4e2b49afb1 100644
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-wm/sawfish/files/Attic/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl,v 1.1 2006-05-29 06:23:01 mezz Exp $
-
--- lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:16:50 1.1
+++ lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:17:07
@@ -28,7 +28,6 @@
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 5dfcd8ffc5df..49a6645e91aa 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -680,3 +680,37 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
@dirrm libexec/sawfish/%%VERSION%%
@dirrm libexec/sawfish
@dirrm libexec/rep/%%GNUHOST%%/sawfish
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 59132a7efbcb..e49d432c0d58 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -3,11 +3,12 @@
# Whom: Dominik Rothert <dr@domix.de>
#
# $FreeBSD$
+# $MCom: ports/x11-wm/wmakerconf/Makefile,v 1.2 2006/10/05 07:31:44 mezz Exp $
#
PORTNAME= wmakerconf
PORTVERSION= 2.11
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.starplot.org/wmakerconf/
@@ -18,8 +19,9 @@ LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
USE_X_PREFIX= yes
-USE_GNOME= gnomehier gnometarget gtk20
+USE_GNOME= gnometarget gtk20
USE_PERL5= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wmakerdir="${X11BASE}/share/WindowMaker"
@@ -41,8 +43,8 @@ pre-configure:
.endfor
post-install:
- @${MKDIR} ${PREFIX}/share/gnome/applications
+ @${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/wmakerconf.desktop \
- ${PREFIX}/share/gnome/applications
+ ${PREFIX}/share/applications
.include <bsd.port.mk>
diff --git a/x11-wm/wmakerconf/pkg-plist b/x11-wm/wmakerconf/pkg-plist
index d429aa30d49c..1ad7c5741837 100644
--- a/x11-wm/wmakerconf/pkg-plist
+++ b/x11-wm/wmakerconf/pkg-plist
@@ -1,6 +1,6 @@
bin/mkpreview
bin/wmakerconf
-share/gnome/applications/wmakerconf.desktop
+share/applications/wmakerconf.desktop
share/locale/ca/LC_MESSAGES/wmakerconf.mo
share/locale/da/LC_MESSAGES/wmakerconf-data.mo
share/locale/da/LC_MESSAGES/wmakerconf.mo
@@ -60,3 +60,4 @@ share/locale/tr/LC_MESSAGES/wmakerconf.mo
%%DATADIR%%/wmakerconf.xpm
%%DATADIR%%/workspace.xpm
@dirrm %%DATADIR%%
+@dirrmtry share/applications
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 3d7b282b8982..a014354a9952 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce
PORTVERSION= 3.8.18
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT= CDE like desktop with GTK
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
-USE_X_PREFIX= yes
USE_XPM= yes
USE_GETTEXT= yes
USE_GNOME= gdkpixbuf
@@ -53,9 +52,9 @@ CONFIGURE_ARGS+= --disable-xinerama
post-patch:
@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/other/xinitrc.in
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in
@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
@${REINPLACE_CMD} -e 's|/opt/kde3|${LOCALBASE}|g ; \
- s|/opt/gnome|${X11BASE}|g' ${WRKSRC}/xfmenu/xfmenu.c
+ s|/opt/gnome|${LOCALBASE}|g' ${WRKSRC}/xfmenu/xfmenu.c
.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 2aa984e566b7..6852e129079b 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -659,3 +659,23 @@ share/xfce/textures/stripe.xpm
@dirrm share/xfce/backdrops
@dirrm share/xfce
@dirrm etc/xfce
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7093cb4683c7..3beaabb87991 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-desktop
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -29,7 +29,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index dcc0d3411969..e3fe67b7fc38 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -145,16 +145,13 @@ share/xfce4/doc/he/images/xfdesktop-menu-tab.png
share/xfce4/doc/he/images/xfdesktop-list.png
share/xfce4/doc/he/xfdesktop.html
@dirrm etc/xdg/xfce4/desktop
+@dirrmtry share/pixmaps
@dirrmtry share/applications
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
@dirrmtry etc/xfce4
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrm share/xfce4/backdrops
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@@ -164,5 +161,39 @@ share/xfce4/doc/he/xfdesktop.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index b986e6dc042f..d9a72de184ec 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-panel
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_GETTEXT= yes
USE_GNOME= gtk20 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index dca9a880b158..deca268261b4 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -169,10 +169,6 @@ share/xfce4/doc/he/xfce4-panel.html
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
@dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -181,5 +177,39 @@ share/xfce4/doc/he/xfce4-panel.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 138896ae584f..950c63e9d6fd 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-session
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 83095fa3d67b..0ceaecfa6233 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -104,10 +104,6 @@ share/xfce4/doc/he/xfce4-session.html
@dirrm include/xfce4/xfce4-session-4.2
@dirrmtry include/xfce4
@dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrm share/themes/Default/balou
@dirrmtry share/themes/Default
@dirrmtry share/themes
@@ -124,3 +120,37 @@ share/xfce4/doc/he/xfce4-session.html
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
@dirrmtry lib/pkgconfig
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 20c2b4444d68..e30ba32867f4 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-systray
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 196b84f565ba..d45df4530426 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_X_PREFIX= yes
USE_XPM= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 2e27d7f7fb90..df0a759b7edf 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -727,12 +727,6 @@ share/xfce4/doc/he/xfwm4.html
share/xfwm4/defaults
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -759,3 +753,37 @@ share/xfwm4/defaults
@dirrmtry share/themes/Wildbush
@dirrmtry share/xfwm4/themes
@dirrmtry share/xfwm4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index bc23a12907f9..5073527b830e 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce
PORTVERSION= 4.2.3.2
-PORTREVISION= 0
+PORTREVISION= 3
CATEGORIES= x11-wm xfce
MASTER_SITES= # empty
DISTFILES= # empty
@@ -16,25 +16,25 @@ EXTRACT_ONLY= # empty
MAINTAINER= oliver@FreeBSD.org
COMMENT= The "meta-port" for the XFce 4 desktop environment
-RUN_DEPENDS= ${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \
+RUN_DEPENDS= ${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \
xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \
xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
- ${X11BASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
+ ${LOCALBASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
startxfce4:${PORTSDIR}/sysutils/xfce4-utils \
xffm:${PORTSDIR}/x11-fm/xfce4-fm \
xfprint4:${PORTSDIR}/print/xfce4-print \
xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
- ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
+ ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
-.if exists(${X11BASE}/sbin/gdm)
+.if exists(${LOCALBASE}/sbin/gdm)
WITH_GDM= yes
.endif
.if defined(WITH_GDM)
-RUN_DEPENDS+= ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm
+RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
PLIST_SUB+= GDM=""
.else
PLIST_SUB+= GDM="@comment "
@@ -42,28 +42,28 @@ PLIST_SUB+= GDM="@comment "
.if !defined(WITHOUT_EXTRAS)
.if !defined(WITHOUT_THEMES)
-RUN_DEPENDS+= ${X11BASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
+RUN_DEPENDS+= ${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
.endif
.if !defined(WITHOUT_PLUGINS)
-RUN_DEPENDS+= ${X11BASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
- ${X11BASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
+RUN_DEPENDS+= ${LOCALBASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
+ ${LOCALBASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
xfce4-tips:${PORTSDIR}/games/xfce4-toys
.endif
.endif
LATEST_LINK= xfce4
NO_BUILD= yes
-USE_X_PREFIX= yes
+USE_GNOME= gtk20
do-install: # empty
post-install:
.if defined(WITH_GDM)
- @${TEST} -d ${X11BASE}/etc/gdm/Sessions || \
- ${MKDIR} -p ${X11BASE}/etc/gdm/Sessions
- @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${X11BASE}/etc/gdm/Sessions
- @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${X11BASE}/etc/dm/Sessions
+ @${TEST} -d ${LOCALBASE}/etc/gdm/Sessions || \
+ ${MKDIR} -p ${LOCALBASE}/etc/gdm/Sessions
+ @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${LOCALBASE}/etc/gdm/Sessions
+ @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${LOCALBASE}/etc/dm/Sessions
.endif
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index f1b32f03f7d6..d8ef9ae74228 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,4 +1,4 @@
-%%GDM%%etc/dm/Sessions/XFce4.desktop
-%%GDM%%etc/gdm/Sessions/XFce4
-%%GDM%%@dirrmtry etc/gdm/Sessions
-%%GDM%%@dirrmtry etc/gdm
+%%GDM%%@unexec rm -f %%LOCAL1BASE%%/etc/dm/Sessions/XFce4.desktop
+%%GDM%%@unexec rm -f %%LOCALBASE%%/etc/gdm/Sessions/XFce4
+%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm/Sessions
+%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 6ee5631c81ef..6df009dd0bbd 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -3,11 +3,12 @@
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11/Terminal/Makefile,v 1.2 2006/10/08 00:20:31 mezz Exp $
#
PORTNAME= Terminal
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/xfce-goodies/
@@ -20,7 +21,6 @@ LIB_DEPENDS= exo-0.3:${PORTSDIR}/x11/libexo \
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20 vte intlhack
-USE_X_PREFIX= yes
MAN1= Terminal.1
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index b81391d11a4e..c1e1fb3e156c 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -47,6 +47,7 @@ share/applications/Terminal.desktop
share/icons/hicolor/48x48/apps/Terminal.png
share/icons/hicolor/scalable/apps/Terminal.svg
share/pixmaps/terminal.xpm
+@dirrmtry share/pixmaps
@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index e4450141f2f4..5c8603b8e65b 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alltray
PORTVERSION= 0.69
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -35,8 +36,8 @@ USE_GNOME+= gconf2
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
- @${REINPLACE_CMD} -e 's|/etc/gconf|${X11BASE}/etc/gconf|; \
- /THEME_DIR1/ s|/usr/share/|${X11BASE}/share/gnome/themes/|' \
+ @${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
+ /THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/gnome/themes/|' \
${WRKSRC}/src/gnome_theme.c
@${REINPLACE_CMD} -e 's|liballtray\.so\.0\.0\.0|liballtray.so.0|; \
s|/usr/lib|${PREFIX}/lib|' ${WRKSRC}/src/child.c
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index 57aeadef23eb..1d8886a1717f 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -7,20 +7,22 @@
PORTNAME= fireflies
PORTVERSION= 2.07
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://somewhere.fscked.org/fireflies/
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= Fireflies is a extention of xscreensaver
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/GL" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS= --with-bindir=${X11BASE}/bin/xscreensaver-hacks --with-confdir=${X11BASE}/share/xscreensaver/config
+CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \
+ --with-confdir=${LOCALBASE}/share/xscreensaver/config
PLIST_SUB= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 36d2fa602fde..1cf8e16e9bb2 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcb
PORTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://freebsd.flatrate.ru/distfiles/ \
http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
@@ -16,7 +17,6 @@ COMMENT= A GTK+ tool for managing x11 cut-buffers
HAS_CONFIGURE= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gtk20
.include <bsd.port.pre.mk>
diff --git a/x11/gcb/pkg-plist b/x11/gcb/pkg-plist
index 3d2662970866..c3bb4941d0b1 100644
--- a/x11/gcb/pkg-plist
+++ b/x11/gcb/pkg-plist
@@ -1,5 +1,7 @@
bin/gcb
-share/icons/gcb.png
share/applications/gcb.desktop
+share/icons/gcb.png
share/pixmaps/gcb.png
+@dirrmtry share/pixmaps
+@dirrmtry share/icons
@dirrmtry share/applications
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 3ec776c87920..b535b53a2884 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcursor
PORTVERSION= 0.061
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= http://download.qballcow.nl/programs/gcursor/
@@ -17,7 +17,7 @@ COMMENT= A mouse cursor theme selector for GNOME
RUN_DEPENDS= file-roller:${PORTSDIR}/archivers/file-roller
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
@@ -27,8 +27,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
DOCS= AUTHORS COPYING ChangeLog INSTALL TODO
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/src/gcursor.c
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
@${REINPLACE_CMD} -e 's|share/applications|share/gnome/applications|g' \
${WRKSRC}/data/Makefile.in
diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c
index e5ee235e98af..583eac0fd36d 100644
--- a/x11/gcursor/files/patch-src::gcursor.c
+++ b/x11/gcursor/files/patch-src::gcursor.c
@@ -1,6 +1,6 @@
---- src/gcursor.c.orig Mon Sep 20 14:34:20 2004
-+++ src/gcursor.c Mon Sep 20 14:34:25 2004
-@@ -32,29 +32,21 @@
+--- src/gcursor.c.orig Thu Aug 26 05:35:55 2004
++++ src/gcursor.c Thu Jul 27 13:25:46 2006
+@@ -32,29 +32,22 @@
#warning move this into gconf
char *paths[] = {
@@ -9,6 +9,7 @@
- "/usr/Xorg/lib/X11/icons/",
- "/usr/local/share/icons/",
- "/usr/share/icons/",
++ "%%LOCALBASE%%/lib/X11/icons/",
+ "%%X11BASE%%/lib/X11/icons/",
"%s/.icons/",
NULL
@@ -38,7 +39,7 @@
}
-@@ -85,7 +77,7 @@
+@@ -85,7 +78,7 @@
filename = g_shell_quote(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
#endif
@@ -47,7 +48,7 @@
filename);
g_free(filename);
-@@ -281,7 +273,7 @@
+@@ -281,7 +274,7 @@
for (iterator = paths; *iterator; iterator++)
{
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index b755bb7a068b..2d1625a29709 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tasklist
PORTVERSION= 0.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
@@ -18,7 +18,7 @@ COMMENT= Displays the GNOME tasklist and floats above the other windows
RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets
-USE_X_PREFIX= yes
+USE_XLIB= yes
NAME= tasklist
DATADIR= ${PREFIX}/share/gnome
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 5a458b5ea008..33799cb89b8d 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-launch-box
PORTVERSION= 20060112
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jylefort
@@ -15,7 +16,6 @@ MAINTAINER= jylefort@FreeBSD.org
COMMENT= An application launcher for the GNOME desktop
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui evolutiondataserver gnomemenus gnomedesktop
diff --git a/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c b/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c
new file mode 100644
index 000000000000..b0643f9b7963
--- /dev/null
+++ b/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c
@@ -0,0 +1,13 @@
+--- src/lb-module-evolution.c.orig Sat Sep 30 02:32:56 2006
++++ src/lb-module-evolution.c Sat Sep 30 02:33:58 2006
+@@ -258,8 +258,8 @@
+
+ g_print ("Loading image\n");
+ loader = gdk_pixbuf_loader_new ();
+- gdk_pixbuf_loader_write (loader, photo->data,
+- photo->length, NULL);
++ gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
++ photo->data.inlined.length, NULL);
+ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ if (pixbuf) {
+ g_object_set (item,
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 823eaf1631ed..f66c3f4bb37e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,11 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
+# $MCom: ports/x11/gnome-libs/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $
#
PORTNAME= gnome-libs
PORTVERSION= 1.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-libs/1.4
@@ -20,13 +21,13 @@ BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-test-gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bd53848a429e..f9c1f0cd0613 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -562,3 +562,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
@dirrm include/gnome-1.0/libgnome
@dirrm include/gnome-1.0/libart_lgpl
@dirrm include/gnome-1.0/gtk-xmhtml
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sp/LC_MESSAGES
+@dirrmtry share/locale/sp
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 8c25f6f3be72..e62d02178704 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.9
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gsynaptics/21527
@@ -15,10 +16,9 @@ MAINTAINER= nork@FreeBSD.org
COMMENT= GNOME Synaptics Touchpad setting tool
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS= ${PREFIX}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
+RUN_DEPENDS= ${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
USE_GNOME= lthack intlhack intltool pkgconfig gtk20 libgnome libglade2 libgnomeui
-USE_X_PREFIX= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 055dee05dfe9..9a546777e9d0 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -11,4 +11,9 @@ share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
share/pixmaps/touchpad.png
@dirrmtry share/gnome/autostart
@dirrmtry share/applications
+@dirrmtry share/pixmaps
@dirrm share/gsynaptics
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index b31e284bea36..b27d81474ddd 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Soboleb <sobomax@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11/libcapplet/Makefile,v 1.4 2006/10/07 19:06:46 ahze Exp $
PORTNAME= libcapplet
PORTVERSION= 1.4.0.5
-PORTREVISION= 3
+PORTREVISION= 7
CATEGORIES= x11 gnome
MASTER_SITES= http://people.freebsd.org/~sobomax/
DIST_SUBDIR= gnome
@@ -16,11 +16,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for writing custom applets for GNOME Control Center
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomelibs
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GETOPT_LONG=yes
-MAKE_ENV= X11BASE="${X11BASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile
index caeb33b82976..72fec2549c4f 100644
--- a/x11/libcapplet/files/patch-Makefile
+++ b/x11/libcapplet/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig Wed Jul 10 05:32:05 2002
-+++ Makefile Sun Jan 22 15:06:39 2006
-@@ -13,6 +13,6 @@
+--- Makefile.orig Wed Jul 10 08:32:05 2002
++++ Makefile Wed Oct 4 15:35:57 2006
+@@ -7,14 +7,14 @@
+ SRCS= capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \
+ capplet-widget.h control-center-common.c control-center-skels.c \
+ control-center-stubs.c control-center.h
+-CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \
+- -I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \
++CFLAGS+=-I. -I${X11BASE}/include -I${LOCALBASE}/include/gtk12 \
++ -I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0
LDADD+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \
- -lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
- -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \
@@ -11,3 +19,5 @@
+ -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
+ -lesd ${LDFLAGS} -laudiofile
+ CLEANFILES+=control-center-common.c control-center-skels.c \
+ control-center-stubs.c control-center.h cappletConf.sh \
diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in
index cc27c4874c78..ee73029fd555 100644
--- a/x11/libcapplet/files/patch-cappletConf.sh.in
+++ b/x11/libcapplet/files/patch-cappletConf.sh.in
@@ -1,7 +1,9 @@
---- cappletConf.sh.in.orig Wed Jul 10 05:42:31 2002
-+++ cappletConf.sh.in Sun Jan 22 21:22:31 2006
-@@ -1,3 +1,3 @@
+--- cappletConf.sh.in.orig Wed Jul 10 08:42:31 2002
++++ cappletConf.sh.in Sat Oct 7 15:03:42 2006
+@@ -1,4 +1,4 @@
CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
-CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba"
+-CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
+CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba"
- CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
++CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12"
+ MODULE_VERSION="capplet-1.4.0.5"
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index c6e38158160b..2ccbdbd83d40 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -3,11 +3,11 @@
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
PORTNAME= libexo
PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DISTNAME= exo-${PORTVERSION}
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
USE_GNOME= glib20
-USE_X_PREFIX= yes
USE_LDCONFIG= yes
.if defined(WITH_GTKDOC)
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6b31a4b44390..6ec24e022a30 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.8 2006/04/13 07:52:41 bland Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.10 2006/08/21 15:25:07 ahze Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,12 +22,12 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libgnomemm26
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack libgnome
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index b8a51c48cfa3..0b20f59ebc30 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.14.0.tar.bz2) = 8e31905b9732fdb099381569736829fa
-SHA256 (gnome2/libgnomemm-2.14.0.tar.bz2) = 66cc9f99f074bcc9c2c014880ff14d0e8ec15067fff0a9f6fe7ca79f65f65500
-SIZE (gnome2/libgnomemm-2.14.0.tar.bz2) = 250757
+MD5 (gnome2/libgnomemm-2.16.0.tar.bz2) = 2971eea9ebe6041735375e765322c51f
+SHA256 (gnome2/libgnomemm-2.16.0.tar.bz2) = 4a90c066a09539e159e1abfd2acbc189e814f558e4e0ef33e46b5fc8af57b2d5
+SIZE (gnome2/libgnomemm-2.16.0.tar.bz2) = 256478
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 571f9776210a..58b9933a4037 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxfce4mcs
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -20,8 +20,8 @@ COMMENT= XFce 4 settings management library used by most XFce 4 modules
LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util
+USE_XLIB= yes
USE_GNOME= glib20 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 9933971726fe..cc734a398c8d 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxfce4util
PORTVERSION= 4.2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -19,7 +19,6 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 library with non-graphical helper functions
USE_GNOME= glib20 gnomehack
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 3630a16578a8..ed26fb17971f 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -51,4 +51,3 @@ share/xfce4/m4/i18n.m4
@dirrmtry share/gtk-doc
@dirrm share/xfce4/m4
@dirrmtry share/xfce4
-@dirrmtry sbin
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2b5cc7d61a67..46030a627ffd 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,30 +3,32 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 2.2
-PORTREVISION= 1
+PORTVERSION= 2.91
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
-DIST_SUBDIR= gnome2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= gswitchit
MAINTAINER= gnome@FreeBSD.org
COMMENT= An utility library to make XKB stuff easier
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gnomehack libxml2
-INSTALLS_SHLIB= yes
+USE_GNOME= gnometarget gnomehack libxml2 glib20
+USE_LDCONFIG= yes
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
CONFIGURE_ARGS= --disable-doxygen \
--with-xkb-base=${X11BASE}/lib/X11/xkb \
- --with-xmodmap-base=${X11BASE}/share/gnome/xmodmap
+ --with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
+ --disable-gtk-doc \
+ --with-html-dir=${GNOME_HTML_DIR}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 22a33aafe04d..8456fa5a39e7 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxklavier-2.2.tar.gz) = a9c2e53ea96ed138b588df5a9b9addaf
-SHA256 (gnome2/libxklavier-2.2.tar.gz) = ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de
-SIZE (gnome2/libxklavier-2.2.tar.gz) = 467577
+MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814
+SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b
+SIZE (libxklavier-2.91.tar.gz) = 455935
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
index 6355d7b772e6..d4b14aee6b60 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -1,11 +1,11 @@
---- libxklavier/xklavier.c.orig Tue Dec 13 00:52:26 2005
-+++ libxklavier/xklavier.c Tue Dec 13 00:52:45 2005
-@@ -606,7 +606,7 @@
- int level, const char format[], va_list args )
+--- libxklavier/xklavier.c.orig Sat Apr 15 21:14:40 2006
++++ libxklavier/xklavier.c Tue Jun 13 00:07:32 2006
+@@ -394,7 +394,7 @@ xkl_default_log_appender(const gchar fil
+ gint level, const gchar format[], va_list args)
{
- time_t now = time( NULL );
-- fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function );
-+ fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function );
- vfprintf( stdout, format, args );
+ time_t now = time(NULL);
+- fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file,
++ fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file,
+ function);
+ vfprintf(stdout, format, args);
}
-
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
new file mode 100644
index 000000000000..889c14b89d85
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_config.c 2006-04-15 22:04:38.000000000 -0400
++++ libxklavier/xklavier_config.c 2006-07-08 10:15:17.000000000 -0400
+@@ -275,7 +275,11 @@
+ gchar *
+ xkl_strings_concat_comma_separated(gchar ** array)
+ {
+- return g_strjoinv(",", array);
++ if (array) {
++ return g_strjoinv(",", array);
++ } else {
++ return g_strdup("");
++ }
+ }
+
+ void
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
index 0ef120607f55..91d73cf112a3 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -1,11 +1,11 @@
---- libxklavier/xklavier_config_i18n.c.orig Tue Nov 23 18:33:37 2004
-+++ libxklavier/xklavier_config_i18n.c Tue Nov 23 18:34:30 2004
-@@ -106,7 +106,7 @@
- iconv_t converter;
- static char converted[XKL_MAX_CI_DESC_LENGTH];
- char *convertedStart = converted;
-- char *utfStart = ( char * ) utf8string;
-+ const char *utfStart = ( const char * ) utf8string;
- size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
- const char *charset;
+--- libxklavier/xklavier_config_i18n.c.orig Tue Jun 13 00:12:44 2006
++++ libxklavier/xklavier_config_i18n.c Tue Jun 13 00:13:05 2006
+@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s
+ iconv_t converter;
+ gchar converted[XKL_MAX_CI_DESC_LENGTH];
+ gchar *converted_start = converted;
+- gchar *utf_start = (char *) utf8string;
++ const gchar *utf_start = (const char *) utf8string;
+ size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+ const gchar *charset;
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
deleted file mode 100644
index 8dbfe37c7977..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libxklavier/xklavier_evt_xmm.c.orig Tue Nov 30 02:18:31 2004
-+++ libxklavier/xklavier_evt_xmm.c Tue Nov 30 02:20:24 2004
-@@ -13,15 +13,15 @@
- {
- if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
- {
-- XklDebug( 200, "Processing the KeyPress event\n" );
- int currentShortcut = 0;
- const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode,
-- kpe->state,
-- &currentShortcut );
-+ kpe->state,
-+ &currentShortcut );
-+ XklDebug( 200, "Processing the KeyPress event\n" );
- if( sop != NULL )
- {
-- XklDebug( 150, "It is THE shortcut\n" );
- XklState state;
-+ XklDebug( 150, "It is THE shortcut\n" );
- _XklXmmGetRealState( &state );
- if( state.group != -1 )
- {
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
index 87dffde8985b..a56ec7896810 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
@@ -1,13 +1,15 @@
---- libxklavier/xklavier_props.c.orig Mon Apr 3 14:49:17 2006
-+++ libxklavier/xklavier_props.c Mon Apr 3 17:16:13 2006
-@@ -319,7 +324,9 @@ Bool XklGetNamesProp( Atom rulesAtom,
- memcpy( var, varstart + 1, --varlen );
- var[varlen] = '\0';
-
-- ( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';
-+ *theLayout = realloc (*theLayout, laylen + 1);
-+ (*theLayout)[laylen] = '\0';
-+ /*( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';*/
- }
- }
- }
+--- libxklavier/xklavier_props.c.orig Sun Apr 16 20:51:36 2006
++++ libxklavier/xklavier_props.c Tue Jun 13 00:11:24 2006
+@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop
+ --varlen);
+ var[varlen] = '\0';
+ /* Resize the original layout */
+- ((char *)
+- g_realloc(*layout,
+- laylen + 1))[laylen] =
+- '\0';
++ *layout = g_realloc(*layout, laylen + 1);
++ (*layout)[laylen] = '\0';
+ }
+ }
+ layout++;
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
deleted file mode 100644
index 09658570e653..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libxklavier/xklavier_xmm.c.orig Tue Dec 13 00:58:22 2005
-+++ libxklavier/xklavier_xmm.c Tue Dec 13 00:58:47 2005
-@@ -66,7 +66,8 @@
- XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void )
- {
- const char* optionName = _XklXmmGetCurrentShortcutOptionName();
-- XmmSwitchOptionPtr switchOption = allSwitchOptions;
-+ XmmSwitchOptionPtr switchOption;
-+ switchOption = allSwitchOptions;
- XklDebug( 150, "Configured switch option: [%s]\n", optionName );
- if( optionName == NULL )
- return NULL;
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index d669618f0bc2..8b2c1b17f954 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -1,10 +1,30 @@
include/libxklavier/xklavier.h
-include/libxklavier/xklavier_config.h
+include/libxklavier/xkl_config_item.h
+include/libxklavier/xkl_config_rec.h
+include/libxklavier/xkl_config_registry.h
+include/libxklavier/xkl_engine.h
+include/libxklavier/xkl_engine_marshal.h
lib/libxklavier.a
lib/libxklavier.la
lib/libxklavier.so
-lib/libxklavier.so.10
+lib/libxklavier.so.11
libdata/pkgconfig/libxklavier.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libxklavier-XklConfigItem.html
+%%DOCSDIR%%/libxklavier-XklConfigRec.html
+%%DOCSDIR%%/libxklavier-XklConfigRegistry.html
+%%DOCSDIR%%/libxklavier-XklEngine.html
+%%DOCSDIR%%/libxklavier-xklavier.html
+%%DOCSDIR%%/libxklavier.devhelp
+%%DOCSDIR%%/libxklavier.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
%%DATADIR%%/xfree86.xml
@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
@dirrm include/libxklavier
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index b61d28df67fc..d4a229bf9398 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Frederic Dubuy <fdubuy@free.fr>
#
# $FreeBSD$
-#
+# $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.1 2006/10/04 20:27:01 ahze Exp $
PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= multignometerm
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= multignometerm
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome tabbed terminal emulator
-USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix libglade
USE_GMAKE= yes
diff --git a/x11/multi-gnome-terminal/pkg-plist b/x11/multi-gnome-terminal/pkg-plist
index b5464500f04d..8b23fd5565c0 100644
--- a/x11/multi-gnome-terminal/pkg-plist
+++ b/x11/multi-gnome-terminal/pkg-plist
@@ -185,4 +185,3 @@ share/gnome/pixmaps/multignometerm.png
@dirrm share/gnome/help/multi-gnome-terminal/C/figures
@dirrm share/gnome/help/multi-gnome-terminal/C
@dirrm share/gnome/help/multi-gnome-terminal
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 351e8262fe83..a69ed7b6f583 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -3,11 +3,11 @@
# Whom: Scott A. Moberly <smoberly@xavier.dyndns.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11/powershell/Makefile,v 1.1 2006/10/04 19:44:10 ahze Exp $
PORTNAME= powershell
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A terminal emulator for the X11
-USE_X_PREFIX= yes
-USE_GNOME= gnomelibs
-USE_AUTOTOOLS= autoconf:213
+USE_GNOME= gnomelibs gnomehier
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${IMLIB_CONFIG} --cflags`" \
LDFLAGS="-L${LOCALBASE}/lib `${IMLIB_CONFIG} --libs`"
ALL_TARGET= ${PORTNAME}
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index b225967b2f3e..7bd939a35201 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 0.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= xfce-goodies
@@ -24,7 +24,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index b2fb2453998a..0acfdfd43ddd 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-trigger-launcher
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20 libxml2
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 0ef5ba1c64d9..2fe549731256 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver-kde
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -33,9 +34,9 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
WITH_XSGNOME= yes
-.elif exists(${X11BASE}/bin/screensaver)
+.elif exists(${LOCALBASE}/bin/screensaver)
WITH_XSGNOME= yes
.else
WITH_XS= yes
@@ -47,8 +48,8 @@ RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
.endif # defined(WITH_XS)
.if defined(WITH_XSGNOME)
-BUILD_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+BUILD_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
.endif # defined(WITH_XSGNOME)
pre-configure:
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 90c4c59cc094..5502d35e0e88 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.01
+PORTREVISION= 3
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
@@ -19,7 +20,6 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \
xml2.5:${PORTSDIR}/textproc/libxml2 \
glade-2.0.0:${PORTSDIR}/devel/libglade2
-USE_X_PREFIX= yes
USE_XPM= yes
USE_GL= yes
USE_GMAKE= yes
@@ -108,7 +108,7 @@ post-patch:
${WRKSRC}/configure.Patched > ${WRKSRC}/configure
post-install:
- @(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
+ @(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index a58e06fb7499..1490260c8f67 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -211,7 +211,6 @@ bin/xscreensaver-hacks/xspirograph
bin/xscreensaver-hacks/xsublim
bin/xscreensaver-hacks/zoom
bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/README
%%DATADIR%%/config/anemone.xml
@@ -435,6 +434,9 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/glade/screensaver-snap.png
%%DATADIR%%/glade/xscreensaver-demo.glade2
@dirrmtry bin/xscreensaver-hacks
+@dirrmtry share/pixmaps
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
+@cwd %%X11BASE%%
+lib/X11/app-defaults/XScreenSaver