aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gecko.mk2
-rw-r--r--UPDATING12
-rw-r--r--accessibility/accerciser/Makefile2
-rw-r--r--accessibility/at-poke/Makefile2
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/at-spi2-atk/Makefile1
-rw-r--r--accessibility/dasher/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile1
-rw-r--r--accessibility/gnopernicus/Makefile2
-rw-r--r--accessibility/gok/Makefile1
-rw-r--r--accessibility/java-access-bridge/Makefile2
-rw-r--r--accessibility/jovie/Makefile1
-rw-r--r--accessibility/kdeaccessibility/Makefile2
-rw-r--r--accessibility/mousetweaks/Makefile1
-rw-r--r--accessibility/orca/Makefile2
-rw-r--r--accessibility/py-atspi/Makefile1
-rw-r--r--accessibility/qt4-accessible/Makefile1
-rw-r--r--accessibility/redshift/Makefile1
-rw-r--r--arabic/kde3-i18n/Makefile2
-rw-r--r--arabic/kde4-l10n/Makefile1
-rw-r--r--archivers/file-roller/Makefile1
-rw-r--r--archivers/kbackup/Makefile2
-rw-r--r--archivers/kio_p7zip/Makefile2
-rw-r--r--archivers/rox-archive/Makefile2
-rw-r--r--archivers/rpm5/Makefile2
-rw-r--r--archivers/squeeze/Makefile2
-rw-r--r--archivers/thunar-archive-plugin/Makefile2
-rw-r--r--archivers/xarchive/Makefile2
-rw-r--r--archivers/xarchiver/Makefile2
-rw-r--r--astro/astrometry/Makefile4
-rw-r--r--astro/astrometry/files/patch-cairoutils.c10
-rw-r--r--astro/boinc-astropulse/Makefile1
-rw-r--r--astro/boinc-setiathome-enhanced/Makefile2
-rw-r--r--astro/celestia/Makefile3
-rw-r--r--astro/celestia/files/patch-src_celestia_imagecapture.cpp10
-rw-r--r--astro/foxtrotgps/Makefile1
-rw-r--r--astro/gkrellmoon2/Makefile2
-rw-r--r--astro/glunarclock/Makefile1
-rw-r--r--astro/gmapcatcher/Makefile1
-rw-r--r--astro/gpscorrelate/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/kstars/Makefile1
-rw-r--r--astro/libroadnav/Makefile2
-rw-r--r--astro/marble/Makefile1
-rw-r--r--astro/merkaartor/Makefile2
-rw-r--r--astro/nightfall/Makefile2
-rw-r--r--astro/nova/Makefile2
-rw-r--r--astro/orsa/Makefile2
-rw-r--r--astro/pp3/Makefile2
-rw-r--r--astro/py-aipy/Makefile1
-rw-r--r--astro/py-astLib/Makefile1
-rw-r--r--astro/qlandkartegt/Makefile2
-rw-r--r--astro/rmap/Makefile2
-rw-r--r--astro/roadmap/Makefile2
-rw-r--r--astro/roadnav/Makefile2
-rw-r--r--astro/starplot/Makefile2
-rw-r--r--astro/stellarium/Makefile1
-rw-r--r--astro/sunclock/Makefile4
-rw-r--r--astro/tangogps/Makefile2
-rw-r--r--astro/viking/Makefile1
-rw-r--r--astro/wmglobe/Makefile2
-rw-r--r--astro/xephem/Makefile4
-rw-r--r--astro/xephem/pkg-plist3
-rw-r--r--astro/xglobe/Makefile2
-rw-r--r--astro/xplanet/Makefile3
-rw-r--r--astro/xtide/Makefile6
-rw-r--r--audio/abraca/Makefile1
-rw-r--r--audio/akode-plugins-ffmpeg/Makefile2
-rw-r--r--audio/akode-plugins-pulseaudio/Makefile2
-rw-r--r--audio/akode/Makefile2
-rw-r--r--audio/amarok-fs/Makefile2
-rw-r--r--audio/amarok-kde4/Makefile2
-rw-r--r--audio/amarok/Makefile2
-rw-r--r--audio/aqualung/Makefile2
-rw-r--r--audio/ardour/Makefile2
-rw-r--r--audio/ario/Makefile2
-rw-r--r--audio/arts/Makefile2
-rw-r--r--audio/asunder/Makefile2
-rw-r--r--audio/atunes/Makefile2
-rw-r--r--audio/aubio/Makefile2
-rw-r--r--audio/audacious-dumb/Makefile1
-rw-r--r--audio/audacity/Makefile1
-rw-r--r--audio/audex/Makefile2
-rw-r--r--audio/beast/Makefile2
-rw-r--r--audio/bebocd/Makefile2
-rw-r--r--audio/bmp-fc/Makefile2
-rw-r--r--audio/bmp-flac/Makefile2
-rw-r--r--audio/bmp-htmlplaylist/Makefile2
-rw-r--r--audio/bmp-mac/Makefile2
-rw-r--r--audio/bmp-modplug/Makefile2
-rw-r--r--audio/bmp-scrobbler/Makefile2
-rw-r--r--audio/bmp-songchange/Makefile2
-rw-r--r--audio/bmp-wma/Makefile2
-rw-r--r--audio/calf/Makefile1
-rw-r--r--audio/cantus_3/Makefile2
-rw-r--r--audio/cheesetracker/Makefile2
-rw-r--r--audio/clementine-player/Makefile2
-rw-r--r--audio/cmp3/Makefile2
-rw-r--r--audio/cmus/Makefile1
-rw-r--r--audio/cowbell/Makefile2
-rw-r--r--audio/creox/Makefile2
-rw-r--r--audio/csound/Makefile1
-rw-r--r--audio/cuberok/Makefile2
-rw-r--r--audio/cueplayer/Makefile2
-rw-r--r--audio/deadbeef-mpris-plugin/Makefile1
-rw-r--r--audio/deadbeef/Makefile2
-rw-r--r--audio/denemo/Makefile2
-rw-r--r--audio/dvda-author/Makefile4
-rw-r--r--audio/easytag/Makefile1
-rw-r--r--audio/eawplus/Makefile2
-rw-r--r--audio/emms/Makefile2
-rw-r--r--audio/enscribe/Makefile4
-rw-r--r--audio/ermixer/Makefile2
-rw-r--r--audio/esperanza/Makefile1
-rw-r--r--audio/exaile/Makefile3
-rw-r--r--audio/extace/Makefile2
-rw-r--r--audio/fdmf/Makefile2
-rw-r--r--audio/festalon/Makefile2
-rw-r--r--audio/firefly/Makefile2
-rw-r--r--audio/fluidsynth-dssi/Makefile2
-rw-r--r--audio/fmit/Makefile2
-rw-r--r--audio/gbemol/Makefile2
-rw-r--r--audio/gdam/Makefile2
-rw-r--r--audio/ghostess/Makefile1
-rw-r--r--audio/gigedit/Makefile2
-rw-r--r--audio/gimmix/Makefile2
-rw-r--r--audio/gkrellmms/Makefile2
-rw-r--r--audio/gkrellmms2/Makefile2
-rw-r--r--audio/gkrellmss2/Makefile2
-rw-r--r--audio/gkrellmvolume/Makefile2
-rw-r--r--audio/gkrellmvolume2/Makefile2
-rw-r--r--audio/glame/Makefile2
-rw-r--r--audio/glurp/Makefile2
-rw-r--r--audio/gmidimonitor/Makefile1
-rw-r--r--audio/gmpc-alarm/Makefile1
-rw-r--r--audio/gmpc-albumview/Makefile1
-rw-r--r--audio/gmpc-discogs/Makefile2
-rw-r--r--audio/gmpc-extraplaylist/Makefile2
-rw-r--r--audio/gmpc-lastfm/Makefile2
-rw-r--r--audio/gmpc-libnotify/Makefile1
-rw-r--r--audio/gmpc-lyrics/Makefile1
-rw-r--r--audio/gmpc-lyricsplugin/Makefile2
-rw-r--r--audio/gmpc-lyricwiki/Makefile1
-rw-r--r--audio/gmpc-magnatune/Makefile1
-rw-r--r--audio/gmpc-mdcover/Makefile2
-rw-r--r--audio/gmpc-mserver/Makefile2
-rw-r--r--audio/gmpc-shout/Makefile2
-rw-r--r--audio/gmpc-wikipedia/Makefile1
-rw-r--r--audio/gmpc/Makefile1
-rw-r--r--audio/gmusicbrowser/Makefile1
-rw-r--r--audio/gnaural/Makefile1
-rw-r--r--audio/gnome-media/Makefile2
-rw-r--r--audio/gnomoradio/Makefile2
-rw-r--r--audio/gnuitar/Makefile2
-rw-r--r--audio/gogglesmm/Makefile2
-rw-r--r--audio/goobox/Makefile1
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg-devel/files/patch-ui_pixbuf_save.c19
-rw-r--r--audio/gqmpeg/Makefile9
-rw-r--r--audio/gqmpeg/files/patch-ui_pixbuf_save.c19
-rw-r--r--audio/gqradio/Makefile2
-rw-r--r--audio/grip/Makefile2
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/gstreamer-plugins-pulse/Makefile2
-rw-r--r--audio/gtick/Makefile1
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/gtkpod/Makefile1
-rw-r--r--audio/gxmms2/Makefile1
-rw-r--r--audio/hexter/Makefile2
-rw-r--r--audio/ipod-sharp/Makefile1
-rw-r--r--audio/istream/Makefile2
-rw-r--r--audio/jack-keyboard/Makefile1
-rw-r--r--audio/jack-rack/Makefile2
-rw-r--r--audio/jack-smf-utils/Makefile2
-rw-r--r--audio/jack_mixer/Makefile1
-rw-r--r--audio/jamin/Makefile2
-rw-r--r--audio/jokosher/Makefile1
-rw-r--r--audio/juk/Makefile2
-rw-r--r--audio/k3bmonkeyaudioplugin/Makefile2
-rw-r--r--audio/kaudiocreator/Makefile2
-rw-r--r--audio/kid3-kde4/Makefile1
-rw-r--r--audio/kid3/Makefile2
-rw-r--r--audio/kirocker/Makefile2
-rw-r--r--audio/kmp/Makefile2
-rw-r--r--audio/kstreamripper/Makefile2
-rw-r--r--audio/lash/Makefile2
-rw-r--r--audio/last.fm/Makefile2
-rw-r--r--audio/libcanberra/Makefile2
-rw-r--r--audio/libgpod/Makefile1
-rw-r--r--audio/liblastfm/Makefile2
-rw-r--r--audio/libnjb/Makefile2
-rw-r--r--audio/lingot/Makefile1
-rw-r--r--audio/liteamp/Makefile1
-rw-r--r--audio/lmms/Makefile1
-rw-r--r--audio/lplayer/Makefile2
-rw-r--r--audio/madman/Makefile2
-rw-r--r--audio/mangler/Makefile1
-rw-r--r--audio/mbox/Makefile2
-rw-r--r--audio/mehdiaplayer/Makefile2
-rw-r--r--audio/mhwaveedit/Makefile2
-rw-r--r--audio/midipp/Makefile1
-rw-r--r--audio/minitunes/Makefile1
-rw-r--r--audio/mixmos/Makefile2
-rw-r--r--audio/mixxx/Makefile3
-rw-r--r--audio/moc/Makefile2
-rw-r--r--audio/mp3plot/Makefile2
-rw-r--r--audio/mp3splt-gtk/Makefile1
-rw-r--r--audio/mp3stat/Makefile2
-rw-r--r--audio/mpdbrowser/Makefile2
-rw-r--r--audio/mpeglib_artsplug/Makefile2
-rw-r--r--audio/muine/Makefile2
-rw-r--r--audio/mumble/Makefile1
-rw-r--r--audio/muse/Makefile2
-rw-r--r--audio/musescore/Makefile2
-rw-r--r--audio/musicbox-tag-editor/Makefile2
-rw-r--r--audio/musicpd/Makefile1
-rw-r--r--audio/mythplugin-mythmusic/Makefile1
-rw-r--r--audio/nekobee/Makefile2
-rw-r--r--audio/normalize/Makefile2
-rw-r--r--audio/osd-lyrics/Makefile1
-rw-r--r--audio/osdmixer/Makefile2
-rw-r--r--audio/oss/Makefile2
-rw-r--r--audio/padevchooser/Makefile2
-rw-r--r--audio/paman/Makefile2
-rw-r--r--audio/paprefs/Makefile1
-rw-r--r--audio/patchage/Makefile1
-rw-r--r--audio/pavucontrol/Makefile1
-rw-r--r--audio/pavumeter/Makefile2
-rw-r--r--audio/picard/Makefile2
-rw-r--r--audio/pidgin-musictracker/Makefile2
-rw-r--r--audio/pithos/Makefile2
-rw-r--r--audio/prokyon3/Makefile2
-rw-r--r--audio/pulseaudio/Makefile1
-rw-r--r--audio/py-karaoke/Makefile2
-rw-r--r--audio/q-audio/Makefile2
-rw-r--r--audio/qjackctl/Makefile2
-rw-r--r--audio/qmpdclient/Makefile1
-rw-r--r--audio/qsampler/Makefile2
-rw-r--r--audio/qsynth/Makefile2
-rw-r--r--audio/quimup/Makefile1
-rw-r--r--audio/raop_play/Makefile2
-rw-r--r--audio/rezound/Makefile2
-rw-r--r--audio/rhythmbox/Makefile2
-rw-r--r--audio/ripperx/Makefile1
-rw-r--r--audio/rosegarden/Makefile1
-rw-r--r--audio/rubyripper/Makefile2
-rw-r--r--audio/scrobbler/Makefile2
-rw-r--r--audio/smasher/Makefile2
-rw-r--r--audio/snd/Makefile1
-rw-r--r--audio/solfege/Makefile1
-rw-r--r--audio/sonata/Makefile2
-rw-r--r--audio/sonice/Makefile2
-rw-r--r--audio/sooperlooper/Makefile1
-rw-r--r--audio/sound-juicer/Makefile2
-rw-r--r--audio/soundconverter/Makefile1
-rw-r--r--audio/soundkonverter/Makefile2
-rw-r--r--audio/soundtracker/Makefile2
-rw-r--r--audio/sox/Makefile4
-rw-r--r--audio/specimen/Makefile2
-rw-r--r--audio/spek/Makefile2
-rw-r--r--audio/spiralloops/Makefile2
-rw-r--r--audio/spiralsynth/Makefile2
-rw-r--r--audio/spiralsynthmodular/Makefile2
-rw-r--r--audio/streamtuner/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--audio/tagtool/Makefile2
-rw-r--r--audio/tepsonic/Makefile1
-rw-r--r--audio/terminatorx/Makefile1
-rw-r--r--audio/thunar-media-tags-plugin/Makefile1
-rw-r--r--audio/timemachine/Makefile2
-rw-r--r--audio/timidity++/Makefile5
-rw-r--r--audio/timidity++/files/patch-x_sherry.c28
-rw-r--r--audio/trommler/Makefile2
-rw-r--r--audio/tuxguitar/Makefile2
-rw-r--r--audio/vagalume/Makefile2
-rw-r--r--audio/vitunes/Makefile1
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/vsound/Makefile2
-rw-r--r--audio/waheela/Makefile2
-rw-r--r--audio/waon/Makefile2
-rw-r--r--audio/wavbreaker/Makefile1
-rw-r--r--audio/whysynth/Makefile2
-rw-r--r--audio/wmalbum/Makefile2
-rw-r--r--audio/wmauda/Makefile1
-rw-r--r--audio/wsoundserver/Makefile2
-rw-r--r--audio/wxguitar/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--audio/xfce4-mpc-plugin/Makefile1
-rw-r--r--audio/xfmpc/Makefile2
-rw-r--r--audio/xmms-arts_output/Makefile2
-rw-r--r--audio/xmms-crossfade/Makefile2
-rw-r--r--audio/xmms-crystality/Makefile2
-rw-r--r--audio/xmms-faad/Makefile.inc2
-rw-r--r--audio/xmms-kde/Makefile2
-rw-r--r--audio/xsynth-dssi/Makefile1
-rw-r--r--audio/yammi/Makefile2
-rw-r--r--audio/yamt/Makefile2
-rw-r--r--audio/zinf/Makefile2
-rw-r--r--audio/zynaddsubfx/Makefile2
-rw-r--r--benchmarks/autobench/Makefile2
-rw-r--r--benchmarks/dbs/Makefile2
-rw-r--r--benchmarks/gtkperf/Makefile2
-rw-r--r--benchmarks/octave-forge-benchmark/Makefile2
-rw-r--r--biology/embassy/Makefile2
-rw-r--r--biology/emboss/Makefile6
-rw-r--r--biology/genpak/Makefile2
-rw-r--r--biology/gperiodic/Makefile2
-rw-r--r--biology/p5-Bio-Das/Makefile2
-rw-r--r--biology/p5-Bio-Graphics/Makefile1
-rw-r--r--biology/p5-Bio-Phylo/Makefile1
-rw-r--r--biology/p5-bioperl-run/Makefile2
-rw-r--r--biology/p5-bioperl/Makefile2
-rw-r--r--biology/povchem/Makefile2
-rw-r--r--biology/protomol/Makefile4
-rw-r--r--biology/pymol/Makefile3
-rw-r--r--biology/seaview/Makefile2
-rw-r--r--biology/treeviewx/Makefile2
-rw-r--r--biology/xdrawchem/Makefile2
-rw-r--r--cad/basicdsp/Makefile2
-rw-r--r--cad/brlcad/Makefile3
-rw-r--r--cad/geda-gattrib/Makefile2
-rw-r--r--cad/geda-gschem/Makefile2
-rw-r--r--cad/geda-netlist/Makefile2
-rw-r--r--cad/geda-symcheck/Makefile2
-rw-r--r--cad/geda-utils/Makefile2
-rw-r--r--cad/gerbv/Makefile1
-rw-r--r--cad/gmsh/Makefile3
-rw-r--r--cad/gmsh/files/patch-Graphics_gl2png.cpp10
-rw-r--r--cad/gspiceui/Makefile1
-rw-r--r--cad/gtkwave3/Makefile1
-rw-r--r--cad/gwave/Makefile2
-rw-r--r--cad/kicad-devel/Makefile2
-rw-r--r--cad/kicad/Makefile2
-rw-r--r--cad/klayout/Makefile1
-rw-r--r--cad/layouteditor/Makefile1
-rw-r--r--cad/leocad/Makefile4
-rw-r--r--cad/leocad/files/patch-im_png.cpp47
-rw-r--r--cad/libgeda/Makefile2
-rw-r--r--cad/librecad/Makefile1
-rw-r--r--cad/linux-eagle5/Makefile2
-rw-r--r--cad/meshlab/Makefile2
-rw-r--r--cad/netgen/Makefile2
-rw-r--r--cad/opencascade/Makefile2
-rw-r--r--cad/openscad/Makefile2
-rw-r--r--cad/openvsp/Makefile3
-rw-r--r--cad/pcb/Makefile1
-rw-r--r--cad/pdnmesh/Makefile2
-rw-r--r--cad/pythoncad/Makefile1
-rw-r--r--cad/qcad/Makefile2
-rw-r--r--cad/qelectrotech/Makefile1
-rw-r--r--cad/qfsm/Makefile2
-rw-r--r--cad/qucs/Makefile1
-rw-r--r--cad/salome-geom/Makefile2
-rw-r--r--cad/salome-jobmanager/Makefile2
-rw-r--r--cad/salome-light/Makefile2
-rw-r--r--cad/salome-med/Makefile2
-rw-r--r--cad/salome-multipr/Makefile2
-rw-r--r--cad/salome-netgenplugin/Makefile2
-rw-r--r--cad/salome-sierpinsky/Makefile2
-rw-r--r--cad/salome-smesh/Makefile2
-rw-r--r--cad/salome-visu/Makefile2
-rw-r--r--cad/transcalc/Makefile2
-rw-r--r--cad/vipec/Makefile2
-rw-r--r--cad/xcircuit/Makefile1
-rw-r--r--cad/z88/Makefile2
-rw-r--r--chinese/docproj/Makefile2
-rw-r--r--chinese/fcitx-chewing/Makefile1
-rw-r--r--chinese/fcitx-cloudpinyin/Makefile1
-rw-r--r--chinese/fcitx-configtool/Makefile1
-rw-r--r--chinese/fcitx-googlepinyin/Makefile1
-rw-r--r--chinese/fcitx-sunpinyin/Makefile1
-rw-r--r--chinese/fcitx-ui-light/Makefile1
-rw-r--r--chinese/fcitx/Makefile1
-rw-r--r--chinese/fqterm/Makefile2
-rw-r--r--chinese/gcin/Makefile2
-rw-r--r--chinese/ibus-chewing/Makefile1
-rw-r--r--chinese/ibus-pinyin/Makefile1
-rw-r--r--chinese/kde3-i18n-zh_CN/Makefile2
-rw-r--r--chinese/kde3-i18n-zh_TW/Makefile2
-rw-r--r--chinese/kde4-l10n-zh_CN/Makefile1
-rw-r--r--chinese/kde4-l10n-zh_TW/Makefile1
-rw-r--r--chinese/oxim/Makefile2
-rw-r--r--chinese/pcmanx/Makefile1
-rw-r--r--chinese/qterm/Makefile2
-rw-r--r--chinese/reciteword/Makefile1
-rw-r--r--chinese/scim-array/Makefile2
-rw-r--r--chinese/scim-fcitx/Makefile2
-rw-r--r--chinese/scim-pinyin/Makefile2
-rw-r--r--chinese/scim-tables/Makefile1
-rw-r--r--chinese/srecite/Makefile2
-rw-r--r--chinese/tin/Makefile2
-rw-r--r--chinese/wenju/Makefile1
-rw-r--r--chinese/xemacs21/Makefile2
-rw-r--r--comms/amtterm/Makefile1
-rw-r--r--comms/cutecom/Makefile2
-rw-r--r--comms/efax-gtk/Makefile1
-rw-r--r--comms/efax/Makefile2
-rw-r--r--comms/fldigi/Makefile1
-rw-r--r--comms/flwrap/Makefile1
-rw-r--r--comms/geoid/Makefile2
-rw-r--r--comms/ghfaxviewer/Makefile2
-rw-r--r--comms/gnocky/Makefile2
-rw-r--r--comms/gnokii/Makefile1
-rw-r--r--comms/gnuradio/Makefile2
-rw-r--r--comms/gpredict/Makefile1
-rw-r--r--comms/gpsk31/Makefile2
-rw-r--r--comms/grig/Makefile1
-rw-r--r--comms/gscmxx/Makefile2
-rw-r--r--comms/hamfax/Makefile2
-rw-r--r--comms/hf/Makefile2
-rw-r--r--comms/hylafax/Makefile1
-rw-r--r--comms/kallers/Makefile2
-rw-r--r--comms/kb/Makefile2
-rw-r--r--comms/klog/Makefile2
-rw-r--r--comms/kmobiletools/Makefile2
-rw-r--r--comms/kpsk/Makefile2
-rw-r--r--comms/ktrack/Makefile2
-rw-r--r--comms/linpsk/Makefile2
-rw-r--r--comms/qfaxreader/Makefile2
-rw-r--r--comms/qsstv/Makefile2
-rw-r--r--comms/tilp2/Makefile1
-rw-r--r--comms/tkhylafax/Makefile2
-rw-r--r--comms/trustedqsl/Makefile2
-rw-r--r--comms/xastir/Makefile4
-rw-r--r--comms/xdx/Makefile2
-rw-r--r--comms/xlog/Makefile1
-rw-r--r--comms/xmorse/Makefile2
-rw-r--r--comms/xnecview/Makefile3
-rw-r--r--comms/xnecview/files/patch-Makefile4
-rw-r--r--comms/xnecview/files/patch-xwin.c11
-rw-r--r--comms/xwota/Makefile2
-rw-r--r--converters/gbsdconv/Makefile1
-rw-r--r--converters/ktextdecode/Makefile2
-rw-r--r--converters/mule-ucs/Makefile2
-rw-r--r--converters/pdf2djvu/Makefile2
-rw-r--r--converters/rcctools/Makefile2
-rw-r--r--converters/wkhtmltopdf/Makefile3
-rw-r--r--databases/akonadi-google/Makefile1
-rw-r--r--databases/akonadi-googledata/Makefile2
-rw-r--r--databases/akonadi/Makefile1
-rw-r--r--databases/animenfo-client-gtk/Makefile2
-rw-r--r--databases/bbdb/Makefile2
-rw-r--r--databases/emma/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/flamerobin/Makefile1
-rw-r--r--databases/gdl2/Makefile2
-rw-r--r--databases/gnome-db/Makefile2
-rw-r--r--databases/grass/Makefile4
-rw-r--r--databases/jrrd/Makefile1
-rw-r--r--databases/kbibtex/Makefile1
-rw-r--r--databases/kmysqladmin/Makefile2
-rw-r--r--databases/knoda/Makefile1
-rw-r--r--databases/ksqlanalyzer/Makefile2
-rw-r--r--databases/ksqlshell/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgda4-bdb/Makefile2
-rw-r--r--databases/libgda4-jdbc/Makefile2
-rw-r--r--databases/libgda4-mdb/Makefile2
-rw-r--r--databases/libgda4-mysql/Makefile2
-rw-r--r--databases/libgda4-postgresql/Makefile2
-rw-r--r--databases/libgda4/Makefile2
-rw-r--r--databases/libgdamm/Makefile1
-rw-r--r--databases/libgnomedb/Makefile2
-rw-r--r--databases/lsdb/Makefile2
-rw-r--r--databases/mergeant/Makefile2
-rw-r--r--databases/mysql-navigator/Makefile2
-rw-r--r--databases/mysql-workbench51/Makefile2
-rw-r--r--databases/mysqlard/Makefile2
-rw-r--r--databases/p5-GraphViz-DBI/Makefile1
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile2
-rw-r--r--databases/p5-RRD-Simple/Makefile2
-rw-r--r--databases/pgadmin3/Makefile1
-rw-r--r--databases/pgworksheet/Makefile2
-rw-r--r--databases/py-qt4-sql/Makefile1
-rw-r--r--databases/py-rrdtool_lgpl/Makefile2
-rw-r--r--databases/py-sqlkit/Makefile2
-rw-r--r--databases/qt-mysql-plugin/Makefile2
-rw-r--r--databases/qt-odbc-plugin/Makefile2
-rw-r--r--databases/qt-pgsql-plugin/Makefile2
-rw-r--r--databases/qt-sqlite-plugin/Makefile2
-rw-r--r--databases/rrdman/Makefile2
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/rrdtool12/Makefile4
-rw-r--r--databases/sqliteman/Makefile2
-rw-r--r--databases/tora/Makefile2
-rw-r--r--databases/virtuoso/Makefile2
-rw-r--r--deskutils/adesklets/Makefile2
-rw-r--r--deskutils/akamaru/Makefile2
-rw-r--r--deskutils/alacarte/Makefile2
-rw-r--r--deskutils/basket/Makefile2
-rw-r--r--deskutils/bmp-docklet/Makefile2
-rw-r--r--deskutils/bookreader/Makefile2
-rw-r--r--deskutils/cairo-dock-plugins/Makefile2
-rw-r--r--deskutils/cairo-dock/Makefile2
-rw-r--r--deskutils/calibre/Makefile2
-rw-r--r--deskutils/cdcat/Makefile1
-rw-r--r--deskutils/chmsee/Makefile2
-rw-r--r--deskutils/conduit/Makefile2
-rw-r--r--deskutils/contacts/Makefile2
-rw-r--r--deskutils/deskbar-applet/Makefile2
-rw-r--r--deskutils/dlume/Makefile2
-rw-r--r--deskutils/dragstack/Makefile2
-rw-r--r--deskutils/drivel/Makefile1
-rw-r--r--deskutils/epoch/Makefile1
-rw-r--r--deskutils/etask/Makefile2
-rw-r--r--deskutils/everygui/Makefile2
-rw-r--r--deskutils/fbreader/Makefile1
-rw-r--r--deskutils/fet/Makefile1
-rw-r--r--deskutils/fusenshi/Makefile2
-rw-r--r--deskutils/ganyremote/Makefile1
-rw-r--r--deskutils/gbirthday/Makefile2
-rw-r--r--deskutils/gdesklets-starterbar/Makefile2
-rw-r--r--deskutils/gdesklets/Makefile1
-rw-r--r--deskutils/genius/Makefile1
-rw-r--r--deskutils/gimmie/Makefile2
-rw-r--r--deskutils/gkrellm-reminder2/Makefile2
-rw-r--r--deskutils/glabels/Makefile2
-rw-r--r--deskutils/glipper/Makefile2
-rw-r--r--deskutils/global-menu/Makefile2
-rw-r--r--deskutils/gnochm/Makefile2
-rw-r--r--deskutils/gnome-blog/Makefile2
-rw-r--r--deskutils/gnome-main-menu/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile1
-rw-r--r--deskutils/gnote/Makefile2
-rw-r--r--deskutils/gnotime/Makefile2
-rw-r--r--deskutils/google-gadgets/Makefile2
-rw-r--r--deskutils/gourmet/Makefile1
-rw-r--r--deskutils/gruler/Makefile2
-rw-r--r--deskutils/gtg/Makefile1
-rw-r--r--deskutils/gtimer/Makefile1
-rw-r--r--deskutils/gtkjournal/Makefile2
-rw-r--r--deskutils/gtodo/Makefile2
-rw-r--r--deskutils/gtweakui/Makefile2
-rw-r--r--deskutils/gucharmap/Makefile1
-rw-r--r--deskutils/gxmessage/Makefile1
-rw-r--r--deskutils/gxneur/Makefile1
-rw-r--r--deskutils/hamster-applet/Makefile2
-rw-r--r--deskutils/hot-babe/Makefile2
-rw-r--r--deskutils/howm/Makefile1
-rw-r--r--deskutils/karamba/Makefile2
-rw-r--r--deskutils/katapult/Makefile2
-rw-r--r--deskutils/kbirthday/Makefile2
-rw-r--r--deskutils/kblticker/Makefile2
-rw-r--r--deskutils/kchm/Makefile2
-rw-r--r--deskutils/kchmviewer-kde4/Makefile2
-rw-r--r--deskutils/kchmviewer/Makefile2
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kdepim4-runtime/Makefile1
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepimlibs4/Makefile1
-rw-r--r--deskutils/kdeplasma-addons/Makefile1
-rw-r--r--deskutils/kdissert/Makefile2
-rw-r--r--deskutils/kickpim/Makefile2
-rw-r--r--deskutils/klipoquery/Makefile2
-rw-r--r--deskutils/kluje/Makefile2
-rw-r--r--deskutils/kmatrix3d/Makefile5
-rw-r--r--deskutils/kmatrix3d/files/patch-src__kmatrix3d.cpp10
-rw-r--r--deskutils/knowit/Makefile2
-rw-r--r--deskutils/kompose/Makefile2
-rw-r--r--deskutils/kooldock/Makefile2
-rw-r--r--deskutils/krefty/Makefile2
-rw-r--r--deskutils/krss/Makefile1
-rw-r--r--deskutils/kruler/Makefile1
-rw-r--r--deskutils/ksmoothdock/Makefile2
-rw-r--r--deskutils/ksshaskpass/Makefile2
-rw-r--r--deskutils/ktagebuch/Makefile2
-rw-r--r--deskutils/labyrinth/Makefile2
-rw-r--r--deskutils/launchy/Makefile1
-rw-r--r--deskutils/libopensync-plugin-evolution2-devel/Makefile2
-rw-r--r--deskutils/libopensync-plugin-evolution2/Makefile2
-rw-r--r--deskutils/ljit/Makefile2
-rw-r--r--deskutils/logjam/Makefile1
-rw-r--r--deskutils/mdh/Makefile2
-rw-r--r--deskutils/metabar/Makefile2
-rw-r--r--deskutils/multisync/Makefile2
-rw-r--r--deskutils/nagaina/Makefile2
-rw-r--r--deskutils/narval/Makefile2
-rw-r--r--deskutils/nautilus-actions/Makefile1
-rw-r--r--deskutils/nautilus-locked-folder/Makefile2
-rw-r--r--deskutils/nautilus-open-terminal/Makefile2
-rw-r--r--deskutils/nautilus-sendto/Makefile2
-rw-r--r--deskutils/notecase/Makefile2
-rw-r--r--deskutils/notification-daemon/Makefile1
-rw-r--r--deskutils/notify-osd/Makefile2
-rw-r--r--deskutils/ontv/Makefile1
-rw-r--r--deskutils/orage/Makefile1
-rw-r--r--deskutils/org-mode.el/Makefile2
-rw-r--r--deskutils/osmo/Makefile2
-rw-r--r--deskutils/p5-ZConf-BGSet/Makefile2
-rw-r--r--deskutils/p5-ZConf-Runner-GUI-GTK/Makefile2
-rw-r--r--deskutils/parcellite/Makefile1
-rw-r--r--deskutils/pinot/Makefile2
-rw-r--r--deskutils/planner.el/Makefile2
-rw-r--r--deskutils/planner/Makefile1
-rw-r--r--deskutils/plasma-applet-cwp/Makefile1
-rw-r--r--deskutils/plasma-applet-daisy/Makefile2
-rw-r--r--deskutils/plasma-applet-fancytasks/Makefile1
-rw-r--r--deskutils/plasma-applet-panelspacer/Makefile2
-rw-r--r--deskutils/plasma-applet-playwolf/Makefile2
-rw-r--r--deskutils/plasma-applet-serverstatuswidget/Makefile2
-rw-r--r--deskutils/plasma-applet-simpleweatherforecast/Makefile2
-rw-r--r--deskutils/plasma-applet-teacooker/Makefile2
-rw-r--r--deskutils/plasma-applet-yawp/Makefile1
-rw-r--r--deskutils/pybookreader/Makefile2
-rw-r--r--deskutils/pypanel/Makefile2
-rw-r--r--deskutils/q4wine/Makefile1
-rw-r--r--deskutils/qlabels/Makefile2
-rw-r--r--deskutils/qorganizer/Makefile2
-rw-r--r--deskutils/qrfcview/Makefile2
-rw-r--r--deskutils/qtm/Makefile1
-rw-r--r--deskutils/recoll/Makefile1
-rw-r--r--deskutils/rednotebook/Makefile1
-rw-r--r--deskutils/rox-memo/Makefile1
-rw-r--r--deskutils/rubrica/Makefile1
-rw-r--r--deskutils/semantik/Makefile2
-rw-r--r--deskutils/silence/Makefile2
-rw-r--r--deskutils/snotes/Makefile2
-rw-r--r--deskutils/splashsetter/Makefile2
-rw-r--r--deskutils/steadyflow/Makefile2
-rw-r--r--deskutils/strigi/Makefile2
-rw-r--r--deskutils/superswitcher/Makefile1
-rw-r--r--deskutils/taskcoach/Makefile1
-rw-r--r--deskutils/taskjuggler/Makefile2
-rw-r--r--deskutils/timer-applet/Makefile2
-rw-r--r--deskutils/tomboy-plugin-latex/Makefile1
-rw-r--r--deskutils/tomboy-plugin-reminder/Makefile1
-rw-r--r--deskutils/tomboy-plugin-todo/Makefile1
-rw-r--r--deskutils/tomboy-plugin-wordcount/Makefile1
-rw-r--r--deskutils/tomboy/Makefile1
-rw-r--r--deskutils/tpb/Makefile2
-rw-r--r--deskutils/treeline/Makefile2
-rw-r--r--deskutils/tuxcards/Makefile1
-rw-r--r--deskutils/vboxgtk/Makefile2
-rw-r--r--deskutils/virt-manager/Makefile1
-rw-r--r--deskutils/vym/Makefile1
-rw-r--r--deskutils/wammu/Makefile2
-rw-r--r--deskutils/x-tile/Makefile1
-rw-r--r--deskutils/xchm/Makefile1
-rw-r--r--deskutils/xfce4-generic-slider/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile2
-rw-r--r--deskutils/xfce4-tumbler/Makefile3
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile2
-rw-r--r--deskutils/xneur/Makefile2
-rw-r--r--deskutils/xpad-current/Makefile1
-rw-r--r--deskutils/xpad/Makefile2
-rw-r--r--deskutils/znotes/Makefile1
-rw-r--r--devel/adasdl/Makefile2
-rw-r--r--devel/alabastra/Makefile2
-rw-r--r--devel/allegro-devel/Makefile4
-rw-r--r--devel/allegro-devel/files/patch-loadpng.c10
-rw-r--r--devel/anjuta-extras/Makefile1
-rw-r--r--devel/anjuta/Makefile2
-rw-r--r--devel/apiextractor/Makefile2
-rw-r--r--devel/autodia/Makefile2
-rw-r--r--devel/bennugd-modules/Makefile6
-rw-r--r--devel/bennugd-modules/files/patch-mod_map-file_png.c37
-rw-r--r--devel/boaconstructor/Makefile2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bouml/Makefile1
-rw-r--r--devel/bug-buddy/Makefile2
-rw-r--r--devel/bzapi/Makefile1
-rw-r--r--devel/bzr-explorer/Makefile1
-rw-r--r--devel/bzr-gtk/Makefile1
-rw-r--r--devel/cedet/Makefile1
-rw-r--r--devel/clanlib/Makefile6
-rw-r--r--devel/clanlib/files/patch-Sources-Display-Providers-png_provider_generic.cpp11
-rw-r--r--devel/clewn/Makefile1
-rw-r--r--devel/cmake-gui/Makefile1
-rw-r--r--devel/codeblocks/Makefile1
-rw-r--r--devel/crossvc/Makefile2
-rw-r--r--devel/cutter/Makefile1
-rw-r--r--devel/cvsgraph/Makefile2
-rw-r--r--devel/d-feet/Makefile2
-rw-r--r--devel/datadesigner/Makefile2
-rw-r--r--devel/dbus-qt3/Makefile2
-rw-r--r--devel/dbus-sharp/Makefile2
-rw-r--r--devel/dcmtk/Makefile3
-rw-r--r--devel/dconf/Makefile2
-rw-r--r--devel/devhelp/Makefile2
-rw-r--r--devel/diffuse/Makefile1
-rw-r--r--devel/directfb/Makefile6
-rw-r--r--devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c28
-rw-r--r--devel/directfb/files/patch-tools-directfb-csource.c19
-rw-r--r--devel/directfb/files/patch-tools-mkdfiff.c11
-rw-r--r--devel/directfb/files/patch-tools-mkdgifft.cpp11
-rw-r--r--devel/dissy/Makefile1
-rw-r--r--devel/distel/Makefile2
-rw-r--r--devel/doxygen/Makefile3
-rw-r--r--devel/dreampie/Makefile1
-rw-r--r--devel/drpython/Makefile2
-rw-r--r--devel/ecb/Makefile2
-rw-r--r--devel/ecos-tools/Makefile2
-rw-r--r--devel/eieio/Makefile2
-rw-r--r--devel/elib/Makefile2
-rw-r--r--devel/esdl/Makefile2
-rw-r--r--devel/esvn/Makefile2
-rw-r--r--devel/evolution-gconf-tools/Makefile2
-rw-r--r--devel/flatzebra/Makefile2
-rw-r--r--devel/flowdesigner/Makefile2
-rw-r--r--devel/fpc-fcl-image/Makefile2
-rw-r--r--devel/fpc-newt/Makefile2
-rw-r--r--devel/fpc-sdl/Makefile1
-rw-r--r--devel/frama-c/Makefile2
-rw-r--r--devel/gaphor/Makefile2
-rw-r--r--devel/gaul/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gconfmm/Makefile2
-rw-r--r--devel/gconfmm26/Makefile1
-rw-r--r--devel/gdcm/Makefile2
-rw-r--r--devel/geany/Makefile1
-rw-r--r--devel/generatorrunner/Makefile2
-rw-r--r--devel/giggle/Makefile2
-rw-r--r--devel/gio-sharp/Makefile1
-rw-r--r--devel/gitg/Makefile1
-rw-r--r--devel/glade2/Makefile2
-rw-r--r--devel/glade3/Makefile1
-rw-r--r--devel/gnome-vfs-monikers/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnome-vfsmm/Makefile2
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--devel/goffice04/Makefile2
-rw-r--r--devel/goffice06/Makefile2
-rw-r--r--devel/goffice1/Makefile2
-rw-r--r--devel/gps/Makefile1
-rw-r--r--devel/gpsim/Makefile2
-rw-r--r--devel/grantlee/Makefile1
-rw-r--r--devel/gstreamer-plugins-gconf/Makefile2
-rw-r--r--devel/gstreamer-plugins-gnomevfs/Makefile2
-rw-r--r--devel/gtkparasite/Makefile2
-rw-r--r--devel/gtranslator/Makefile2
-rw-r--r--devel/guichan/Makefile2
-rw-r--r--devel/guikachu/Makefile2
-rw-r--r--devel/guiloader-c++/Makefile1
-rw-r--r--devel/guiloader/Makefile1
-rw-r--r--devel/gvfs/Makefile2
-rw-r--r--devel/gwenhywfar/Makefile1
-rw-r--r--devel/hgview/Makefile2
-rw-r--r--devel/hs-gconf/Makefile1
-rw-r--r--devel/hs-glade/Makefile1
-rw-r--r--devel/hs-threadscope/Makefile1
-rw-r--r--devel/hyena/Makefile1
-rw-r--r--devel/hypersrc/Makefile2
-rw-r--r--devel/ipython/Makefile2
-rw-r--r--devel/kaptain/Makefile2
-rw-r--r--devel/kcachegrind/Makefile2
-rw-r--r--devel/kdbg/Makefile2
-rw-r--r--devel/kdebindings4-python-krosspython/Makefile1
-rw-r--r--devel/kdebindings4-python-pykde4/Makefile1
-rw-r--r--devel/kdebindings4-python-pykdeuic4/Makefile1
-rw-r--r--devel/kdebindings4-ruby-korundum/Makefile1
-rw-r--r--devel/kdebindings4-ruby-qtruby/Makefile1
-rw-r--r--devel/kdebindings4-smoke-smokekde/Makefile1
-rw-r--r--devel/kdebindings4-smoke-smokeqt/Makefile1
-rw-r--r--devel/kdesdk3/Makefile2
-rw-r--r--devel/kdesdk4/Makefile1
-rw-r--r--devel/kdesvn-kde4/Makefile2
-rw-r--r--devel/kdevelop-kde4/Makefile2
-rw-r--r--devel/kdevelop-pg-qt/Makefile1
-rw-r--r--devel/kdevelop-php-docs/Makefile1
-rw-r--r--devel/kdevelop-php/Makefile1
-rw-r--r--devel/kdevelop/Makefile2
-rw-r--r--devel/kdevplatform/Makefile2
-rw-r--r--devel/klassmodeler/Makefile2
-rw-r--r--devel/kodos/Makefile2
-rw-r--r--devel/kprof/Makefile2
-rw-r--r--devel/kscope/Makefile2
-rw-r--r--devel/kyra/Makefile4
-rw-r--r--devel/lasi/Makefile2
-rw-r--r--devel/lbpp/Makefile2
-rw-r--r--devel/libYGP/Makefile1
-rw-r--r--devel/libast/Makefile2
-rw-r--r--devel/libbonobomm/Makefile2
-rw-r--r--devel/libchipcard/Makefile2
-rw-r--r--devel/libclaw/Makefile4
-rw-r--r--devel/libclaw/files/patch-png.hpp10
-rw-r--r--devel/libdbusmenu-qt/Makefile1
-rw-r--r--devel/libdlna/Makefile2
-rw-r--r--devel/libgconf-java/Makefile2
-rw-r--r--devel/libgdata/Makefile1
-rw-r--r--devel/libglade-java/Makefile2
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libglademm/Makefile2
-rw-r--r--devel/libglademm24/Makefile2
-rw-r--r--devel/libgsf-gnome/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libmcs/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/libparserutils/Makefile1
-rw-r--r--devel/librcc/Makefile2
-rw-r--r--devel/libsigcx/Makefile2
-rw-r--r--devel/libslang2/Makefile4
-rw-r--r--devel/libsoup-gnome/Makefile2
-rw-r--r--devel/libzvbi/Makefile4
-rw-r--r--devel/libzvbi/files/patch-src-exp-gfx.c16
-rw-r--r--devel/love/Makefile1
-rw-r--r--devel/love5/Makefile2
-rw-r--r--devel/m17n-lib/Makefile1
-rw-r--r--devel/magit/Makefile1
-rw-r--r--devel/mono-addins/Makefile1
-rw-r--r--devel/monodevelop-database/Makefile1
-rw-r--r--devel/monodevelop-java/Makefile1
-rw-r--r--devel/monodevelop-python/Makefile1
-rw-r--r--devel/monodevelop-vala/Makefile1
-rw-r--r--devel/monodevelop/Makefile1
-rw-r--r--devel/monotone-viz/Makefile2
-rw-r--r--devel/nemiver/Makefile2
-rw-r--r--devel/newt/Makefile2
-rw-r--r--devel/ninja-ide/Makefile2
-rw-r--r--devel/notify-sharp/Makefile1
-rw-r--r--devel/ocaml-sdl/Makefile2
-rw-r--r--devel/ocamlweb/Makefile2
-rw-r--r--devel/otrs/Makefile1
-rw-r--r--devel/p5-Algorithm-Accounting/Makefile2
-rw-r--r--devel/p5-Algorithm-Evolutionary/Makefile1
-rw-r--r--devel/p5-Cairo-GObject/Makefile1
-rw-r--r--devel/p5-Data-TreeDumper-Renderer-GTK/Makefile2
-rw-r--r--devel/p5-Devel-ptkdb/Makefile2
-rw-r--r--devel/p5-FSA-Rules/Makefile1
-rw-r--r--devel/p5-Gnome2-GConf/Makefile2
-rw-r--r--devel/p5-Goo-Canvas/Makefile2
-rw-r--r--devel/p5-Gtk2-Spell/Makefile2
-rw-r--r--devel/p5-Log-Accounting-SVK/Makefile2
-rw-r--r--devel/p5-Log-Accounting-SVN/Makefile2
-rw-r--r--devel/p5-POE-Loop-Tk/Makefile1
-rw-r--r--devel/p5-Project-Gantt/Makefile2
-rw-r--r--devel/p5-RRDTool-OO/Makefile2
-rw-r--r--devel/p5-SDL/Makefile4
-rw-r--r--devel/p5-SVN-Statistics/Makefile2
-rw-r--r--devel/p5-Sepia/Makefile2
-rw-r--r--devel/p5-Test-Parser/Makefile2
-rw-r--r--devel/p5-doxygenfilter/Makefile2
-rw-r--r--devel/pharmacy/Makefile2
-rw-r--r--devel/pikdev/Makefile4
-rw-r--r--devel/piklab/Makefile2
-rw-r--r--devel/preps-gui/Makefile2
-rw-r--r--devel/prepstools/Makefile1
-rw-r--r--devel/present/Makefile2
-rw-r--r--devel/psvn/Makefile2
-rw-r--r--devel/py-game/Makefile2
-rw-r--r--devel/py-gobject/Makefile1
-rw-r--r--devel/py-itools/Makefile1
-rw-r--r--devel/py-libgsf/Makefile2
-rw-r--r--devel/py-liblarch/Makefile1
-rw-r--r--devel/py-liblarch_gtk/Makefile1
-rw-r--r--devel/py-mwlib.rl/Makefile1
-rw-r--r--devel/py-notify/Makefile2
-rw-r--r--devel/py-ocempgui/Makefile2
-rw-r--r--devel/py-pycallgraph/Makefile2
-rw-r--r--devel/py-qt4-assistant/Makefile1
-rw-r--r--devel/py-qt4-core/Makefile1
-rw-r--r--devel/py-qt4-dbus/Makefile1
-rw-r--r--devel/py-qt4-declarative/Makefile1
-rw-r--r--devel/py-qt4-designer/Makefile1
-rw-r--r--devel/py-qt4-designerplugin/Makefile1
-rw-r--r--devel/py-qt4-help/Makefile1
-rw-r--r--devel/py-qt4-qscintilla2/Makefile1
-rw-r--r--devel/py-qt4-script/Makefile1
-rw-r--r--devel/py-qt4-scripttools/Makefile1
-rw-r--r--devel/py-qt4-test/Makefile1
-rw-r--r--devel/py-roxlib/Makefile2
-rw-r--r--devel/pymacs/Makefile2
-rw-r--r--devel/pyside-tools/Makefile2
-rw-r--r--devel/pyside/Makefile2
-rw-r--r--devel/qbzr/Makefile2
-rw-r--r--devel/qct/Makefile2
-rw-r--r--devel/qdevelop/Makefile1
-rw-r--r--devel/qgit/Makefile1
-rw-r--r--devel/qjson/Makefile2
-rw-r--r--devel/qprog/Makefile2
-rw-r--r--devel/qsa/Makefile1
-rw-r--r--devel/qscintilla2-designerplugin/Makefile1
-rw-r--r--devel/qscintilla2/Makefile1
-rw-r--r--devel/qssl/Makefile2
-rw-r--r--devel/qsvn/Makefile2
-rw-r--r--devel/qt4-assistant-adp/Makefile1
-rw-r--r--devel/qt4-assistant/Makefile1
-rw-r--r--devel/qt4-declarative/Makefile1
-rw-r--r--devel/qt4-designer/Makefile1
-rw-r--r--devel/qt4-help-tools/Makefile1
-rw-r--r--devel/qt4-help/Makefile1
-rw-r--r--devel/qt4-libqtassistantclient/Makefile1
-rw-r--r--devel/qt4-linguist/Makefile1
-rw-r--r--devel/qt4-makeqpf/Makefile1
-rw-r--r--devel/qt4-qdbusviewer/Makefile1
-rw-r--r--devel/qt4-qdoc3/Makefile1
-rw-r--r--devel/qt4-qt3support/Makefile1
-rw-r--r--devel/qt4-qtsolutions-singleapplication/Makefile1
-rw-r--r--devel/qt4-qvfb/Makefile1
-rw-r--r--devel/qt4-scripttools/Makefile1
-rw-r--r--devel/qt4-uic3/Makefile1
-rw-r--r--devel/qtcreator/Makefile1
-rw-r--r--devel/qtscriptgenerator/Makefile1
-rw-r--r--devel/rapidsvn/Makefile2
-rw-r--r--devel/regexxer/Makefile2
-rw-r--r--devel/ros-documentation/Makefile1
-rw-r--r--devel/ros-image_common/Makefile1
-rw-r--r--devel/ros-laser_pipeline/Makefile1
-rw-r--r--devel/ros-rx/Makefile1
-rw-r--r--devel/ros_tutorials/Makefile2
-rw-r--r--devel/ruby-rbbr/Makefile2
-rw-r--r--devel/ruby-sdl/Makefile2
-rw-r--r--devel/sdl_sge/Makefile2
-rw-r--r--devel/seed/Makefile2
-rw-r--r--devel/semantic/Makefile2
-rw-r--r--devel/sfml/Makefile4
-rw-r--r--devel/shiboken/Makefile2
-rw-r--r--devel/simgear/Makefile2
-rw-r--r--devel/simulavr/Makefile2
-rw-r--r--devel/subcommander/Makefile2
-rw-r--r--devel/subcommander2/Makefile2
-rw-r--r--devel/synfig/Makefile3
-rw-r--r--devel/thunar-vcs-plugin/Makefile2
-rw-r--r--devel/titano/Makefile2
-rw-r--r--devel/tortoisehg2/Makefile2
-rw-r--r--devel/umlgraph/Makefile2
-rw-r--r--devel/universalindentgui/Makefile2
-rw-r--r--devel/upp/Makefile2
-rw-r--r--devel/valide/Makefile1
-rw-r--r--devel/wininfo/Makefile2
-rw-r--r--devel/winpdb/Makefile1
-rw-r--r--devel/wxGlade/Makefile1
-rw-r--r--devel/xtla/Makefile2
-rw-r--r--dns/gresolver/Makefile2
-rw-r--r--editors/abiword-docs/Makefile1
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/abiword/files/patch-src_af_util_xp_ut_png.cpp11
-rw-r--r--editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp20
-rw-r--r--editors/apel/Makefile2
-rw-r--r--editors/biew/Makefile2
-rw-r--r--editors/bless/Makefile2
-rw-r--r--editors/calligra/Makefile3
-rw-r--r--editors/code-browser/Makefile1
-rw-r--r--editors/codelite/Makefile1
-rw-r--r--editors/conglomerate/Makefile2
-rw-r--r--editors/cream/Makefile1
-rw-r--r--editors/emacs-devel/Makefile3
-rw-r--r--editors/emacs/Makefile3
-rw-r--r--editors/emacs21/Makefile4
-rw-r--r--editors/emacs21/files/patch-src-xfns.c20
-rw-r--r--editors/emacs22/Makefile4
-rw-r--r--editors/emacs23/Makefile3
-rw-r--r--editors/f4l/Makefile2
-rw-r--r--editors/flim/Makefile2
-rw-r--r--editors/fpc-ide/Makefile2
-rw-r--r--editors/fxite/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile2
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/ghex/Makefile2
-rw-r--r--editors/glimmer/Makefile2
-rw-r--r--editors/gmanedit/Makefile2
-rw-r--r--editors/gnuserv/Makefile2
-rw-r--r--editors/gobby/Makefile2
-rw-r--r--editors/gwrite/Makefile1
-rw-r--r--editors/jed/Makefile2
-rw-r--r--editors/kate/Makefile1
-rw-r--r--editors/kile-kde4/Makefile1
-rw-r--r--editors/kile/Makefile2
-rw-r--r--editors/klat/Makefile2
-rw-r--r--editors/klat4/Makefile2
-rw-r--r--editors/komodo-edit/Makefile2
-rw-r--r--editors/kxmleditor/Makefile2
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/leafpad/Makefile1
-rw-r--r--editors/leo/Makefile2
-rw-r--r--editors/lfhex/Makefile1
-rw-r--r--editors/libreoffice/Makefile4
-rw-r--r--editors/madedit/Makefile2
-rw-r--r--editors/mlview/Makefile2
-rw-r--r--editors/mode-info/Makefile2
-rw-r--r--editors/morla/Makefile2
-rw-r--r--editors/mousepad/Makefile2
-rw-r--r--editors/openoffice-3-devel/Makefile1
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile2
-rw-r--r--editors/p5-Vimana/Makefile2
-rw-r--r--editors/pdfedit/Makefile1
-rw-r--r--editors/poedit/Makefile2
-rw-r--r--editors/psgml/Makefile2
-rw-r--r--editors/py-room/Makefile2
-rw-r--r--editors/rospell/Makefile2
-rw-r--r--editors/rox-edit/Makefile1
-rw-r--r--editors/scite/Makefile1
-rw-r--r--editors/scribes/Makefile2
-rw-r--r--editors/semi/Makefile2
-rw-r--r--editors/slime/Makefile2
-rw-r--r--editors/spe/Makefile2
-rw-r--r--editors/speedbar/Makefile2
-rw-r--r--editors/tamago/Makefile2
-rw-r--r--editors/tea/Makefile1
-rw-r--r--editors/ted/Makefile4
-rw-r--r--editors/ted/files/patch-bitmap-bmpng.c10
-rw-r--r--editors/texmacs/Makefile1
-rw-r--r--editors/texmaker/Makefile1
-rw-r--r--editors/texmakerx/Makefile2
-rw-r--r--editors/textroom/Makefile2
-rw-r--r--editors/texworks/Makefile2
-rw-r--r--editors/tree-widget/Makefile2
-rw-r--r--editors/vim/Makefile2
-rw-r--r--editors/winefish/Makefile2
-rw-r--r--editors/xemacs-devel-mule/Makefile8
-rw-r--r--editors/xemacs-devel-mule/files/patch-glyphs-eimage.c10
-rw-r--r--editors/xemacs-devel/Makefile5
-rw-r--r--editors/xemacs-devel/files/patch-glyphs-eimage.c10
-rw-r--r--editors/xemacs/Makefile7
-rw-r--r--editors/xemacs/files/patch-src__glyphs-eimage.c10
-rw-r--r--editors/xemacs21-mule/Makefile7
-rw-r--r--editors/xemacs21-mule/files/patch-glyphs-eimage.c10
-rw-r--r--editors/xmlcopyeditor/Makefile2
-rw-r--r--editors/xmleditor/Makefile2
-rw-r--r--editors/yzis/Makefile2
-rw-r--r--editors/zim/Makefile1
-rw-r--r--emulators/aqemu/Makefile1
-rw-r--r--emulators/atari800/Makefile4
-rw-r--r--emulators/bsnes/Makefile1
-rw-r--r--emulators/catapult/Makefile1
-rw-r--r--emulators/dboxfe/Makefile2
-rw-r--r--emulators/desmume/Makefile2
-rw-r--r--emulators/dolphin-emu-devel/Makefile2
-rw-r--r--emulators/dosbox/Makefile4
-rw-r--r--emulators/e-uae/Makefile2
-rw-r--r--emulators/fceux/Makefile2
-rw-r--r--emulators/fuse/Makefile3
-rw-r--r--emulators/fuse/files/patch-screenshot.c10
-rw-r--r--emulators/gens/Makefile2
-rw-r--r--emulators/gngeo/Makefile2
-rw-r--r--emulators/gns3/Makefile2
-rw-r--r--emulators/gsnes9x/Makefile2
-rw-r--r--emulators/gxmame/Makefile2
-rw-r--r--emulators/hatari/Makefile4
-rw-r--r--emulators/hugo/Makefile2
-rw-r--r--emulators/kcemu/Makefile2
-rw-r--r--emulators/lisaem/Makefile2
-rw-r--r--emulators/mupen64plus-core/Makefile2
-rw-r--r--emulators/mupen64plus-core/Makefile.common4
-rw-r--r--emulators/mupen64plus-rsp-z64/Makefile2
-rw-r--r--emulators/mupen64plus-video-arachnoid/Makefile2
-rw-r--r--emulators/mupen64plus-video-glide64/Makefile2
-rw-r--r--emulators/mupen64plus-video-z64/Makefile2
-rw-r--r--emulators/nonpareil/Makefile4
-rw-r--r--emulators/nonpareil/files/patch-src_printer.c10
-rw-r--r--emulators/open-vm-tools/Makefile1
-rw-r--r--emulators/openmsx/Makefile4
-rw-r--r--emulators/osmose/Makefile1
-rw-r--r--emulators/pcsxr/Makefile1
-rw-r--r--emulators/qemu-devel/Makefile4
-rw-r--r--emulators/qmc2/Makefile1
-rw-r--r--emulators/qtemu/Makefile2
-rw-r--r--emulators/raine/Makefile4
-rw-r--r--emulators/raine/files/patch-patch-source_png_savepng.c11
-rw-r--r--emulators/raine/files/patch-source_png_loadpng.c29
-rw-r--r--emulators/skyeye/Makefile2
-rw-r--r--emulators/snes9express/Makefile1
-rw-r--r--emulators/snes9x-gtk/Makefile4
-rw-r--r--emulators/snes9x/Makefile6
-rw-r--r--emulators/stella/Makefile3
-rw-r--r--emulators/tiemu2/Makefile2
-rw-r--r--emulators/tiemu3/Makefile2
-rw-r--r--emulators/tilem/Makefile2
-rw-r--r--emulators/uae/Makefile2
-rw-r--r--emulators/vba/Makefile9
-rw-r--r--emulators/vba/files/patch-src-Util.cpp11
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile4
-rw-r--r--emulators/virtualbox-ose/Makefile3
-rw-r--r--emulators/visualboyadvance-m/Makefile4
-rw-r--r--emulators/visualos/Makefile2
-rw-r--r--emulators/vmips/Makefile2
-rw-r--r--emulators/wine-devel/Makefile3
-rw-r--r--emulators/wine/Makefile3
-rw-r--r--emulators/wxmupen64plus/Makefile2
-rw-r--r--emulators/yabause/Makefile1
-rw-r--r--emulators/zsnes/Makefile8
-rw-r--r--emulators/zsnes/files/patch-zpng.c10
-rw-r--r--finance/aqbanking/Makefile1
-rw-r--r--finance/eqonomize-kde3/Makefile2
-rw-r--r--finance/eqonomize-kde4/Makefile2
-rw-r--r--finance/gnofin/Makefile2
-rw-r--r--finance/gnucash-docs/Makefile1
-rw-r--r--finance/gnucash/Makefile1
-rw-r--r--finance/grisbi/Makefile1
-rw-r--r--finance/homebank/Makefile2
-rw-r--r--finance/kexchange/Makefile2
-rw-r--r--finance/khacc/Makefile2
-rw-r--r--finance/kmymoney-kde4/Makefile2
-rw-r--r--finance/kmymoney2/Makefile2
-rw-r--r--finance/libalkimia/Makefile1
-rw-r--r--finance/openerp-server/Makefile1
-rw-r--r--finance/qhacc/Makefile2
-rw-r--r--finance/qtstalker/Makefile2
-rw-r--r--finance/sabernetdcs-client/Makefile2
-rw-r--r--finance/skrooge/Makefile1
-rw-r--r--finance/trytond/Makefile1
-rw-r--r--finance/xtrader/Makefile2
-rw-r--r--french/alphabet_sounds_fr/Makefile2
-rw-r--r--french/aster/Makefile2
-rw-r--r--french/kde3-i18n/Makefile2
-rw-r--r--french/kde4-l10n/Makefile1
-rw-r--r--french/tvdownloader/Makefile2
-rw-r--r--ftp/bareftp/Makefile1
-rw-r--r--ftp/filezilla/Makefile1
-rw-r--r--ftp/ftpcube/Makefile2
-rw-r--r--ftp/gftp/Makefile2
-rw-r--r--ftp/gwget/Makefile2
-rw-r--r--ftp/kasablanca/Makefile2
-rw-r--r--ftp/kbear/Makefile2
-rw-r--r--ftp/kftpgrabber/Makefile2
-rw-r--r--ftp/kpum/Makefile2
-rw-r--r--ftp/multiget/Makefile2
-rw-r--r--ftp/plasma-applet-ftpmonitor/Makefile2
-rw-r--r--ftp/pureadmin/Makefile2
-rw-r--r--ftp/scythia/Makefile2
-rw-r--r--ftp/urlgfe/Makefile2
-rw-r--r--games/0ad/Makefile3
-rw-r--r--games/4stattack/Makefile2
-rw-r--r--games/54321/Makefile4
-rw-r--r--games/adgali/Makefile4
-rw-r--r--games/adgali/files/patch-src-input-imageio-agl_pngio.c20
-rw-r--r--games/afternoonstalker/Makefile2
-rw-r--r--games/agame/Makefile2
-rw-r--r--games/alephone/Makefile1
-rw-r--r--games/alienarena/Makefile4
-rw-r--r--games/allacrost/Makefile6
-rw-r--r--games/allacrost/files/patch-src-engine-video-image.cpp10
-rw-r--r--games/allacrost/files/patch-src-engine-video-image_base.cpp10
-rw-r--r--games/amoebax/Makefile2
-rw-r--r--games/anki/Makefile.inc2
-rw-r--r--games/armagetron/Makefile4
-rw-r--r--games/asc/Makefile2
-rw-r--r--games/assaultcube/Makefile2
-rw-r--r--games/atomix/Makefile2
-rw-r--r--games/avoision/Makefile3
-rw-r--r--games/battletanks/Makefile2
-rw-r--r--games/belooted/Makefile2
-rw-r--r--games/biloba/Makefile2
-rw-r--r--games/biniax2/Makefile2
-rw-r--r--games/blackjack/Makefile2
-rw-r--r--games/blinken/Makefile1
-rw-r--r--games/blinkensisters/Makefile2
-rw-r--r--games/bloboats/Makefile2
-rw-r--r--games/blokish/Makefile2
-rw-r--r--games/bloodfrontier/Makefile2
-rw-r--r--games/bomberclone/Makefile2
-rw-r--r--games/bombermaze/Makefile2
-rw-r--r--games/bomns/Makefile2
-rw-r--r--games/boswars/Makefile4
-rw-r--r--games/brainparty/Makefile2
-rw-r--r--games/brickshooter/Makefile2
-rw-r--r--games/brikx/Makefile2
-rw-r--r--games/briquolo/Makefile4
-rw-r--r--games/brutalchess/Makefile2
-rw-r--r--games/bubbros/Makefile2
-rw-r--r--games/bugsquish/Makefile2
-rw-r--r--games/bumprace/Makefile2
-rw-r--r--games/burgerspace/Makefile2
-rw-r--r--games/burrtools/Makefile3
-rw-r--r--games/bygfoot/Makefile2
-rw-r--r--games/caph/Makefile4
-rw-r--r--games/cave9/Makefile2
-rw-r--r--games/ceferino/Makefile2
-rw-r--r--games/chanta/Makefile2
-rw-r--r--games/chapping/Makefile2
-rw-r--r--games/cheech/Makefile2
-rw-r--r--games/childsplay_plugins/Makefile1
-rw-r--r--games/chroma/Makefile2
-rw-r--r--games/chromium-bsu/Makefile2
-rw-r--r--games/circuslinux/Makefile2
-rw-r--r--games/colorcode/Makefile1
-rw-r--r--games/concentration/Makefile2
-rw-r--r--games/cosmosmash/Makefile2
-rw-r--r--games/crack-attack/Makefile2
-rw-r--r--games/cretan-hubris/Makefile3
-rw-r--r--games/criticalmass/Makefile5
-rw-r--r--games/criticalmass/files/patch-game__main.cpp10
-rw-r--r--games/criticalmass/files/patch-utilssdl_PNG.cpp19
-rw-r--r--games/crossfire-client/Makefile2
-rw-r--r--games/crossfire-server/Makefile3
-rw-r--r--games/csmash/Makefile2
-rw-r--r--games/cube/Makefile2
-rw-r--r--games/cuyo/Makefile2
-rw-r--r--games/d2x-xl/Makefile2
-rw-r--r--games/d2x/Makefile2
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/dangen/Makefile2
-rw-r--r--games/dangerdeep/Makefile2
-rw-r--r--games/demonquake/Makefile8
-rw-r--r--games/demonquake/files/patch-gl_image.c37
-rw-r--r--games/deng/Makefile5
-rw-r--r--games/deng/files/patch-gl_png.c10
-rw-r--r--games/diameter/Makefile5
-rw-r--r--games/dodgindiamond2/Makefile2
-rw-r--r--games/easysok/Makefile2
-rw-r--r--games/eboard/Makefile4
-rw-r--r--games/eboard/files/patch-cimg.cc10
-rw-r--r--games/edge/Makefile4
-rw-r--r--games/edge/files/patch-epi__image_png.cc37
-rw-r--r--games/eduke32/Makefile2
-rw-r--r--games/egl/Makefile6
-rw-r--r--games/egl/files/patch-renderer__rf_image.c21
-rw-r--r--games/egoboo/Makefile2
-rw-r--r--games/el/Makefile4
-rw-r--r--games/ember/Makefile2
-rw-r--r--games/endgame-singularity/Makefile2
-rw-r--r--games/enigma/Makefile7
-rw-r--r--games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c33
-rw-r--r--games/ensemblist/Makefile4
-rw-r--r--games/etracer/Makefile6
-rw-r--r--games/excido/Makefile2
-rw-r--r--games/ezquake/Makefile8
-rw-r--r--games/ezquake/files/patch-image.c119
-rw-r--r--games/f1spirit-remake/Makefile2
-rw-r--r--games/farblazer/Makefile2
-rw-r--r--games/fbg2/Makefile3
-rw-r--r--games/fgkicker/Makefile2
-rw-r--r--games/fgrun/Makefile2
-rw-r--r--games/fillets-ng/Makefile2
-rw-r--r--games/fishsupper/Makefile2
-rw-r--r--games/flare/Makefile2
-rw-r--r--games/flightgear-atlas/Makefile4
-rw-r--r--games/flightgear/Makefile2
-rw-r--r--games/flobopuyo/Makefile2
-rw-r--r--games/flyhard/Makefile4
-rw-r--r--games/foobillard/Makefile4
-rw-r--r--games/formido/Makefile2
-rw-r--r--games/freeciv/Makefile3
-rw-r--r--games/freedink-dfarc/Makefile2
-rw-r--r--games/freedink-engine/Makefile2
-rw-r--r--games/freedoko/Makefile1
-rw-r--r--games/freedroid/Makefile2
-rw-r--r--games/freedroidrpg/Makefile2
-rw-r--r--games/freeorion/Makefile2
-rw-r--r--games/freesci/Makefile2
-rw-r--r--games/freesynd/Makefile4
-rw-r--r--games/freetennis/Makefile2
-rw-r--r--games/frogatto/Makefile5
-rw-r--r--games/frogatto/files/patch-src-IMG_savepng.cpp10
-rw-r--r--games/frozenbubble/Makefile2
-rw-r--r--games/fteqw/Makefile10
-rw-r--r--games/fteqw/files/patch-client__image.c74
-rw-r--r--games/fuhquake/Makefile5
-rw-r--r--games/fuhquake/files/patch-image.c38
-rw-r--r--games/fxsudoku/Makefile2
-rw-r--r--games/galaxyhack/Makefile2
-rw-r--r--games/galaxymage/Makefile2
-rw-r--r--games/gbottler/Makefile1
-rw-r--r--games/gbrainy/Makefile1
-rw-r--r--games/gcompris/Makefile1
-rw-r--r--games/gdado/Makefile2
-rw-r--r--games/gemrb/Makefile3
-rw-r--r--games/ggz-gtk-client/Makefile2
-rw-r--r--games/ggz-gtk-games/Makefile2
-rw-r--r--games/ggz-kde-client/Makefile2
-rw-r--r--games/ggz-sdl-games/Makefile2
-rw-r--r--games/glaxium/Makefile4
-rw-r--r--games/glchess/Makefile2
-rw-r--r--games/glife/Makefile2
-rw-r--r--games/glob2/Makefile2
-rw-r--r--games/gltron/Makefile4
-rw-r--r--games/gnmm/Makefile2
-rw-r--r--games/gno3dtet/Makefile2
-rw-r--r--games/gnome-games-extra-data/Makefile2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomeattacks/Makefile2
-rw-r--r--games/gnomebreakout/Makefile2
-rw-r--r--games/gnomechess/Makefile2
-rw-r--r--games/gnomekiss/Makefile2
-rw-r--r--games/gnomememoryblocks/Makefile2
-rw-r--r--games/gnomermind/Makefile2
-rw-r--r--games/gnomesudoku/Makefile2
-rw-r--r--games/gnono/Makefile2
-rw-r--r--games/gnubg/Makefile5
-rw-r--r--games/gnudoku/Makefile2
-rw-r--r--games/gnurobbo/Makefile2
-rw-r--r--games/gnurobots/Makefile2
-rw-r--r--games/goonies/Makefile2
-rw-r--r--games/gracer/Makefile7
-rw-r--r--games/gracer/files/patch-gr_texture.c11
-rw-r--r--games/gretools/Makefile2
-rw-r--r--games/grhino/Makefile1
-rw-r--r--games/gtetrinet/Makefile2
-rw-r--r--games/gtkatlantic/Makefile1
-rw-r--r--games/gtkballs/Makefile2
-rw-r--r--games/gtklife/Makefile2
-rw-r--r--games/gtkpool/Makefile2
-rw-r--r--games/gtkradiant/Makefile7
-rw-r--r--games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp41
-rw-r--r--games/gtkradiant/files/patch-tools__quake3__q3map2__image.c19
-rw-r--r--games/gtktetcolor/Makefile2
-rw-r--r--games/gturing/Makefile2
-rw-r--r--games/gweled/Makefile2
-rw-r--r--games/hangman/Makefile2
-rw-r--r--games/hedgewars/Makefile2
-rw-r--r--games/hex/Makefile2
-rw-r--r--games/hexalate/Makefile2
-rw-r--r--games/hexglass/Makefile1
-rw-r--r--games/hexxagon/Makefile1
-rw-r--r--games/highmoon/Makefile2
-rw-r--r--games/holotz-castle/Makefile2
-rw-r--r--games/instead/Makefile1
-rw-r--r--games/intensityengine/Makefile2
-rw-r--r--games/interlogic/Makefile2
-rw-r--r--games/irrlamb/Makefile2
-rw-r--r--games/jag/Makefile1
-rw-r--r--games/jfk/Makefile2
-rw-r--r--games/jfsw/Makefile2
-rw-r--r--games/jigzo/Makefile4
-rw-r--r--games/joequake/Makefile4
-rw-r--r--games/jools/Makefile2
-rw-r--r--games/kajongg/Makefile1
-rw-r--r--games/kamikaze/Makefile1
-rw-r--r--games/kanagram/Makefile1
-rw-r--r--games/kanatest/Makefile1
-rw-r--r--games/kardsgt/Makefile2
-rw-r--r--games/kartofel/Makefile2
-rw-r--r--games/kcheckers/Makefile1
-rw-r--r--games/kdegames3/Makefile2
-rw-r--r--games/kdegames4/Makefile1
-rw-r--r--games/kfreerings/Makefile2
-rw-r--r--games/khangman/Makefile1
-rw-r--r--games/kiki/Makefile2
-rw-r--r--games/klavaro/Makefile1
-rw-r--r--games/kmancala/Makefile2
-rw-r--r--games/kmastermind/Makefile2
-rw-r--r--games/kmquake2/Makefile4
-rw-r--r--games/knights-kde4/Makefile2
-rw-r--r--games/knights/Makefile2
-rw-r--r--games/kobodeluxe/Makefile2
-rw-r--r--games/kpicframer/Makefile2
-rw-r--r--games/kpictorial/Makefile2
-rw-r--r--games/kpuzzle/Makefile2
-rw-r--r--games/ksudoku/Makefile2
-rw-r--r--games/ktritoc/Makefile2
-rw-r--r--games/kwappen/Makefile2
-rw-r--r--games/lander/Makefile2
-rw-r--r--games/lbreakout2/Makefile6
-rw-r--r--games/lbreakout2/files/patch-stk.c35
-rw-r--r--games/legesmotus/Makefile2
-rw-r--r--games/lianliankan/Makefile2
-rw-r--r--games/lincity-ng/Makefile2
-rw-r--r--games/lincity/Makefile4
-rw-r--r--games/liquidwar/Makefile2
-rw-r--r--games/lordsawar/Makefile2
-rw-r--r--games/lucidlife/Makefile2
-rw-r--r--games/luola/Makefile2
-rw-r--r--games/macopix/Makefile4
-rw-r--r--games/madbomber/Makefile2
-rw-r--r--games/mahjong/Makefile1
-rw-r--r--games/marsnomercy/Makefile2
-rw-r--r--games/meandmyshadow/Makefile1
-rw-r--r--games/megaglest/Makefile5
-rw-r--r--games/megaglest/files/patch-PNGReader.cpp10
-rw-r--r--games/memonix/Makefile2
-rw-r--r--games/meritous/Makefile2
-rw-r--r--games/minetest/Makefile3
-rw-r--r--games/mirrormagic/Makefile2
-rw-r--r--games/mkhexgrid/Makefile2
-rw-r--r--games/monkeybubble/Makefile2
-rw-r--r--games/monster-masher/Makefile1
-rw-r--r--games/monsterz/Makefile2
-rw-r--r--games/moonlander/Makefile2
-rw-r--r--games/motogt/Makefile5
-rw-r--r--games/motogt/files/patch-src-MakeData.cpp10
-rw-r--r--games/mt_gtk_client/Makefile2
-rw-r--r--games/mudmagic/Makefile4
-rw-r--r--games/naev/Makefile3
-rw-r--r--games/nazghul/Makefile4
-rw-r--r--games/nethack33/Makefile2
-rw-r--r--games/nethack34/Makefile2
-rw-r--r--games/netpanzer/Makefile1
-rw-r--r--games/netspades/Makefile2
-rw-r--r--games/neverball/Makefile4
-rw-r--r--games/nexuiz/Makefile4
-rw-r--r--games/nil/Makefile2
-rw-r--r--games/nimuh/Makefile2
-rw-r--r--games/ninix-aya/Makefile3
-rw-r--r--games/njam/Makefile2
-rw-r--r--games/noegnud-littlehack/Makefile2
-rw-r--r--games/noegnud-nethack-deet/Makefile2
-rw-r--r--games/noegnud-nethack/Makefile2
-rw-r--r--games/noegnud-slashem/Makefile2
-rw-r--r--games/nuclearchess/Makefile2
-rw-r--r--games/numptyphysics/Makefile2
-rw-r--r--games/oolite/Makefile1
-rw-r--r--games/openalchemist/Makefile4
-rw-r--r--games/opencity/Makefile2
-rw-r--r--games/openlierox/Makefile2
-rw-r--r--games/openmortal/Makefile2
-rw-r--r--games/openpref/Makefile1
-rw-r--r--games/opensonic/Makefile2
-rw-r--r--games/openssn/Makefile2
-rw-r--r--games/openttd/Makefile4
-rw-r--r--games/openyahtzee/Makefile1
-rw-r--r--games/optimax/Makefile2
-rw-r--r--games/orbital_eunuchs_sniper/Makefile2
-rw-r--r--games/osgg/Makefile2
-rw-r--r--games/paintown/Makefile4
-rw-r--r--games/paintown/files/patch-IMG_png.c35
-rw-r--r--games/paintown/files/patch-IMG_savepng.c28
-rw-r--r--games/palomino/Makefile2
-rw-r--r--games/peg-e/Makefile2
-rw-r--r--games/pengpong/Makefile2
-rw-r--r--games/penguin-command/Makefile4
-rw-r--r--games/pets/Makefile2
-rw-r--r--games/phlipple/Makefile2
-rw-r--r--games/pinball/Makefile2
-rw-r--r--games/pinedit/Makefile2
-rw-r--r--games/pingus/Makefile4
-rw-r--r--games/pingus/files/patch-src-screenshot.cpp11
-rw-r--r--games/pink-pony/Makefile2
-rw-r--r--games/pioneers/Makefile2
-rw-r--r--games/pipenightdreams/Makefile2
-rw-r--r--games/plutocracy/Makefile4
-rw-r--r--games/plutocracy/files/patch-r_surface.c20
-rw-r--r--games/pokerth/Makefile1
-rw-r--r--games/pongix/Makefile2
-rw-r--r--games/pouetchess/Makefile2
-rw-r--r--games/ppracer/Makefile6
-rw-r--r--games/pushover/Makefile4
-rw-r--r--games/py-mnemosyne/Makefile2
-rw-r--r--games/py-pychess/Makefile2
-rw-r--r--games/pyawale/Makefile2
-rw-r--r--games/pydance/Makefile2
-rw-r--r--games/pykawari/Makefile2
-rw-r--r--games/pysycache/Makefile2
-rw-r--r--games/q15/Makefile2
-rw-r--r--games/q2p/Makefile4
-rw-r--r--games/q2pro/Makefile4
-rw-r--r--games/qgo/Makefile2
-rw-r--r--games/qnetchess/Makefile2
-rw-r--r--games/qnetwalk/Makefile2
-rw-r--r--games/qonk/Makefile2
-rw-r--r--games/quackle/Makefile1
-rw-r--r--games/quadra/Makefile5
-rw-r--r--games/quake2max/Makefile4
-rw-r--r--games/quake2max/files/patch-ref_gl__sul_png.c11
-rw-r--r--games/qudos/Makefile4
-rw-r--r--games/qudos/files/patch-src__ref_gl__gl_local.h10
-rw-r--r--games/r1q2/Makefile8
-rw-r--r--games/r1q2/files/patch-ref_gl__gl_image.c28
-rw-r--r--games/railroad-rampage/Makefile2
-rw-r--r--games/redeclipse/Makefile2
-rw-r--r--games/rockdodger/Makefile2
-rw-r--r--games/rtb/Makefile2
-rw-r--r--games/sauerbraten/Makefile2
-rw-r--r--games/scorched3d/Makefile3
-rw-r--r--games/scourge/Makefile2
-rw-r--r--games/scramble/Makefile2
-rw-r--r--games/scummvm-tools/Makefile6
-rw-r--r--games/scummvm-tools/files/patch-encode_dxa.cpp10
-rw-r--r--games/sdb/Makefile2
-rw-r--r--games/sdl-ball/Makefile2
-rw-r--r--games/sdlCC/Makefile2
-rw-r--r--games/sdlquake2/Makefile10
-rw-r--r--games/sdlquake2/files/patch-gl_image.c33
-rw-r--r--games/sea-defender/Makefile2
-rw-r--r--games/secretmaryochronicles/Makefile3
-rw-r--r--games/senken/Makefile2
-rw-r--r--games/shaaft/Makefile6
-rw-r--r--games/shaaft/files/patch-PNG.cpp19
-rw-r--r--games/shootingstar/Makefile2
-rw-r--r--games/simplevaders/Makefile2
-rw-r--r--games/six/Makefile2
-rw-r--r--games/solarconquest/Makefile2
-rw-r--r--games/solarwolf/Makefile2
-rw-r--r--games/sopwith/Makefile2
-rw-r--r--games/spacehulk/Makefile2
-rw-r--r--games/spacejunk/Makefile2
-rw-r--r--games/spellathon/Makefile1
-rw-r--r--games/spring/Makefile2
-rw-r--r--games/springlobby/Makefile1
-rw-r--r--games/stepmania-devel/Makefile4
-rw-r--r--games/stonesoup/Makefile3
-rw-r--r--games/stransball2/Makefile2
-rw-r--r--games/stratagus/Makefile5
-rw-r--r--games/stratagus/files/patch-png.cpp28
-rw-r--r--games/stroq/Makefile2
-rw-r--r--games/sumwars/Makefile2
-rw-r--r--games/super_methane_brothers/Makefile2
-rw-r--r--games/supertux/Makefile2
-rw-r--r--games/supertuxkart/Makefile2
-rw-r--r--games/taxipilot/Makefile2
-rw-r--r--games/tbe/Makefile1
-rw-r--r--games/tecnoballz/Makefile2
-rw-r--r--games/teg/Makefile2
-rw-r--r--games/tenebrae/Makefile4
-rw-r--r--games/tetzle/Makefile1
-rw-r--r--games/thegrind/Makefile3
-rw-r--r--games/tmw/Makefile5
-rw-r--r--games/tomatoes/Makefile2
-rw-r--r--games/torcs/Makefile3
-rw-r--r--games/torrent/Makefile2
-rw-r--r--games/toycars/Makefile2
-rw-r--r--games/trackballs/Makefile2
-rw-r--r--games/traindirector/Makefile2
-rw-r--r--games/tremor/Makefile8
-rw-r--r--games/tremor/files/patch-src__image.c37
-rw-r--r--games/trigger/Makefile2
-rw-r--r--games/trophy/Makefile1
-rw-r--r--games/tuxmath/Makefile1
-rw-r--r--games/tuxpaint-config/Makefile1
-rw-r--r--games/tuxpaint/Makefile2
-rw-r--r--games/tuxpaint/files/patch-tuxpaint.c10
-rw-r--r--games/tuxpuck/Makefile5
-rw-r--r--games/tuxpuck/files/patch-png.c30
-rw-r--r--games/tuxtype/Makefile1
-rw-r--r--games/twitch/Makefile2
-rw-r--r--games/ufoai/Makefile4
-rw-r--r--games/ufoai/files/patch-images.c10
-rw-r--r--games/ultimatestunts/Makefile2
-rw-r--r--games/umark/Makefile2
-rw-r--r--games/uqm/Makefile2
-rw-r--r--games/vamos/Makefile3
-rw-r--r--games/vavoom/Makefile4
-rw-r--r--games/vdrift/Makefile2
-rw-r--r--games/vectoroids/Makefile2
-rw-r--r--games/vegastrike/Makefile2
-rw-r--r--games/violetland/Makefile2
-rw-r--r--games/viruskiller/Makefile2
-rw-r--r--games/volleyball/Makefile2
-rw-r--r--games/vor/Makefile2
-rw-r--r--games/vultures-eye/Makefile12
-rw-r--r--games/vultures-eye/files/patch-win-vultures-GNUmakefile13
-rw-r--r--games/vultures-eye/files/patch-win-vultures-util-tiletrans.c37
-rw-r--r--games/vultures-eye/files/patch-win-vultures-vultures_gfl.c18
-rw-r--r--games/wargus/Makefile6
-rw-r--r--games/wargus/files/patch-wartool.c20
-rw-r--r--games/warmux/Makefile2
-rw-r--r--games/warmux/files/patch-src-graphic.surface.cpp10
-rw-r--r--games/warzone2100/Makefile4
-rw-r--r--games/wesnoth/Makefile7
-rw-r--r--games/wesnoth/files/patch-src-tools-exploder_utils.cpp10
-rw-r--r--games/whichwayisup/Makefile2
-rw-r--r--games/widelands/Makefile6
-rw-r--r--games/widelands/files/patch-src-graphic-SDL_mng.cc35
-rw-r--r--games/windstille/Makefile4
-rw-r--r--games/wop/Makefile2
-rw-r--r--games/xblast/Makefile2
-rw-r--r--games/xboard/Makefile1
-rw-r--r--games/xbubble/Makefile6
-rw-r--r--games/xbubble/files/patch-src-loadpng.c21
-rw-r--r--games/xcowsay/Makefile1
-rw-r--r--games/xglk/Makefile4
-rw-r--r--games/xglk/files/patch-xglk_pict.c11
-rw-r--r--games/xlogical/Makefile2
-rw-r--r--games/xmoto/Makefile4
-rw-r--r--games/xmoto/files/patch-tim_png.cpp10
-rw-r--r--games/xonotic/Makefile3
-rw-r--r--games/xorgramana/Makefile2
-rw-r--r--games/xpilot-ng-server/Makefile2
-rw-r--r--games/xpired/Makefile2
-rw-r--r--games/xqf/Makefile2
-rw-r--r--games/xscorch/Makefile1
-rw-r--r--games/xteddy/Makefile2
-rw-r--r--games/xwordpy/Makefile2
-rw-r--r--games/xye/Makefile2
-rw-r--r--games/zatacka/Makefile2
-rw-r--r--games/zaz/Makefile2
-rw-r--r--games/zoom/Makefile3
-rw-r--r--german/BBBike/Makefile1
-rw-r--r--german/bsdforen-firefox-searchplugin/Makefile2
-rw-r--r--german/bsdgroup-firefox-searchplugin/Makefile2
-rw-r--r--german/kde3-i18n/Makefile2
-rw-r--r--german/kde4-l10n/Makefile1
-rw-r--r--german/kheisereg/Makefile2
-rw-r--r--german/ksteak/Makefile2
-rw-r--r--german/tipp10/Makefile1
-rw-r--r--graphics/Coin/Makefile2
-rw-r--r--graphics/EZWGL/Makefile6
-rw-r--r--graphics/EZWGL/files/patch-EZ_Png.c19
-rw-r--r--graphics/GraphicsMagick/Makefile6
-rw-r--r--graphics/GraphicsMagick/files/patch-coders__png.c67
-rw-r--r--graphics/GraphicsMagick12/Makefile7
-rw-r--r--graphics/GraphicsMagick12/files/patch-coders__png.c78
-rw-r--r--graphics/GraphicsMagick13/Makefile4
-rw-r--r--graphics/IPA/Makefile1
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/a2png/Makefile2
-rw-r--r--graphics/aaphoto/Makefile3
-rw-r--r--graphics/aaphoto/files/patch-aaphoto.c10
-rw-r--r--graphics/aeskulap/Makefile2
-rw-r--r--graphics/agave/Makefile2
-rw-r--r--graphics/albumshaper/Makefile2
-rw-r--r--graphics/ale/Makefile2
-rw-r--r--graphics/alpng/Makefile1
-rw-r--r--graphics/amanith/Makefile4
-rw-r--r--graphics/amide/Makefile1
-rw-r--r--graphics/aolserver-nsgd/Makefile2
-rw-r--r--graphics/apngasm/Makefile3
-rw-r--r--graphics/apvlv/Makefile2
-rw-r--r--graphics/aqsis/Makefile2
-rw-r--r--graphics/asciio/Makefile2
-rw-r--r--graphics/autopano-sift-c/Makefile4
-rw-r--r--graphics/autoq3d/Makefile2
-rw-r--r--graphics/autotrace/Makefile6
-rw-r--r--graphics/autotrace/files/patch-input-png.c10
-rw-r--r--graphics/aview/Makefile2
-rw-r--r--graphics/ayam/Makefile2
-rw-r--r--graphics/bbrb/Makefile2
-rw-r--r--graphics/blender/Makefile3
-rw-r--r--graphics/bmeps/Makefile4
-rw-r--r--graphics/bmp-rootvis/Makefile2
-rw-r--r--graphics/box/Makefile1
-rw-r--r--graphics/boxer/Makefile1
-rw-r--r--graphics/cairo-java/Makefile2
-rw-r--r--graphics/cairo/Makefile4
-rw-r--r--graphics/cairomm/Makefile1
-rw-r--r--graphics/cbrpager/Makefile2
-rw-r--r--graphics/cegui/Makefile2
-rw-r--r--graphics/cfdg/Makefile3
-rw-r--r--graphics/chbg/Makefile4
-rw-r--r--graphics/chbg/files/patch-absimg.c11
-rw-r--r--graphics/cimg/Makefile4
-rw-r--r--graphics/cinepaint/Makefile8
-rw-r--r--graphics/cinepaint/files/patch-plug-ins-png-png.c28
-rw-r--r--graphics/claraocr/Makefile2
-rw-r--r--graphics/clutter-box2d/Makefile2
-rw-r--r--graphics/clutter-gtk/Makefile2
-rw-r--r--graphics/clutter/Makefile1
-rw-r--r--graphics/comical/Makefile2
-rw-r--r--graphics/corona/Makefile6
-rw-r--r--graphics/corona/files/patch-OpenPNG.cpp19
-rw-r--r--graphics/corona/files/patch-SavePNG.cpp9
-rw-r--r--graphics/crw/Makefile9
-rw-r--r--graphics/crw/files/patch-crw.c11
-rw-r--r--graphics/cthumb/Makefile2
-rw-r--r--graphics/curator/Makefile2
-rw-r--r--graphics/danpei/Makefile4
-rw-r--r--graphics/danpei/files/patch-image_cache.c11
-rw-r--r--graphics/darknock/Makefile2
-rw-r--r--graphics/darktable/Makefile1
-rw-r--r--graphics/dataplot/Makefile3
-rw-r--r--graphics/dc20ctrl/Makefile4
-rw-r--r--graphics/dc20ctrl/files/patch-pixmaps.c (renamed from graphics/dc20ctrl/files/patch-ad)15
-rw-r--r--graphics/devil/Makefile4
-rw-r--r--graphics/dia/Makefile5
-rw-r--r--graphics/dia/files/patch-export_png.c11
-rw-r--r--graphics/diacanvas2/Makefile2
-rw-r--r--graphics/digikam-doc/Makefile2
-rw-r--r--graphics/digikam-kde4/Makefile4
-rw-r--r--graphics/digikam/Makefile5
-rw-r--r--graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp23
-rw-r--r--graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp23
-rw-r--r--graphics/divxcalc/Makefile2
-rw-r--r--graphics/djview4/Makefile1
-rw-r--r--graphics/djvulibre/Makefile1
-rw-r--r--graphics/dmtx-utils/Makefile1
-rw-r--r--graphics/easypaint/Makefile1
-rw-r--r--graphics/ecg2png/Makefile2
-rw-r--r--graphics/edje/Makefile1
-rw-r--r--graphics/edje_viewer/Makefile1
-rw-r--r--graphics/electriceyes/Makefile2
-rw-r--r--graphics/electrix/Makefile1
-rw-r--r--graphics/enblend/Makefile4
-rw-r--r--graphics/enblend/files/patch-png.cxx218
-rw-r--r--graphics/enfle/Makefile6
-rw-r--r--graphics/enfle/files/patch-plugins-loader-png-png.c18
-rw-r--r--graphics/eog-plugins/Makefile2
-rw-r--r--graphics/eog/Makefile2
-rw-r--r--graphics/eos-movrec/Makefile2
-rw-r--r--graphics/epdfview/Makefile2
-rw-r--r--graphics/epix/Makefile1
-rw-r--r--graphics/eps2png/Makefile2
-rw-r--r--graphics/epstool/Makefile2
-rw-r--r--graphics/ethumb/Makefile2
-rw-r--r--graphics/evas-loader-png/Makefile3
-rw-r--r--graphics/evas-loader-svg/Makefile1
-rw-r--r--graphics/evas/Makefile1
-rw-r--r--graphics/evince/Makefile2
-rw-r--r--graphics/evolvotron/Makefile2
-rw-r--r--graphics/exact-image/Makefile5
-rw-r--r--graphics/exact-image/files/patch-codecs__png.cc27
-rw-r--r--graphics/exrtools/Makefile4
-rw-r--r--graphics/exrtools/files/patch-pngoutput.c10
-rw-r--r--graphics/f-spot/Makefile1
-rw-r--r--graphics/fbm/Makefile2
-rw-r--r--graphics/feh/Makefile1
-rw-r--r--graphics/figurine/Makefile2
-rw-r--r--graphics/flam3/Makefile5
-rw-r--r--graphics/flam3/files/patch-png.c10
-rw-r--r--graphics/flip/Makefile2
-rw-r--r--graphics/flphoto/Makefile6
-rw-r--r--graphics/flphoto/files/patch-image.cxx10
-rw-r--r--graphics/fly/Makefile2
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/fotoxx/Makefile1
-rw-r--r--graphics/fpc-cairo/Makefile2
-rw-r--r--graphics/fpc-fpvectorial/Makefile2
-rw-r--r--graphics/fpc-graph/Makefile2
-rw-r--r--graphics/fpc-imagemagick/Makefile2
-rw-r--r--graphics/fpc-libgd/Makefile2
-rw-r--r--graphics/fpc-libpng/Makefile2
-rw-r--r--graphics/fpc-rsvg/Makefile2
-rw-r--r--graphics/fracplanet/Makefile2
-rw-r--r--graphics/fractorama/Makefile2
-rw-r--r--graphics/fraqtive/Makefile2
-rw-r--r--graphics/frei0r/Makefile4
-rw-r--r--graphics/frontline/Makefile2
-rw-r--r--graphics/fv/Makefile7
-rw-r--r--graphics/fyre/Makefile1
-rw-r--r--graphics/g2/Makefile2
-rw-r--r--graphics/gcolor2/Makefile2
-rw-r--r--graphics/gd/Makefile4
-rw-r--r--graphics/gdal-grass/Makefile2
-rw-r--r--graphics/gdal/Makefile3
-rw-r--r--graphics/gdchart/Makefile2
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/gdk-pixbuf/files/patch-io-png.c29
-rw-r--r--graphics/gdk-pixbuf2/Makefile4
-rw-r--r--graphics/gdtclft/Makefile2
-rw-r--r--graphics/geeqie/Makefile4
-rw-r--r--graphics/gegl/Makefile4
-rw-r--r--graphics/geomorph/Makefile7
-rw-r--r--graphics/geomorph/files/patch-src-utils-writepng.c19
-rw-r--r--graphics/giblib/Makefile2
-rw-r--r--graphics/gif2png/Makefile3
-rw-r--r--graphics/gif2png/files/patch-gif2png.h11
-rw-r--r--graphics/gimageview/Makefile5
-rw-r--r--graphics/gimageview/files/patch-png_loader.c11
-rw-r--r--graphics/gimageview/files/patch-png_saver.c11
-rw-r--r--graphics/gimmage/Makefile2
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-data-extras/Makefile2
-rw-r--r--graphics/gimp-focusblur-plugin/Makefile2
-rw-r--r--graphics/gimp-gmic-plugin/Makefile2
-rw-r--r--graphics/gimp-lqr-plugin/Makefile1
-rw-r--r--graphics/gimp-resynthesizer/Makefile2
-rw-r--r--graphics/gimp-save-for-web/Makefile1
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gkrellkam/Makefile2
-rw-r--r--graphics/gkrellkam2/Makefile2
-rw-r--r--graphics/gle-graphics/Makefile4
-rw-r--r--graphics/gliv/Makefile1
-rw-r--r--graphics/glosm/Makefile4
-rw-r--r--graphics/glpng/Makefile9
-rw-r--r--graphics/glpng/files/patch-glpng.c49
-rw-r--r--graphics/gmt/Makefile2
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/gnofract4d/Makefile9
-rw-r--r--graphics/gnomeiconedit/Makefile4
-rw-r--r--graphics/gnomeiconedit/files/patch-io.c11
-rw-r--r--graphics/gocr/Makefile1
-rw-r--r--graphics/goocanvas/Makefile2
-rw-r--r--graphics/goocanvasmm/Makefile1
-rw-r--r--graphics/gource/Makefile1
-rw-r--r--graphics/gozer/Makefile2
-rw-r--r--graphics/gpaint/Makefile2
-rw-r--r--graphics/gpicview/Makefile2
-rw-r--r--graphics/gqview-devel/Makefile4
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/grads/Makefile4
-rw-r--r--graphics/grafx2/Makefile4
-rw-r--r--graphics/graphviz/Makefile3
-rw-r--r--graphics/grx/Makefile3
-rw-r--r--graphics/gscan2pdf/Makefile1
-rw-r--r--graphics/gsculpt/Makefile1
-rw-r--r--graphics/gsnapshot/Makefile2
-rw-r--r--graphics/gstreamer-plugins-cairo/Makefile2
-rw-r--r--graphics/gstreamer-plugins-gdkpixbuf/Makefile2
-rw-r--r--graphics/gstreamer-plugins-gl/Makefile3
-rw-r--r--graphics/gstreamer-plugins-libcaca/Makefile2
-rw-r--r--graphics/gstreamer-plugins-libpng/Makefile2
-rw-r--r--graphics/gstreamer-plugins-opencv/Makefile2
-rw-r--r--graphics/gthumb/Makefile2
-rw-r--r--graphics/gtimelapse/Makefile1
-rw-r--r--graphics/gtk-update-icon-cache/Makefile2
-rw-r--r--graphics/gtkam/Makefile1
-rw-r--r--graphics/gtkdps/Makefile2
-rw-r--r--graphics/gtkgraph/Makefile2
-rw-r--r--graphics/gwenview-kde4/Makefile1
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp32
-rw-r--r--graphics/gx/Makefile2
-rw-r--r--graphics/hs-cairo/Makefile1
-rw-r--r--graphics/hs-soegtk/Makefile1
-rw-r--r--graphics/hs-svgcairo/Makefile1
-rw-r--r--graphics/hsetroot/Makefile2
-rw-r--r--graphics/hugin/Makefile3
-rw-r--r--graphics/icoconvert/Makefile2
-rw-r--r--graphics/icon-slicer/Makefile2
-rw-r--r--graphics/icontact/Makefile2
-rw-r--r--graphics/icoutils/Makefile3
-rw-r--r--graphics/ida/Makefile3
-rw-r--r--graphics/iiview/Makefile1
-rw-r--r--graphics/imageindex/Makefile2
-rw-r--r--graphics/imagesort/Makefile4
-rw-r--r--graphics/imc/Makefile2
-rw-r--r--graphics/imgseek/Makefile2
-rw-r--r--graphics/imgtops/Makefile2
-rw-r--r--graphics/imlib/Makefile6
-rw-r--r--graphics/imlib/files/patch-io-png.c46
-rw-r--r--graphics/imlib/files/patch-load.c17
-rw-r--r--graphics/imlib/files/patch-save.c11
-rw-r--r--graphics/imlib/files/patch-utils.c19
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/imlib2_loaders/Makefile1
-rw-r--r--graphics/inkscape/Makefile5
-rw-r--r--graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp11
-rw-r--r--graphics/inkscape/files/patch-src_helper_png-write.cpp11
-rw-r--r--graphics/inkscape/files/patch-src_sp-image.cpp11
-rw-r--r--graphics/ipe/Makefile1
-rw-r--r--graphics/iulib/Makefile4
-rw-r--r--graphics/jbig2dec/Makefile4
-rw-r--r--graphics/jbig2dec/files/patch-jbig2_image_png.c10
-rw-r--r--graphics/k3d/Makefile2
-rw-r--r--graphics/kalbum/Makefile2
-rw-r--r--graphics/kamera-kde4/Makefile1
-rw-r--r--graphics/kamera/Makefile2
-rw-r--r--graphics/kbarcode/Makefile2
-rw-r--r--graphics/kcolorchooser/Makefile1
-rw-r--r--graphics/kcoloredit/Makefile2
-rw-r--r--graphics/kdegraphics3/Makefile2
-rw-r--r--graphics/kdegraphics4-mobipocket/Makefile1
-rw-r--r--graphics/kdegraphics4-strigi-analyzer/Makefile1
-rw-r--r--graphics/kdegraphics4-svgpart/Makefile1
-rw-r--r--graphics/kdegraphics4-thumbnailers/Makefile1
-rw-r--r--graphics/kgraphviewer/Makefile2
-rw-r--r--graphics/kiconedit/Makefile2
-rw-r--r--graphics/kipi-plugins-kde4/Makefile2
-rw-r--r--graphics/kipi-plugins/Makefile3
-rw-r--r--graphics/kipi-plugins/files/patch-rawdecodingiface.cpp11
-rw-r--r--graphics/kisomandel/Makefile4
-rw-r--r--graphics/klatexformula/Makefile2
-rw-r--r--graphics/kludge3d/Makefile2
-rw-r--r--graphics/kolourpaint/Makefile1
-rw-r--r--graphics/kooka/Makefile2
-rw-r--r--graphics/kphotoalbum-kde4/Makefile2
-rw-r--r--graphics/kphotoalbum/Makefile2
-rw-r--r--graphics/kpovmodeler/Makefile2
-rw-r--r--graphics/kradview/Makefile2
-rw-r--r--graphics/ksaneplugin/Makefile1
-rw-r--r--graphics/ksnapshot/Makefile1
-rw-r--r--graphics/kudu/Makefile2
-rw-r--r--graphics/kuickshow-kde4/Makefile2
-rw-r--r--graphics/kuickshow/Makefile2
-rw-r--r--graphics/landscape/Makefile2
-rw-r--r--graphics/lcdtest/Makefile2
-rw-r--r--graphics/lensfun/Makefile4
-rw-r--r--graphics/lensfun/files/patch-image.cpp37
-rw-r--r--graphics/leptonica/Makefile3
-rw-r--r--graphics/leptonica/files/patch-pngio.c10
-rw-r--r--graphics/libafterimage/Makefile3
-rw-r--r--graphics/libafterimage/files/patch-export.c11
-rw-r--r--graphics/libafterimage/files/patch-import.c19
-rw-r--r--graphics/libboard/Makefile1
-rw-r--r--graphics/libcaca/Makefile1
-rw-r--r--graphics/libchamplain/Makefile2
-rw-r--r--graphics/libdmtx/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile2
-rw-r--r--graphics/libgfx/Makefile5
-rw-r--r--graphics/libgfx/files/patch-png.cxx20
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/libgnomecanvasmm/Makefile2
-rw-r--r--graphics/libgnomecanvasmm26/Makefile2
-rw-r--r--graphics/libimg/Makefile4
-rw-r--r--graphics/libkdcraw-kde4/Makefile1
-rw-r--r--graphics/libkdcraw/Makefile2
-rw-r--r--graphics/libkexif/Makefile2
-rw-r--r--graphics/libkexiv2-kde4/Makefile1
-rw-r--r--graphics/libkexiv2/Makefile2
-rw-r--r--graphics/libkipi-kde4/Makefile1
-rw-r--r--graphics/libkipi/Makefile2
-rw-r--r--graphics/libksane/Makefile1
-rw-r--r--graphics/libopenraw/Makefile2
-rw-r--r--graphics/libpano12/Makefile5
-rw-r--r--graphics/libpano12/files/patch-png.c27
-rw-r--r--graphics/libpano13/Makefile3
-rw-r--r--graphics/libpuzzle/Makefile2
-rw-r--r--graphics/libqglviewer/Makefile2
-rw-r--r--graphics/libqrencode/Makefile4
-rw-r--r--graphics/librsvg2/Makefile1
-rw-r--r--graphics/libsvg-cairo/Makefile2
-rw-r--r--graphics/libsvg/Makefile4
-rw-r--r--graphics/libwmf/Makefile4
-rw-r--r--graphics/libwpg/Makefile1
-rw-r--r--graphics/libwpg01/Makefile2
-rw-r--r--graphics/libx3dtk/Makefile2
-rw-r--r--graphics/linux-cairo/Makefile2
-rw-r--r--graphics/linux-f10-cairo/Makefile2
-rw-r--r--graphics/linux-f10-png/Makefile2
-rw-r--r--graphics/linux-f10-sdl_image/Makefile2
-rw-r--r--graphics/linux-png/Makefile2
-rw-r--r--graphics/linux-png10/Makefile2
-rw-r--r--graphics/lprof-devel/Makefile2
-rw-r--r--graphics/luminance/Makefile2
-rw-r--r--graphics/luxrender/Makefile3
-rw-r--r--graphics/makehuman/Makefile2
-rw-r--r--graphics/mapnik/Makefile4
-rw-r--r--graphics/mapserver/Makefile4
-rw-r--r--graphics/maverik/Makefile2
-rw-r--r--graphics/megapov/Makefile10
-rw-r--r--graphics/megapov/files/patch-png_pov.cpp106
-rw-r--r--graphics/meshviewer/Makefile2
-rw-r--r--graphics/metapixel/Makefile6
-rw-r--r--graphics/metapixel/files/patch-rwpng.c64
-rw-r--r--graphics/mhgui/Makefile4
-rw-r--r--graphics/ming/Makefile4
-rw-r--r--graphics/mingplot/Makefile1
-rw-r--r--graphics/mirage/Makefile1
-rw-r--r--graphics/morpheus/Makefile2
-rw-r--r--graphics/mscgen/Makefile1
-rw-r--r--graphics/mtpaint/Makefile3
-rw-r--r--graphics/multivideo/Makefile2
-rw-r--r--graphics/mupdf/Makefile1
-rw-r--r--graphics/mypaint/Makefile1
-rw-r--r--graphics/nathive/Makefile2
-rw-r--r--graphics/netpbm/Makefile4
-rw-r--r--graphics/netpbm/files/patch-pamrgbatopng.c8
-rw-r--r--graphics/netpbm/files/patch-pngtopnm.c24
-rw-r--r--graphics/netpbm/files/patch-pngtxt.c10
-rw-r--r--graphics/nip2/Makefile1
-rw-r--r--graphics/nvidia-texture-tools/Makefile7
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp11
-rw-r--r--graphics/ocaml-images/Makefile5
-rw-r--r--graphics/ocaml-images/files/patch-src_pngread.c38
-rw-r--r--graphics/ocaml-images/files/patch-src_pngwrite.c20
-rw-r--r--graphics/ocre/Makefile1
-rw-r--r--graphics/ocrfeeder/Makefile1
-rw-r--r--graphics/ocropus/Makefile4
-rw-r--r--graphics/okular/Makefile1
-rw-r--r--graphics/opencsg/Makefile2
-rw-r--r--graphics/opencv/Makefile4
-rw-r--r--graphics/opendx/Makefile2
-rw-r--r--graphics/opengtl/Makefile3
-rw-r--r--graphics/openimageio/Makefile2
-rw-r--r--graphics/optar/Makefile4
-rw-r--r--graphics/optipng/Makefile3
-rw-r--r--graphics/orca/Makefile2
-rw-r--r--graphics/osg-devel/Makefile4
-rw-r--r--graphics/osg/Makefile4
-rw-r--r--graphics/p5-Acme-Steganography-Image-Png/Makefile2
-rw-r--r--graphics/p5-CAD-Drawing-Template/Makefile2
-rw-r--r--graphics/p5-CAD-Drawing/Makefile2
-rw-r--r--graphics/p5-Cairo/Makefile1
-rw-r--r--graphics/p5-Chart-Clicker/Makefile1
-rw-r--r--graphics/p5-Chart-Graph/Makefile2
-rw-r--r--graphics/p5-Chart-PNGgraph/Makefile2
-rw-r--r--graphics/p5-Chart/Makefile1
-rw-r--r--graphics/p5-GD-Arrow/Makefile2
-rw-r--r--graphics/p5-GD-Barcode/Makefile2
-rw-r--r--graphics/p5-GD-Graph-histogram/Makefile2
-rw-r--r--graphics/p5-GD-Graph-ohlc/Makefile2
-rw-r--r--graphics/p5-GD-Graph/Makefile2
-rw-r--r--graphics/p5-GD-Graph3d/Makefile2
-rw-r--r--graphics/p5-GD-SVG/Makefile2
-rw-r--r--graphics/p5-GD-TextUtil/Makefile2
-rw-r--r--graphics/p5-GD-Thumbnail/Makefile2
-rw-r--r--graphics/p5-GD/Makefile1
-rw-r--r--graphics/p5-Graph-SocialMap/Makefile2
-rw-r--r--graphics/p5-Graph-Writer-GraphViz/Makefile1
-rw-r--r--graphics/p5-GraphViz-Data-Structure/Makefile2
-rw-r--r--graphics/p5-GraphViz-Traverse/Makefile2
-rw-r--r--graphics/p5-GraphViz/Makefile1
-rw-r--r--graphics/p5-GraphViz2/Makefile1
-rw-r--r--graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile1
-rw-r--r--graphics/p5-Image-Compare/Makefile1
-rw-r--r--graphics/p5-Image-Heatmap/Makefile1
-rw-r--r--graphics/p5-Image-Imlib2/Makefile2
-rw-r--r--graphics/p5-Image-Magick-Iterator/Makefile2
-rw-r--r--graphics/p5-Image-Scale/Makefile3
-rw-r--r--graphics/p5-Imager-AverageGray/Makefile2
-rw-r--r--graphics/p5-Imager-Graph/Makefile1
-rw-r--r--graphics/p5-Imager-Plot/Makefile2
-rw-r--r--graphics/p5-Imager-QRCode/Makefile1
-rw-r--r--graphics/p5-Imager/Makefile3
-rw-r--r--graphics/p5-Imlib2/Makefile2
-rw-r--r--graphics/p5-PGPLOT/Makefile2
-rw-r--r--graphics/p5-SpringGraph/Makefile2
-rw-r--r--graphics/p5-Tk-JPEG-Lite/Makefile2
-rw-r--r--graphics/p5-chart/Makefile1
-rw-r--r--graphics/p5-ming/Makefile2
-rw-r--r--graphics/panoglview/Makefile1
-rw-r--r--graphics/passepartout/Makefile2
-rw-r--r--graphics/pdf2svg/Makefile2
-rw-r--r--graphics/pear-Image_Canvas/Makefile1
-rw-r--r--graphics/pencil/Makefile4
-rw-r--r--graphics/peps/Makefile2
-rw-r--r--graphics/pgplot/Makefile4
-rw-r--r--graphics/pho/Makefile1
-rw-r--r--graphics/php5-swfed/Makefile3
-rw-r--r--graphics/picpuz/Makefile2
-rw-r--r--graphics/picturebook/Makefile2
-rw-r--r--graphics/picviz/Makefile2
-rw-r--r--graphics/pinpoint/Makefile1
-rw-r--r--graphics/pixelize/Makefile1
-rw-r--r--graphics/pixie/Makefile2
-rw-r--r--graphics/plotutils/Makefile5
-rw-r--r--graphics/plotutils/files/patch-libplot-z_write.c29
-rw-r--r--graphics/png/Makefile53
-rw-r--r--graphics/png/distinfo8
-rw-r--r--graphics/png/files/patch-libpng.pc.in18
-rw-r--r--graphics/png/files/patch-makefile.freebsd14
-rw-r--r--graphics/png/files/patch-pngrutil.c20
-rw-r--r--graphics/png/pkg-plist34
-rw-r--r--graphics/png2html/Makefile4
-rw-r--r--graphics/png2ico/Makefile4
-rw-r--r--graphics/pngcrush/Makefile3
-rw-r--r--graphics/pngnq/Makefile3
-rw-r--r--graphics/pngnq/files/patch-rwpng.c10
-rw-r--r--graphics/pngquant/Makefile3
-rw-r--r--graphics/pngrewrite/Makefile3
-rw-r--r--graphics/pngwriter/Makefile6
-rw-r--r--graphics/pngwriter/files/patch-pngwriter.cc37
-rw-r--r--graphics/podofo/Makefile4
-rw-r--r--graphics/poppler-glib/Makefile2
-rw-r--r--graphics/poppler-qt4/Makefile2
-rw-r--r--graphics/poppler-utils/Makefile2
-rw-r--r--graphics/poppler/Makefile2
-rw-r--r--graphics/pornview/Makefile7
-rw-r--r--graphics/pornview/files/patch-pixbuf_utils.c19
-rw-r--r--graphics/potracegui/Makefile2
-rw-r--r--graphics/povray31/Makefile4
-rw-r--r--graphics/povray31/files/patch-ab7
-rw-r--r--graphics/povray31/files/patch-png_pov.c104
-rw-r--r--graphics/povray36/Makefile6
-rw-r--r--graphics/povray36/files/patch-png_pov.cpp104
-rw-r--r--graphics/povray37/Makefile4
-rw-r--r--graphics/ppminfo/Makefile2
-rw-r--r--graphics/pqiv/Makefile1
-rw-r--r--graphics/prison/Makefile1
-rw-r--r--graphics/pstoedit/Makefile1
-rw-r--r--graphics/pstoepsi/Makefile2
-rw-r--r--graphics/pvmpov/Makefile3
-rw-r--r--graphics/pvmpov/files/patch-ab2
-rw-r--r--graphics/py-PyX/Makefile1
-rw-r--r--graphics/py-amanith/Makefile2
-rw-r--r--graphics/py-cairo/Makefile1
-rw-r--r--graphics/py-chart/Makefile2
-rw-r--r--graphics/py-clutter-gtk/Makefile1
-rw-r--r--graphics/py-clutter/Makefile2
-rw-r--r--graphics/py-gd/Makefile2
-rw-r--r--graphics/py-gimp/Makefile2
-rw-r--r--graphics/py-goocanvas/Makefile2
-rw-r--r--graphics/py-graph-dot/Makefile1
-rw-r--r--graphics/py-graphviz/Makefile1
-rw-r--r--graphics/py-ming/Makefile2
-rw-r--r--graphics/py-paint/Makefile7
-rw-r--r--graphics/py-paint/files/patch-image.c20
-rw-r--r--graphics/py-poppler/Makefile2
-rw-r--r--graphics/py-pycha/Makefile1
-rw-r--r--graphics/py-pydot/Makefile2
-rw-r--r--graphics/py-qt4-svg/Makefile1
-rw-r--r--graphics/py-visual/Makefile2
-rw-r--r--graphics/q-graph/Makefile2
-rw-r--r--graphics/qcomicbook/Makefile2
-rw-r--r--graphics/qgis/Makefile2
-rw-r--r--graphics/qiv/Makefile1
-rw-r--r--graphics/qiviewer/Makefile1
-rw-r--r--graphics/qslim/Makefile4
-rw-r--r--graphics/qt4-iconengines/Makefile1
-rw-r--r--graphics/qt4-imageformats/Makefile3
-rw-r--r--graphics/qt4-pixeltool/Makefile1
-rw-r--r--graphics/qt4-svg/Makefile1
-rw-r--r--graphics/qtgtl/Makefile1
-rw-r--r--graphics/quat-gui/Makefile2
-rw-r--r--graphics/radius-engine/Makefile2
-rw-r--r--graphics/raster3d/Makefile1
-rw-r--r--graphics/rawstudio/Makefile3
-rw-r--r--graphics/rawstudio/files/patch-exiv2-colorspace.cpp19
-rw-r--r--graphics/rawstudio/files/patch-output-pngfile.c10
-rw-r--r--graphics/rawtherapee/Makefile3
-rw-r--r--graphics/rayshade/Makefile2
-rw-r--r--graphics/reallyslick/Makefile2
-rw-r--r--graphics/repng2jpeg/Makefile2
-rw-r--r--graphics/rgbpaint/Makefile2
-rw-r--r--graphics/ristretto/Makefile1
-rw-r--r--graphics/ruby-cairo/Makefile1
-rw-r--r--graphics/ruby-gd/Makefile1
-rw-r--r--graphics/ruby-gdk_pixbuf2/Makefile1
-rw-r--r--graphics/ruby-imlib2/Makefile2
-rw-r--r--graphics/ruby-ming/Makefile2
-rw-r--r--graphics/ruby-rmagick/Makefile2
-rw-r--r--graphics/ruby-rsvg2/Makefile1
-rw-r--r--graphics/ruby-tgif/Makefile2
-rw-r--r--graphics/rubygem-chunky_png/Makefile1
-rw-r--r--graphics/rubygem-png/Makefile1
-rw-r--r--graphics/sam2p/Makefile1
-rw-r--r--graphics/sane-epkowa/Makefile2
-rw-r--r--graphics/sane-frontends/Makefile2
-rw-r--r--graphics/scale2x/Makefile8
-rw-r--r--graphics/scantailor/Makefile3
-rw-r--r--graphics/scr2png/Makefile2
-rw-r--r--graphics/scrot/Makefile2
-rw-r--r--graphics/sdl_image/Makefile3
-rw-r--r--graphics/seam-carving-gui/Makefile2
-rw-r--r--graphics/separate/Makefile1
-rw-r--r--graphics/sharpconstruct/Makefile2
-rw-r--r--graphics/shotwell/Makefile1
-rw-r--r--graphics/show/Makefile4
-rw-r--r--graphics/showimage/Makefile2
-rw-r--r--graphics/showimg/Makefile2
-rw-r--r--graphics/simage/Makefile3
-rw-r--r--graphics/simage/files/patch-simage_png.c11
-rw-r--r--graphics/simpleviewer/Makefile7
-rw-r--r--graphics/simpleviewer/files/patch-formatpng.cpp10
-rw-r--r--graphics/skanlite/Makefile2
-rw-r--r--graphics/sng/Makefile6
-rw-r--r--graphics/sng/files/patch-sngc.c10
-rw-r--r--graphics/sng/files/patch-sngd.c25
-rw-r--r--graphics/sodipodi/Makefile5
-rw-r--r--graphics/sodipodi/files/patch-src_helper_png-write.c29
-rw-r--r--graphics/structuresynth/Makefile2
-rw-r--r--graphics/svg2pdf/Makefile2
-rw-r--r--graphics/svg2png/Makefile2
-rw-r--r--graphics/svgviewer/Makefile4
-rw-r--r--graphics/swfdec/Makefile2
-rw-r--r--graphics/swfmill/Makefile5
-rw-r--r--graphics/swfmill/files/patch-readpng.c14
-rw-r--r--graphics/synfigstudio/Makefile1
-rw-r--r--graphics/telak/Makefile1
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--graphics/tgif/Makefile1
-rw-r--r--graphics/tif22pnm/Makefile8
-rw-r--r--graphics/tif22pnm/files/patch-png22pnm.c20
-rw-r--r--graphics/tiff2png/Makefile4
-rw-r--r--graphics/tiff2png/files/patch-tiff2png.c10
-rw-r--r--graphics/truevision/Makefile2
-rw-r--r--graphics/tulip/Makefile2
-rw-r--r--graphics/tumble/Makefile2
-rw-r--r--graphics/ufraw/Makefile4
-rw-r--r--graphics/uniconvw/Makefile1
-rw-r--r--graphics/urt/Makefile2
-rw-r--r--graphics/view3ds/Makefile2
-rw-r--r--graphics/vigra/Makefile4
-rw-r--r--graphics/vigra/files/patch-png.cxx20
-rw-r--r--graphics/vips/Makefile4
-rw-r--r--graphics/visionworkbench/Makefile4
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc10
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc11
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc10
-rw-r--r--graphics/visprint/Makefile4
-rw-r--r--graphics/vp/Makefile2
-rw-r--r--graphics/webp/Makefile3
-rw-r--r--graphics/white_dune/Makefile4
-rw-r--r--graphics/white_dune/files/patch-src-pngLoad.c11
-rw-r--r--graphics/wings-devel/Makefile1
-rw-r--r--graphics/wings/Makefile1
-rw-r--r--graphics/wmgrabimage/Makefile2
-rw-r--r--graphics/wxsvg/Makefile1
-rw-r--r--graphics/xaos/Makefile6
-rw-r--r--graphics/xaos/files/patch-png.c20
-rw-r--r--graphics/xd3d/Makefile2
-rw-r--r--graphics/xenomorph/Makefile2
-rw-r--r--graphics/xface.el/Makefile2
-rw-r--r--graphics/xfig-devel/Makefile5
-rw-r--r--graphics/xfig/Makefile7
-rw-r--r--graphics/xfpovray/Makefile2
-rw-r--r--graphics/xli/Makefile4
-rw-r--r--graphics/xmedcon/Makefile3
-rw-r--r--graphics/xmms-vumeter/Makefile2
-rw-r--r--graphics/xournal/Makefile2
-rw-r--r--graphics/xpaint/Makefile3
-rw-r--r--graphics/xsane/Makefile3
-rw-r--r--graphics/xsane/files/patch-xsane-save.c20
-rw-r--r--graphics/xsvg/Makefile2
-rw-r--r--graphics/xv/Makefile5
-rw-r--r--graphics/xv/files/patch-xvpng.c38
-rw-r--r--graphics/xzgv/Makefile2
-rw-r--r--graphics/yagf/Makefile2
-rw-r--r--graphics/zathura/Makefile2
-rw-r--r--graphics/zbar/Makefile2
-rw-r--r--graphics/zgv/Makefile4
-rw-r--r--graphics/zgv/files/patch-readpng.c20
-rw-r--r--graphics/zimg/Makefile2
-rw-r--r--graphics/zint/Makefile3
-rw-r--r--graphics/zphoto/Makefile2
-rw-r--r--hebrew/kde3-i18n/Makefile2
-rw-r--r--hebrew/kde4-l10n/Makefile1
-rw-r--r--hungarian/kde3-i18n/Makefile2
-rw-r--r--hungarian/kde4-l10n/Makefile1
-rw-r--r--irc/cwirc/Makefile2
-rw-r--r--irc/eggcreator/Makefile2
-rw-r--r--irc/irchat-pj-emacs21/Makefile2
-rw-r--r--irc/kmyirc/Makefile2
-rw-r--r--irc/konversation-kde4/Makefile2
-rw-r--r--irc/konversation/Makefile2
-rw-r--r--irc/kvirc/Makefile2
-rw-r--r--irc/kwirc/Makefile2
-rw-r--r--irc/lostirc/Makefile2
-rw-r--r--irc/minbif/Makefile2
-rw-r--r--irc/pure-emacs21/Makefile2
-rw-r--r--irc/quassel/Makefile1
-rw-r--r--irc/riece/Makefile1
-rw-r--r--irc/slirc/Makefile2
-rw-r--r--irc/xchat-fish/Makefile2
-rw-r--r--irc/xchat-gnome/Makefile2
-rw-r--r--irc/xchat-mircryption/Makefile2
-rw-r--r--irc/xchat-ruby/Makefile2
-rw-r--r--irc/xchat/Makefile1
-rw-r--r--japanese/aterm/Makefile4
-rw-r--r--japanese/ddskk/Makefile2
-rw-r--r--japanese/dvipsk/Makefile4
-rw-r--r--japanese/ebview-gtk2/Makefile2
-rw-r--r--japanese/ebview/Makefile2
-rw-r--r--japanese/emacs-emcws/Makefile4
-rw-r--r--japanese/groff/Makefile2
-rw-r--r--japanese/gxditview/Makefile2
-rw-r--r--japanese/ibus-anthy/Makefile1
-rw-r--r--japanese/ibus-skk/Makefile1
-rw-r--r--japanese/im-ja/Makefile2
-rw-r--r--japanese/jadetex-ptex/Makefile4
-rw-r--r--japanese/jd/Makefile1
-rw-r--r--japanese/kanjipad/Makefile2
-rw-r--r--japanese/kasumi/Makefile2
-rw-r--r--japanese/kde3-i18n/Makefile2
-rw-r--r--japanese/kde4-l10n/Makefile1
-rw-r--r--japanese/kiten/Makefile1
-rw-r--r--japanese/latex2html/Makefile2
-rw-r--r--japanese/libtomoe-gtk/Makefile2
-rw-r--r--japanese/lookup/Makefile2
-rw-r--r--japanese/man-doc/Makefile2
-rw-r--r--japanese/man/Makefile2
-rw-r--r--japanese/migemo/Makefile2
-rw-r--r--japanese/ming/Makefile4
-rw-r--r--japanese/ming/files/patch-util_png2dbl.c11
-rw-r--r--japanese/mozc-server/Makefile1
-rw-r--r--japanese/navi2ch/Makefile1
-rw-r--r--japanese/netype/Makefile2
-rw-r--r--japanese/ochusha/Makefile2
-rw-r--r--japanese/platex-japanese/Makefile2
-rw-r--r--japanese/platex-otf/Makefile2
-rw-r--r--japanese/platex209/Makefile2
-rw-r--r--japanese/ptex/Makefile6
-rw-r--r--japanese/ptex/files/patch-texk-pdftexdir-writepng.c19
-rw-r--r--japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c10
-rw-r--r--japanese/scim-anthy/Makefile2
-rw-r--r--japanese/scim-canna/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile2
-rw-r--r--japanese/scim-honoka/Makefile2
-rw-r--r--japanese/scim-prime/Makefile2
-rw-r--r--japanese/scim-skk/Makefile2
-rw-r--r--japanese/scim-tables/Makefile1
-rw-r--r--japanese/scim-tomoe/Makefile2
-rw-r--r--japanese/scim-uim/Makefile2
-rw-r--r--japanese/teTeX/Makefile2
-rw-r--r--japanese/texfamily-vfn2a/Makefile2
-rw-r--r--japanese/texfamily/Makefile4
-rw-r--r--japanese/texinfo/Makefile2
-rw-r--r--japanese/uim-tomoe-gtk/Makefile2
-rw-r--r--japanese/xdtp/Makefile2
-rw-r--r--japanese/xdvik/Makefile2
-rw-r--r--japanese/xjtext/Makefile2
-rw-r--r--japanese/yc.el/Makefile2
-rw-r--r--java/cacao/Makefile2
-rw-r--r--java/classpath/Makefile2
-rw-r--r--java/eclipse-devel/Makefile1
-rw-r--r--java/eclipse-findbugs/Makefile2
-rw-r--r--java/eclipse-langpack/Makefile2
-rw-r--r--java/eclipse/Makefile1
-rw-r--r--java/icedtea-web/Makefile2
-rw-r--r--java/jamvm/Makefile2
-rw-r--r--java/jc/Makefile2
-rw-r--r--java/jmp/Makefile2
-rw-r--r--java/phpeclipse/Makefile2
-rw-r--r--java/sablevm-classpath/Makefile2
-rw-r--r--java/sablevm/Makefile2
-rw-r--r--korean/ami/Makefile1
-rw-r--r--korean/eterm/Makefile2
-rw-r--r--korean/gtkcomm/Makefile1
-rw-r--r--korean/ibus-hangul/Makefile2
-rw-r--r--korean/imhangul/Makefile1
-rw-r--r--korean/kde3-i18n/Makefile2
-rw-r--r--korean/kde4-l10n/Makefile1
-rw-r--r--korean/ko.TeX/Makefile2
-rw-r--r--korean/man-doc/Makefile2
-rw-r--r--korean/nabi/Makefile1
-rw-r--r--korean/scim-hangul/Makefile1
-rw-r--r--korean/scim-tables/Makefile1
-rw-r--r--lang/algol68g/Makefile1
-rw-r--r--lang/basic256/Makefile1
-rw-r--r--lang/bigloo/Makefile2
-rw-r--r--lang/clisp/Makefile2
-rw-r--r--lang/fpc-units/Makefile1
-rw-r--r--lang/fpc/Makefile.units2
-rw-r--r--lang/fsharp/Makefile2
-rw-r--r--lang/gambas/Makefile2
-rw-r--r--lang/gjs/Makefile1
-rw-r--r--lang/harbour/Makefile1
-rw-r--r--lang/klogoturtle/Makefile2
-rw-r--r--lang/kroc/Makefile4
-rw-r--r--lang/kturtle/Makefile1
-rw-r--r--lang/lafontaine/Makefile2
-rw-r--r--lang/lush/Makefile2
-rw-r--r--lang/mdk/Makefile2
-rw-r--r--lang/mlton/Makefile2
-rw-r--r--lang/nbc/Makefile2
-rw-r--r--lang/neko/Makefile2
-rw-r--r--lang/ofc/Makefile16
-rw-r--r--lang/ofc/files/patch-DPNGImage.m46
-rw-r--r--lang/opa/Makefile1
-rw-r--r--lang/phantomjs/Makefile1
-rw-r--r--lang/php5/Makefile.ext2
-rw-r--r--lang/php52/Makefile.ext2
-rw-r--r--lang/pike76/Makefile2
-rw-r--r--lang/q/Makefile2
-rw-r--r--lang/racket/Makefile4
-rw-r--r--lang/sbcl/Makefile1
-rw-r--r--lang/smalltalk/Makefile2
-rw-r--r--lang/sml-mode.el/Makefile2
-rw-r--r--lang/squeak/Makefile2
-rw-r--r--lang/steptalk/Makefile2
-rw-r--r--lang/tuareg-mode.el/Makefile2
-rw-r--r--lang/twelf/Makefile2
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/c-sig/Makefile2
-rw-r--r--mail/claws-mail-address_keeper/Makefile1
-rw-r--r--mail/claws-mail-archiver/Makefile1
-rw-r--r--mail/claws-mail-att_remover/Makefile1
-rw-r--r--mail/claws-mail-attach_warner/Makefile1
-rw-r--r--mail/claws-mail-bsfilter/Makefile1
-rw-r--r--mail/claws-mail-cachesaver/Makefile2
-rw-r--r--mail/claws-mail-clamd/Makefile1
-rw-r--r--mail/claws-mail-fancy/Makefile1
-rw-r--r--mail/claws-mail-fetchinfo/Makefile2
-rw-r--r--mail/claws-mail-gdata/Makefile1
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile1
-rw-r--r--mail/claws-mail-mailmbox/Makefile1
-rw-r--r--mail/claws-mail-newmail/Makefile2
-rw-r--r--mail/claws-mail-notification/Makefile1
-rw-r--r--mail/claws-mail-perl/Makefile1
-rw-r--r--mail/claws-mail-python/Makefile1
-rw-r--r--mail/claws-mail-rssyl/Makefile1
-rw-r--r--mail/claws-mail-spamreport/Makefile1
-rw-r--r--mail/claws-mail-synce/Makefile2
-rw-r--r--mail/claws-mail-tnef/Makefile1
-rw-r--r--mail/claws-mail-vcalendar/Makefile1
-rw-r--r--mail/claws-mail/Makefile3
-rw-r--r--mail/clawsker/Makefile1
-rw-r--r--mail/contact-lookup-applet/Makefile2
-rw-r--r--mail/davmail/Makefile1
-rw-r--r--mail/emh/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile2
-rw-r--r--mail/evolution-mapi/Makefile1
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/exmh2/Makefile2
-rw-r--r--mail/firetray/Makefile1
-rw-r--r--mail/gkrellmmailwatch/Makefile2
-rw-r--r--mail/gkrellmmailwatch2/Makefile2
-rw-r--r--mail/gmail-notify/Makefile2
-rw-r--r--mail/gmime24-sharp/Makefile2
-rw-r--r--mail/gnome-gmail-notifier/Makefile2
-rw-r--r--mail/gnubiff/Makefile2
-rw-r--r--mail/kbiff/Makefile1
-rw-r--r--mail/kcheckgmail/Makefile2
-rw-r--r--mail/kshowmail/Makefile1
-rw-r--r--mail/mahogany/Makefile2
-rw-r--r--mail/mail-notification/Makefile2
-rw-r--r--mail/mailcrypt/Makefile2
-rw-r--r--mail/mailtray/Makefile1
-rw-r--r--mail/mboxcheck-applet/Makefile2
-rw-r--r--mail/metamail/Makefile2
-rw-r--r--mail/mew/Makefile1
-rw-r--r--mail/mew2/Makefile2
-rw-r--r--mail/mew3/Makefile2
-rw-r--r--mail/mmc/Makefile2
-rw-r--r--mail/p5-FuzzyOcr-devel/Makefile2
-rw-r--r--mail/p5-FuzzyOcr/Makefile2
-rw-r--r--mail/p5-Mail-Graph/Makefile2
-rw-r--r--mail/qgmailnotifier/Makefile2
-rw-r--r--mail/qmailmrtg7/Makefile2
-rw-r--r--mail/qmrtg/Makefile2
-rw-r--r--mail/quickml/Makefile2
-rw-r--r--mail/spamprobe/Makefile4
-rw-r--r--mail/sylpheed/Makefile1
-rw-r--r--mail/thunderbird-dictionaries/Makefile2
-rw-r--r--mail/thunderbird-esr/Makefile1
-rw-r--r--mail/thunderbird/Makefile1
-rw-r--r--mail/vm/Makefile1
-rw-r--r--mail/wanderlust-devel/Makefile2
-rw-r--r--mail/wanderlust/Makefile2
-rw-r--r--mail/x-face-e21/Makefile2
-rw-r--r--mail/xcite/Makefile4
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile2
-rw-r--r--math/PDL/Makefile2
-rw-r--r--math/R/Makefile3
-rw-r--r--math/abakus/Makefile2
-rw-r--r--math/alt-ergo/Makefile1
-rw-r--r--math/asymptote/Makefile2
-rw-r--r--math/bargraph/Makefile1
-rw-r--r--math/biggles/Makefile2
-rw-r--r--math/blitz++/Makefile2
-rw-r--r--math/calcoo/Makefile2
-rw-r--r--math/cantor/Makefile1
-rw-r--r--math/convertall/Makefile2
-rw-r--r--math/coq/Makefile1
-rw-r--r--math/digitizer/Makefile2
-rw-r--r--math/drgeo/Makefile2
-rw-r--r--math/dynare/Makefile1
-rw-r--r--math/emacs-calc/Makefile2
-rw-r--r--math/ess/Makefile1
-rw-r--r--math/eukleides/Makefile2
-rw-r--r--math/fityk/Makefile2
-rw-r--r--math/freemat/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/galculator/Makefile2
-rw-r--r--math/gambit/Makefile1
-rw-r--r--math/gcalctool/Makefile1
-rw-r--r--math/gdcalc/Makefile2
-rw-r--r--math/ggobi/Makefile1
-rw-r--r--math/giacxcas/Makefile1
-rw-r--r--math/gnumeric/Makefile1
-rw-r--r--math/gnuplot+/Makefile4
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/grace/Makefile4
-rw-r--r--math/grace/files/patch-src-rstdrv.c19
-rw-r--r--math/graphthing/Makefile2
-rw-r--r--math/gretl/Makefile1
-rw-r--r--math/gri/Makefile2
-rw-r--r--math/guppi/Makefile2
-rw-r--r--math/k3dsurf/Makefile2
-rw-r--r--math/kalgebra/Makefile1
-rw-r--r--math/kbruch/Makefile1
-rw-r--r--math/kig/Makefile1
-rw-r--r--math/kmplot/Makefile1
-rw-r--r--math/koctave/Makefile2
-rw-r--r--math/kseg/Makefile2
-rw-r--r--math/labplot/Makefile2
-rw-r--r--math/lybniz/Makefile2
-rw-r--r--math/matrices/Makefile2
-rw-r--r--math/maxima/Makefile2
-rw-r--r--math/mbasecalc/Makefile2
-rw-r--r--math/naturalmath/Makefile2
-rw-r--r--math/ocaml-ocamlgraph/Makefile1
-rw-r--r--math/octave-forge-actuarial/Makefile2
-rw-r--r--math/octave-forge-ad/Makefile2
-rw-r--r--math/octave-forge-audio/Makefile2
-rw-r--r--math/octave-forge-base/Makefile1
-rw-r--r--math/octave-forge-bim/Makefile2
-rw-r--r--math/octave-forge-bioinfo/Makefile2
-rw-r--r--math/octave-forge-civil-engineering/Makefile2
-rw-r--r--math/octave-forge-combinatorics/Makefile2
-rw-r--r--math/octave-forge-communications/Makefile1
-rw-r--r--math/octave-forge-control/Makefile1
-rw-r--r--math/octave-forge-data-smoothing/Makefile1
-rw-r--r--math/octave-forge-dataframe/Makefile2
-rw-r--r--math/octave-forge-dicom/Makefile2
-rw-r--r--math/octave-forge-econometrics/Makefile2
-rw-r--r--math/octave-forge-engine/Makefile2
-rw-r--r--math/octave-forge-fenv/Makefile2
-rw-r--r--math/octave-forge-financial/Makefile1
-rw-r--r--math/octave-forge-fits/Makefile2
-rw-r--r--math/octave-forge-fl-core/Makefile2
-rw-r--r--math/octave-forge-fpl/Makefile2
-rw-r--r--math/octave-forge-fuzzy-logic-toolkit/Makefile2
-rw-r--r--math/octave-forge-ga/Makefile1
-rw-r--r--math/octave-forge-general/Makefile1
-rw-r--r--math/octave-forge-generate_html/Makefile1
-rw-r--r--math/octave-forge-geometry/Makefile1
-rw-r--r--math/octave-forge-gnuplot/Makefile2
-rw-r--r--math/octave-forge-gsl/Makefile2
-rw-r--r--math/octave-forge-ident/Makefile2
-rw-r--r--math/octave-forge-image/Makefile2
-rw-r--r--math/octave-forge-informationtheory/Makefile2
-rw-r--r--math/octave-forge-integration/Makefile2
-rw-r--r--math/octave-forge-io/Makefile1
-rw-r--r--math/octave-forge-irsa/Makefile2
-rw-r--r--math/octave-forge-mapping/Makefile2
-rw-r--r--math/octave-forge-mechanics/Makefile2
-rw-r--r--math/octave-forge-miscellaneous/Makefile1
-rw-r--r--math/octave-forge-missing-functions/Makefile2
-rw-r--r--math/octave-forge-msh/Makefile2
-rw-r--r--math/octave-forge-multicore/Makefile2
-rw-r--r--math/octave-forge-nan/Makefile1
-rw-r--r--math/octave-forge-nlwing2/Makefile2
-rw-r--r--math/octave-forge-nnet/Makefile2
-rw-r--r--math/octave-forge-nurbs/Makefile1
-rw-r--r--math/octave-forge-ocs/Makefile2
-rw-r--r--math/octave-forge-oct2mat/Makefile2
-rw-r--r--math/octave-forge-octcdf/Makefile2
-rw-r--r--math/octave-forge-octclip/Makefile2
-rw-r--r--math/octave-forge-octgpr/Makefile2
-rw-r--r--math/octave-forge-octproj/Makefile1
-rw-r--r--math/octave-forge-odebvp/Makefile2
-rw-r--r--math/octave-forge-odepkg/Makefile1
-rw-r--r--math/octave-forge-optim/Makefile1
-rw-r--r--math/octave-forge-optiminterp/Makefile2
-rw-r--r--math/octave-forge-outliers/Makefile2
-rw-r--r--math/octave-forge-parallel/Makefile2
-rw-r--r--math/octave-forge-pdb/Makefile2
-rw-r--r--math/octave-forge-physicalconstants/Makefile2
-rw-r--r--math/octave-forge-plot/Makefile2
-rw-r--r--math/octave-forge-pt_br/Makefile2
-rw-r--r--math/octave-forge-quaternion/Makefile1
-rw-r--r--math/octave-forge-queueing/Makefile1
-rw-r--r--math/octave-forge-secs1d/Makefile1
-rw-r--r--math/octave-forge-secs2d/Makefile2
-rw-r--r--math/octave-forge-secs3d/Makefile2
-rw-r--r--math/octave-forge-signal/Makefile1
-rw-r--r--math/octave-forge-simp/Makefile2
-rw-r--r--math/octave-forge-sockets/Makefile2
-rw-r--r--math/octave-forge-specfun/Makefile2
-rw-r--r--math/octave-forge-special-matrix/Makefile2
-rw-r--r--math/octave-forge-spline-gcvspl/Makefile2
-rw-r--r--math/octave-forge-splines/Makefile2
-rw-r--r--math/octave-forge-statistics/Makefile1
-rw-r--r--math/octave-forge-strings/Makefile1
-rw-r--r--math/octave-forge-struct/Makefile1
-rw-r--r--math/octave-forge-symband/Makefile2
-rw-r--r--math/octave-forge-symbolic/Makefile2
-rw-r--r--math/octave-forge-tcl-octave/Makefile2
-rw-r--r--math/octave-forge-tsa/Makefile1
-rw-r--r--math/octave-forge-video/Makefile2
-rw-r--r--math/octave-forge-xraylib/Makefile2
-rw-r--r--math/octave-forge-zenity/Makefile2
-rw-r--r--math/octave-forge/Makefile1
-rw-r--r--math/octave/Makefile1
-rw-r--r--math/p5-Statistics-R/Makefile2
-rw-r--r--math/pgcalc/Makefile2
-rw-r--r--math/ploticus/Makefile4
-rw-r--r--math/proofgeneral/Makefile1
-rw-r--r--math/pspp/Makefile2
-rw-r--r--math/py-basemap/Makefile2
-rw-r--r--math/py-gnuplot/Makefile2
-rw-r--r--math/py-graphtool/Makefile1
-rw-r--r--math/py-matplotlib/Makefile6
-rw-r--r--math/py-matplotlib/files/patch-_png.cpp23
-rw-r--r--math/qalculate/Makefile2
-rw-r--r--math/qtiplot-doc/Makefile1
-rw-r--r--math/qtiplot/Makefile5
-rw-r--r--math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c10
-rw-r--r--math/qtoctave/Makefile1
-rw-r--r--math/qwtplot3d-qt4/Makefile2
-rw-r--r--math/qwtplot3d/Makefile2
-rw-r--r--math/rocs/Makefile1
-rw-r--r--math/rpy/Makefile2
-rw-r--r--math/rpy2/Makefile2
-rw-r--r--math/saga/Makefile2
-rw-r--r--math/sage/Makefile1
-rw-r--r--math/scilab-toolbox-sivp/Makefile1
-rw-r--r--math/sedumi/Makefile2
-rw-r--r--math/slgrace/Makefile2
-rw-r--r--math/speedcrunch/Makefile2
-rw-r--r--math/ump/Makefile2
-rw-r--r--math/vtk-python/Makefile3
-rw-r--r--math/vtk/Makefile6
-rw-r--r--math/vtk/files/patch-vtkPNGReader.cxx20
-rw-r--r--math/vtk/files/patch-vtkPNGWriter.cxx20
-rw-r--r--math/vtk5/Makefile4
-rw-r--r--math/wxMaxima/Makefile2
-rw-r--r--math/xgfe/Makefile2
-rw-r--r--misc/alevt/Makefile4
-rw-r--r--misc/alevt/files/patch-exp-gfx.c10
-rw-r--r--misc/bibletime/Makefile1
-rw-r--r--misc/bigboard/Makefile2
-rw-r--r--misc/cdcollect/Makefile2
-rw-r--r--misc/color-theme.el/Makefile2
-rw-r--r--misc/dahdi-kmod/Makefile2
-rw-r--r--misc/dahdi/Makefile2
-rw-r--r--misc/diary-hercules/Makefile1
-rw-r--r--misc/explosions/Makefile2
-rw-r--r--misc/freebsd-doc-en/Makefile1
-rw-r--r--misc/freeguide/Makefile1
-rw-r--r--misc/gcstar/Makefile1
-rw-r--r--misc/gkrellm-gamma/Makefile2
-rw-r--r--misc/gkrellm-helium/Makefile2
-rw-r--r--misc/gkrellm-xkb/Makefile2
-rw-r--r--misc/gkrellmbgchg2/Makefile1
-rw-r--r--misc/gkrellmfmonitor/Makefile2
-rw-r--r--misc/gkrellmlaunch/Makefile2
-rw-r--r--misc/gkrellmlaunch2/Makefile2
-rw-r--r--misc/gkrellshoot/Makefile2
-rw-r--r--misc/gkrellshoot2/Makefile2
-rw-r--r--misc/gkrellweather2/Makefile2
-rw-r--r--misc/gkx86info2/Makefile2
-rw-r--r--misc/gnome-icon-theme-extras/Makefile1
-rw-r--r--misc/gnome-icon-theme/Makefile2
-rw-r--r--misc/gnome-osd/Makefile1
-rw-r--r--misc/gonvert/Makefile1
-rw-r--r--misc/gopod/Makefile2
-rw-r--r--misc/gregexp/Makefile2
-rw-r--r--misc/gtktalog/Makefile2
-rw-r--r--misc/gwenview-i18n/Makefile2
-rw-r--r--misc/hotkeys/Makefile2
-rw-r--r--misc/k3b-i18n/Makefile2
-rw-r--r--misc/katalog/Makefile2
-rw-r--r--misc/kbfx/Makefile2
-rw-r--r--misc/kde3-i18n-af/Makefile2
-rw-r--r--misc/kde3-i18n-az/Makefile2
-rw-r--r--misc/kde3-i18n-be/Makefile2
-rw-r--r--misc/kde3-i18n-bg/Makefile2
-rw-r--r--misc/kde3-i18n-bn/Makefile2
-rw-r--r--misc/kde3-i18n-br/Makefile2
-rw-r--r--misc/kde3-i18n-bs/Makefile2
-rw-r--r--misc/kde3-i18n-ca/Makefile2
-rw-r--r--misc/kde3-i18n-cs/Makefile2
-rw-r--r--misc/kde3-i18n-csb/Makefile2
-rw-r--r--misc/kde3-i18n-cy/Makefile2
-rw-r--r--misc/kde3-i18n-da/Makefile2
-rw-r--r--misc/kde3-i18n-el/Makefile2
-rw-r--r--misc/kde3-i18n-en_GB/Makefile2
-rw-r--r--misc/kde3-i18n-eo/Makefile2
-rw-r--r--misc/kde3-i18n-es/Makefile2
-rw-r--r--misc/kde3-i18n-et/Makefile2
-rw-r--r--misc/kde3-i18n-eu/Makefile2
-rw-r--r--misc/kde3-i18n-fa/Makefile2
-rw-r--r--misc/kde3-i18n-fi/Makefile2
-rw-r--r--misc/kde3-i18n-fy/Makefile2
-rw-r--r--misc/kde3-i18n-ga/Makefile2
-rw-r--r--misc/kde3-i18n-gl/Makefile2
-rw-r--r--misc/kde3-i18n-hi/Makefile2
-rw-r--r--misc/kde3-i18n-hr/Makefile2
-rw-r--r--misc/kde3-i18n-is/Makefile2
-rw-r--r--misc/kde3-i18n-it/Makefile2
-rw-r--r--misc/kde3-i18n-kk/Makefile2
-rw-r--r--misc/kde3-i18n-km/Makefile2
-rw-r--r--misc/kde3-i18n-lt/Makefile2
-rw-r--r--misc/kde3-i18n-lv/Makefile2
-rw-r--r--misc/kde3-i18n-mk/Makefile2
-rw-r--r--misc/kde3-i18n-mn/Makefile2
-rw-r--r--misc/kde3-i18n-ms/Makefile2
-rw-r--r--misc/kde3-i18n-nb/Makefile2
-rw-r--r--misc/kde3-i18n-nds/Makefile2
-rw-r--r--misc/kde3-i18n-nl/Makefile2
-rw-r--r--misc/kde3-i18n-nn/Makefile2
-rw-r--r--misc/kde3-i18n-pa/Makefile2
-rw-r--r--misc/kde3-i18n-ro/Makefile2
-rw-r--r--misc/kde3-i18n-rw/Makefile2
-rw-r--r--misc/kde3-i18n-se/Makefile2
-rw-r--r--misc/kde3-i18n-sk/Makefile2
-rw-r--r--misc/kde3-i18n-sl/Makefile2
-rw-r--r--misc/kde3-i18n-sr/Makefile2
-rw-r--r--misc/kde3-i18n-sr_Latn/Makefile2
-rw-r--r--misc/kde3-i18n-ss/Makefile2
-rw-r--r--misc/kde3-i18n-sv/Makefile2
-rw-r--r--misc/kde3-i18n-ta/Makefile2
-rw-r--r--misc/kde3-i18n-te/Makefile2
-rw-r--r--misc/kde3-i18n-tg/Makefile2
-rw-r--r--misc/kde3-i18n-th/Makefile2
-rw-r--r--misc/kde3-i18n-tr/Makefile2
-rw-r--r--misc/kde3-i18n-uz/Makefile2
-rw-r--r--misc/kde3-i18n-ven/Makefile2
-rw-r--r--misc/kde3-i18n-wa/Makefile2
-rw-r--r--misc/kde3-i18n-xh/Makefile2
-rw-r--r--misc/kde3-i18n-zu/Makefile2
-rw-r--r--misc/kde4-l10n-bg/Makefile1
-rw-r--r--misc/kde4-l10n-bs/Makefile1
-rw-r--r--misc/kde4-l10n-ca/Makefile1
-rw-r--r--misc/kde4-l10n-ca_valencia/Makefile1
-rw-r--r--misc/kde4-l10n-cs/Makefile1
-rw-r--r--misc/kde4-l10n-da/Makefile1
-rw-r--r--misc/kde4-l10n-el/Makefile1
-rw-r--r--misc/kde4-l10n-en_GB/Makefile1
-rw-r--r--misc/kde4-l10n-eo/Makefile1
-rw-r--r--misc/kde4-l10n-es/Makefile1
-rw-r--r--misc/kde4-l10n-et/Makefile1
-rw-r--r--misc/kde4-l10n-eu/Makefile1
-rw-r--r--misc/kde4-l10n-fi/Makefile1
-rw-r--r--misc/kde4-l10n-ga/Makefile1
-rw-r--r--misc/kde4-l10n-gl/Makefile1
-rw-r--r--misc/kde4-l10n-hr/Makefile1
-rw-r--r--misc/kde4-l10n-ia/Makefile1
-rw-r--r--misc/kde4-l10n-id/Makefile1
-rw-r--r--misc/kde4-l10n-is/Makefile1
-rw-r--r--misc/kde4-l10n-it/Makefile1
-rw-r--r--misc/kde4-l10n-kk/Makefile1
-rw-r--r--misc/kde4-l10n-km/Makefile1
-rw-r--r--misc/kde4-l10n-lt/Makefile1
-rw-r--r--misc/kde4-l10n-lv/Makefile1
-rw-r--r--misc/kde4-l10n-nb/Makefile1
-rw-r--r--misc/kde4-l10n-nds/Makefile1
-rw-r--r--misc/kde4-l10n-nl/Makefile1
-rw-r--r--misc/kde4-l10n-nn/Makefile1
-rw-r--r--misc/kde4-l10n-pa/Makefile1
-rw-r--r--misc/kde4-l10n-ro/Makefile1
-rw-r--r--misc/kde4-l10n-si/Makefile1
-rw-r--r--misc/kde4-l10n-sk/Makefile1
-rw-r--r--misc/kde4-l10n-sl/Makefile1
-rw-r--r--misc/kde4-l10n-sr/Makefile1
-rw-r--r--misc/kde4-l10n-sv/Makefile1
-rw-r--r--misc/kde4-l10n-tg/Makefile1
-rw-r--r--misc/kde4-l10n-th/Makefile1
-rw-r--r--misc/kde4-l10n-tr/Makefile1
-rw-r--r--misc/kde4-l10n-ug/Makefile1
-rw-r--r--misc/kde4-l10n-wa/Makefile1
-rw-r--r--misc/kdeaddons3/Makefile.split18
-rw-r--r--misc/kdeedu3/Makefile2
-rw-r--r--misc/kdeutils3/Makefile2
-rw-r--r--misc/kgeography/Makefile1
-rw-r--r--misc/klettres/Makefile1
-rw-r--r--misc/krecipes-kde4/Makefile2
-rw-r--r--misc/krecipes/Makefile2
-rw-r--r--misc/ksig/Makefile2
-rw-r--r--misc/ktouch/Makefile1
-rw-r--r--misc/kwatch/Makefile2
-rw-r--r--misc/kwordquiz/Makefile1
-rw-r--r--misc/latex-mk/Makefile2
-rw-r--r--misc/libkdeedu/Makefile1
-rw-r--r--misc/lingoteach/Makefile2
-rw-r--r--misc/lxde-common/Makefile2
-rw-r--r--misc/magicpoint/Makefile6
-rw-r--r--misc/magicpoint/files/patch-png.c20
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/metalink-editor/Makefile2
-rw-r--r--misc/metromap/Makefile1
-rw-r--r--misc/misterproper/Makefile2
-rw-r--r--misc/parley/Makefile1
-rw-r--r--misc/pdmenu/Makefile1
-rw-r--r--misc/pspresent/Makefile2
-rw-r--r--misc/py-osd/Makefile2
-rw-r--r--misc/pypanda/Makefile2
-rw-r--r--misc/qbrew/Makefile2
-rw-r--r--misc/qt4-l10n/Makefile1
-rw-r--r--misc/qt4-qtconfig/Makefile1
-rw-r--r--misc/qt4-qtdemo/Makefile1
-rw-r--r--misc/quick-lounge-applet/Makefile1
-rw-r--r--misc/rabbit/Makefile1
-rw-r--r--misc/tellico-kde4/Makefile2
-rw-r--r--misc/terraform/Makefile1
-rw-r--r--misc/toilet/Makefile1
-rw-r--r--misc/typetrainer/Makefile1
-rw-r--r--misc/uf-view/Makefile2
-rw-r--r--misc/wmcalendar/Makefile2
-rw-r--r--misc/wmweather+/Makefile4
-rw-r--r--misc/xfce4-appfinder/Makefile1
-rw-r--r--misc/xfce4-artwork/Makefile2
-rw-r--r--misc/xfce4-weather-plugin/Makefile2
-rw-r--r--misc/xfce4-wm-themes/Makefile1
-rw-r--r--misc/xiphos/Makefile2
-rw-r--r--misc/xmonad-log-applet/Makefile1
-rw-r--r--misc/xosd/Makefile1
-rw-r--r--misc/xsw/Makefile2
-rw-r--r--multimedia/2mandvd/Makefile2
-rw-r--r--multimedia/abby/Makefile2
-rw-r--r--multimedia/acidrip/Makefile2
-rw-r--r--multimedia/aegisub/Makefile1
-rw-r--r--multimedia/arista/Makefile2
-rw-r--r--multimedia/audacious-plugins/Makefile2
-rw-r--r--multimedia/audacious/Makefile1
-rw-r--r--multimedia/audiopreview/Makefile1
-rw-r--r--multimedia/avbin/Makefile2
-rw-r--r--multimedia/avidemux2-plugins/Makefile1
-rw-r--r--multimedia/avidemux2/Makefile.common4
-rw-r--r--multimedia/bangarang/Makefile1
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/bino/Makefile1
-rw-r--r--multimedia/bmp-extra-plugins/Makefile2
-rw-r--r--multimedia/bombono/Makefile2
-rw-r--r--multimedia/camserv/Makefile2
-rw-r--r--multimedia/cheese/Makefile2
-rw-r--r--multimedia/clipgrab/Makefile1
-rw-r--r--multimedia/clive1/Makefile2
-rw-r--r--multimedia/clutter-gst/Makefile1
-rw-r--r--multimedia/dv2jpg/Makefile2
-rw-r--r--multimedia/dvbcut/Makefile2
-rw-r--r--multimedia/dvdauthor/Makefile4
-rw-r--r--multimedia/dvdauthor/files/patch-spuunmux.c19
-rw-r--r--multimedia/dvdauthorwizard/Makefile2
-rw-r--r--multimedia/dvdrip/Makefile2
-rw-r--r--multimedia/dvdstyler/Makefile2
-rw-r--r--multimedia/emotion/Makefile2
-rw-r--r--multimedia/ffmpeg-devel/Makefile2
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/ffmpeg2theora/Makefile2
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile4
-rw-r--r--multimedia/freevo/Makefile2
-rw-r--r--multimedia/gaupol/Makefile1
-rw-r--r--multimedia/gavl/Makefile3
-rw-r--r--multimedia/gdvrecv/Makefile2
-rw-r--r--multimedia/gmencoder/Makefile2
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile4
-rw-r--r--multimedia/gmerlin/Makefile4
-rw-r--r--multimedia/gmimms/Makefile2
-rw-r--r--multimedia/gnome-mplayer/Makefile2
-rw-r--r--multimedia/gnome-subtitles/Makefile1
-rw-r--r--multimedia/gpac-libgpac/Makefile5
-rw-r--r--multimedia/gpac-libgpac/files/patch-src-media_tools-img.c32
-rw-r--r--multimedia/gpac-mp4box/Makefile1
-rw-r--r--multimedia/gpodder/Makefile1
-rw-r--r--multimedia/grpplaylist/Makefile2
-rw-r--r--multimedia/gst123/Makefile1
-rw-r--r--multimedia/gstreamer-plugins-core/Makefile2
-rw-r--r--multimedia/gstreamer-plugins-mpeg2enc/Makefile2
-rw-r--r--multimedia/gstreamer-plugins-x264/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/gstreamer-qt4/Makefile1
-rw-r--r--multimedia/gstreamermm/Makefile1
-rw-r--r--multimedia/gsubedit/Makefile2
-rw-r--r--multimedia/gtk-recordmydesktop/Makefile2
-rw-r--r--multimedia/gxine/Makefile1
-rw-r--r--multimedia/gxmms/Makefile2
-rw-r--r--multimedia/imagination/Makefile2
-rw-r--r--multimedia/iriverter/Makefile2
-rw-r--r--multimedia/k9copy-kde4/Makefile2
-rw-r--r--multimedia/k9copy/Makefile1
-rw-r--r--multimedia/kaffeine-mozilla/Makefile2
-rw-r--r--multimedia/kaffeine/Makefile2
-rw-r--r--multimedia/kdemultimedia3/Makefile2
-rw-r--r--multimedia/kdemultimedia4/Makefile1
-rw-r--r--multimedia/kdenlive/Makefile2
-rw-r--r--multimedia/kino/Makefile2
-rw-r--r--multimedia/kissdx/Makefile2
-rw-r--r--multimedia/kmenc15/Makefile2
-rw-r--r--multimedia/kmplayer-kde4/Makefile2
-rw-r--r--multimedia/kmplayer/Makefile2
-rw-r--r--multimedia/konverter/Makefile2
-rw-r--r--multimedia/kplayer-kde4/Makefile2
-rw-r--r--multimedia/kplayer/Makefile2
-rw-r--r--multimedia/ksubeditor/Makefile2
-rw-r--r--multimedia/libkate/Makefile3
-rw-r--r--multimedia/libquicktime-lame/Makefile4
-rw-r--r--multimedia/libquicktime/Makefile4
-rw-r--r--multimedia/libxine/Makefile3
-rw-r--r--multimedia/linux-huludesktop/Makefile2
-rw-r--r--multimedia/linux-realplayer/Makefile2
-rw-r--r--multimedia/lives/Makefile2
-rw-r--r--multimedia/lxdvdrip/Makefile2
-rw-r--r--multimedia/m2tstoavi/Makefile2
-rw-r--r--multimedia/mandvd/Makefile2
-rw-r--r--multimedia/mediadownloader/Makefile1
-rw-r--r--multimedia/mencoder/Makefile2
-rw-r--r--multimedia/minitube/Makefile1
-rw-r--r--multimedia/miro/Makefile1
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mkvtoolnix/Makefile1
-rw-r--r--multimedia/mlt/Makefile1
-rw-r--r--multimedia/motion/Makefile2
-rw-r--r--multimedia/mpeg4ip/Makefile2
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayer/Makefile.shared2
-rw-r--r--multimedia/mplayerxp/Makefile4
-rw-r--r--multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c19
-rw-r--r--multimedia/mythtv-frontend/Makefile1
-rw-r--r--multimedia/mythtv/Makefile1
-rw-r--r--multimedia/oggvideotools/Makefile2
-rw-r--r--multimedia/ogmrip/Makefile4
-rw-r--r--multimedia/openmovieeditor/Makefile2
-rw-r--r--multimedia/openshot/Makefile1
-rw-r--r--multimedia/p5-FFmpeg-Command/Makefile1
-rw-r--r--multimedia/phonon-gstreamer/Makefile1
-rw-r--r--multimedia/phonon-vlc/Makefile1
-rw-r--r--multimedia/phonon-xine/Makefile2
-rw-r--r--multimedia/phonon/Makefile1
-rw-r--r--multimedia/photofilmstrip/Makefile2
-rw-r--r--multimedia/pitivi/Makefile2
-rw-r--r--multimedia/py-gstreamer/Makefile1
-rw-r--r--multimedia/py-kaa-base/Makefile2
-rw-r--r--multimedia/py-kaa-imlib2/Makefile2
-rw-r--r--multimedia/py-kaa-metadata/Makefile2
-rw-r--r--multimedia/py-mlt/Makefile1
-rw-r--r--multimedia/py-openlp/Makefile2
-rw-r--r--multimedia/py-pybmp/Makefile2
-rw-r--r--multimedia/py-qt4-multimedia/Makefile1
-rw-r--r--multimedia/py-qt4-phonon/Makefile1
-rw-r--r--multimedia/qdvdauthor/Makefile2
-rw-r--r--multimedia/qmmp/Makefile1
-rw-r--r--multimedia/qt4-multimedia/Makefile1
-rw-r--r--multimedia/qt4-phonon-gst/Makefile1
-rw-r--r--multimedia/qt4-phonon/Makefile1
-rw-r--r--multimedia/quark/Makefile2
-rw-r--r--multimedia/quodlibet/Makefile2
-rw-r--r--multimedia/rox-videothumbnail/Makefile2
-rw-r--r--multimedia/sabbu/Makefile2
-rw-r--r--multimedia/smile/Makefile2
-rw-r--r--multimedia/smplayer/Makefile1
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile2
-rw-r--r--multimedia/subtitlecomposer/Makefile2
-rw-r--r--multimedia/subtitleeditor/Makefile2
-rw-r--r--multimedia/subtitleripper/Makefile4
-rw-r--r--multimedia/swfdec-gnome/Makefile1
-rw-r--r--multimedia/totem-pl-parser/Makefile1
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/transkode/Makefile2
-rw-r--r--multimedia/umplayer/Makefile1
-rw-r--r--multimedia/vdr-plugin-markad/Makefile2
-rw-r--r--multimedia/vdr-plugin-osdpip/Makefile2
-rw-r--r--multimedia/vdr-plugin-softdevice/Makefile2
-rw-r--r--multimedia/vdr-plugin-upnp/Makefile2
-rw-r--r--multimedia/vdr-plugin-xineliboutput/Makefile1
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/x264-devel/Makefile2
-rw-r--r--multimedia/x264/Makefile2
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--multimedia/xbmc-addon-xvdr/Makefile2
-rw-r--r--multimedia/xbmc-pvr/Makefile4
-rw-r--r--multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp74
-rw-r--r--multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h19
-rw-r--r--multimedia/xbmc/Makefile4
-rw-r--r--multimedia/xfce4-media/Makefile2
-rw-r--r--multimedia/xfce4-parole/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--multimedia/xine/Makefile4
-rw-r--r--multimedia/xine/files/patch-src_xitk_Imlib-light_load.c10
-rw-r--r--multimedia/xine_artsplugin/Makefile2
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--multimedia/y4mscaler/Makefile2
-rw-r--r--net-im/amsn/Makefile4
-rw-r--r--net-im/amsn/files/patch-ximapng.cpp74
-rw-r--r--net-im/amsn/files/patch-ximapng.h19
-rw-r--r--net-im/ayttm/Makefile2
-rw-r--r--net-im/decibel/Makefile2
-rw-r--r--net-im/emesene/Makefile2
-rw-r--r--net-im/empathy/Makefile2
-rw-r--r--net-im/eva/Makefile2
-rw-r--r--net-im/farsight2/Makefile1
-rw-r--r--net-im/finch/Makefile2
-rw-r--r--net-im/gajim-devel/Makefile1
-rw-r--r--net-im/gajim/Makefile2
-rw-r--r--net-im/gyach/Makefile2
-rw-r--r--net-im/jabber.el/Makefile2
-rw-r--r--net-im/kmerlin/Makefile2
-rw-r--r--net-im/kmess-kde4/Makefile2
-rw-r--r--net-im/kmess/Makefile2
-rw-r--r--net-im/komclean/Makefile1
-rw-r--r--net-im/konverse/Makefile2
-rw-r--r--net-im/kopete/Makefile2
-rw-r--r--net-im/kpopup/Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/licq-osd/Makefile1
-rw-r--r--net-im/licq-qt-gui/Makefile1
-rw-r--r--net-im/mbpurple/Makefile2
-rw-r--r--net-im/openfetion/Makefile1
-rw-r--r--net-im/papyon/Makefile1
-rw-r--r--net-im/pidgin-audacious-remote/Makefile2
-rw-r--r--net-im/pidgin-birthday-reminder/Makefile2
-rw-r--r--net-im/pidgin-bs/Makefile2
-rw-r--r--net-im/pidgin-facebookchat/Makefile2
-rw-r--r--net-im/pidgin-fetion/Makefile2
-rw-r--r--net-im/pidgin-guifications/Makefile2
-rw-r--r--net-im/pidgin-hotkeys/Makefile2
-rw-r--r--net-im/pidgin-latex/Makefile2
-rw-r--r--net-im/pidgin-libnotify/Makefile2
-rw-r--r--net-im/pidgin-manualsize/Makefile2
-rw-r--r--net-im/pidgin-msn-pecan/Makefile2
-rw-r--r--net-im/pidgin-osd/Makefile2
-rw-r--r--net-im/pidgin-pidgimpd/Makefile2
-rw-r--r--net-im/pidgin-privacy-please/Makefile2
-rw-r--r--net-im/pidgin-rhythmbox/Makefile2
-rw-r--r--net-im/pidgin-sipe/Makefile1
-rw-r--r--net-im/pidgin-skype/Makefile1
-rw-r--r--net-im/pidgin-twitter/Makefile1
-rw-r--r--net-im/pidgin/Makefile2
-rw-r--r--net-im/psi/Makefile2
-rw-r--r--net-im/psimedia/Makefile1
-rw-r--r--net-im/pymsn/Makefile2
-rw-r--r--net-im/qutim-plugin-icq/Makefile2
-rw-r--r--net-im/qutim-plugin-jabber/Makefile2
-rw-r--r--net-im/qutim/Makefile2
-rw-r--r--net-im/qwit-devel/Makefile2
-rw-r--r--net-im/qwit/Makefile2
-rw-r--r--net-im/qxmpp/Makefile1
-rw-r--r--net-im/ramblercontacts/Makefile1
-rw-r--r--net-im/sim-im-devel/Makefile2
-rw-r--r--net-im/sim-im/Makefile2
-rw-r--r--net-im/telepathy-butterfly/Makefile2
-rw-r--r--net-im/telepathy-farsight/Makefile1
-rw-r--r--net-im/telepathy-haze/Makefile2
-rw-r--r--net-im/telepathy-mission-control/Makefile1
-rw-r--r--net-im/telepathy-qt4/Makefile1
-rw-r--r--net-im/turpial/Makefile1
-rw-r--r--net-im/vacuum-im/Makefile1
-rw-r--r--net-im/vqcc-gtk/Makefile2
-rw-r--r--net-im/xfce4-messenger-plugin/Makefile2
-rw-r--r--net-mgmt/argus-monitor/Makefile2
-rw-r--r--net-mgmt/bandwidthd/Makefile2
-rw-r--r--net-mgmt/collectd/Makefile2
-rw-r--r--net-mgmt/collectd5/Makefile2
-rw-r--r--net-mgmt/etherape/Makefile2
-rw-r--r--net-mgmt/ettercap/Makefile1
-rw-r--r--net-mgmt/flowviewer/Makefile2
-rw-r--r--net-mgmt/icinga/Makefile2
-rw-r--r--net-mgmt/lanmap/Makefile2
-rw-r--r--net-mgmt/mbrowse/Makefile2
-rw-r--r--net-mgmt/mrtg-ping-probe/Makefile2
-rw-r--r--net-mgmt/mrtg/Makefile2
-rw-r--r--net-mgmt/nagiosagent/Makefile2
-rw-r--r--net-mgmt/nagiosgrapher/Makefile2
-rw-r--r--net-mgmt/nagstamon/Makefile1
-rw-r--r--net-mgmt/ndoutils/Makefile2
-rw-r--r--net-mgmt/nettop/Makefile2
-rw-r--r--net-mgmt/nfdump-devel/Makefile2
-rw-r--r--net-mgmt/nfdump/Makefile2
-rw-r--r--net-mgmt/nsca/Makefile1
-rw-r--r--net-mgmt/p5-FusionInventory-Agent/Makefile1
-rw-r--r--net-mgmt/qkismet/Makefile2
-rw-r--r--net-mgmt/rrdbot/Makefile2
-rw-r--r--net-mgmt/smokeping/Makefile2
-rw-r--r--net-mgmt/spectools/Makefile1
-rw-r--r--net-mgmt/tork/Makefile2
-rw-r--r--net-mgmt/torrus/Makefile2
-rw-r--r--net-mgmt/vidalia/Makefile1
-rw-r--r--net-mgmt/virt-viewer/Makefile1
-rw-r--r--net-mgmt/wifimgr/Makefile1
-rw-r--r--net-mgmt/xymon-server/Makefile4
-rw-r--r--net-mgmt/yabm/Makefile4
-rw-r--r--net-mgmt/yabm/files/patch-Makefile49
-rw-r--r--net-mgmt/yabm/files/patch-mylibpng.c10
-rw-r--r--net-p2p/amule-devel/Makefile2
-rw-r--r--net-p2p/amule/Makefile2
-rw-r--r--net-p2p/azureus2/Makefile2
-rw-r--r--net-p2p/bitcoin/Makefile1
-rw-r--r--net-p2p/bittyrant/Makefile2
-rw-r--r--net-p2p/deluge/Makefile1
-rw-r--r--net-p2p/eiskaltdcpp-data/Makefile1
-rw-r--r--net-p2p/eiskaltdcpp-gtk/Makefile2
-rw-r--r--net-p2p/eiskaltdcpp-qt/Makefile2
-rw-r--r--net-p2p/gkremldk/Makefile1
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/gtk-gnutella/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile2
-rw-r--r--net-p2p/gtorrentviewer/Makefile2
-rw-r--r--net-p2p/kmldonkey/Makefile2
-rw-r--r--net-p2p/ktorrent/Makefile1
-rw-r--r--net-p2p/ktorrent2/Makefile2
-rw-r--r--net-p2p/libktorrent/Makefile1
-rw-r--r--net-p2p/linuxdcpp/Makefile1
-rw-r--r--net-p2p/mldonkey/Makefile1
-rw-r--r--net-p2p/museekplus/Makefile2
-rw-r--r--net-p2p/py-bittornado/Makefile2
-rw-r--r--net-p2p/qbittorrent-29/Makefile2
-rw-r--r--net-p2p/qtella/Makefile2
-rw-r--r--net-p2p/qtorrent/Makefile2
-rw-r--r--net-p2p/retroshare/Makefile2
-rw-r--r--net-p2p/sharktorrent/Makefile2
-rw-r--r--net-p2p/solidcoin/Makefile1
-rw-r--r--net-p2p/transmission-cli/Makefile2
-rw-r--r--net-p2p/transmission-qt4/Makefile2
-rw-r--r--net-p2p/transmission-remote-gui/Makefile2
-rw-r--r--net-p2p/tribler/Makefile1
-rw-r--r--net-p2p/valknut/Makefile2
-rw-r--r--net-p2p/vuze/Makefile1
-rw-r--r--net/appkonference/Makefile2
-rw-r--r--net/asterisk-oh323/Makefile2
-rw-r--r--net/asterisk/Makefile1
-rw-r--r--net/asterisk10/Makefile1
-rw-r--r--net/asterisk14-addons/Makefile1
-rw-r--r--net/asterisk14/Makefile2
-rw-r--r--net/asterisk16-addons/Makefile1
-rw-r--r--net/asterisk16/Makefile1
-rw-r--r--net/avahi-gtk/Makefile2
-rw-r--r--net/avahi-qt3/Makefile2
-rw-r--r--net/blam/Makefile2
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/boinc_curses/Makefile1
-rw-r--r--net/cphone/Makefile2
-rw-r--r--net/desktop-data-model/Makefile2
-rw-r--r--net/diradmin/Makefile2
-rw-r--r--net/ekiga/Makefile2
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/freenx/Makefile2
-rw-r--r--net/freerdp/Makefile1
-rw-r--r--net/g2ipmsg/Makefile2
-rw-r--r--net/gatekeeper/Makefile2
-rw-r--r--net/gkrellmqst/Makefile2
-rw-r--r--net/gkrellmwireless2/Makefile2
-rw-r--r--net/gnome-mud/Makefile2
-rw-r--r--net/gnome-netstatus/Makefile1
-rw-r--r--net/gnome-nettool/Makefile1
-rw-r--r--net/gnome-vnc/Makefile2
-rw-r--r--net/gq/Makefile2
-rw-r--r--net/grdesktop/Makefile2
-rw-r--r--net/grsync/Makefile1
-rw-r--r--net/gspoof/Makefile2
-rw-r--r--net/gssdp/Makefile2
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/gupnp-av/Makefile2
-rw-r--r--net/gupnp-igd/Makefile2
-rw-r--r--net/gupnp-ui/Makefile2
-rw-r--r--net/gupnp/Makefile2
-rw-r--r--net/heybuddy/Makefile2
-rw-r--r--net/hupnp/Makefile1
-rw-r--r--net/kdenetwork3/Makefile2
-rw-r--r--net/kdenetwork4/Makefile1
-rw-r--r--net/kiax/Makefile2
-rw-r--r--net/kio-upnp-ms/Makefile2
-rw-r--r--net/knemo-kde4/Makefile2
-rw-r--r--net/knemo/Makefile2
-rw-r--r--net/kphone/Makefile2
-rw-r--r--net/krdesktop/Makefile2
-rw-r--r--net/kwooty/Makefile2
-rw-r--r--net/lanbrowsing/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libgweather/Makefile1
-rw-r--r--net/libproxy-gnome/Makefile2
-rw-r--r--net/libproxy-kde/Makefile2
-rw-r--r--net/libproxy-mozjs/Makefile2
-rw-r--r--net/libproxy-webkit/Makefile2
-rw-r--r--net/liferea/Makefile1
-rw-r--r--net/link-monitor-applet/Makefile2
-rw-r--r--net/linphone/Makefile2
-rw-r--r--net/linux-nx-client/Makefile2
-rw-r--r--net/mediatomb/Makefile2
-rw-r--r--net/minidlna/Makefile1
-rw-r--r--net/mtr/Makefile2
-rw-r--r--net/netmap/Makefile1
-rw-r--r--net/netspeed_applet/Makefile1
-rw-r--r--net/nos-ttb/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/nxproxy/Makefile6
-rw-r--r--net/nxproxy/files/patch-nxcomp-Pgn.cpp10
-rw-r--r--net/nxserver/Makefile6
-rw-r--r--net/nxserver/files/patch-nxcomp-Pgn.cpp10
-rw-r--r--net/ohphone/Makefile2
-rw-r--r--net/online-desktop/Makefile2
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/opal3/Makefile2
-rw-r--r--net/openam/Makefile2
-rw-r--r--net/openh323/Makefile2
-rw-r--r--net/openmcu/Makefile2
-rw-r--r--net/opennx/Makefile1
-rw-r--r--net/p5-Net-FS-Flickr/Makefile2
-rw-r--r--net/p5-Net-VNC/Makefile1
-rw-r--r--net/pcbsd-netmanager/Makefile2
-rw-r--r--net/pppload/Makefile2
-rw-r--r--net/py-avahi/Makefile2
-rw-r--r--net/py-qt4-network/Makefile1
-rw-r--r--net/remmina-applet/Makefile1
-rw-r--r--net/remmina-plugin-vnc/Makefile1
-rw-r--r--net/remmina/Makefile2
-rw-r--r--net/rsplib/Makefile1
-rw-r--r--net/rude/Makefile2
-rw-r--r--net/service-discovery-applet/Makefile2
-rw-r--r--net/smb4k-kde4/Makefile2
-rw-r--r--net/smb4k/Makefile2
-rw-r--r--net/tramp/Makefile1
-rw-r--r--net/tsclient/Makefile2
-rw-r--r--net/tucan/Makefile1
-rw-r--r--net/twinkle/Makefile2
-rw-r--r--net/twitux/Makefile2
-rw-r--r--net/unison-devel/Makefile1
-rw-r--r--net/unison/Makefile1
-rw-r--r--net/unison232/Makefile1
-rw-r--r--net/vinagre/Makefile2
-rw-r--r--net/vino/Makefile2
-rw-r--r--net/vnstat/Makefile1
-rw-r--r--net/wireshark/Makefile1
-rw-r--r--net/wpa_gui/Makefile2
-rw-r--r--net/x2goclient/Makefile2
-rw-r--r--news/grn/Makefile2
-rw-r--r--news/klibido/Makefile2
-rw-r--r--news/knews/Makefile4
-rw-r--r--news/knews/files/patch-Imakefile12
-rw-r--r--news/knews/files/patch-png.c22
-rw-r--r--news/lottanzb/Makefile2
-rw-r--r--news/pan/Makefile2
-rw-r--r--news/slrn/Makefile2
-rw-r--r--news/slrnconf/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--palm/gnome-pilot-conduits/Makefile2
-rw-r--r--palm/gnome-pilot/Makefile2
-rw-r--r--palm/imgvtopgm/Makefile2
-rw-r--r--palm/jpilot-picsnvideos/Makefile2
-rw-r--r--palm/jpilot/Makefile1
-rw-r--r--palm/pilot-link/Makefile2
-rw-r--r--palm/ppmtoTbmp/Makefile2
-rw-r--r--palm/synce-gvfs/Makefile2
-rw-r--r--palm/synce-trayicon/Makefile2
-rw-r--r--polish/gnugadu2/Makefile2
-rw-r--r--polish/kadu/Makefile2
-rw-r--r--polish/kde3-i18n/Makefile2
-rw-r--r--polish/kde4-l10n/Makefile1
-rw-r--r--polish/qfaktury/Makefile2
-rw-r--r--polish/qnapi/Makefile2
-rw-r--r--polish/tleenx2/Makefile2
-rw-r--r--ports-mgmt/bpm/Makefile2
-rw-r--r--ports-mgmt/bxpkg/Makefile2
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile2
-rw-r--r--ports-mgmt/kpackagekit/Makefile2
-rw-r--r--ports-mgmt/kports-qt4/Makefile2
-rw-r--r--ports-mgmt/kports/Makefile2
-rw-r--r--ports-mgmt/packagekit/Makefile2
-rw-r--r--ports-mgmt/portrac/Makefile1
-rw-r--r--ports-mgmt/qtpkg/Makefile2
-rw-r--r--portuguese/kde3-i18n-pt_BR/Makefile2
-rw-r--r--portuguese/kde3-i18n/Makefile2
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile1
-rw-r--r--portuguese/kde4-l10n/Makefile1
-rw-r--r--print/advi/Makefile4
-rw-r--r--print/apsfilter/Makefile2
-rw-r--r--print/auctex/Makefile2
-rw-r--r--print/catdvi/Makefile2
-rw-r--r--print/cjk-lyx/Makefile2
-rw-r--r--print/cm-super/Makefile2
-rw-r--r--print/cups-base/Makefile8
-rw-r--r--print/cups-bjnp/Makefile2
-rw-r--r--print/cups-pdf/Makefile1
-rw-r--r--print/cups-pk-helper/Makefile2
-rw-r--r--print/cups-pstoraster/Makefile2
-rw-r--r--print/dot2tex/Makefile1
-rw-r--r--print/dvipdfmx/Makefile4
-rw-r--r--print/dvipsk-tetex/Makefile4
-rw-r--r--print/dvisvg/Makefile2
-rw-r--r--print/enscript-letter/Makefile2
-rw-r--r--print/epsonepl/Makefile2
-rw-r--r--print/flpsed/Makefile1
-rw-r--r--print/fontforge/Makefile4
-rw-r--r--print/foo2zjs/Makefile2
-rw-r--r--print/foomatic-filters/Makefile1
-rw-r--r--print/freetype-tools/Makefile2
-rw-r--r--print/frescobaldi/Makefile2
-rw-r--r--print/ggv/Makefile2
-rw-r--r--print/ghostscript7-commfont/Makefile2
-rw-r--r--print/ghostscript7/Makefile7
-rw-r--r--print/ghostscript7/files/patch-src-gdevpng.c11
-rw-r--r--print/ghostscript7/files/patch-src-png_.h9
-rw-r--r--print/ghostscript8/Makefile6
-rw-r--r--print/ghostscript8/files/patch-base-gdevpng.c11
-rw-r--r--print/ghostscript8/files/patch-base-png_.h9
-rw-r--r--print/ghostscript9/Makefile4
-rw-r--r--print/gnome-cups-manager/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnome-specimen/Makefile2
-rw-r--r--print/gnomephotoprinter/Makefile2
-rw-r--r--print/gribouy/Makefile2
-rw-r--r--print/gsview/Makefile2
-rw-r--r--print/gtklp/Makefile1
-rw-r--r--print/gutenprint-base/Makefile1
-rw-r--r--print/gv/Makefile1
-rw-r--r--print/hp2xx/Makefile4
-rw-r--r--print/hp2xx/files/patch-png.c19
-rw-r--r--print/hpijs/Makefile2
-rw-r--r--print/hplip/Makefile2
-rw-r--r--print/hyperlatex/Makefile2
-rw-r--r--print/ifxetex/Makefile2
-rw-r--r--print/jadetex/Makefile4
-rw-r--r--print/kcdlabel/Makefile2
-rw-r--r--print/kdeutils4-printer-applet/Makefile1
-rw-r--r--print/kover/Makefile1
-rw-r--r--print/kpdftool/Makefile1
-rw-r--r--print/latex-arydshln/Makefile2
-rw-r--r--print/latex-bytefield/Makefile2
-rw-r--r--print/latex-caption/Makefile2
-rw-r--r--print/latex-chapterfolder/Makefile1
-rw-r--r--print/latex-circ/Makefile2
-rw-r--r--print/latex-cjk/Makefile2
-rw-r--r--print/latex-feynmf/Makefile2
-rw-r--r--print/latex-logpap/Makefile2
-rw-r--r--print/latex-nomencl/Makefile1
-rw-r--r--print/latex-prettyref/Makefile2
-rw-r--r--print/latex-subfloat/Makefile2
-rw-r--r--print/latex-supertabular/Makefile2
-rw-r--r--print/latex-svninfo/Makefile2
-rw-r--r--print/lgrind/Makefile2
-rw-r--r--print/libgnomeprint/Makefile1
-rw-r--r--print/libgnomeprintmm/Makefile2
-rw-r--r--print/libharu/Makefile5
-rw-r--r--print/libharu/files/patch-hpdf_image_png.c10
-rw-r--r--print/libspectre/Makefile1
-rw-r--r--print/lilypond/Makefile2
-rw-r--r--print/lpr-wrapper/Makefile1
-rw-r--r--print/lyx/Makefile1
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--print/magicfilter/Makefile2
-rw-r--r--print/mapagi/Makefile2
-rw-r--r--print/mftrace/Makefile2
-rw-r--r--print/p5-Net-CUPS/Makefile1
-rw-r--r--print/panda/Makefile4
-rw-r--r--print/paps/Makefile2
-rw-r--r--print/passivetex/Makefile2
-rw-r--r--print/pdfcube/Makefile1
-rw-r--r--print/pdfjam/Makefile1
-rw-r--r--print/pdfmod/Makefile1
-rw-r--r--print/pips-sc60s/Makefile2
-rw-r--r--print/pips-sc65_66s/Makefile2
-rw-r--r--print/pips-sc80s/Makefile2
-rw-r--r--print/pips-sc84_83s/Makefile2
-rw-r--r--print/pips-sc85_86s/Makefile2
-rw-r--r--print/pips-scx3500_3600s/Makefile2
-rw-r--r--print/pips-sp2100_2200/Makefile2
-rw-r--r--print/pips-spr200_210/Makefile2
-rw-r--r--print/pips-spr300_310/Makefile2
-rw-r--r--print/pips-spr800/Makefile2
-rw-r--r--print/pips2200/Makefile2
-rw-r--r--print/pips3000/Makefile2
-rw-r--r--print/pips3300/Makefile2
-rw-r--r--print/pips3500/Makefile2
-rw-r--r--print/pips4000/Makefile2
-rw-r--r--print/pips670/Makefile2
-rw-r--r--print/pips730/Makefile2
-rw-r--r--print/pips740-cups/Makefile2
-rw-r--r--print/pips740/Makefile2
-rw-r--r--print/pips750_2000/Makefile2
-rw-r--r--print/pips760/Makefile2
-rw-r--r--print/pips770/Makefile2
-rw-r--r--print/pips780/Makefile2
-rw-r--r--print/pips800/Makefile2
-rw-r--r--print/pips800/Makefile.pips2
-rw-r--r--print/pips820/Makefile2
-rw-r--r--print/pips870-cups/Makefile2
-rw-r--r--print/pips870/Makefile2
-rw-r--r--print/pips880/Makefile2
-rw-r--r--print/pips900/Makefile2
-rw-r--r--print/pips930/Makefile2
-rw-r--r--print/pips940/Makefile2
-rw-r--r--print/pips970-cups/Makefile2
-rw-r--r--print/pips970/Makefile2
-rw-r--r--print/pips980/Makefile2
-rw-r--r--print/pipsg700/Makefile2
-rw-r--r--print/pipsg800/Makefile2
-rw-r--r--print/pipsg900/Makefile2
-rw-r--r--print/pipsv500/Makefile2
-rw-r--r--print/pipsv600/Makefile2
-rw-r--r--print/pipsv700-cups/Makefile2
-rw-r--r--print/pipsv700/Makefile2
-rw-r--r--print/pnm2ppa/Makefile1
-rw-r--r--print/ps2eps/Makefile2
-rw-r--r--print/psdim/Makefile2
-rw-r--r--print/pslib/Makefile3
-rw-r--r--print/pstotext/Makefile2
-rw-r--r--print/py-pyscript/Makefile2
-rw-r--r--print/py-relatorio/Makefile1
-rw-r--r--print/ruby-panda/Makefile4
-rw-r--r--print/scribus-devel/Makefile3
-rw-r--r--print/scribus/Makefile3
-rw-r--r--print/sgf2tex/Makefile2
-rw-r--r--print/splix/Makefile2
-rw-r--r--print/system-config-printer-kde/Makefile1
-rw-r--r--print/system-config-printer/Makefile2
-rw-r--r--print/teTeX-base/Makefile6
-rw-r--r--print/teTeX-base/files/patch-texk-pdftexdir-writepng.c19
-rw-r--r--print/teTeX-base/files/patch-texk-web2c-pdftexdir-writeimg.c10
-rw-r--r--print/teTeX/Makefile2
-rw-r--r--print/tex-mfpic/Makefile1
-rw-r--r--print/tex-omegaware-old/Makefile2
-rw-r--r--print/texpower/Makefile2
-rw-r--r--print/texvc/Makefile2
-rw-r--r--print/transfig/Makefile4
-rw-r--r--print/transfig/files/patch-fig2dev_dev_readpng.c19
-rw-r--r--print/typetools/Makefile1
-rw-r--r--print/xdvik/Makefile2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--print/xmltex/Makefile4
-rw-r--r--print/xpp/Makefile2
-rw-r--r--print/xtexsh/Makefile2
-rw-r--r--print/yatex/Makefile2
-rw-r--r--russian/kde3-i18n/Makefile2
-rw-r--r--russian/kde4-l10n/Makefile1
-rw-r--r--russian/ksocrat/Makefile2
-rw-r--r--science/abinit/Makefile2
-rw-r--r--science/afni/Makefile1
-rw-r--r--science/avogadro/Makefile1
-rw-r--r--science/brian/Makefile1
-rw-r--r--science/cdcl/Makefile2
-rw-r--r--science/chemical-mime-data/Makefile2
-rw-r--r--science/chemtool-devel/Makefile2
-rw-r--r--science/chemtool/Makefile2
-rw-r--r--science/dcl/Makefile1
-rw-r--r--science/ecs/Makefile2
-rw-r--r--science/euler/Makefile2
-rw-r--r--science/flounder/Makefile4
-rw-r--r--science/flounder/files/patch-PNGwrite.cc11
-rw-r--r--science/g3data/Makefile2
-rw-r--r--science/gchemutils/Makefile1
-rw-r--r--science/gdis/Makefile2
-rw-r--r--science/getdp/Makefile2
-rw-r--r--science/ghemical/Makefile2
-rw-r--r--science/gnudatalanguage/Makefile2
-rw-r--r--science/gramps/Makefile1
-rw-r--r--science/gsmc/Makefile2
-rw-r--r--science/gsystem/Makefile2
-rw-r--r--science/gwyddion/Makefile2
-rw-r--r--science/gwyddion/files/patch-pixmap.c10
-rw-r--r--science/h5utils/Makefile6
-rw-r--r--science/h5utils/files/patch-writepng.c19
-rw-r--r--science/kalzium/Makefile1
-rw-r--r--science/kmovisto/Makefile2
-rw-r--r--science/kst/Makefile2
-rw-r--r--science/kst2/Makefile1
-rw-r--r--science/linsmith/Makefile1
-rw-r--r--science/massxpert/Makefile1
-rw-r--r--science/mayavi/Makefile2
-rw-r--r--science/mcstas/Makefile1
-rw-r--r--science/mpqc/Makefile2
-rw-r--r--science/ncs/Makefile2
-rw-r--r--science/omnetpp/Makefile2
-rw-r--r--science/ovt/Makefile2
-rw-r--r--science/paraview/Makefile3
-rw-r--r--science/peekabot/Makefile2
-rw-r--r--science/psychopy/Makefile1
-rw-r--r--science/py-hcluster/Makefile2
-rw-r--r--science/py-obspy-core/Makefile1
-rw-r--r--science/py-obspy.db/Makefile1
-rw-r--r--science/py-obspy.gse2/Makefile1
-rw-r--r--science/py-obspy.imaging/Makefile1
-rw-r--r--science/py-obspy.iris/Makefile1
-rw-r--r--science/py-obspy.mseed/Makefile1
-rw-r--r--science/py-obspy.signal/Makefile1
-rw-r--r--science/py-obspy.taup/Makefile1
-rw-r--r--science/py-obspy.wav/Makefile1
-rw-r--r--science/py-obspy.xseed/Makefile1
-rw-r--r--science/qtresistors/Makefile2
-rw-r--r--science/ruby-dcl/Makefile1
-rw-r--r--science/ruby-gphys/Makefile2
-rw-r--r--science/silo/Makefile2
-rw-r--r--science/step/Makefile1
-rw-r--r--science/v_sim/Makefile1
-rw-r--r--science/veusz/Makefile2
-rw-r--r--science/vis5d+/Makefile2
-rw-r--r--security/clamtk/Makefile1
-rw-r--r--security/clusterssh/Makefile1
-rw-r--r--security/fpm/Makefile2
-rw-r--r--security/fprint_demo/Makefile1
-rw-r--r--security/fwanalog/Makefile2
-rw-r--r--security/fwbuilder/Makefile2
-rw-r--r--security/gcipher/Makefile1
-rw-r--r--security/gnome-gpg/Makefile2
-rw-r--r--security/gnome-keyring-sharp/Makefile1
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/gnome-password-generator/Makefile2
-rw-r--r--security/gnome-ssh-askpass/Makefile1
-rw-r--r--security/gpass/Makefile2
-rw-r--r--security/gringotts/Makefile2
-rw-r--r--security/gtkpasman/Makefile1
-rw-r--r--security/hotssh/Makefile2
-rw-r--r--security/ike/Makefile1
-rw-r--r--security/kedpm/Makefile2
-rw-r--r--security/keepassx/Makefile1
-rw-r--r--security/kgpg/Makefile2
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/kopete-otr/Makefile2
-rw-r--r--security/kovpn/Makefile2
-rw-r--r--security/krb5/Makefile2
-rw-r--r--security/kssh/Makefile2
-rw-r--r--security/libfprint/Makefile2
-rw-r--r--security/libgnome-keyring/Makefile2
-rw-r--r--security/libgnomesu/Makefile2
-rw-r--r--security/log2timeline/Makefile1
-rw-r--r--security/nmapsi4/Makefile2
-rw-r--r--security/openvas-client/Makefile2
-rw-r--r--security/openvpn-admin/Makefile2
-rw-r--r--security/ophcrack/Makefile1
-rw-r--r--security/p5-Authen-Captcha/Makefile2
-rw-r--r--security/p5-GD-SecurityImage/Makefile1
-rw-r--r--security/pam_fprint/Makefile1
-rw-r--r--security/parano/Makefile2
-rw-r--r--security/pidgin-encryption/Makefile1
-rw-r--r--security/pinentry/Makefile2
-rw-r--r--security/putty/Makefile1
-rw-r--r--security/qca-tls/Makefile2
-rw-r--r--security/qtfw/Makefile2
-rw-r--r--security/quantis/Makefile1
-rw-r--r--security/revelation/Makefile2
-rw-r--r--security/seahorse-plugins/Makefile2
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--security/signing-party/Makefile2
-rw-r--r--security/snortreport/Makefile1
-rw-r--r--security/ssh_askpass_gtk2/Makefile2
-rw-r--r--security/starttls/Makefile2
-rw-r--r--security/tpmmanager/Makefile1
-rw-r--r--security/tuntun/Makefile2
-rw-r--r--security/umit/Makefile1
-rw-r--r--security/xca/Makefile1
-rw-r--r--security/zenmap/Makefile2
-rw-r--r--shells/fish/Makefile2
-rw-r--r--shells/viewglob/Makefile2
-rw-r--r--sysutils/LPRngTool/Makefile2
-rw-r--r--sysutils/abgx360gui/Makefile2
-rw-r--r--sysutils/asusoled/Makefile2
-rw-r--r--sysutils/bacula-bat/Makefile2
-rw-r--r--sysutils/battfink/Makefile2
-rw-r--r--sysutils/battray/Makefile1
-rw-r--r--sysutils/brasero/Makefile2
-rw-r--r--sysutils/bubblemon2/Makefile2
-rw-r--r--sysutils/cdrdao/Makefile2
-rw-r--r--sysutils/cog/Makefile2
-rw-r--r--sysutils/desktopbsd-tools/Makefile2
-rw-r--r--sysutils/dircomp/Makefile1
-rw-r--r--sysutils/downtime/Makefile2
-rw-r--r--sysutils/dvdisaster/Makefile2
-rw-r--r--sysutils/easypbi/Makefile2
-rw-r--r--sysutils/eiciel/Makefile1
-rw-r--r--sysutils/empower/Makefile1
-rw-r--r--sysutils/eroaster/Makefile2
-rw-r--r--sysutils/filelight-kde4/Makefile1
-rw-r--r--sysutils/filelight/Makefile2
-rw-r--r--sysutils/ftwin/Makefile2
-rw-r--r--sysutils/fusefs-gnome-vfs/Makefile2
-rw-r--r--sysutils/fusefs-pod/Makefile2
-rw-r--r--sysutils/fusefs-smbnetfs/Makefile1
-rw-r--r--sysutils/gai-leds/Makefile2
-rw-r--r--sysutils/ganglia-monitor-core/Makefile2
-rw-r--r--sysutils/gapcmon/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile1
-rw-r--r--sysutils/gdmap/Makefile2
-rw-r--r--sysutils/geomgui/Makefile2
-rw-r--r--sysutils/gkfreq/Makefile2
-rw-r--r--sysutils/gkleds2/Makefile2
-rw-r--r--sysutils/gkrellfire/Makefile2
-rw-r--r--sysutils/gkrellflynn/Makefile2
-rw-r--r--sysutils/gkrellm-trayicons/Makefile2
-rw-r--r--sysutils/gkrellm/Makefile2
-rw-r--r--sysutils/gkrellm2/Makefile2
-rw-r--r--sysutils/gkrellmwho2/Makefile2
-rw-r--r--sysutils/gkrelltop/Makefile2
-rw-r--r--sysutils/gksu/Makefile1
-rw-r--r--sysutils/gnome-control-center/Makefile1
-rw-r--r--sysutils/gnome-device-manager/Makefile2
-rw-r--r--sysutils/gnome-mount/Makefile2
-rw-r--r--sysutils/gnome-pkgview/Makefile2
-rw-r--r--sysutils/gnome-power-manager/Makefile2
-rw-r--r--sysutils/gnome-schedule/Makefile1
-rw-r--r--sysutils/gnome-settings-daemon/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile1
-rw-r--r--sysutils/gnome-system-tools/Makefile2
-rw-r--r--sysutils/gnomebaker/Makefile2
-rw-r--r--sysutils/gpkgdep/Makefile2
-rw-r--r--sysutils/graphicboot/Makefile2
-rw-r--r--sysutils/graveman/Makefile2
-rw-r--r--sysutils/gsmartcontrol/Makefile2
-rw-r--r--sysutils/gtk-imonc/Makefile2
-rw-r--r--sysutils/gtk-send-pr/Makefile2
-rw-r--r--sysutils/gupsc/Makefile2
-rw-r--r--sysutils/hachoir-wx/Makefile2
-rw-r--r--sysutils/hoz/Makefile2
-rw-r--r--sysutils/isomaster/Makefile2
-rw-r--r--sysutils/jfbterm/Makefile4
-rw-r--r--sysutils/k3b-kde4/Makefile2
-rw-r--r--sysutils/k3b/Makefile2
-rw-r--r--sysutils/kcpuload/Makefile2
-rw-r--r--sysutils/kdeadmin3/Makefile2
-rw-r--r--sysutils/kdeadmin4/Makefile1
-rw-r--r--sysutils/kdirstat/Makefile2
-rw-r--r--sysutils/keep/Makefile2
-rw-r--r--sysutils/kgrubeditor/Makefile2
-rw-r--r--sysutils/kgtk/Makefile2
-rw-r--r--sysutils/kkbswitch/Makefile2
-rw-r--r--sysutils/kkeyled/Makefile2
-rw-r--r--sysutils/klaptopdaemon/Makefile2
-rw-r--r--sysutils/kleansweep/Makefile2
-rw-r--r--sysutils/klineakconfig/Makefile2
-rw-r--r--sysutils/kmilo/Makefile2
-rw-r--r--sysutils/knutclient-kde4/Makefile2
-rw-r--r--sysutils/knutclient/Makefile2
-rw-r--r--sysutils/komparator/Makefile1
-rw-r--r--sysutils/krename-kde4/Makefile2
-rw-r--r--sysutils/krename/Makefile2
-rw-r--r--sysutils/kshutdown-kde4/Makefile1
-rw-r--r--sysutils/kshutdown/Makefile2
-rw-r--r--sysutils/ksynaptics/Makefile2
-rw-r--r--sysutils/libgksu/Makefile1
-rw-r--r--sysutils/lineak-kdeplugins/Makefile2
-rw-r--r--sysutils/lineak-xosdplugin/Makefile2
-rw-r--r--sysutils/lire/Makefile2
-rw-r--r--sysutils/logstalgia/Makefile4
-rw-r--r--sysutils/luckybackup/Makefile1
-rw-r--r--sysutils/luma/Makefile2
-rw-r--r--sysutils/lxinput/Makefile1
-rw-r--r--sysutils/lxtask/Makefile1
-rw-r--r--sysutils/lxterminal/Makefile1
-rw-r--r--sysutils/monitorix/Makefile1
-rw-r--r--sysutils/most/Makefile2
-rw-r--r--sysutils/mount.app/Makefile2
-rw-r--r--sysutils/munin-master/Makefile2
-rw-r--r--sysutils/nautilus-cd-burner/Makefile2
-rw-r--r--sysutils/nbosd/Makefile2
-rw-r--r--sysutils/nitrogen/Makefile1
-rw-r--r--sysutils/nvclock/Makefile2
-rw-r--r--sysutils/pbreg/Makefile1
-rw-r--r--sysutils/pessulus/Makefile2
-rw-r--r--sysutils/pfstat/Makefile2
-rw-r--r--sysutils/plasma-applet-apcups/Makefile2
-rw-r--r--sysutils/policykit-gnome/Makefile2
-rw-r--r--sysutils/policykit-qt/Makefile1
-rw-r--r--sysutils/polkit-gnome/Makefile1
-rw-r--r--sysutils/polkit-kde/Makefile2
-rw-r--r--sysutils/polkit-qt/Makefile1
-rw-r--r--sysutils/pwg/Makefile2
-rw-r--r--sysutils/pyrenamer/Makefile2
-rw-r--r--sysutils/qpxtool/Makefile3
-rw-r--r--sysutils/qpxtool/files/patch-f1tattoo.cpp10
-rw-r--r--sysutils/quicksynergy/Makefile2
-rw-r--r--sysutils/searchmonkey/Makefile1
-rw-r--r--sysutils/sensors-applet/Makefile2
-rw-r--r--sysutils/serpentine/Makefile2
-rw-r--r--sysutils/slmon/Makefile2
-rw-r--r--sysutils/spassgen/Makefile2
-rw-r--r--sysutils/symon/Makefile1
-rw-r--r--sysutils/thefish/Makefile2
-rw-r--r--sysutils/tracker-client/Makefile4
-rw-r--r--sysutils/usbhotkey/Makefile2
-rw-r--r--sysutils/vimpager/Makefile1
-rw-r--r--sysutils/warden/Makefile1
-rw-r--r--sysutils/wmfire/Makefile2
-rw-r--r--sysutils/xcdroast/Makefile2
-rw-r--r--sysutils/xfburn/Makefile2
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile1
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile1
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile1
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-power-manager/Makefile2
-rw-r--r--sysutils/xfce4-settings/Makefile1
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-utils/Makefile2
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile4
-rw-r--r--sysutils/xsu/Makefile2
-rw-r--r--sysutils/xvidcap/Makefile2
-rw-r--r--sysutils/zeitgeist/Makefile1
-rw-r--r--textproc/aiksaurus-gtk/Makefile2
-rw-r--r--textproc/artha/Makefile2
-rw-r--r--textproc/beediff/Makefile2
-rw-r--r--textproc/bibtool/Makefile2
-rw-r--r--textproc/chm2pdf/Makefile2
-rw-r--r--textproc/dblatex/Makefile1
-rw-r--r--textproc/dictem/Makefile2
-rw-r--r--textproc/dictionary/Makefile2
-rw-r--r--textproc/dikt/Makefile2
-rw-r--r--textproc/dixit/Makefile1
-rw-r--r--textproc/docbook-utils/Makefile2
-rw-r--r--textproc/docproj/Makefile2
-rw-r--r--textproc/emacs-wiki/Makefile2
-rw-r--r--textproc/eqe/Makefile2
-rw-r--r--textproc/fcitx-keyboard/Makefile1
-rw-r--r--textproc/fixrtf/Makefile4
-rw-r--r--textproc/fldiff/Makefile2
-rw-r--r--textproc/foiltex/Makefile2
-rw-r--r--textproc/gladtex/Makefile6
-rw-r--r--textproc/gladtex/files/patch-eqn2img.c22
-rw-r--r--textproc/gnome-spell/Makefile2
-rw-r--r--textproc/gnome-translate/Makefile2
-rw-r--r--textproc/goldendict/Makefile2
-rw-r--r--textproc/groff/Makefile1
-rw-r--r--textproc/gtkdiff/Makefile2
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/gutenmark/Makefile1
-rw-r--r--textproc/gxmlviewer/Makefile2
-rw-r--r--textproc/hs-lhs2tex/Makefile2
-rw-r--r--textproc/htmldoc/Makefile6
-rw-r--r--textproc/htmldoc/files/patch-image.cxx19
-rw-r--r--textproc/htmlize.el/Makefile1
-rw-r--r--textproc/htmltolatex/Makefile2
-rw-r--r--textproc/ibus-el/Makefile2
-rw-r--r--textproc/ibus-kmfl/Makefile2
-rw-r--r--textproc/ibus-m17n/Makefile1
-rw-r--r--textproc/ibus-qt/Makefile2
-rw-r--r--textproc/ibus-table/Makefile1
-rw-r--r--textproc/ibus/Makefile2
-rw-r--r--textproc/ipdf/Makefile4
-rw-r--r--textproc/kbedic/Makefile2
-rw-r--r--textproc/kdiff3/Makefile2
-rw-r--r--textproc/latex2html/Makefile1
-rw-r--r--textproc/libvisio/Makefile1
-rw-r--r--textproc/libwpd/Makefile1
-rw-r--r--textproc/libwpd08/Makefile2
-rw-r--r--textproc/libwps/Makefile1
-rw-r--r--textproc/m17n-im-config/Makefile2
-rw-r--r--textproc/meld/Makefile1
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/muse/Makefile2
-rw-r--r--textproc/opensched/Makefile2
-rw-r--r--textproc/openvanilla-modules/Makefile2
-rw-r--r--textproc/p5-HTML-HTMLDoc/Makefile1
-rw-r--r--textproc/p5-HTML-QRCode/Makefile1
-rw-r--r--textproc/p5-LaTeX-Driver/Makefile1
-rw-r--r--textproc/p5-LaTeX-Table/Makefile1
-rw-r--r--textproc/p5-Text-QRCode/Makefile1
-rw-r--r--textproc/p5-Text-VimColor/Makefile1
-rw-r--r--textproc/p5-Tk-Pod/Makefile1
-rw-r--r--textproc/p5-Tk-XMLViewer/Makefile2
-rw-r--r--textproc/p5-UML-Class-Simple/Makefile2
-rw-r--r--textproc/p5-UML-Sequence/Makefile2
-rw-r--r--textproc/p5-xmltv/Makefile1
-rw-r--r--textproc/pdfgrep/Makefile2
-rw-r--r--textproc/pdftohtml/Makefile2
-rw-r--r--textproc/py-enchant/Makefile2
-rw-r--r--textproc/py-qt4-xml/Makefile1
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile1
-rw-r--r--textproc/py-xmltools/Makefile2
-rw-r--r--textproc/qstardict/Makefile2
-rw-r--r--textproc/rst.el/Makefile2
-rw-r--r--textproc/rubber/Makefile2
-rw-r--r--textproc/rubygem-compass/Makefile1
-rw-r--r--textproc/sagasu/Makefile1
-rw-r--r--textproc/scim-bridge-qt4/Makefile1
-rw-r--r--textproc/scim-bridge/Makefile1
-rw-r--r--textproc/scim-input-pad/Makefile1
-rw-r--r--textproc/scim-kmfl-imengine/Makefile4
-rw-r--r--textproc/scim-m17n/Makefile2
-rw-r--r--textproc/scim-openvanilla/Makefile2
-rw-r--r--textproc/scim-table-imengine/Makefile1
-rw-r--r--textproc/scim/Makefile1
-rw-r--r--textproc/sgmltools-lite/Makefile2
-rw-r--r--textproc/sigil/Makefile1
-rw-r--r--textproc/sowing/Makefile1
-rw-r--r--textproc/stardict2/Makefile2
-rw-r--r--textproc/stardict3/Makefile1
-rw-r--r--textproc/tex2im/Makefile2
-rw-r--r--textproc/tth/Makefile2
-rw-r--r--textproc/uim-el/Makefile1
-rw-r--r--textproc/uim/Makefile1
-rw-r--r--textproc/wv/Makefile1
-rw-r--r--textproc/wv2/Makefile2
-rw-r--r--textproc/xfce4-dict-plugin/Makefile2
-rw-r--r--textproc/xml-lite.el/Makefile2
-rw-r--r--textproc/xmlroff/Makefile2
-rw-r--r--textproc/xxdiff-scripts/Makefile2
-rw-r--r--textproc/xxdiff/Makefile2
-rw-r--r--textproc/yaml-mode.el/Makefile2
-rw-r--r--textproc/yodl/Makefile1
-rw-r--r--textproc/zorba/Makefile1
-rw-r--r--ukrainian/kde3-i18n/Makefile2
-rw-r--r--ukrainian/kde4-l10n/Makefile1
-rw-r--r--vietnamese/kde3-i18n/Makefile2
-rw-r--r--vietnamese/xvnkb/Makefile2
-rw-r--r--www/WebMagick/Makefile1
-rw-r--r--www/analog/Makefile4
-rw-r--r--www/aria2fe/Makefile2
-rw-r--r--www/arora/Makefile1
-rw-r--r--www/asterisk-stat/Makefile2
-rw-r--r--www/awffull/Makefile4
-rw-r--r--www/bigbluebutton/Makefile2
-rw-r--r--www/bluefish/Makefile1
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/caudium14/Makefile2
-rw-r--r--www/cgicc/Makefile2
-rw-r--r--www/cherokee/Makefile2
-rw-r--r--www/choqok/Makefile1
-rw-r--r--www/chromium/Makefile1
-rw-r--r--www/cssed/Makefile2
-rw-r--r--www/cutycapt/Makefile1
-rw-r--r--www/dillo-i18n/Makefile4
-rw-r--r--www/dillo/Makefile4
-rw-r--r--www/dillo2/Makefile1
-rw-r--r--www/drupal6-advanced_help/Makefile2
-rw-r--r--www/drupal6-cck/Makefile1
-rw-r--r--www/drupal6-chaos/Makefile1
-rw-r--r--www/drupal6-ckeditor/Makefile1
-rw-r--r--www/drupal6-imce/Makefile1
-rw-r--r--www/drupal6-nice_menus/Makefile2
-rw-r--r--www/drupal6-panels/Makefile1
-rw-r--r--www/drupal6-views/Makefile1
-rw-r--r--www/drupal6-webform/Makefile1
-rw-r--r--www/drupal6-zeropoint/Makefile1
-rw-r--r--www/emacs-w3m/Makefile1
-rw-r--r--www/epiphany-extensions/Makefile2
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/evolution-webcal/Makefile2
-rw-r--r--www/firefox-esr/Makefile1
-rw-r--r--www/firefox/Makefile1
-rw-r--r--www/gallery2/Makefile1
-rw-r--r--www/gallery3/Makefile1
-rw-r--r--www/gecko-mediaplayer/Makefile1
-rw-r--r--www/gecko-sharp20/Makefile2
-rw-r--r--www/gnome-user-share/Makefile2
-rw-r--r--www/gnome-web-photo/Makefile1
-rw-r--r--www/gtkhtml3/Makefile2
-rw-r--r--www/gurlchecker/Makefile2
-rw-r--r--www/helixplugin/Makefile1
-rw-r--r--www/hs-webkit/Makefile1
-rw-r--r--www/http-analyze/Makefile2
-rw-r--r--www/igal/Makefile2
-rw-r--r--www/ilias/Makefile3
-rw-r--r--www/ilias3/Makefile3
-rw-r--r--www/kdewebdev/Makefile2
-rw-r--r--www/kdewebdev4/Makefile1
-rw-r--r--www/khtml2png/Makefile1
-rw-r--r--www/kompozer/Makefile5
-rw-r--r--www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp65
-rw-r--r--www/kwebkitpart/Makefile2
-rw-r--r--www/libepc/Makefile2
-rw-r--r--www/libgtkhtml/Makefile2
-rw-r--r--www/libxul/Makefile1
-rw-r--r--www/links-hacked/Makefile3
-rw-r--r--www/links-hacked/files/patch-png.c38
-rw-r--r--www/links/Makefile3
-rw-r--r--www/linux-opera-devel/Makefile2
-rw-r--r--www/linux-opera/Makefile1
-rw-r--r--www/llgal/Makefile1
-rw-r--r--www/luakit/Makefile1
-rw-r--r--www/mgstat/Makefile2
-rw-r--r--www/midori/Makefile1
-rw-r--r--www/mod_pagespeed/Makefile4
-rw-r--r--www/moonshine/Makefile2
-rw-r--r--www/netsurf/Makefile1
-rw-r--r--www/npapi-xine/Makefile2
-rw-r--r--www/openvrml/Makefile6
-rw-r--r--www/openvrml/files/patch-image_stream_listener.cpp10
-rw-r--r--www/p5-Apache-Gallery/Makefile1
-rw-r--r--www/p5-Catalyst-Plugin-Captcha/Makefile1
-rw-r--r--www/p5-Catalyst-View-GraphViz/Makefile2
-rw-r--r--www/p5-Catalyst-View-RRDGraph/Makefile2
-rw-r--r--www/p5-Gtk2-WebKit/Makefile1
-rw-r--r--www/p5-HTML-FormFu-Imager/Makefile2
-rw-r--r--www/p5-MojoMojo/Makefile2
-rw-r--r--www/p5-RT-Authen-ExternalAuth/Makefile2
-rw-r--r--www/p5-RT-Extension-LDAPImport/Makefile2
-rw-r--r--www/p5-RT-Extension-SLA/Makefile1
-rw-r--r--www/p5-RTx-Calendar/Makefile2
-rw-r--r--www/p5-ZConf-RSS-GUI-GTK/Makefile2
-rw-r--r--www/py-funkload/Makefile2
-rw-r--r--www/py-graphite-web/Makefile1
-rw-r--r--www/py-jswebkit/Makefile2
-rw-r--r--www/py-qt4-webkit/Makefile1
-rw-r--r--www/py-webkitgtk/Makefile2
-rw-r--r--www/qt4-webkit/Makefile1
-rw-r--r--www/redmine-backlogs/Makefile1
-rw-r--r--www/redmine-http-auth/Makefile1
-rw-r--r--www/rekonq/Makefile1
-rw-r--r--www/rnews/Makefile1
-rw-r--r--www/rssowl/Makefile2
-rw-r--r--www/sarg/Makefile2
-rw-r--r--www/screem/Makefile2
-rw-r--r--www/seamonkey/Makefile1
-rw-r--r--www/squidstats/Makefile2
-rw-r--r--www/surf/Makefile2
-rw-r--r--www/swfdec-plugin/Makefile2
-rw-r--r--www/trac-math/Makefile2
-rw-r--r--www/uzbl/Makefile1
-rw-r--r--www/w3m/Makefile1
-rw-r--r--www/webalizer/Makefile1
-rw-r--r--www/webkit-gtk2/Makefile1
-rw-r--r--www/webkit-sharp/Makefile2
-rw-r--r--www/wml/Makefile5
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile2
-rw-r--r--www/xpi-conkeror/Makefile2
-rw-r--r--www/xshttpd-devel/Makefile2
-rw-r--r--www/xshttpd/Makefile2
-rw-r--r--www/xxxterm/Makefile1
-rw-r--r--x11-clocks/alarm-clock/Makefile2
-rw-r--r--x11-clocks/alltraxclock/Makefile2
-rw-r--r--x11-clocks/bmp-alarm/Makefile2
-rw-r--r--x11-clocks/cairo-clock/Makefile2
-rw-r--r--x11-clocks/dclock/Makefile2
-rw-r--r--x11-clocks/gdesklets-clock/Makefile2
-rw-r--r--x11-clocks/gdesklets-countdown/Makefile2
-rw-r--r--x11-clocks/gdesklets-ebichuclock/Makefile2
-rw-r--r--x11-clocks/gtubeclock/Makefile2
-rw-r--r--x11-clocks/intclock/Makefile1
-rw-r--r--x11-clocks/kdetoys3/Makefile2
-rw-r--r--x11-clocks/kdetoys4/Makefile1
-rw-r--r--x11-clocks/osdclock/Makefile2
-rw-r--r--x11-clocks/plasma-applet-adjustableclock/Makefile1
-rw-r--r--x11-clocks/plasma-applet-geekclock/Makefile2
-rw-r--r--x11-clocks/sanduhr/Makefile2
-rw-r--r--x11-clocks/wmtimer/Makefile2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile2
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile1
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile2
-rw-r--r--x11-fm/catseye-fm/Makefile1
-rw-r--r--x11-fm/dfm/Makefile2
-rw-r--r--x11-fm/dolphin/Makefile2
-rw-r--r--x11-fm/emelfm2/Makefile1
-rw-r--r--x11-fm/ezfm/Makefile2
-rw-r--r--x11-fm/gentoo/Makefile1
-rw-r--r--x11-fm/gnome-commander2/Makefile1
-rw-r--r--x11-fm/krusader/Makefile2
-rw-r--r--x11-fm/krusader2/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/p5-PerlFM/Makefile2
-rw-r--r--x11-fm/pbi-thumbnailer/Makefile2
-rw-r--r--x11-fm/pcmanfm/Makefile1
-rw-r--r--x11-fm/py-nautilus/Makefile1
-rw-r--r--x11-fm/rodent/Makefile1
-rw-r--r--x11-fm/rox-filer/Makefile1
-rw-r--r--x11-fm/rox-mime-editor/Makefile1
-rw-r--r--x11-fm/rox-session/Makefile2
-rw-r--r--x11-fm/tdfsb/Makefile2
-rw-r--r--x11-fm/thunar-vfs/Makefile4
-rw-r--r--x11-fm/thunar/Makefile1
-rw-r--r--x11-fm/ultracopier/Makefile2
-rw-r--r--x11-fm/xdiskusage/Makefile2
-rw-r--r--x11-fm/xfe/Makefile2
-rw-r--r--x11-fm/xnc/Makefile6
-rw-r--r--x11-fm/xnc/files/patch-IMG_png.c35
-rw-r--r--x11-fonts/fntsample/Makefile2
-rw-r--r--x11-fonts/font-manager/Makefile2
-rw-r--r--x11-fonts/fontmatrix/Makefile2
-rw-r--r--x11-themes/baghira/Makefile2
-rw-r--r--x11-themes/bluecurve-themes/Makefile2
-rw-r--r--x11-themes/clearlooks/Makefile2
-rw-r--r--x11-themes/cursor-crystal-theme/Makefile2
-rw-r--r--x11-themes/etoile-iconkit/Makefile4
-rw-r--r--x11-themes/fvwm-themes/Makefile2
-rw-r--r--x11-themes/gnome-icons-faenza/Makefile2
-rw-r--r--x11-themes/gnome-themes-extras/Makefile2
-rw-r--r--x11-themes/gnome-themes/Makefile1
-rw-r--r--x11-themes/gtk-aurora-engine/Makefile2
-rw-r--r--x11-themes/gtk-cleanice-engine/Makefile2
-rw-r--r--x11-themes/gtk-engines/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile1
-rw-r--r--x11-themes/gtk-equinox-engine/Makefile2
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile2
-rw-r--r--x11-themes/gtk-murrine-engine/Makefile1
-rw-r--r--x11-themes/gtk-nodoka-engine/Makefile1
-rw-r--r--x11-themes/gtk-oxygen-engine/Makefile1
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile2
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile1
-rw-r--r--x11-themes/gtk3-oxygen-engine/Makefile1
-rw-r--r--x11-themes/icons-buuf/Makefile2
-rw-r--r--x11-themes/icons-tango-extras/Makefile2
-rw-r--r--x11-themes/icons-tango/Makefile2
-rw-r--r--x11-themes/kde-style-comix/Makefile2
-rw-r--r--x11-themes/kde-style-lipstik/Makefile2
-rw-r--r--x11-themes/kde-style-polyester/Makefile1
-rw-r--r--x11-themes/kde-style-tiblit/Makefile2
-rw-r--r--x11-themes/kde-windeco-activeheart/Makefile2
-rw-r--r--x11-themes/kde-windeco-crystal/Makefile2
-rw-r--r--x11-themes/kde-windeco-knifty/Makefile2
-rw-r--r--x11-themes/kde-windeco-neos/Makefile2
-rw-r--r--x11-themes/kde-windeco-smoothblend/Makefile2
-rw-r--r--x11-themes/kde4-style-nitrogen/Makefile2
-rw-r--r--x11-themes/kde4-style-polyester/Makefile2
-rw-r--r--x11-themes/kde4-style-skulpture/Makefile2
-rw-r--r--x11-themes/kde4-windeco-crystal/Makefile2
-rw-r--r--x11-themes/kde4-windeco-dekorator/Makefile2
-rw-r--r--x11-themes/kde4-windeco-nitrogen/Makefile2
-rw-r--r--x11-themes/kdeartwork3/Makefile2
-rw-r--r--x11-themes/kdeartwork4/Makefile1
-rw-r--r--x11-themes/kdmtheme/Makefile2
-rw-r--r--x11-themes/lxappearance/Makefile1
-rw-r--r--x11-themes/lxde-icon-theme/Makefile1
-rw-r--r--x11-themes/moodin/Makefile2
-rw-r--r--x11-themes/murrine-configurator/Makefile2
-rw-r--r--x11-themes/nimbus/Makefile1
-rw-r--r--x11-themes/phase/Makefile2
-rw-r--r--x11-themes/polymer/Makefile2
-rw-r--r--x11-themes/qinx/Makefile2
-rw-r--r--x11-themes/qnxstyle/Makefile2
-rw-r--r--x11-themes/qt4-style-float/Makefile1
-rw-r--r--x11-themes/qt4-style-phase/Makefile1
-rw-r--r--x11-themes/qt4-style-quantumstyle/Makefile1
-rw-r--r--x11-themes/qtcurve-gtk2/Makefile1
-rw-r--r--x11-themes/qtcurve-kde3/Makefile1
-rw-r--r--x11-themes/qtcurve-kde4/Makefile2
-rw-r--r--x11-themes/qtcurve-qt4/Makefile1
-rw-r--r--x11-themes/rezlooks/Makefile2
-rw-r--r--x11-themes/thewidgetfactory/Makefile2
-rw-r--r--x11-themes/ubuntulooks/Makefile2
-rw-r--r--x11-themes/xcursor-themes/Makefile1
-rw-r--r--x11-toolkits/SoXt/Makefile1
-rw-r--r--x11-toolkits/bakery/Makefile2
-rw-r--r--x11-toolkits/c++-gtk-utils/Makefile1
-rw-r--r--x11-toolkits/easygtk/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile2
-rw-r--r--x11-toolkits/efltk/Makefile5
-rw-r--r--x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp37
-rw-r--r--x11-toolkits/elementary/Makefile1
-rw-r--r--x11-toolkits/fl_editor/Makefile2
-rw-r--r--x11-toolkits/flowcanvas/Makefile1
-rw-r--r--x11-toolkits/fltk/Makefile3
-rw-r--r--x11-toolkits/fltk11/Makefile5
-rw-r--r--x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx19
-rw-r--r--x11-toolkits/fltk2/Makefile3
-rw-r--r--x11-toolkits/flu/Makefile2
-rw-r--r--x11-toolkits/flvw/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile4
-rw-r--r--x11-toolkits/fox14/files/patch-src-fxpngio.cpp46
-rw-r--r--x11-toolkits/fox16/Makefile3
-rw-r--r--x11-toolkits/fox17/Makefile3
-rw-r--r--x11-toolkits/fpc-gtk2/Makefile2
-rw-r--r--x11-toolkits/fxscintilla/Makefile2
-rw-r--r--x11-toolkits/gai/Makefile2
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal2/Makefile2
-rw-r--r--x11-toolkits/gdl/Makefile1
-rw-r--r--x11-toolkits/gigi/Makefile2
-rw-r--r--x11-toolkits/gnocl/Makefile2
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/Makefile2
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile1
-rw-r--r--x11-toolkits/gnustep-back/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile9
-rw-r--r--x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m15
-rw-r--r--x11-toolkits/gstreamer-plugins-pango/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile1
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkada/Makefile1
-rw-r--r--x11-toolkits/gtkdatabox/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/Makefile1
-rw-r--r--x11-toolkits/gtkglarea2/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile2
-rw-r--r--x11-toolkits/gtkglextmm/Makefile2
-rw-r--r--x11-toolkits/gtkimageview/Makefile2
-rw-r--r--x11-toolkits/gtkmathview/Makefile2
-rw-r--r--x11-toolkits/gtkmm20-reference/Makefile2
-rw-r--r--x11-toolkits/gtkmm20/Makefile2
-rw-r--r--x11-toolkits/gtkmm24-reference/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile2
-rw-r--r--x11-toolkits/gtkmm30-reference/Makefile2
-rw-r--r--x11-toolkits/gtkmm30/Makefile2
-rw-r--r--x11-toolkits/gtksourceview-sharp/Makefile2
-rw-r--r--x11-toolkits/gtksourceview/Makefile2
-rw-r--r--x11-toolkits/gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/gtkunique/Makefile2
-rw-r--r--x11-toolkits/guile-gtk/Makefile2
-rw-r--r--x11-toolkits/hippo-canvas/Makefile2
-rw-r--r--x11-toolkits/hs-gtk/Makefile1
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile1
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile1
-rw-r--r--x11-toolkits/hs-pango/Makefile1
-rw-r--r--x11-toolkits/hs-vte/Makefile1
-rw-r--r--x11-toolkits/hs-wx/Makefile1
-rw-r--r--x11-toolkits/hs-wxcore/Makefile1
-rw-r--r--x11-toolkits/irrlicht/Makefile6
-rw-r--r--x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp28
-rw-r--r--x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp19
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/libbonobouimm/Makefile2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile1
-rw-r--r--x11-toolkits/libgdiplus/Makefile6
-rw-r--r--x11-toolkits/libgdiplus/files/patch-pngcodec.c10
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile1
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile2
-rw-r--r--x11-toolkits/libgtk-java/Makefile2
-rw-r--r--x11-toolkits/libgtksourceviewmm/Makefile2
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
-rw-r--r--x11-toolkits/libsexy/Makefile2
-rw-r--r--x11-toolkits/libsexymm/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile2
-rw-r--r--x11-toolkits/libxfce4gui/Makefile1
-rw-r--r--x11-toolkits/libzvt/Makefile2
-rw-r--r--x11-toolkits/linux-f10-gtk2/Makefile2
-rw-r--r--x11-toolkits/linux-f10-qt33/Makefile2
-rw-r--r--x11-toolkits/linux-gtk2/Makefile2
-rw-r--r--x11-toolkits/linux-qt33/Makefile2
-rw-r--r--x11-toolkits/nucleo/Makefile10
-rw-r--r--x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx19
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile2
-rw-r--r--x11-toolkits/open-motif/Makefile3
-rw-r--r--x11-toolkits/p5-Alien-wxWidgets/Makefile1
-rw-r--r--x11-toolkits/p5-GdkImlib/Makefile2
-rw-r--r--x11-toolkits/p5-Glade2/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome2-Canvas/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome2-VFS/Makefile2
-rw-r--r--x11-toolkits/p5-Gnome2/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Chmod/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile1
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Utils/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-GladeXML/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-Html2/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-ImageView/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-PathButtonBar/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2-TrayIcon/Makefile2
-rw-r--r--x11-toolkits/p5-Gtk2/Makefile1
-rw-r--r--x11-toolkits/p5-Pango/Makefile1
-rw-r--r--x11-toolkits/p5-Prima/Makefile3
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Contrib/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-CursorControl/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-DKW/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Date/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-DynaTabFrame/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Enscript/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-FileDialog/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-FontDialog/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-GBARR/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Getopt/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-HistEntry/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-JComboBox/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-ResizeButton/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-Role-Dialog/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-Splashscreen/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-TableMatrix/Makefile2
-rw-r--r--x11-toolkits/p5-Tk-ToolBar/Makefile2
-rw-r--r--x11-toolkits/p5-Tk/Makefile3
-rw-r--r--x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile1
-rw-r--r--x11-toolkits/p5-Wx/Makefile1
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/pangomm/Makefile2
-rw-r--r--x11-toolkits/pangoxsl/Makefile2
-rw-r--r--x11-toolkits/paragui-devel/Makefile2
-rw-r--r--x11-toolkits/paragui/Makefile2
-rw-r--r--x11-toolkits/phat/Makefile2
-rw-r--r--x11-toolkits/pure-gtk/Makefile2
-rw-r--r--x11-toolkits/py-SciParam/Makefile2
-rw-r--r--x11-toolkits/py-fltk/Makefile1
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile2
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile2
-rw-r--r--x11-toolkits/py-gtk/Makefile2
-rw-r--r--x11-toolkits/py-gtk2/Makefile1
-rw-r--r--x11-toolkits/py-gtkglext/Makefile2
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile1
-rw-r--r--x11-toolkits/py-gui/Makefile2
-rw-r--r--x11-toolkits/py-kiwi/Makefile2
-rw-r--r--x11-toolkits/py-pyqwt/Makefile2
-rw-r--r--x11-toolkits/py-qt/Makefile2
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile1
-rw-r--r--x11-toolkits/py-sexy/Makefile2
-rw-r--r--x11-toolkits/py-traitsbackendwx/Makefile2
-rw-r--r--x11-toolkits/py-traitsgui/Makefile2
-rw-r--r--x11-toolkits/py-vte/Makefile2
-rw-r--r--x11-toolkits/py-wxPython24/Makefile2
-rw-r--r--x11-toolkits/py-wxPython26-common/Makefile2
-rw-r--r--x11-toolkits/py-wxPython26/Makefile2
-rw-r--r--x11-toolkits/py-wxPython28-common/Makefile2
-rw-r--r--x11-toolkits/py-wxPython28/Makefile2
-rw-r--r--x11-toolkits/qscintilla/Makefile2
-rw-r--r--x11-toolkits/qt33/Makefile7
-rw-r--r--x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp50
-rw-r--r--x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp10
-rw-r--r--x11-toolkits/qt4-gui/Makefile3
-rw-r--r--x11-toolkits/qwt4/Makefile2
-rw-r--r--x11-toolkits/qwt5-designerplugin/Makefile1
-rw-r--r--x11-toolkits/qwt5/Makefile1
-rw-r--r--x11-toolkits/qwt6-designerplugin/Makefile1
-rw-r--r--x11-toolkits/qwt6/Makefile1
-rw-r--r--x11-toolkits/rep-gtk2/Makefile1
-rw-r--r--x11-toolkits/ruby-fox16/Makefile4
-rw-r--r--x11-toolkits/ruby-goocanvas/Makefile1
-rw-r--r--x11-toolkits/ruby-gtk2/Makefile1
-rw-r--r--x11-toolkits/ruby-gtksourceview2/Makefile1
-rw-r--r--x11-toolkits/ruby-pango/Makefile1
-rw-r--r--x11-toolkits/ruby-poppler/Makefile1
-rw-r--r--x11-toolkits/ruby-vte/Makefile1
-rw-r--r--x11-toolkits/sakura/Makefile1
-rw-r--r--x11-toolkits/scintilla/Makefile1
-rw-r--r--x11-toolkits/sdl_pango/Makefile2
-rw-r--r--x11-toolkits/soqt/Makefile2
-rw-r--r--x11-toolkits/swt-devel/Makefile1
-rw-r--r--x11-toolkits/swt/Makefile1
-rw-r--r--x11-toolkits/termit/Makefile1
-rw-r--r--x11-toolkits/unique/Makefile2
-rw-r--r--x11-toolkits/vdk/Makefile1
-rw-r--r--x11-toolkits/vdkbuilder/Makefile1
-rw-r--r--x11-toolkits/vte/Makefile2
-rw-r--r--x11-toolkits/wxd/Makefile2
-rw-r--r--x11-toolkits/wxgtk24-contrib/Makefile2
-rw-r--r--x11-toolkits/wxgtk24/Makefile4
-rw-r--r--x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp44
-rw-r--r--x11-toolkits/wxgtk26/Makefile4
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp11
-rw-r--r--x11-toolkits/wxgtk28/Makefile4
-rw-r--r--x11-toolkits/wxgtk29/Makefile4
-rw-r--r--x11-toolkits/xmhtml/Makefile6
-rw-r--r--x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c28
-rw-r--r--x11-wm/afterstep-stable/Makefile3
-rw-r--r--x11-wm/afterstep-stable/files/patch-libAfterImage-export.c11
-rw-r--r--x11-wm/afterstep-stable/files/patch-libAfterImage-import.c19
-rw-r--r--x11-wm/awesome/Makefile2
-rw-r--r--x11-wm/awesome2/Makefile2
-rw-r--r--x11-wm/bbconf/Makefile2
-rw-r--r--x11-wm/blwm/Makefile2
-rw-r--r--x11-wm/ccsm/Makefile2
-rw-r--r--x11-wm/clementine/Makefile2
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile2
-rw-r--r--x11-wm/compiz-plugins-main/Makefile2
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile2
-rw-r--r--x11-wm/compiz/Makefile6
-rw-r--r--x11-wm/compizconfig-backend-gconf/Makefile2
-rw-r--r--x11-wm/compizconfig-python/Makefile2
-rw-r--r--x11-wm/devilspie/Makefile2
-rw-r--r--x11-wm/e16/Makefile1
-rw-r--r--x11-wm/e16utils/Makefile2
-rw-r--r--x11-wm/e17-module-alarm/Makefile1
-rw-r--r--x11-wm/e17-module-calendar/Makefile1
-rw-r--r--x11-wm/e17-module-cpu/Makefile1
-rw-r--r--x11-wm/e17-module-deskshow/Makefile1
-rw-r--r--x11-wm/e17-module-diskio/Makefile1
-rw-r--r--x11-wm/e17-module-drawer/Makefile2
-rw-r--r--x11-wm/e17-module-efm_nav/Makefile1
-rw-r--r--x11-wm/e17-module-efm_path/Makefile1
-rw-r--r--x11-wm/e17-module-efm_pathbar/Makefile1
-rw-r--r--x11-wm/e17-module-empris/Makefile1
-rw-r--r--x11-wm/e17-module-engage/Makefile1
-rw-r--r--x11-wm/e17-module-eooorg/Makefile1
-rw-r--r--x11-wm/e17-module-everything-mpris/Makefile1
-rw-r--r--x11-wm/e17-module-everything-pidgin/Makefile1
-rw-r--r--x11-wm/e17-module-everything-places/Makefile1
-rw-r--r--x11-wm/e17-module-everything-wallpaper/Makefile1
-rw-r--r--x11-wm/e17-module-everything-websearch/Makefile1
-rw-r--r--x11-wm/e17-module-exebuf/Makefile1
-rw-r--r--x11-wm/e17-module-execwatch/Makefile1
-rw-r--r--x11-wm/e17-module-flame/Makefile1
-rw-r--r--x11-wm/e17-module-forecasts/Makefile1
-rw-r--r--x11-wm/e17-module-iiirk/Makefile1
-rw-r--r--x11-wm/e17-module-itask-ng/Makefile1
-rw-r--r--x11-wm/e17-module-itask/Makefile1
-rw-r--r--x11-wm/e17-module-language/Makefile1
-rw-r--r--x11-wm/e17-module-mail/Makefile1
-rw-r--r--x11-wm/e17-module-mem/Makefile1
-rw-r--r--x11-wm/e17-module-moon/Makefile1
-rw-r--r--x11-wm/e17-module-mpdule/Makefile2
-rw-r--r--x11-wm/e17-module-net/Makefile1
-rw-r--r--x11-wm/e17-module-news/Makefile1
-rw-r--r--x11-wm/e17-module-notification/Makefile1
-rw-r--r--x11-wm/e17-module-penguins/Makefile1
-rw-r--r--x11-wm/e17-module-photo/Makefile1
-rw-r--r--x11-wm/e17-module-places/Makefile1
-rw-r--r--x11-wm/e17-module-quickaccess/Makefile1
-rw-r--r--x11-wm/e17-module-rain/Makefile1
-rw-r--r--x11-wm/e17-module-screenshot/Makefile1
-rw-r--r--x11-wm/e17-module-slideshow/Makefile1
-rw-r--r--x11-wm/e17-module-snow/Makefile1
-rw-r--r--x11-wm/e17-module-taskbar/Makefile1
-rw-r--r--x11-wm/e17-module-tclock/Makefile1
-rw-r--r--x11-wm/e17-module-tiling/Makefile1
-rw-r--r--x11-wm/e17-module-uptime/Makefile1
-rw-r--r--x11-wm/e17-module-weather/Makefile1
-rw-r--r--x11-wm/e17-module-winlist-ng/Makefile1
-rw-r--r--x11-wm/e17-module-winselector/Makefile1
-rw-r--r--x11-wm/e17-module-wlan/Makefile1
-rw-r--r--x11-wm/ede/Makefile2
-rw-r--r--x11-wm/emerald/Makefile2
-rw-r--r--x11-wm/enlightenment-docs/Makefile2
-rw-r--r--x11-wm/enlightenment/Makefile1
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/fluxconf/Makefile2
-rw-r--r--x11-wm/flwm/Makefile2
-rw-r--r--x11-wm/fvwm-crystal/Makefile2
-rw-r--r--x11-wm/fvwm2/Makefile3
-rw-r--r--x11-wm/gcompmgr/Makefile2
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/jwm/Makefile4
-rw-r--r--x11-wm/kompmgr/Makefile2
-rw-r--r--x11-wm/libcompizconfig/Makefile2
-rw-r--r--x11-wm/libwraster/Makefile2
-rw-r--r--x11-wm/lxsession/Makefile1
-rw-r--r--x11-wm/metacity/Makefile1
-rw-r--r--x11-wm/mutter/Makefile2
-rw-r--r--x11-wm/obconf/Makefile2
-rw-r--r--x11-wm/obmenu/Makefile2
-rw-r--r--x11-wm/openbox/Makefile2
-rw-r--r--x11-wm/pager/Makefile1
-rw-r--r--x11-wm/pekwm/Makefile3
-rw-r--r--x11-wm/phluid/Makefile2
-rw-r--r--x11-wm/qlwm/Makefile2
-rw-r--r--x11-wm/qvwm/Makefile2
-rw-r--r--x11-wm/sawfish/Makefile1
-rw-r--r--x11-wm/selectwm/Makefile2
-rw-r--r--x11-wm/simple-ccsm/Makefile2
-rw-r--r--x11-wm/skippy/Makefile2
-rw-r--r--x11-wm/waimea-devel/Makefile4
-rw-r--r--x11-wm/waimea/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11-wm/wmanager/Makefile2
-rw-r--r--x11-wm/wmfs/Makefile1
-rw-r--r--x11-wm/xfce4-desktop/Makefile1
-rw-r--r--x11-wm/xfce4-panel/Makefile1
-rw-r--r--x11-wm/xfce4-session/Makefile1
-rw-r--r--x11-wm/xfce4-wm/Makefile1
-rw-r--r--x11/3ddesktop/Makefile2
-rw-r--r--x11/Terminal/Makefile1
-rw-r--r--x11/alltray/Makefile2
-rw-r--r--x11/apwal/Makefile2
-rw-r--r--x11/aterm/Makefile2
-rw-r--r--x11/avant-window-navigator-gnome/Makefile2
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/bbdock/Makefile4
-rw-r--r--x11/bbdock/files/patch-Slot.cc10
-rw-r--r--x11/bbrun/Makefile2
-rw-r--r--x11/bgrot/Makefile2
-rw-r--r--x11/bgs/Makefile2
-rw-r--r--x11/brightside/Makefile2
-rw-r--r--x11/decurs/Makefile2
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/eaglemode/Makefile4
-rw-r--r--x11/emprint/Makefile1
-rw-r--r--x11/erun/Makefile2
-rw-r--r--x11/eterm/Makefile1
-rw-r--r--x11/evilvte/Makefile1
-rw-r--r--x11/fbdesk/Makefile4
-rw-r--r--x11/fbdesk/files/patch-ImagePNG.cc21
-rw-r--r--x11/fbpanel/Makefile1
-rw-r--r--x11/florence/Makefile2
-rw-r--r--x11/fluxbg/Makefile2
-rw-r--r--x11/gcb/Makefile2
-rw-r--r--x11/gdesklets-tasklist/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gmrun/Makefile2
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnome-clipboard-daemon/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-libs/Makefile5
-rw-r--r--x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c28
-rw-r--r--x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c21
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-screensaver/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-swallow/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gnome2-fifth-toe/Makefile2
-rw-r--r--x11/gromit/Makefile2
-rw-r--r--x11/gsynaptics/Makefile2
-rw-r--r--x11/gtk-theme-switch2/Makefile2
-rw-r--r--x11/gtkchtheme/Makefile2
-rw-r--r--x11/gtkterm2/Makefile2
-rw-r--r--x11/gtstarter/Makefile2
-rw-r--r--x11/hotwire-shell/Makefile2
-rw-r--r--x11/i3lock/Makefile1
-rw-r--r--x11/idesk/Makefile2
-rw-r--r--x11/ipager/Makefile2
-rw-r--r--x11/kde4-baseapps/Makefile1
-rw-r--r--x11/kde4-runtime/Makefile1
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/keybinder/Makefile1
-rw-r--r--x11/keyboardcast/Makefile1
-rw-r--r--x11/keynav/Makefile1
-rw-r--r--x11/kgamma/Makefile1
-rw-r--r--x11/konsole/Makefile1
-rw-r--r--x11/libexo/Makefile1
-rw-r--r--x11/libfm/Makefile1
-rw-r--r--x11/libgnome-java/Makefile2
-rw-r--r--x11/libgnome/Makefile2
-rw-r--r--x11/libgnomekbd/Makefile1
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libgnomemm26/Makefile1
-rw-r--r--x11/libxfce4menu/Makefile1
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/menu-cache/Makefile2
-rw-r--r--x11/metalock/Makefile1
-rw-r--r--x11/metisse/Makefile6
-rw-r--r--x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c10
-rw-r--r--x11/mlterm/Makefile1
-rw-r--r--x11/mrxvt-devel/Makefile4
-rw-r--r--x11/mrxvt/Makefile4
-rw-r--r--x11/multi-gnome-terminal/Makefile2
-rw-r--r--x11/nvidia-settings/Makefile1
-rw-r--r--x11/oooqs/Makefile2
-rw-r--r--x11/oooqs2/Makefile2
-rw-r--r--x11/peeper/Makefile2
-rw-r--r--x11/plasma-scriptengine-python/Makefile1
-rw-r--r--x11/plasma-scriptengine-ruby/Makefile1
-rw-r--r--x11/powershell/Makefile2
-rw-r--r--x11/py-qt4-opengl/Makefile1
-rw-r--r--x11/qimageblitz/Makefile1
-rw-r--r--x11/qt4-graphicssystems-opengl/Makefile1
-rw-r--r--x11/qt4-inputmethods/Makefile1
-rw-r--r--x11/qt4-opengl/Makefile1
-rw-r--r--x11/rox-wallpaper/Makefile1
-rw-r--r--x11/roxbg/Makefile2
-rw-r--r--x11/roxterm/Makefile1
-rw-r--r--x11/rsibreak-kde4/Makefile2
-rw-r--r--x11/rsibreak/Makefile2
-rw-r--r--x11/rxvt-unicode/Makefile1
-rw-r--r--x11/silo/Makefile2
-rw-r--r--x11/simdock/Makefile2
-rw-r--r--x11/sisctrl/Makefile2
-rw-r--r--x11/slim/Makefile4
-rw-r--r--x11/slim/files/patch-png.c11
-rw-r--r--x11/stjerm/Makefile1
-rw-r--r--x11/terminator/Makefile2
-rw-r--r--x11/tilda/Makefile2
-rw-r--r--x11/tint/Makefile1
-rw-r--r--x11/trayer-srg/Makefile1
-rw-r--r--x11/trayer/Makefile1
-rw-r--r--x11/wbar/Makefile2
-rw-r--r--x11/wbarconf/Makefile2
-rw-r--r--x11/wdm/Makefile2
-rw-r--r--x11/wmblob/Makefile2
-rw-r--r--x11/wmcliphist/Makefile1
-rw-r--r--x11/wmdrawer/Makefile2
-rw-r--r--x11/workrave/Makefile1
-rw-r--r--x11/xautomation/Makefile4
-rw-r--r--x11/xcursorgen/Makefile3
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-conf/Makefile1
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-verve-plugin/Makefile2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
-rw-r--r--x11/xloadimage/Makefile3
-rw-r--r--x11/xorg-edit/Makefile2
-rw-r--r--x11/xpra/Makefile1
-rw-r--r--x11/xscreensaver-gnome-hacks/Makefile2
-rw-r--r--x11/xscreensaver-gnome/Makefile2
-rw-r--r--x11/xscreensaver-kde/Makefile2
-rw-r--r--x11/xscreensaver/Makefile1
-rw-r--r--x11/xvattr/Makefile2
-rw-r--r--x11/yakuake-kde4/Makefile2
-rw-r--r--x11/yakuake/Makefile2
-rw-r--r--x11/yalias/Makefile2
-rw-r--r--x11/yelp/Makefile2
-rw-r--r--x11/zenity/Makefile2
4373 files changed, 9761 insertions, 3664 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 3b4dab3c6f84..392736accb72 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -595,7 +595,7 @@ nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
-png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
png_MOZ_OPTIONS= --with-system-png=${LOCALBASE}
xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/UPDATING b/UPDATING
index b52f74025350..059072cfd8ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20120531:
+ AFFECTS: users of graphics/png
+ AUTHOR: dinoex@FreeBSD.org
+
+ The PNG library has been updated to version 1.5.10. Please rebuild all
+ ports that depend on it.
+
+ If you use portmaster:
+ portmaster -r png-
+ If you use portupgrade:
+ portupgrade -fr graphics/png
+
+20120531:
AFFECTS: users of editors/koffice-kde4
AUTHOR: kde@FreeBSD.org
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 258c6ff522ca..b0ee637029fe 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= accerciser
PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index 417a33e9e276..de74c4281b6e 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -7,7 +7,7 @@
PORTNAME= at-poke
PORTVERSION= 0.2.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 7b85d1d16399..d5d677ad1b7c 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= at-spi
PORTVERSION= 1.32.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 3a9f37676e0d..fb67fdb8750b 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -8,6 +8,7 @@
PORTNAME= at-spi2-atk
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 8b330013c566..5cb2d6427554 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dasher
PORTVERSION= 4.10.1
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= GNOME
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 8277994bfbb4..631ccc785b06 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-mag
PORTVERSION= 0.16.3
+PORTREVISION= 1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index ffe04da3b2d7..0f4b9094dc63 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnopernicus
PORTVERSION= 1.1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= accessibility x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 926a2bc01d6e..7a2fdca4ae0f 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gok
PORTVERSION= 2.30.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index 337b792da36f..765f129c93fe 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= java-access-bridge
PORTVERSION= 1.18.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= accessibility java gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 2caff327609f..90c1025cccaf 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jovie
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile
index ef9992315920..6e5e4c9ed7e0 100644
--- a/accessibility/kdeaccessibility/Makefile
+++ b/accessibility/kdeaccessibility/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdeaccessibility
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= accessibility kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 12cd84f75822..8086a1f0949b 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mousetweaks
PORTVERSION= 2.32.1
+PORTREVISION= 1
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index e9a9c295b144..b8c6de0c6f0f 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -8,7 +8,7 @@
PORTNAME= orca
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index f130466271be..6055411df8d3 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -8,6 +8,7 @@
PORTNAME= atspi
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= accessibility x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 8557e75661c0..a3aa2a486a51 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -8,6 +8,7 @@
PORTNAME= accessible
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= accessibility
PKGNAMEPREFIX= qt4-
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 7ce2a7a81ff9..4ec80fb7ccfb 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -7,6 +7,7 @@
PORTNAME= redshift
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= accessibility
MASTER_SITES= http://launchpad.net/redshift/trunk/${PORTVERSION}/+download/
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index b28b6767bef3..932c2f6f4d6c 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= arabic kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 106da6164bee..c45baa1364f6 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES?= arabic kde
MAINTAINER= kde@FreeBSD.org
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 9bb3931f1368..9d28a54f3e7c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -8,6 +8,7 @@
PORTNAME= file-roller
PORTVERSION= 2.32.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index e0214e2bfa58..1b6e09d4e8f1 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kbackup
PORTVERSION= 0.5.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTNAME= 44998-${PORTNAME}-${PORTVERSION}
diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile
index 5df3920326fc..364a7f91bdfb 100644
--- a/archivers/kio_p7zip/Makefile
+++ b/archivers/kio_p7zip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kio_p7zip
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTNAME= 17829-${PORTNAME}-${PORTVERSION}
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 902c0da467bc..ced2c90f393d 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rox-archive
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= archivers
MASTER_SITES= SF/rox/Archive/${PORTVERSION}
DISTNAME= archive-${PORTVERSION}
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 6f477d177148..8194336b152e 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -6,7 +6,7 @@
PORTNAME= rpm
PORTVERSION= 5.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers
MASTER_SITES= http://rpm5.org/files/rpm/rpm-${PORTVERSION:R}/
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index d3ee56a79265..dee6a49ad3bf 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squeeze
PORTVERSION= 0.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 644391b5056d..08830ee5b69e 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-archive-plugin
PORTVERSION= 0.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}
diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index dbf70f144045..b966297c511c 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xarchive
PORTVERSION= 0.2.8.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= archivers
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2.8-6
DISTNAME= ${PORTNAME}-0.2.8-6
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index f04daad7c53b..3bae2e2328d6 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xarchiver
PORTVERSION= 0.5.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= archivers
MASTER_SITES= SF
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 4700cdd7e152..1c4e5efdba57 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -7,7 +7,7 @@
PORTNAME= astrometry
PORTVERSION= 0.34
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro
MASTER_SITES= http://www.astrometry.net/downloads/
DISTNAME= astrometry.net-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT= Describes an astronomical image
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
netpbm.1:${PORTSDIR}/graphics/netpbm
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
diff --git a/astro/astrometry/files/patch-cairoutils.c b/astro/astrometry/files/patch-cairoutils.c
new file mode 100644
index 000000000000..65255ecab452
--- /dev/null
+++ b/astro/astrometry/files/patch-cairoutils.c
@@ -0,0 +1,10 @@
+--- util/cairoutils.c.orig 2012-04-25 05:33:34.000000000 +0200
++++ util/cairoutils.c 2012-04-25 05:35:29.000000000 +0200
+@@ -25,6 +25,7 @@
+
+ #include <cairo.h>
+ #include <png.h>
++#include <zlib.h>
+ #include <jpeglib.h>
+
+ #include "an-bool.h"
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index 3474afee0163..211fb4fd15c1 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -6,6 +6,7 @@
PORTNAME= boinc-astropulse
PORTVERSION= 6.01
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/
DISTNAME= astropulse-svn-1280
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index c9bcd434a6a8..5003556e457f 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -6,7 +6,7 @@
PORTNAME= boinc-setiathome-enhanced
PORTVERSION= 6.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/
DISTNAME= setiathome-svn-1008
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 7e3948e2b5c6..8440cd30cf05 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= celestia
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION}
PKGNAMESUFFIX= -${CELESTIA_UI}
@@ -17,7 +18,7 @@ COMMENT= Scriptable space flight simulator for X
LICENSE= GPLv2
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/astro/celestia/files/patch-src_celestia_imagecapture.cpp b/astro/celestia/files/patch-src_celestia_imagecapture.cpp
new file mode 100644
index 000000000000..d365fa3eb2a1
--- /dev/null
+++ b/astro/celestia/files/patch-src_celestia_imagecapture.cpp
@@ -0,0 +1,10 @@
+--- src/celestia/imagecapture.cpp.orig 2011-06-05 18:11:13.000000000 +0200
++++ src/celestia/imagecapture.cpp 2012-04-25 05:50:24.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "../celestia/Celestia.app.skel/Contents/Frameworks/Headers/png.h"
+ #else
+ #include "png.h"
++#include "zlib.h"
+ #endif
+
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index bb3d9efb50c8..7c7e96a4c9c1 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -7,6 +7,7 @@
PORTNAME= foxtrotgps
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= astro geography
MASTER_SITES= http://www.foxtrotgps.org/releases/
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index 0f6f95fd7e16..19cbd274f7f2 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmoon2
PORTVERSION= 0.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= astro
MASTER_SITES= SF/gkrellmoon/gkrellmoon/${PORTVERSION}
DISTNAME= gkrellmoon-${PORTVERSION}
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index db464fb286d6..759d45ab9f34 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -8,6 +8,7 @@
PORTNAME= glunarclock
PORTVERSION= 0.34.1
+PORTREVISION= 1
CATEGORIES= astro gnome
MASTER_SITES= SF
diff --git a/astro/gmapcatcher/Makefile b/astro/gmapcatcher/Makefile
index 8892274dd579..ee502e21da5e 100644
--- a/astro/gmapcatcher/Makefile
+++ b/astro/gmapcatcher/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmapcatcher
PORTVERSION= 0.7.6.1
+PORTREVISION= 1
CATEGORIES= astro geography
MASTER_SITES= http://gmapcatcher.googlecode.com/files/
DISTNAME= GMapCatcher-${PORTVERSION}
diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index 7e51e0d22a4d..e701433f219c 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gpscorrelate
PORTVERSION= 1.5.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= astro geography
MASTER_SITES= http://freefoote.dview.net/linux/
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 03ba909ee668..e054743e2255 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpsdrive
PORTVERSION= 2.09
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= astro geography
MASTER_SITES= http://www.gpsdrive.de/packages/ \
LOCAL/beech
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 70b8e40fc615..1feb7c841cde 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kstars
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= astro kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/astro/libroadnav/Makefile b/astro/libroadnav/Makefile
index 720cac2e828c..17a8f8ff2a88 100644
--- a/astro/libroadnav/Makefile
+++ b/astro/libroadnav/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libroadnav
PORTVERSION= 0.19
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro geography
MASTER_SITES= SF/roadnav/LibRoadnav/${PORTVERSION}
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index c93bdd4e97c0..6b0b460c0e37 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -7,6 +7,7 @@
PORTNAME= marble
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= astro kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 71a2dc74bda2..65eec9077647 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.a
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= astro
MASTER_SITES= https://secure.ohos.nl/downloads/
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f7c58b1f542f..b294ff8eb103 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nightfall
PORTVERSION= 1.70
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= astro
MASTER_SITES= http://www.la-samhna.de/nightfall/
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index 0dc70a18da4c..71a84bb0dc62 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nova
PORTVERSION= 0.4
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= astro
MASTER_SITES= SF
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 1c31e202fc55..773fe39317a0 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -8,7 +8,7 @@
PORTNAME= orsa
PORTVERSION= 0.7.0
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/${PORTNAME:U}
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index bfc5000b4479..f9abaec89d86 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pp3
PORTVERSION= 1.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/PP3/${PORTVERSION}
diff --git a/astro/py-aipy/Makefile b/astro/py-aipy/Makefile
index 7bbfabc7b15c..f23c8e86d373 100644
--- a/astro/py-aipy/Makefile
+++ b/astro/py-aipy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aipy
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= astro python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile
index 4477cea706bd..ae1771c9e5cb 100644
--- a/astro/py-astLib/Makefile
+++ b/astro/py-astLib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= astLib
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= astro python
MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 926a56c23d7a..877a36bdd1a2 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qlandkartegt
PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index c5f94e38e534..ad63ab8e3480 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rmap
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= astro geography
MASTER_SITES= http://www.reza.net/rmap/
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 5f2b6cb9fcca..fbdccca7e9dd 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= roadmap
PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= astro geography
MASTER_SITES= SF/${PORTNAME}/RoadMap/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/astro/roadnav/Makefile b/astro/roadnav/Makefile
index b3f6127c6b15..af8338be7900 100644
--- a/astro/roadnav/Makefile
+++ b/astro/roadnav/Makefile
@@ -8,7 +8,7 @@
PORTNAME= roadnav
PORTVERSION= 0.19
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= astro geography
MASTER_SITES= SF/${PORTNAME}/Roadnav/${PORTVERSION}
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 1a4b46958f92..7e693ec1c8a1 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= starplot
PORTVERSION= 0.95.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= astro
MASTER_SITES= http://starplot.org/downloads/
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index eb70cce3b20a..303e0288e508 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stellarium
PORTVERSION= 0.11.3
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 4d6f669eab5c..87fd53285647 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sunclock
PORTVERSION= 3.56
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= astro x11-clocks
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
http://mbsd.msk.ru/dist/
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_XORG= xpm
diff --git a/astro/tangogps/Makefile b/astro/tangogps/Makefile
index 4a223ae93fdd..cd6a6f0df81e 100644
--- a/astro/tangogps/Makefile
+++ b/astro/tangogps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tangogps
PORTVERSION= 0.99.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro geography
MASTER_SITES= http://www.tangogps.org/downloads/
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 3904f597b18c..760393e61e25 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -7,6 +7,7 @@
PORTNAME= viking
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index d40979b8556e..b438255cb02b 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmglobe
PORTVERSION= 1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= astro windowmaker geography
MASTER_SITES= http://hamete.org/static/wmg/
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index f9bc3cba88ee..46297a99d97a 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -7,17 +7,19 @@
PORTNAME= xephem
PORTVERSION= 3.7.5
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= # http://www.clearskyinstitute.com/xephem/
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= An interactive astronomical ephemeris program
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_MOTIF= yes
USE_GMAKE= yes
+USE_XORG= xp xt xext xmu x11 xft
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 8b90e07876da..a611a615d933 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -2,15 +2,12 @@ bin/xephem
lib/X11/app-defaults/XEphem
lib/X11/xephem/auxil/HAReyfigs.csf
lib/X11/xephem/auxil/README
-lib/X11/xephem/auxil/SOHO_512_20030809_0719_eit_304.gif
lib/X11/xephem/auxil/SOHO_512_20090703_1900_eit_171.gif
lib/X11/xephem/auxil/analemma.plt
lib/X11/xephem/auxil/annotation.ano
lib/X11/xephem/auxil/astorb2edb.pl
lib/X11/xephem/auxil/classicfigs.csf
lib/X11/xephem/auxil/dearth.gif
-lib/X11/xephem/auxil/eyepieces.epl
-lib/X11/xephem/auxil/eyepieces.eyp
lib/X11/xephem/auxil/favorites.fav
lib/X11/xephem/auxil/jupiter.1020
lib/X11/xephem/auxil/jupiter.9910
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index f7848a1cba97..ca3f964dd2ce 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xglobe
PORTVERSION= 0.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=kris
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index c2d1b40d7c2c..a8ff0e622060 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xplanet
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= astro geography
MASTER_SITES= SF
@@ -62,7 +63,7 @@ CONFIGURE_ARGS+= --without-jpeg
.if !defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --with-png
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+= --without-png
.endif
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index cf379a22928f..7ba149111cc1 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtide
PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro geography
MASTER_SITES= ftp://ftp.flaterco.com/xtide/ \
http://www.c-s.li/ports/
@@ -20,7 +20,7 @@ COMMENT= Harmonic tide clock and tide predictor
LICENSE= GPLv3
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GMAKE= yes
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
MAN1= tide.1
MAN8= xttpd.8
-CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
+CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 51fa7029a398..1dd7afc8a04b 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= abraca
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://cloud.github.com/downloads/Abraca/Abraca/
diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile
index 5991f1f5c173..687a4fbde839 100644
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akode
PORTVERSION= 2.0.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= audio kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ \
diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile
index 109b1caa3457..19e9ff8e1015 100644
--- a/audio/akode-plugins-pulseaudio/Makefile
+++ b/audio/akode-plugins-pulseaudio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akode-plugins-${PORTNAMESUFX}
PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ \
${MASTER_SITE_LOCAL}
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index 284ec3b953f4..ef56950cc731 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akode
PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= audio kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ \
diff --git a/audio/amarok-fs/Makefile b/audio/amarok-fs/Makefile
index d870f2694195..70b61ec809c1 100644
--- a/audio/amarok-fs/Makefile
+++ b/audio/amarok-fs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amarok-fs
PORTVERSION= 0.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ \
${MASTER_SITE_GENTOO}
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 96297371de50..5a9acc71bd2d 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= amarok
PORTVERSION= 2.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 3b74922997dd..2eeb5fc9ca46 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amarok
PORTVERSION= 1.4.10
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 3d5e73405b3a..6fd2e5a2b58b 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aqualung
DISTVERSION= 0.9beta11
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
http://wickedmachine.net/mirror/
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index e9c2a323b81e..ba4bb5037336 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ardour
PORTVERSION= 2.8.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://freebsd.nsu.ru/distfiles/ \
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index f206ed4d48ee..d74aa5a16725 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ario
PORTVERSION= 1.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION}
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index f1ffe3179f37..942e44408198 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -8,7 +8,7 @@
PORTNAME= arts
PORTVERSION= 1.5.10
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index c9c19d8ab4d5..56fab4492c4f 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -6,7 +6,7 @@
PORTNAME= asunder
PORTVERSION= 2.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= audio
MASTER_SITES= http://littlesvr.ca/asunder/releases/
diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 5cabe5d61e42..317a8566da95 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= atunes
PORTVERSION= 2.0.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index a9f2c3172250..82d8b2eaff76 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aubio
PORTVERSION= 0.3.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://aubio.org/pub/
diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index a52f87e5afee..7ec0546b0760 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= audacious-dumb
PORTVERSION= 0.80
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.netswarm.net/misc/ \
CRITICAL
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 0cc3f743faac..aab2d5f11889 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE \
SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index fb20f2a4c24f..b6056fdd8f70 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= audex
DISTVERSION= 0.74b1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio kde
MASTER_SITES= http://kde.maniatek.com/${PORTNAME}/files/
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 509302669ed3..71bca6f13f03 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beast
PORTVERSION= 0.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://beast.testbit.eu/_dist/beast/v${PORTVERSION:R}/
diff --git a/audio/bebocd/Makefile b/audio/bebocd/Makefile
index 829a685b6414..bec4995d059f 100644
--- a/audio/bebocd/Makefile
+++ b/audio/bebocd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bebocd
PORTVERSION= 0.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index e1a2f77b46e9..339d2423bc2c 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-fc
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= CRITICAL
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index 666a60d6a804..d7d80c81a5eb 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flac
PORTVERSION= 20040316
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://ccm.sherry.jp/tmp/
PKGNAMEPREFIX= bmp-
diff --git a/audio/bmp-htmlplaylist/Makefile b/audio/bmp-htmlplaylist/Makefile
index b7d8519a5061..25c2e4dc03a7 100644
--- a/audio/bmp-htmlplaylist/Makefile
+++ b/audio/bmp-htmlplaylist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-htmlplaylist
PORTVERSION= 0.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://download.berlios.de/bmp-plugins/ \
${MASTER_SITE_LOCAL}
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 115330c751b4..b95fc8d114d9 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mac
PORTVERSION= 0.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= CENKES
PKGNAMEPREFIX= bmp-
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index e6a2121b37f6..1b426afaf122 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modplug
PORTVERSION= 2.0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES?= audio
MASTER_SITES= ftp://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
http://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile
index 2eaf8a4966b1..18537feb3ff5 100644
--- a/audio/bmp-scrobbler/Makefile
+++ b/audio/bmp-scrobbler/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= bmp-scrobbler
-PORTREVISION= 8
+PORTREVISION= 9
MAINTAINER= novel@FreeBSD.org
COMMENT= BMP plugin for Audioscrobbler.com
diff --git a/audio/bmp-songchange/Makefile b/audio/bmp-songchange/Makefile
index 61d417800328..8283358d3851 100644
--- a/audio/bmp-songchange/Makefile
+++ b/audio/bmp-songchange/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-songchange
PORTVERSION= 0.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= BERLIOS/bmp-plugins
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index 43ff918211c3..c97f49b7368c 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-wma
PORTVERSION= 0.1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://download.berlios.de/bmp-plugins/
diff --git a/audio/calf/Makefile b/audio/calf/Makefile
index 77f0ad4606c6..f59f5e682faa 100644
--- a/audio/calf/Makefile
+++ b/audio/calf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= calf
PORTVERSION= 0.0.18.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index c7433a528ae1..9ea9e3955524 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cantus
PORTVERSION= 3.0.2
-PORTREVISION= 7
+PORTREVISION= 8
DISTVERSIONSUFFIX= -testing.src
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/Testing%20%28unstable%29/${PORTVERSION}
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index d2dae3121a8f..48405ad88449 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cheesetracker
PORTVERSION= 0.9.15.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 604dfee87293..28d6e9b48d7d 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clementine
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -player
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 100040434227..5e7e46bd9bbb 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cmp3
PORTVERSION= 2.0.p6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.0-pre6
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 9135103cb325..e8f359ea75e7 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cmus
PORTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 3e83c486a94b..41ed67165068 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cowbell
PORTVERSION= 0.2.7.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio gnome
MASTER_SITES= http://more-cowbell.org/releases/
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 7d4e00fb624c..4bb7ddb181b4 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= creox
DISTVERSION= 0.2.2rc2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde
MASTER_SITES= http://zyzstar.kosoru.com/projects/creox/downloads/
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index bb875a90ad48..d6e8b6fd2d54 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -7,6 +7,7 @@
PORTNAME= csound
PORTVERSION= 5.17.6
+PORTREVISION= 1
CATEGORIES= audio lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index c1dfc7087a3a..09e93b74752a 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cuberok
PORTVERSION= 0.0.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index 5f3bdb8be83b..f709d5bf079b 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cueplayer
PORTVERSION= 0.28
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/deadbeef-mpris-plugin/Makefile b/audio/deadbeef-mpris-plugin/Makefile
index 29cdaf7e67c2..c8e9f6d20812 100644
--- a/audio/deadbeef-mpris-plugin/Makefile
+++ b/audio/deadbeef-mpris-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= deadbeef-mpris-plugin
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 681b9d408366..c5ca4442e4bb 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -7,7 +7,7 @@
PORTNAME= deadbeef
PORTVERSION= 0.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index f4f700cbe6dd..1beb952d0cf2 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= denemo
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= GNU
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 61fc58f01e7f..644642d84cb0 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvda-author
PORTVERSION= 09.05
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= SF/dvd-audio/${PORTNAME}-core/${PORTNAME}-${PORTVERSION}-core
@@ -20,7 +20,7 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
ogg.7:${PORTSDIR}/audio/libogg \
sox.1:${PORTSDIR}/audio/sox \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
MAN1= dvda-author.1
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 36c122b136bf..2ebbe996ad96 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,6 +7,7 @@
PORTNAME= easytag
PORTVERSION= 2.1.7
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28gtk%202%29/${PORTVERSION:C/\.[0-9]+$//}
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 892d916b8d93..5f0ff3b4b826 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eawplus
PORTVERSION= 12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nork
diff --git a/audio/emms/Makefile b/audio/emms/Makefile
index 9a583340d852..de60fe7c66df 100644
--- a/audio/emms/Makefile
+++ b/audio/emms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emms
PORTVERSION= 3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio elisp
MASTER_SITES= GNU
diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile
index f005ed0db9b7..a2882264d6b7 100644
--- a/audio/enscribe/Makefile
+++ b/audio/enscribe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enscribe
PORTVERSION= 0.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio graphics
MASTER_SITES= http://www.coppercloudmusic.com/enscribe/
EXTRACT_SUFX= .tgz
@@ -18,7 +18,7 @@ COMMENT= Create digital audio watermark images from photographic images
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
LICENSE= GPLv2
diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile
index 8cded707ba5f..f0c0b48d7047 100644
--- a/audio/ermixer/Makefile
+++ b/audio/ermixer/Makefile
@@ -9,7 +9,7 @@
PORTNAME= ermixer
PORTVERSION= 0.8
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 0
CATEGORIES= audio kde
MASTER_SITES= SF
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index bd0c3e45c3f1..7dd76f4dc479 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -7,6 +7,7 @@
PORTNAME= esperanza
PORTVERSION= 0.4.0.20091017
+PORTREVISION= 1
CATEGORIES= audio
#MASTER_SITES= http://exodus.xmms.se/~tru/esperanza/0.4/
MASTER_SITES= DEBIAN
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 90e686a3ee0b..4d7e661b3c6c 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -7,6 +7,7 @@
PORTNAME= exaile
PORTVERSION= ${PORTVERSION_MAJOR}.${PORTVERSION_MINOR} # See below
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://launchpad.net/${LP_DIR}/ \
http://wickedmachine.net/mirror/
@@ -38,7 +39,9 @@ OPTIONS= BAD "Install bad GStreamer plugins" On \
SEXY "UI enhancements" On
PORTVERSION_MAJOR= 0.3.2
+PORTREVISION= 1
PORTVERSION_MINOR= 2
+PORTREVISION= 1
LP_DIR= ${PORTNAME}/${PORTVERSION_MAJOR}/${PORTVERSION}/+download
MANCOMPRESSED= yes
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index e21296b0e0d7..f6587793d874 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= extace
PORTVERSION= 1.9.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/eXtace/${PORTVERSION}
diff --git a/audio/fdmf/Makefile b/audio/fdmf/Makefile
index 65837232f861..b277e456709c 100644
--- a/audio/fdmf/Makefile
+++ b/audio/fdmf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fdmf
DISTVERSION= 0.0.9s
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://w140.com/audio/ CENKES
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 2181ce8bcc9d..53729d109be6 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= festalon
PORTVERSION= 0.5.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://projects.raphnet.net/festalon/ \
CRITICAL
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index b9979b5c92df..5eb572db9be4 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -6,7 +6,7 @@
PORTNAME= firefly
PORTVERSION= 1696
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://nightlies.fireflymediaserver.org/nightlies/svn-${PORTVERSION}/ \
http://www.magnesium.net/~mdf/distfiles/
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index d889629768bd..4b1d92ea9b06 100644
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluidsynth-dssi
PORTVERSION= 1.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index a1ea5b2d1d27..d89ac9aa9e9a 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fmit
PORTVERSION= 0.99.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/fmit/
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index f0245b2e72da..d0d9b9942e09 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gbemol
PORTVERSION= 0.3.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 55d932e6599d..bb96b400338e 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdam
PORTVERSION= 0.942
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 4d24e19e4477..ed4b1716698b 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ghostess
PORTVERSION= 20120105
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.smbolton.com/linux/
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 11d77a0aefd2..496de090172d 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gigedit
PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://download.linuxsampler.org/packages/
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index a2eb2739d582..d32a0bb10bf2 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimmix
PORTVERSION= 0.5.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= gimmix
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index 3d0c5f8475a2..dd31b6ddb49f 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmms
PORTVERSION= 0.5.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 751cabcc27ef..229e0d3ca88c 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmms
PORTVERSION= 2.1.22
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index e154e6456860..7a5e49f1ff57 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmss
PORTVERSION= 2.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellmss/
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index d70016dd0382..31bc607efeca 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmvolume
PORTVERSION= 0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= volume-${PORTVERSION}
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index 15424dd480c5..0a35c236c5c8 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmvolume
PORTVERSION= 2.1.13
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= gkrellm-volume-${PORTVERSION}
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 2bd6684610d3..139f6abbf788 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glame
PORTVERSION= 2.0.1
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= audio gnome
MASTER_SITES= SF
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 770be81dc677..eb7988d03f95 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glurp
PORTVERSION= 0.12.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index a32734cec242..151d4950e305 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmidimonitor
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/gmidimonitor/
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index 087f341c43a1..eb6a03c31e6b 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-alarm
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index 119748081fbd..eca9050013fa 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-albumview
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 69624cccbd93..8ea2557e86a5 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-discogs
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index f3e18ec45376..ef33bd012bf2 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-extraplaylist
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 86dcae70b14d..31adc3cad8ab 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-lastfm
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 94c9c6763c92..612520395d48 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-libnotify
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index be8cfcd5fe6d..18a51f2159fd 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-lyrics
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index c9e70be4af22..7c0ee1b6f4b4 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-lyricsplugin
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 9b37a34d28c2..8c4bc5f1760b 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-lyricwiki
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index 620735565785..a93764c9cabd 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-magnatune
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index 3258f8e20939..a3ec327f05ab 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-mdcover
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index da75a8e4851f..3da2e5246ced 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-mserver
PORTVERSION= 0.20.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 0663e08a3a80..5f1145b27cfd 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc-shout
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 5d4a4988ffb5..c2c463b3becc 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-wikipedia
PORTVERSION= 11.8.16
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 30eff13fe0de..fa5c073299ae 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc
PORTVERSION= 11.8.16
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
diff --git a/audio/gmusicbrowser/Makefile b/audio/gmusicbrowser/Makefile
index 5f7946aa4b87..d2ecf0ace5f4 100644
--- a/audio/gmusicbrowser/Makefile
+++ b/audio/gmusicbrowser/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmusicbrowser
PORTVERSION= 1.1.9
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://gmusicbrowser.org/download/
diff --git a/audio/gnaural/Makefile b/audio/gnaural/Makefile
index 04fece10350d..5dce5a8711d2 100644
--- a/audio/gnaural/Makefile
+++ b/audio/gnaural/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnaural
PORTVERSION= 1.0.20110606
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/Gnaural/
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 09616729ef21..f69f440613a3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-media
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index cde6d6d1b29d..fb56fb023354 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomoradio
PORTVERSION= 0.15.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index 60f4ddb0d2e1..9543d99f896a 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -5,7 +5,7 @@
PORTNAME= gnuitar
PORTVERSION= 0.3.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio multimedia
MASTER_SITES= SF
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 48d85628d386..a1129cf71aac 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gogglesmm
PORTVERSION= 0.12.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index f9d982562e0b..152535c5a531 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -8,6 +8,7 @@
PORTNAME= goobox
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 8d83d7ec1b20..124e9c222ac0 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -7,13 +7,15 @@
PORTNAME= gqmpeg
PORTVERSION= 0.91.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio
MASTER_SITES= SF
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another gtk-based MP3 frontend
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
.if defined(WITH_MPG321)
RUN_DEPENDS+= mpg321:${PORTSDIR}/audio/mpg321
.else
diff --git a/audio/gqmpeg-devel/files/patch-ui_pixbuf_save.c b/audio/gqmpeg-devel/files/patch-ui_pixbuf_save.c
new file mode 100644
index 000000000000..2a1590443537
--- /dev/null
+++ b/audio/gqmpeg-devel/files/patch-ui_pixbuf_save.c
@@ -0,0 +1,19 @@
+--- src/ui_pixbuf_save.c.orig 2002-03-09 20:00:13.000000000 +0100
++++ src/ui_pixbuf_save.c 2012-05-09 13:04:57.000000000 +0200
+@@ -24,6 +24,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h> /* for png saving, below */
++#include <pngpriv.h>
+ #endif
+
+
+@@ -86,7 +87,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_ptr->longjmp_buffer))
+ {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (handle);
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 2dd7823ca662..8817a688e1c1 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqmpeg
PORTVERSION= 0.20.0
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES+= audio
MASTER_SITES= SF
@@ -15,6 +15,7 @@ MASTER_SITES= SF
MAINTAINER?= lyngbol@wheel.dk
COMMENT?= Another gtk-based MP3 frontend
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools \
xmp:${PORTSDIR}/audio/xmp
@@ -25,11 +26,13 @@ RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
.endif
USE_GNOME= gdkpixbuf
+USE_GETTEXT= yes
WANT_GNOME= yes
+USE_GETTETX= yes
USE_AUTOTOOLS= autoconf213 libtool
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
MAN1= gqmpeg.1
diff --git a/audio/gqmpeg/files/patch-ui_pixbuf_save.c b/audio/gqmpeg/files/patch-ui_pixbuf_save.c
new file mode 100644
index 000000000000..2a1590443537
--- /dev/null
+++ b/audio/gqmpeg/files/patch-ui_pixbuf_save.c
@@ -0,0 +1,19 @@
+--- src/ui_pixbuf_save.c.orig 2002-03-09 20:00:13.000000000 +0100
++++ src/ui_pixbuf_save.c 2012-05-09 13:04:57.000000000 +0200
+@@ -24,6 +24,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h> /* for png saving, below */
++#include <pngpriv.h>
+ #endif
+
+
+@@ -86,7 +87,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_ptr->longjmp_buffer))
+ {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (handle);
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 2c9935a5804d..6134dc95cf89 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gqradio
PORTVERSION= 1.9.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= SF/gqmpeg/${PORTNAME}/${PORTVERSION}
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 8abdedf1cf19..0144c1d83583 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grip
PORTVERSION= 3.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 06e5703a5a64..58981d940f54 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gspeakers
PORTVERSION= 0.11
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/gstreamer-plugins-pulse/Makefile b/audio/gstreamer-plugins-pulse/Makefile
index 4d0fa6ad5722..64c4a0ec92e8 100644
--- a/audio/gstreamer-plugins-pulse/Makefile
+++ b/audio/gstreamer-plugins-pulse/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio
COMMENT= GStreamer plugin for pulseaudio
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 4990a3f3c024..c89775b612c3 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtick
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.antcom.de/gtick/download/ CENKES
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 40bf110db59a..89c58756a82c 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkguitune
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.oocities.org/harpin_floh/mysoft/
DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION}
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 031427f2212f..388e860f2d01 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkpod
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index f827c8366b69..e49457a7210a 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxmms2
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index d1b1dd172c8e..79b4aff85c1a 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hexter
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
diff --git a/audio/ipod-sharp/Makefile b/audio/ipod-sharp/Makefile
index b2cbeb04a754..ebba9e97dd58 100644
--- a/audio/ipod-sharp/Makefile
+++ b/audio/ipod-sharp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ipod-sharp
PORTVERSION= 0.8.5
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.banshee.fm/${PORTNAME}/${PORTVERSION}/
diff --git a/audio/istream/Makefile b/audio/istream/Makefile
index 0ed81511919b..2520798987b6 100644
--- a/audio/istream/Makefile
+++ b/audio/istream/Makefile
@@ -7,7 +7,7 @@
PORTNAME= istream
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.jochen-baier.de/istream/
diff --git a/audio/jack-keyboard/Makefile b/audio/jack-keyboard/Makefile
index 29474d63eee2..5d568bd4f25b 100644
--- a/audio/jack-keyboard/Makefile
+++ b/audio/jack-keyboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jack-keyboard
DISTVERSION= 2.7.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF \
http://hselasky.homeunix.org:8192/distfiles/
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 5aa45703a026..10ad3484d29c 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jack-rack
PORTVERSION= 1.4.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/jack-smf-utils/Makefile b/audio/jack-smf-utils/Makefile
index f2bc5cb97f2b..87d6c170f9db 100644
--- a/audio/jack-smf-utils/Makefile
+++ b/audio/jack-smf-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jack-smf-utils
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile
index 0efd8a52dc25..ed3fe4f18423 100644
--- a/audio/jack_mixer/Makefile
+++ b/audio/jack_mixer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= jack_mixer
PORTVERSION= 9
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/${PORTNAME:S/_//}/
diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile
index b38be852fbb0..dc472568261c 100644
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jamin
PORTVERSION= 0.95.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index b4c92fa84c5a..d2140d92f406 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jokosher
PORTVERSION= 0.11.5
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://launchpadlibrarian.net/43860543/
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 1d6e30b043db..8c839426aefb 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= juk
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index 64805cea07e8..e38c24e20891 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= k3bmonkeyaudioplugin
PORTVERSION= 3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio kde
MASTER_SITES= SF/k3b/${PORTNAME}/${PORTVERSION}
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 4c9887256fe3..4497c84cec74 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kaudiocreator
PORTVERSION= 1.2.90
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
DISTNAME= 107645-${PORTNAME}-${PORTVERSION}
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 8793b4236975..612bb5ab7c09 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kid3
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= SF
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index b5ee81ca6962..1a8269e2b25f 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kid3
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kde
MASTER_SITES= SF
diff --git a/audio/kirocker/Makefile b/audio/kirocker/Makefile
index 65cace18f8e2..2fff928fff9c 100644
--- a/audio/kirocker/Makefile
+++ b/audio/kirocker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kirocker
PORTVERSION= 4.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio kde
MASTER_SITES= http://slaout.linux62.org/kirocker/downloads/ \
http://contrib.pardus.org.tr/archives/ \
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index 4d63e6d54612..cd2a6d9520f3 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmp
PORTVERSION= 0.01
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://mercury.chem.pitt.edu/~shank/ \
http://www.threadbox.net/files/
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index 228398e8f96b..9711ae728363 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kstreamripper
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index c1305cdf072a..5f44a280a014 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lash
PORTVERSION= 0.5.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SAVANNAH
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index e8c5a4dca6df..df97a3b883b5 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= last.fm
PORTVERSION= 1.4.2.58240
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio net
MASTER_SITES= http://cdn.last.fm/client/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 41c53afc0de7..ed63b78dab2d 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcanberra
PORTVERSION= 0.28
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 824d23b8ac97..c9eda2f97b5d 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgpod
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index a775b308ab56..278f3392aa00 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liblastfm
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= swills
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index c2e6e8b035f8..9d212c81990b 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libnjb
PORTVERSION= 2.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index 6ed2be26991f..25a2e11082b0 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lingot
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 45edc4f33fae..c4c13053cb05 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,6 +6,7 @@
PORTNAME= liteamp
PORTVERSION= 0.2.4.2
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= http://kldp.net/frs/download.php/1153/
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 4dc7b1116e84..33084cceb74f 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lmms
PORTVERSION= 0.4.13
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile
index f6ee6f3d174f..7b76cccf0bfc 100644
--- a/audio/lplayer/Makefile
+++ b/audio/lplayer/Makefile
@@ -9,7 +9,7 @@
PORTNAME= lplayer
PORTVERSION= 1.01
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index c6483a30f220..69f0bf757d3f 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= madman
PORTVERSION= 0.93
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile
index 37c2ffcc4ffb..3193e5a99f73 100644
--- a/audio/mangler/Makefile
+++ b/audio/mangler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mangler
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.mangler.org/downloads/ \
http://ultimeordi.com/pub/mangler/
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 252aa520b0a0..3b46d23f29ba 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mbox
PORTVERSION= 0.7.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://www.mbox.wz.cz/src/ CENKES
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index da8630efe061..804c4158c312 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mehdiaplayer
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 5e9fcd82fbcf..4d5733f2d1e8 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mhwaveedit
PORTVERSION= 1.4.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/mhwaveedit/
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index ddc6540c8cca..adae10be376a 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= midipp
PORTVERSION= 1.0.11
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \
http://hselasky.homeunix.org:8192/distfiles/
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index 1de7a4e2bfff..ca49c2779dee 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= minitunes
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://flavio.tordini.org/files/${PORTNAME}/
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index e0b259a23fd2..10cba643c43e 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mixmos
PORTVERSION= 0.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_TUCOWS}
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 1789099552e5..e38283719179 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -7,8 +7,9 @@
PORTNAME= mixxx
PORTVERSION= 1.10.0
+PORTREVISION= 2
DISTVERSIONSUFFIX= -src
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://mixxx.rasant-records.de/downloads/%SUBDIR%/ \
http://moo.glines.org/mixxx/%SUBDIR%/ \
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index e9bdc28c063c..dc2f211a9a71 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moc
PORTVERSION= 2.4.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/
diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index 461b36b602e9..ac37d1029528 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mp3plot
DISTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://p.outlyer.net/mp3plot/files/
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index d3e38a2b6f01..f9414512d723 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mp3splt-gtk
PORTVERSION= 0.7.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/mp3splt/${PORTNAME}/${PORTVERSION}
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index c665778d8cd4..e13741d97c1a 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mp3stat
PORTVERSION= 2.6.01
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= https://signal-lost.homeip.net/files/ \
http://www.alaskaparadise.com/freebsd/
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 6109f9294869..6ca3e29463c4 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpdbrowser
PORTVERSION= 0.9.15
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio python
MASTER_SITES= http://mpdbrowser.tuxfamily.org/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index 0933abd092b6..b60ae619aec2 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpeglib_artsplug
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 0c8c19ae3369..d9c5e529e002 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= muine
PORTVERSION= 0.8.11
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio gnome
MASTER_SITES= GNOME
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 51eea57e2a9c..f2f10e9283a1 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mumble
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION}
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index ee19ac2000af..d1870ddcb899 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= MuSE
PORTVERSION= 0.9.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
http://www.ljudmila.org/~jaromil/muse/releases/
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 44a723fa3eea..1c6e4f2d0493 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -7,7 +7,7 @@
PORTNAME= musescore
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/mscore/mscore/MuseScore-${PORTVERSION}
DISTNAME= mscore-${PORTVERSION}
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index ade54ec00587..9db7171c38be 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= musicbox-tag-editor
PORTVERSION= 0.2.3
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= SF/musicbox/musicbox/${PORTVERSION}
DISTNAME= musicbox-${PORTVERSION}
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index a0e9446b3b84..eaf4feeca689 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= musicpd
PORTVERSION= 0.16.8
+PORTREVISION= 1
CATEGORIES= audio ipv6
MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 6afa5c1ccf5a..b9736b25f1f1 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mythmusic
PORTVERSION= 0.25
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \
http://ftp.osuosl.org/pub/mythtv/old_releases/ \
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index a6b86c01c2e8..3977f6f2e6dd 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nekobee
PORTVERSION= 0.1.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.nekosynth.co.uk/releases/
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index b6f6fa1f0396..7450b75cc615 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -7,7 +7,7 @@
PORTNAME= normalize
PORTVERSION= 0.7.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SAVANNAH
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 917a405f7cb3..84528f6d9ff8 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= osdlyrics
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= audio deskutils
MASTER_SITES= GOOGLE_CODE
PROJECTHOST= osd-lyrics
diff --git a/audio/osdmixer/Makefile b/audio/osdmixer/Makefile
index 1a94c7822fcc..b0fb891219bc 100644
--- a/audio/osdmixer/Makefile
+++ b/audio/osdmixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osdmixer
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index d82f3b218d9c..a1b63bb9634a 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oss
DISTVERSION= 4.2-build2006
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kld
MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/
DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-bsd
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 1781c1eca8ed..c5dd4669b28d 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= padevchooser
PORTVERSION= 0.9.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 90103a8aa054..48ca82e943ce 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paman
PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index b74b6a9a9eff..f87f30fc9ecf 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= paprefs
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index ff54e86bb35d..2f0b89364a10 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= patchage
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.drobilla.net/ \
http://frugalware.mirrors.tds.net/pub/linux/frugalware/frugalware-current/source/xmultimedia-extra/patchage/
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 31ebda23e940..82fdf46a6246 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pavucontrol
PORTVERSION= 0.9.10
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index 76bdd99620e8..c0a9aa22cf2e 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pavumeter
PORTVERSION= 0.9.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index ab09f0df8d6c..93de2f32c2e4 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= picard
PORTVERSION= 0.16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio python
MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile
index 7b3253e498a9..106cf7919dd5 100644
--- a/audio/pidgin-musictracker/Makefile
+++ b/audio/pidgin-musictracker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= musictracker
PORTVERSION= 0.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= pidgin-
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index e8df8191a17a..faacb4bba27a 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pithos
PORTVERSION= 0.3.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index a2374808401b..04a4f3983fcc 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= prokyon3
PORTVERSION= 0.9.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 6de0e2da012d..d2f593aaece9 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -12,6 +12,7 @@
PORTNAME= pulseaudio
PORTVERSION= 0.9.23
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index c4cba159471d..291200659482 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -7,7 +7,7 @@
PORTNAME= karaoke
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio python
MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index 307708d6237a..e0a8ed091946 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= audio
PORTVERSION= 2.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF/q-lang/q-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= q-
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 962858b747e2..e11607a79267 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qjackctl
DISTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 008624a43dda..c671fe036078 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qmpdclient
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://dump.bitcheese.net/files/
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index a7cb29325825..02c1f6cf4619 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qsampler
PORTVERSION= 0.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} \
http://download.linuxsampler.org/packages/
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index f6d66388c8a9..5ad9c4d8a907 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qsynth
PORTVERSION= 0.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index 7b9e31b55b3d..f4cee089881f 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quimup
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
MASTER_SITE_SUBDIR=musicpd/Quimup/${PORTVERSION}
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index e4caf5b4c829..b635e05e4053 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -7,7 +7,7 @@
PORTNAME= raop_play
PORTVERSION= 0.5.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= SF/raop-play/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index bb5f0d1433f3..d504828288e4 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rezound
DISTVERSION= 0.12.3beta
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/ReZound/${DISTVERSION}
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9d09fe8bd6f7..958be9cb2480 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rhythmbox
PORTVERSION= 0.12.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index b3c501ae0d9a..63c800c077d0 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ripperx
PORTVERSION= 2.7.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
DISTNAME= ripperX-${PORTVERSION}
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 4d0fd4f109ee..b3b0af414eca 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rosegarden
PORTVERSION= 12.04
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-LINUX/
diff --git a/audio/rubyripper/Makefile b/audio/rubyripper/Makefile
index 21d12cb279a1..c056c6611378 100644
--- a/audio/rubyripper/Makefile
+++ b/audio/rubyripper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rubyripper
DISTVERSION= 0.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio sysutils ruby
MASTER_SITES= GOOGLE_CODE
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index e7f2805eb5b5..f15984117005 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= scrobbler
PORTVERSION= 0.3.8.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= audio
MASTER_SITES= http://static.audioscrobbler.com/plugins/ \
http://www.pipian.com/stuffforchat/
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index a9702e23df2d..f07a1c62b1a1 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smasher
PORTVERSION= 1.1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 4dc670803284..b50895fc429e 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snd
PORTVERSION= 12.11
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
http://mirror.mcx2.org/
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 4dccbbf34129..ce12bbbc1eec 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -9,6 +9,7 @@
PORTNAME= solfege
PORTVERSION= 3.20.4
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
PKGNAMESUFFIX= -nosound
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 2746dd15b84a..d52103265022 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sonata
PORTVERSION= 1.6.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio python
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/sonice/Makefile b/audio/sonice/Makefile
index b8695781b946..42ddb5669cc7 100644
--- a/audio/sonice/Makefile
+++ b/audio/sonice/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sonice
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://freebsd.t-hosting.hu/${PORTNAME}/
diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile
index 1232cbe3a046..340cdce4a7aa 100644
--- a/audio/sooperlooper/Makefile
+++ b/audio/sooperlooper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sooperlooper
PORTVERSION= 1.6.18
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://essej.net/sooperlooper/
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 9eba2fdedc7d..9cb962f6b274 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sound-juicer
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index 0daa8ec6fb8f..e7f01a5de455 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= soundconverter
PORTVERSION= 1.5.4
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= BERLIOS
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 24aa186d4d35..ee5f11037946 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -6,7 +6,7 @@
PORTNAME= soundkonverter
DISTVERSION= 0.9.94rc2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde
MASTER_SITES= https://api.opensuse.org/public/source/home:HessiJames/soundkonverter/
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index b28fe6523b3f..51ef75f66b92 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= soundtracker
PORTVERSION= 0.6.8
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= audio gnome
MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
MASTER_SITE_SUBDIR= v${PORTVERSION:R}
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 235b6744c304..d078e4bc11e3 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sox
PORTVERSION= 14.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= SF
@@ -138,7 +138,7 @@ CONFIGURE_ARGS+= --without-mad
.if defined(WITH_PNG)
CONFIGURE_ARGS+= --with-png
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+= --without-png
.endif
diff --git a/audio/specimen/Makefile b/audio/specimen/Makefile
index 2fae43f60bda..56189b1afb58 100644
--- a/audio/specimen/Makefile
+++ b/audio/specimen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= specimen
DISTVERSION= 0.5.2-rc3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://zhevny.com/specimen/files/
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index afe238873555..1389616b7141 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spek
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 0f60439ce79a..e47aad2d2f99 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spiralloops
PORTVERSION= 2.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/
DISTNAME= SpiralLoops-${PORTVERSION}
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 24acb8166722..c2845021d04d 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spiralsynth
PORTVERSION= 0.1.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/
DISTNAME= SpiralSynth-${PORTVERSION}
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 3837d0a34e74..09134e4346ff 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spiralsynthmodular
PORTVERSION= 0.2.2a
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF/spiralmodular/spiralmodular/${PORTVERSION}%20%28Latest%20Version%29
DISTNAME= spiralmodular-${PORTVERSION}
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index b3954bf77e57..9709c8e7626a 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= streamtuner
PORTVERSION= 0.99.99
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= audio www
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index c8178a6644d5..9acb67bb7ab3 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sweep
PORTVERSION= 0.9.3
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= audio gnome
MASTER_SITES= SF
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 75256cd798dc..486b72eb7102 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tagtool
PORTVERSION= 0.12.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/tepsonic/Makefile b/audio/tepsonic/Makefile
index dcd5c6f3442a..abeee13941a5 100644
--- a/audio/tepsonic/Makefile
+++ b/audio/tepsonic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tepsonic
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.tepsonic.org/files/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 419ec4545f35..95a742f35765 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= terminatorx
PORTVERSION= 3.84
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
DISTNAME= terminatorX-${PORTVERSION}
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 34bb37c35aa2..7be1e3a6581b 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index 9fea9cdc44f7..c9493acc31bc 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= timemachine
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://plugin.org.uk/timemachine/
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 7214088b3bb0..7d77fc9326a8 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -7,7 +7,7 @@
PORTNAME= timidity++
PORTVERSION= 2.13.2
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES+= audio
MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
DISTNAME= TiMidity++-${PORTVERSION}
@@ -56,7 +56,8 @@ CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynami
.else
CONFIGURE_ARGS+=--with-x --enable-spectrogram --enable-wrd --enable-dynamic
USE_XORG= x11 xext
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
.endif
.if ${HAVE_GNOME:Mesound}!=""
diff --git a/audio/timidity++/files/patch-x_sherry.c b/audio/timidity++/files/patch-x_sherry.c
new file mode 100644
index 000000000000..c33a60cf7ce0
--- /dev/null
+++ b/audio/timidity++/files/patch-x_sherry.c
@@ -0,0 +1,28 @@
+--- interface/x_sherry.c.orig 2002-07-14 23:19:32.000000000 +0200
++++ interface/x_sherry.c 2012-04-27 13:12:58.000000000 +0200
+@@ -34,6 +34,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "timidity.h"
+ #include "common.h"
+@@ -909,7 +910,7 @@
+ {
+ if(png_get_valid(pngPtr, infoPtr, PNG_INFO_hIST))
+ png_get_hIST(pngPtr, infoPtr, &hist);
+- png_set_dither(pngPtr, palette,
++ png_set_quantize(pngPtr, palette,
+ numPalette, MAX_SCREEN_COLORS, hist, 1);
+ }
+ }
+@@ -934,7 +935,7 @@
+ }
+ }
+ }
+- png_set_dither(pngPtr, stdColorCube,
++ png_set_quantize(pngPtr, stdColorCube,
+ 6*7*6, MAX_SCREEN_COLORS,
+ NULL, 1);
+ /*???*/
diff --git a/audio/trommler/Makefile b/audio/trommler/Makefile
index b728f0a03e4e..8807ab46315d 100644
--- a/audio/trommler/Makefile
+++ b/audio/trommler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trommler
PORTVERSION= 3.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://muth.org/Robert/Trommler/
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 0573c318575c..fafff448eb25 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tuxguitar
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
${MASTER_SITE_LOCAL}/gahr/:fluid \
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index cfb8aef8c569..459b449587f7 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vagalume
PORTVERSION= 0.8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://vagalume.igalia.com/files/source/ \
${MASTER_SITE_DEBIAN_POOL}
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index c6abd84865d6..126d5d708249 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vitunes
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://vitunes.org/files/ \
http://mirror.4bit.ws/ \
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 2e795460f53f..d780127c279f 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 374fbb33bcb0..e96c0b218e03 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vsound
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.vsound.org/
diff --git a/audio/waheela/Makefile b/audio/waheela/Makefile
index 76149cd8d5f8..040a078fe9ae 100644
--- a/audio/waheela/Makefile
+++ b/audio/waheela/Makefile
@@ -6,7 +6,7 @@
PORTNAME= waheela
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio kde
MASTER_SITES= http://linux.wuertz.org/dists/sid/main/source/
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/audio/waon/Makefile b/audio/waon/Makefile
index 9dd67e11b175..7d82348367b8 100644
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waon
PORTVERSION= 0.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index 4b601725e5fe..b9eb6a53c042 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -6,6 +6,7 @@
PORTNAME= wavbreaker
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile
index 72be67a04dff..2393f4ed74f3 100644
--- a/audio/whysynth/Makefile
+++ b/audio/whysynth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= whysynth
PORTVERSION= 20100922
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://smbolton.com/whysynth/
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index 5a2d1fb91ab3..435cd130f6a6 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmalbum
PORTVERSION= 0.1.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio windowmaker
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/wmauda/Makefile b/audio/wmauda/Makefile
index d21bbc74215b..1dfd51306bba 100644
--- a/audio/wmauda/Makefile
+++ b/audio/wmauda/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmauda
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.netswarm.net/misc/ \
${MASTER_SITE_GENTOO}
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 51edf6882143..79b1700ad35e 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wsoundserver
PORTVERSION= 0.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio windowmaker
MASTER_SITES= ${MASTER_SITE_NETBSD}
DISTNAME= WSoundServer-${PORTVERSION}
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index 4f1dc1c778e7..829abace5943 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxguitar
PORTVERSION= 1.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index e41db2614ba0..eb3c996fa38d 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/4.8
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index d9917d33301e..35f28bf49cb1 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-mpc-plugin
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index a52000dfbe12..e34dd2442219 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfmpc
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile
index fc16740e9b32..1f59a1c9e107 100644
--- a/audio/xmms-arts_output/Makefile
+++ b/audio/xmms-arts_output/Makefile
@@ -8,7 +8,7 @@
PKGNAMEPREFIX= xmms-
PORTNAME= arts_output
PORTVERSION= 0.7.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://havardk.xmms.org/plugins/arts_output/
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 78f35274691e..7d9d3e84195b 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -22,7 +22,7 @@ HAS_CONFIGURE= yes
APP?= xmms
.if ${APP} == bmp
PORTVERSION= 0.3.12
-PORTREVISION= 2
+PORTREVISION= 3
.endif
PLUGDIR?= lib/${APP}/Output
PORTDOCS= README
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 24c7ecee2a0e..dfcd8899dc33 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -7,7 +7,7 @@
PORTNAME= crystality
PORTVERSION= 0.92
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://ftp.ussg.iu.edu/FreeBSD/distfiles/ \
http://T32.TecNik93.com/FreeBSD/others_ports/xmms-crystality/sources/
diff --git a/audio/xmms-faad/Makefile.inc b/audio/xmms-faad/Makefile.inc
index 925d051c93bb..db0f686f9ce7 100644
--- a/audio/xmms-faad/Makefile.inc
+++ b/audio/xmms-faad/Makefile.inc
@@ -2,7 +2,7 @@
PORTNAME= faad2
PORTVERSION= 2.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SFE/faac
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index d9a7f3dd9be2..268a161feb70 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-kde
PORTVERSION= 3.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio kde
MASTER_SITES= SF
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index b0b4dc238125..c2f52d4ed126 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xsynth-dssi
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index aa425de1c8c4..0b9e049250ad 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yammi
PORTVERSION= 1.2.3
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 0f8f149bf8b9..a22be194075c 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yamt
PORTVERSION= 0.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio gnome
MASTER_SITES= SF \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 02950f707fbc..4c3f8142544d 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zinf
PORTVERSION= 2.2.5
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= audio ipv6
MASTER_SITES= SF
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index ce846daa06c1..848959384582 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zynaddsubfx
PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF
DISTNAME= ZynAddSubFX-${PORTVERSION}
diff --git a/benchmarks/autobench/Makefile b/benchmarks/autobench/Makefile
index 7a8b8acab89f..c6280637e77d 100644
--- a/benchmarks/autobench/Makefile
+++ b/benchmarks/autobench/Makefile
@@ -8,7 +8,7 @@
PORTNAME= autobench
PORTVERSION= 2.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= benchmarks www
MASTER_SITES= http://www.xenoclast.org/autobench/downloads/ \
http://www.sfr-fresh.com/unix/privat/
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 5cb164b2323b..7e38ff995fde 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dbs
PORTVERSION= 1.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= benchmarks
MASTER_SITES= http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \
LOCAL/jkoshy
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index 29a776c839b5..198d85769b57 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkperf
PORTVERSION= 0.40
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= benchmarks
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index 798dd4f71074..fc041cff1c06 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-benchmark
PORTVERSION= 1.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= benchmarks math
MAINTAINER= stephen@FreeBSD.org
diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile
index 41d1b14baf4b..cbb37e290d66 100644
--- a/biology/embassy/Makefile
+++ b/biology/embassy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= embassy
PORTVERSION= 6.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/
DIST_SUBDIR= emboss
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index dbc931cf52bb..b9a5e0b31a43 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -8,7 +8,7 @@
PORTNAME= emboss
PORTVERSION= 6.2.0
RELEASE= ${PORTNAME:U}-${PORTVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/
DISTNAME= ${RELEASE}
@@ -20,7 +20,7 @@ COMMENT= A collection of open source tools for genetic sequence analysis
BUILD_DEPENDS= clustalw:${PORTSDIR}/biology/clustalw \
primer3:${PORTSDIR}/biology/primer3
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= qmail-ldap-[0-9]* digest-[0-9]*
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --with-docroot=${DOCSDIR}
USE_XORG= x11
USE_MOTIF= yes
LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+= --without-x
.endif
diff --git a/biology/genpak/Makefile b/biology/genpak/Makefile
index 52af42a6097b..4735855af352 100644
--- a/biology/genpak/Makefile
+++ b/biology/genpak/Makefile
@@ -8,7 +8,7 @@
PORTNAME= genpak
PORTVERSION= 0.26
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= biology
MASTER_SITES= http://www.bioinformatics.org/genpak/download/
DISTNAME= gp-${PORTVERSION}
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index e19ccde0786d..a9b4caaa18ef 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gperiodic
PORTVERSION= 2.0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= biology
MASTER_SITES= http://www.frantz.fi/software/
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index f3615d350a05..60b25424aa24 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Bio-Das
PORTVERSION= 1.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/biology/p5-Bio-Graphics/Makefile b/biology/p5-Bio-Graphics/Makefile
index 3f677f958879..b707af4fe801 100644
--- a/biology/p5-Bio-Graphics/Makefile
+++ b/biology/p5-Bio-Graphics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Bio-Graphics
PORTVERSION= 2.28
+PORTREVISION= 1
CATEGORIES= biology perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index aa388d4bd42d..e73ec371b6af 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Bio-Phylo
PORTVERSION= 0.48
+PORTREVISION= 1
CATEGORIES= biology perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index 4ee63b210a08..5414a95550f8 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bioperl-run
PORTVERSION= 1.6.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= biology perl5
MASTER_SITES= http://bioperl.org/DIST/ \
CPAN
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 4830902d7cf9..b438bfd33096 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bioperl
PORTVERSION= 1.6.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= biology perl5
MASTER_SITES= http://bioperl.org/DIST/ \
CPAN
diff --git a/biology/povchem/Makefile b/biology/povchem/Makefile
index 1a14cfef0ce9..18aa6c25c99d 100644
--- a/biology/povchem/Makefile
+++ b/biology/povchem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povchem
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= biology graphics
MASTER_SITES= http://www.chemicalgraphics.com/paul/PC_Dist/v1.00/
DISTFILES= povchem.c \
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 3fc6b7680a23..656012dfcaef 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -6,7 +6,7 @@
PORTNAME= protomol
PORTVERSION= 2.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= biology
MASTER_SITES= SF/${PORTNAME}/ProtoMol/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-tar.gz
@@ -15,7 +15,7 @@ EXTRACT_SUFX= # nada
MAINTAINER= sangwoos@gmail.com
COMMENT= OO, component based, framework for molecular dynamics (MD) simulations
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile
index 33484a174424..bc84b3a13fb3 100644
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -6,6 +6,7 @@
PORTNAME= pymol
PORTVERSION= ${VERSION}.${SVNREVISION}
+PORTREVISION= 1
CATEGORIES= biology python
MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/pymol|}
@@ -15,7 +16,7 @@ COMMENT= Free and Open-Source molecular modeling system
BUILD_DEPENDS= ${PYNUMERIC}
RUN_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
VERSION= 1.5.0.1
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index a56fb753de05..c7b4308075c7 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= seaview
PORTVERSION= 2006.02.13
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= biology
MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile
index 619f9f46d3ab..77929ed61c08 100644
--- a/biology/treeviewx/Makefile
+++ b/biology/treeviewx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= treeviewx
PORTVERSION= 0.5.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= biology
MASTER_SITES= http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/${PORTVERSION:S/.1//}/
DISTNAME= tv-${PORTVERSION}
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 7743131b468e..08b2c216aa3d 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdrawchem
PORTVERSION= 1.9.9
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= biology
MASTER_SITES= SF
diff --git a/cad/basicdsp/Makefile b/cad/basicdsp/Makefile
index 970ddaaf52ad..28564ce9ee2e 100644
--- a/cad/basicdsp/Makefile
+++ b/cad/basicdsp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= basicdsp
PORTVERSION= 1.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= cad hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ \
${MASTER_SITE_LOCAL}
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 3b10ed1f419e..0b7b69b9ac99 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= brlcad
PORTVERSION= 7.20.6
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
@@ -15,7 +16,7 @@ COMMENT= CSG modelling system from the US Ballistic Research Laboratory
BUILD_DEPENDS= ${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama \
xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
rle.1:${PORTSDIR}/graphics/urt
USE_BZIP2= yes
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index c73e3174cc86..e5b97aaaa49f 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gattrib
PORTVERSION= 1.4.3
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index d7cd376b2b69..a748426e922a 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gschem
PORTVERSION= 1.4.3
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index e3219b9cbd1a..7d339d8eaa46 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netlist
PORTVERSION= 1.4.3
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index 20362d5debac..99681b83359d 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -7,7 +7,7 @@
PORTNAME= symcheck
PORTVERSION= 1.4.3
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 31827e7f54d0..dcce8cd6c0e8 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= utils
PORTVERSION= 1.4.3
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 3d478ed5c054..c15819fb82f1 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gerbv
PORTVERSION= 2.6.0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 8f4689fc4b47..adefca84103b 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmsh
PORTVERSION= 2.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= http://www.geuz.org/gmsh/src/ \
http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -22,6 +22,7 @@ COMMENT= An automatic 3D finite element mesh generator
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
jpeg.11:${PORTSDIR}/graphics/jpeg \
+ png15:${PORTSDIR}/graphics/png \
lapack.4:${PORTSDIR}/math/lapack
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gmsh/files/patch-Graphics_gl2png.cpp b/cad/gmsh/files/patch-Graphics_gl2png.cpp
new file mode 100644
index 000000000000..5cce14f1189b
--- /dev/null
+++ b/cad/gmsh/files/patch-Graphics_gl2png.cpp
@@ -0,0 +1,10 @@
+--- Graphics/gl2png.cpp.orig 2010-10-15 15:35:00.000000000 +0200
++++ Graphics/gl2png.cpp 2012-05-09 13:23:42.000000000 +0200
+@@ -16,6 +16,7 @@
+ #else
+
+ #include <png.h>
++#include <zlib.h>
+
+ #ifndef png_jmpbuf
+ # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 6ccdbc15969c..87b940e4ffe1 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gspiceui
PORTVERSION= 1.0.00
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/cad/gtkwave3/Makefile b/cad/gtkwave3/Makefile
index 4538ffe8ce3a..8ae658e795c8 100644
--- a/cad/gtkwave3/Makefile
+++ b/cad/gtkwave3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkwave3
PORTVERSION= 3.3.35
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://gtkwave.sourceforge.net/
DISTNAME= gtkwave-${PORTVERSION}
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 496125d495ba..2f44e5032277 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwave
PORTVERSION= 20080127
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= cad
MASTER_SITES= http://geda.seul.org/dist/
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 87554d1b742c..d038e5db5a96 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kicad
DISTVERSION= r${BZR_SRC_REV}
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= cad
DIST_SUBDIR= ${PORTNAME}
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index f625988deda1..4957769cc0b5 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kicad
DISTVERSION= 2010-05-05-BZR2356
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/ \
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index f79385e0089f..cb24b0aeb69d 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -7,6 +7,7 @@
PORTNAME= klayout
PORTVERSION= 0.21.11
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www.klayout.de/
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index f2afe615e852..df0f5b89a304 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= layouteditor
PORTVERSION= 0.0.20110614
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= hrs
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 528517a507cd..c7730cc3416c 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= leocad
PORTVERSION= 0.73
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -19,7 +19,7 @@ COMMENT= A CAD program that uses bricks similar to those found in many toys
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GL= glut
USE_XORG= x11
diff --git a/cad/leocad/files/patch-im_png.cpp b/cad/leocad/files/patch-im_png.cpp
index 127f267823d1..39415c645ea7 100644
--- a/cad/leocad/files/patch-im_png.cpp
+++ b/cad/leocad/files/patch-im_png.cpp
@@ -1,5 +1,5 @@
--- common/im_png.cpp.orig 2000-09-16 19:18:01.000000000 +0200
-+++ common/im_png.cpp 2010-03-29 20:47:19.000000000 +0200
++++ common/im_png.cpp 2012-04-27 08:02:21.000000000 +0200
@@ -34,7 +34,7 @@
return NULL;
@@ -9,3 +9,48 @@
{
fclose(f);
return NULL; // bad signature
+@@ -55,7 +55,7 @@
+ return NULL; // out of memory
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -69,7 +69,7 @@
+ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+ NULL, NULL, NULL);
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -80,7 +80,7 @@
+ {
+ png_get_bKGD(png_ptr, info_ptr, &pBackground);
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -113,7 +113,7 @@
+ }
+ else
+ {
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -283,7 +283,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ fclose(fp);
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index acc15e5b6867..f3fc44257bd8 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgeda
PORTVERSION= 1.4.3
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 5ea7bc0c12d0..7cc0a80a7de0 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= librecad
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= LOCAL/makc
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index 90741a3c36cb..7ab5ec5687f1 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -10,7 +10,7 @@ EAGLEBASEVERSION?= 5.11
EAGLEBUGFIX?= 0
EAGLEVERSION= ${EAGLEBASEVERSION}.${EAGLEBUGFIX}
PORTVERSION= ${EAGLEVERSION:S/r/./}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= cad linux
MASTER_SITES= ftp://ftp.cadsoft.de/eagle/program/${EAGLEBASEVERSION}/
DISTNAME= eagle-${EAGLEVERSION}
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 9fde058248ea..b6cfdcebbbd6 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -8,7 +8,7 @@
PORTNAME= meshlab
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/
DISTNAME= MeshLabSrc_AllInc_v123a
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 0a3db61ac63c..8d1edae1f940 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netgen
PORTVERSION= 4.9.13
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= cad
MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION}/
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index b6a1cc3987a4..5301fcbde62d 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opencascade
PORTVERSION= 6.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= cad science
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= thierry
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 8bb420b88e24..9bd87f593a52 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openscad
PORTVERSION= 2011.12
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= https://cloud.github.com/downloads/openscad/openscad/
DISTNAME= openscad-${PORTVERSION}.src
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 148e7d4d6931..8ea41ffe9bf9 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -6,6 +6,7 @@
PORTNAME= openvsp
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= https://nodeload.github.com/OpenVSP/OpenVSP/tarball/
DISTNAME= OpenVSP_${PORTVERSION}_Community
@@ -17,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/OpenVSP-OpenVSP-574d7c3/src
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 23abf1af2760..b361edabac95 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pcb
PORTVERSION= 20110918
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index b3577d2157cb..1c386bd1035a 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pdnmesh
PORTVERSION= 0.2.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index 69275bf4e79f..9f13cf18c0c5 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pythoncad
PORTVERSION= 37
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/R${PORTVERSION}%20PyGtk/Source
DISTNAME= PythonCAD-DS1-R${PORTVERSION}
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index f6867b4a7df8..e0f093eebe38 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qcad
PORTVERSION= 2.0.5.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= cad
MASTER_SITES= ftp://www.ribbonsoft.com/archives/qcad/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index 97cafbd9005d..2fe2528e2dd4 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qelectrotech
PORTVERSION= 0.22
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://download.tuxfamily.org/qet/tags/20100313/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index e1f1f19862f3..005cf72e5f57 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qfsm
PORTVERSION= 0.52.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index f59bce110b4b..6287e8522bfb 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qucs
PORTVERSION= 0.0.16
+PORTREVISION= 1
CATEGORIES= cad science
MASTER_SITES= SF
diff --git a/cad/salome-geom/Makefile b/cad/salome-geom/Makefile
index 649c4d7dcc35..5a6a2703f918 100644
--- a/cad/salome-geom/Makefile
+++ b/cad/salome-geom/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-jobmanager/Makefile b/cad/salome-jobmanager/Makefile
index a81ab5bab709..ab30d63e64ae 100644
--- a/cad/salome-jobmanager/Makefile
+++ b/cad/salome-jobmanager/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-light/Makefile b/cad/salome-light/Makefile
index 31e0d909cf94..8ee8ce90cb39 100644
--- a/cad/salome-light/Makefile
+++ b/cad/salome-light/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-med/Makefile b/cad/salome-med/Makefile
index e008e315bbe5..00976f041e0f 100644
--- a/cad/salome-med/Makefile
+++ b/cad/salome-med/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-multipr/Makefile b/cad/salome-multipr/Makefile
index ccbddb14c3c9..bee31cc67bba 100644
--- a/cad/salome-multipr/Makefile
+++ b/cad/salome-multipr/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-netgenplugin/Makefile b/cad/salome-netgenplugin/Makefile
index 8fd09fa486e5..735ab3298083 100644
--- a/cad/salome-netgenplugin/Makefile
+++ b/cad/salome-netgenplugin/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-sierpinsky/Makefile b/cad/salome-sierpinsky/Makefile
index fa69cac64f88..3275c30b6043 100644
--- a/cad/salome-sierpinsky/Makefile
+++ b/cad/salome-sierpinsky/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-smesh/Makefile b/cad/salome-smesh/Makefile
index cc30a0612555..ad22a27e37b5 100644
--- a/cad/salome-smesh/Makefile
+++ b/cad/salome-smesh/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/salome-visu/Makefile b/cad/salome-visu/Makefile
index 4b5940b530fe..150b28f69cd0 100644
--- a/cad/salome-visu/Makefile
+++ b/cad/salome-visu/Makefile
@@ -4,7 +4,7 @@
#
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index d693f13297c7..67e831ddb92f 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= transcalc
PORTVERSION= 0.14
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= cad
MASTER_SITES= http://transcalc.sourceforge.net/
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index dfc258d4b0c6..3e05da12b8cb 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vipec
PORTVERSION= 3.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/ViPEC/${PORTVERSION}
DISTNAME= ViPEC-${PORTVERSION}
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 3fac852948dc..355a313cb85c 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcircuit
PORTVERSION= 3.7.39
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ \
diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index a0f3539b3332..9be7232c9f86 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -7,7 +7,7 @@
PORTNAME= z88
PORTVERSION= 13.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= http://www.z88.uni-bayreuth.de/download/
DISTFILES= ${PORTNAME}130${EXTRACT_SUFX} ${PORTNAME}mane.pdf
diff --git a/chinese/docproj/Makefile b/chinese/docproj/Makefile
index 02fe26930142..0d4ee703eabe 100644
--- a/chinese/docproj/Makefile
+++ b/chinese/docproj/Makefile
@@ -9,7 +9,7 @@
PORTNAME= docproj
PORTVERSION= 0.1.20060303
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= chinese
MASTER_SITES= # none
DISTFILES= # none
diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index 620224d2664f..c022ecfbf6c7 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-chewing
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx-cloudpinyin/Makefile b/chinese/fcitx-cloudpinyin/Makefile
index 08bc14448c56..827be0bd027c 100644
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-cloudpinyin
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index 10e6124dde2e..c51cb8b44ffe 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-configtool
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 33f24d291d6e..854b9ff714b6 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-googlepinyin
PORTVERSION= 0.1.5
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx-sunpinyin/Makefile b/chinese/fcitx-sunpinyin/Makefile
index 5c8c3dfd24c5..ad0545dfbc36 100644
--- a/chinese/fcitx-sunpinyin/Makefile
+++ b/chinese/fcitx-sunpinyin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-sunpinyin
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx-ui-light/Makefile b/chinese/fcitx-ui-light/Makefile
index 289ff5711c61..81f9cd28ca3e 100644
--- a/chinese/fcitx-ui-light/Makefile
+++ b/chinese/fcitx-ui-light/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-ui-light
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 233d3a2cfeb4..dd82efa698a0 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx
PORTVERSION= 4.2.3
+PORTREVISION= 1
CATEGORIES= chinese x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile
index f0cb430f1519..edaf4d55a6f6 100644
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fqterm
PORTVERSION= 0.9.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 54383082182c..41cba2a7f500 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcin
PORTVERSION= 2.7.6.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= chinese textproc gnome
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
index 81b8e846074c..2b8938b86d70 100644
--- a/chinese/ibus-chewing/Makefile
+++ b/chinese/ibus-chewing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-chewing
PORTVERSION= 1.3.10
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index ad76a5f6c9f1..b6f37692453c 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-pinyin
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/chinese/kde3-i18n-zh_CN/Makefile b/chinese/kde3-i18n-zh_CN/Makefile
index e12780838734..a7c1d2a102ac 100644
--- a/chinese/kde3-i18n-zh_CN/Makefile
+++ b/chinese/kde3-i18n-zh_CN/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/kde3-i18n-zh_TW/Makefile b/chinese/kde3-i18n-zh_TW/Makefile
index 34fdccd225dd..fde778ea19c8 100644
--- a/chinese/kde3-i18n-zh_TW/Makefile
+++ b/chinese/kde3-i18n-zh_TW/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 1a3e7368ebb6..8d2ff474c191 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= chinese kde
MAINTAINER= kde@FreeBSD.org
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 06a1ed0fa845..2c0c323d7d4d 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= chinese kde
MAINTAINER= kde@FreeBSD.org
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index c35dc86b4d57..b218b60798a1 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oxim
PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese textproc
MASTER_SITES= ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
ftp://140.111.128.66/odp/OXIM/Source/
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 4cd1b2255a8d..c93e578611ea 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pcmanx
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= chinese net gnome
MASTER_SITES= http://pcmanx-gtk2.googlecode.com/files/
DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION}
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 77fb5c7ab8fa..5c4abd22bca6 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qterm
PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= chinese
MASTER_SITES= SF/qterm/qterm/${PORTVERSION}
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index a78672cf04a8..eefe473ee933 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -7,6 +7,7 @@
PORTNAME= reciteword
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= SF:src \
SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index ca765b5bd993..b93c698e8ff9 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-array
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese
MASTER_SITES= http://of.openfoundry.org/download/scimarray/${PORTVERSION}/
diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
index 117e7385c246..f521566c7858 100644
--- a/chinese/scim-fcitx/Makefile
+++ b/chinese/scim-fcitx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim
PORTVERSION= 3.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= chinese
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-fcitx/${PORTVERSION}
PKGNAMESUFFIX= -fcitx
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 0c81a0d51481..e86e9c2222a6 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-pinyin
PORTVERSION= 0.5.91
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= chinese
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index ec9b0c4c7b60..85be2bdcc0a8 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-tables
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index c1e3288b2e78..39c0a78f0833 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= srecite
PORTVERSION= 0.6.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= chinese textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SRecite-${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile
index 5e8bc46bd257..76da9ccabafa 100644
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@@ -7,7 +7,7 @@
#
# Don't reset PORTREVISION and keep bumping it even if PORTVERSION is changed.
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= chinese
MAINTAINER= ports@FreeBSD.org
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index db9181a370af..38d496623244 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wenju
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= SF
diff --git a/chinese/xemacs21/Makefile b/chinese/xemacs21/Makefile
index 723b9c089f55..344b89980e7a 100644
--- a/chinese/xemacs21/Makefile
+++ b/chinese/xemacs21/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= chinese
MAINTAINER= rafan@FreeBSD.org
diff --git a/comms/amtterm/Makefile b/comms/amtterm/Makefile
index c637d199c655..98d4c8251d5b 100644
--- a/comms/amtterm/Makefile
+++ b/comms/amtterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= amtterm
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= https://www.kraxel.org/releases/${PORTNAME}/
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index 1638382ff132..3846a2a50e8d 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -6,7 +6,7 @@
PORTNAME= cutecom
PORTVERSION= 0.20.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://cutecom.sourceforge.net/ \
http://personalpages.tds.net/~jwbacon/Ports/distfiles/
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index b5ce0fd6d07d..ecb24294815f 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= efax-gtk
PORTVERSION= 3.2.9
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= SF
EXTRACT_SUFX= .src.tgz
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index e7e9cd6f1850..f259d8404741 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -7,7 +7,7 @@
PORTNAME= efax-0.9a
PORTVERSION= 001114a7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= comms
MASTER_SITES= http://shino.pos.to/linux/
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 86211aa8e493..ddb0f534d182 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fldigi
PORTVERSION= 3.21.41
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\
${MASTER_SITE_LOCAL}
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 48201ef2d139..7719dfdfdc86 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flwrap
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/fldigi-distro/ \
${MASTER_SITE_LOCAL}
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 6a9de8380f18..ba5bf7a53016 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= geoid
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
DISTVERSIONSUFFIX= .src
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/LinuxApps/ \
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 1635111e2521..3b1d56a91334 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghfaxviewer
PORTVERSION= 0.22.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= halifax
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 4b021568cff6..8fd0c45dd19d 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnocky
PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://www.gnokii.org/download/gnocky/
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 3e4938523730..5a292a67da63 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnokii
PORTVERSION= 0.6.31
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= http://www.gnokii.org/download/gnokii/ \
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index a2ef66a6122f..fc8c99b52847 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuradio
PORTVERSION= 3.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= comms astro hamradio
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gnuradio
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 876d7b0f3cd0..09eb31525db1 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gpredict
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= SF/gpredict/Gpredict/${PORTVERSION}
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index 86573fc52cd7..ec10f5169977 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gpsk31
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://www.qsl.net/pg4i/download/
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index b44c12f5e7fb..c22d4375601b 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= grig
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= SF/groundstation/Grig/${PORTVERSION}
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index c36c1cedcedd..282fe905b015 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gscmxx
PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= comms
MASTER_SITES= SF
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 590ba600b16f..4c37f98b8d12 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -6,7 +6,7 @@
PORTNAME= hamfax
PORTVERSION= 0.6.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms audio hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/HamFax%20${PORTVERSION}
DISTNAME= HamFax-${PORTVERSION}
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index ce0b33cb4f89..4dfae2c5a8da 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hf
PORTVERSION= 0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}term/${PORTNAME}/${PORTVERSION}
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 0bc78eb2f600..0d030c04561e 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hylafax
PORTVERSION= 6.0.5
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.hylafax.org/source/
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index 43716ef14a8b..c1464e35fe06 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kallers
PORTVERSION= 0.3.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= comms kde
MASTER_SITES= http://www.nadmm.com/kallers/src/
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index 9f1937d4dabd..c30b95ccb261 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kb
PORTVERSION= 8.04
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://www.db.net/downloads/ \
${MASTER_SITE_LOCAL}
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index d2283810cc24..cec6974dd400 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -6,7 +6,7 @@
PORTNAME= klog
PORTVERSION= 0.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= comms hamradio
MASTER_SITES= BERLIOS
diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile
index 008e918c75a8..137685c226ef 100644
--- a/comms/kmobiletools/Makefile
+++ b/comms/kmobiletools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmobiletools
PORTVERSION= 0.4.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= comms kde
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= kmobiletools
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index 18ec28b37942..9d7ea7f601af 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kpsk
PORTVERSION= 1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= comms kde hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/_.tar.bz2%20files
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index 28f614b7392b..95bd4eb2f384 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ktrack
PORTVERSION= 0.3.0r1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.0-rc1
DISTNAME= ${PORTNAME}-0.3.0-rc1
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 7a36ebc3316d..71ef4b3b36a3 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linpsk
PORTVERSION= 0.8.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile
index 27353bbc488a..2523a7c16efe 100644
--- a/comms/qfaxreader/Makefile
+++ b/comms/qfaxreader/Makefile
@@ -9,7 +9,7 @@
PORTNAME= qfaxreader
DISTVERSION= 0.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms graphics print
MASTER_SITES= SF
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index c5d8410a65bd..c3ad418a3a97 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qsstv
PORTVERSION= 6.0a
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://users.telenet.be/on4qz/snapshots/download/ \
${MASTER_SITE_LOCAL}
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index e104b32674f9..9a05cd544b6f 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tilp2
PORTVERSION= 1.16
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= SF/tilp/tilp2-linux/${DISTNAME}
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index f6cdfd2da66f..975eceeec947 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tkhylafax
PORTVERSION= 3.2b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= comms tk
MASTER_SITES= ftp://ftp.hylafax.org/contrib/tkhylafax/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/}
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index f76abb69cba3..c8706680d2c0 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trustedqsl
PORTVERSION= 1.11
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/tqsllib/V2.0
DISTFILES= tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 5383e2356957..fc05b8e99959 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xastir
PORTVERSION= 2.0.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
@@ -18,7 +18,7 @@ BUILD_DEPENDS= xfontsel:${PORTSDIR}/x11-fonts/xfontsel
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 450be137adc5..6e1bc7420781 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdx
PORTVERSION= 2.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= comms hamradio
MASTER_SITES= http://www.chronos.org.uk/download/ \
${MASTER_SITE_LOCAL}
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 20b841268390..4a173ae5c0ae 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlog
PORTVERSION= 2.0.5
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
http://www.chronos.org.uk/download/
diff --git a/comms/xmorse/Makefile b/comms/xmorse/Makefile
index 820d454dc4f2..f6f75b144441 100644
--- a/comms/xmorse/Makefile
+++ b/comms/xmorse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmorse
PORTVERSION= 20041125
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://c2.com/morse/files/SourceCode/ \
http://www.525183.com/freebsd/xmorse/ \
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index f49dd8befe13..11d2a8a31dea 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -6,6 +6,7 @@
PORTNAME= xnecview
PORTVERSION= 1.36
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/
EXTRACT_SUFX= .tgz
@@ -13,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= xride@FreeBSD.org
COMMENT= A X viewer of nec2c data
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= nec2c:${PORTSDIR}/comms/nec2c
USE_GNOME= gtk20
diff --git a/comms/xnecview/files/patch-Makefile b/comms/xnecview/files/patch-Makefile
index a8cc806e1791..09cec08bab2a 100644
--- a/comms/xnecview/files/patch-Makefile
+++ b/comms/xnecview/files/patch-Makefile
@@ -17,8 +17,8 @@
ifeq ($(PNG),yes)
CFLAGS += -DHAVE_LIBPNG
-LDFLAGS += -lpng
-+CFLAGS += `pkg-config --cflags ${LOCALBASE}/libdata/pkgconfig/libpng14.pc`
-+LDFLAGS += `pkg-config --libs ${LOCALBASE}/libdata/pkgconfig/libpng14.pc`
++CFLAGS += `pkg-config --cflags ${LOCALBASE}/libdata/pkgconfig/libpng15.pc`
++LDFLAGS += `pkg-config --libs ${LOCALBASE}/libdata/pkgconfig/libpng15.pc`
endif
SRCS = xnecview.c xwin.c parse_input.c parse_output.c draw.c draw_opaque.c freqplot.c postscript.c icon.xbm
diff --git a/comms/xnecview/files/patch-xwin.c b/comms/xnecview/files/patch-xwin.c
new file mode 100644
index 000000000000..6d56247a50ce
--- /dev/null
+++ b/comms/xnecview/files/patch-xwin.c
@@ -0,0 +1,11 @@
+--- xwin.c.orig 2011-07-26 00:03:37.000000000 +0200
++++ xwin.c 2012-05-01 08:33:19.000000000 +0200
+@@ -277,7 +277,7 @@
+ fclose(f);
+ return 1;
+ }
+- if (setjmp(pp->jmpbuf)) {
++ if (setjmp(png_jmpbuf(pp))) {
+ png_destroy_write_struct(&pp,&ip);
+ fclose(f);
+ gdk_image_destroy(image);
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index d37c5af4e82e..33051b634f57 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xwota
PORTVERSION= 0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= comms hamradio
MASTER_SITES= http://people.fabaris.it/iz0ete/xwota/ \
${MASTER_SITE_LOCAL}
diff --git a/converters/gbsdconv/Makefile b/converters/gbsdconv/Makefile
index 97a217251d1a..8ee7d0a0e930 100644
--- a/converters/gbsdconv/Makefile
+++ b/converters/gbsdconv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gbsdconv
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= converters python
MASTER_SITES= https://github.com/buganini/${PORTNAME}/tarball/${PORTVERSION}/
DISTNAME= buganini-${PORTNAME}-${PORTVERSION}-0-g${GITVERSION}
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile
index c7fc06623784..356d2b437fab 100644
--- a/converters/ktextdecode/Makefile
+++ b/converters/ktextdecode/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ktextdecode
PORTVERSION= 3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= converters kde
MASTER_SITES= http://osmirrors.cerias.purdue.edu/pub/FreeBSD/ports/local-distfiles/markus/
diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile
index 6b743d86344e..8263c3d4196d 100644
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mule-ucs
PORTVERSION= 0.85.r3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= converters elisp
MASTER_SITES= ${MASTER_SITE_M17N}
MASTER_SITE_SUBDIR= mule/Mule-UCS/test
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 557830905569..9aa1cc4ed7e3 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pdf2djvu
PORTVERSION= 0.5.11
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
diff --git a/converters/rcctools/Makefile b/converters/rcctools/Makefile
index 15a59c2fff88..db5abdaf02d9 100644
--- a/converters/rcctools/Makefile
+++ b/converters/rcctools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rcctools
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= converters
MASTER_SITES= SF/rusxmms/${PORTNAME}/${PORTVERSION}
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index b59d4c15b19c..c01cd6ac5912 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wkhtmltopdf
DISTVERSION= 0.11.0_rc1
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:wkhtmltopdf \
${MASTER_SITE_LOCAL}
@@ -66,7 +67,7 @@ BROKEN= Does not link on powerpc
CONFIGURE_ARGS+= -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg
.else
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
mng:${PORTSDIR}/graphics/libmng \
tiff:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= -system-libtiff -system-libpng -system-libmng \
diff --git a/databases/akonadi-google/Makefile b/databases/akonadi-google/Makefile
index d625b2ddf6af..96f1a13f84ea 100644
--- a/databases/akonadi-google/Makefile
+++ b/databases/akonadi-google/Makefile
@@ -7,6 +7,7 @@
PORTNAME= akonadi-google
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= databases kde
MASTER_SITES= http://www.progdan.cz/wp-content/uploads/
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile
index 589fc683b92f..6aab8d79c144 100644
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akonadi-googledata
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://libgcal.googlecode.com/files/
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 8b389eae002e..97a590f27b4c 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -6,6 +6,7 @@
PORTNAME= akonadi
PORTVERSION= 1.7.2
+PORTREVISION= 1
CATEGORIES= databases kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/src/
diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile
index 941461e08e1d..da960cdd1805 100644
--- a/databases/animenfo-client-gtk/Makefile
+++ b/databases/animenfo-client-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= animenfo
PORTVERSION= 20020819
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases
MASTER_SITES= http://www.animenfo.com/extension/files/
PKGNAMESUFFIX= -client-gui-gtk${PKGNAMESUFFIX2}
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index bed6ed8061c4..3384ebef7bd2 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbdb
PORTVERSION= 2.35
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases elisp
MASTER_SITES= SF
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index 56456ae09749..923677195f4f 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emma
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases
MASTER_SITES= http://www.fastflo.de/files/emma/downloads/python_src/
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 5dd1ac5fc4ed..a8609b070423 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index f91b0d48a927..f05b4e88a34d 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flamerobin
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/databases/gdl2/Makefile b/databases/gdl2/Makefile
index 5bb57beae91b..db613dc0231c 100644
--- a/databases/gdl2/Makefile
+++ b/databases/gdl2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdl2
PORTVERSION= 0.12.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= libs
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index cda56e1dff01..6ceef540507d 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-db
PORTVERSION= 0.2.96
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 33c81826f656..cdec9a42f3e2 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grass
PORTVERSION= 6.4.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= databases geography
MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \
@@ -28,7 +28,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
LIB_DEPENDS= gdal.17:${PORTSDIR}/graphics/gdal \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
proj.7:${PORTSDIR}/graphics/proj \
tiff.4:${PORTSDIR}/graphics/tiff \
fftw3.6:${PORTSDIR}/math/fftw3 \
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 515f3fcb3746..fbe570f79284 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jrrd
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= SF/opennms/JRRD/stable-1.0
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index e1feb74ad70a..eba7b9596938 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kbibtex
DISTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= databases kde
MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index d1dc4d360f70..067c70033921 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmysqladmin
PORTVERSION= 0.7.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases
MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 5ac223db490a..7143b39303d5 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -6,6 +6,7 @@
PORTNAME= knoda
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF
diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile
index a0d19bb927d9..868cc733f907 100644
--- a/databases/ksqlanalyzer/Makefile
+++ b/databases/ksqlanalyzer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksqlanalyzer
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases kde
MASTER_SITES= http://www.kpage.de/download/
diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile
index 09031f2765b4..095db5191caf 100644
--- a/databases/ksqlshell/Makefile
+++ b/databases/ksqlshell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksqlshell
PORTVERSION= 0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= databases kde
MASTER_SITES= http://www.ksqlshell.de/
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 3c05b81794bf..ad1f72967c1c 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgda
PORTVERSION= 0.2.96
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/databases/libgda4-bdb/Makefile b/databases/libgda4-bdb/Makefile
index a09090bc82a8..eeca1198f0c5 100644
--- a/databases/libgda4-bdb/Makefile
+++ b/databases/libgda4-bdb/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -bdb
diff --git a/databases/libgda4-jdbc/Makefile b/databases/libgda4-jdbc/Makefile
index a4ac9b5658ad..97cac4d93290 100644
--- a/databases/libgda4-jdbc/Makefile
+++ b/databases/libgda4-jdbc/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -jdbc
diff --git a/databases/libgda4-mdb/Makefile b/databases/libgda4-mdb/Makefile
index 8528c8ba1ee0..c902174be6a6 100644
--- a/databases/libgda4-mdb/Makefile
+++ b/databases/libgda4-mdb/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/databases/libgda4-mdb/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $
#
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -mdb
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index f632024ceb07..07d71ad1b0f2 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -mysql
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index fcc137941fee..79c02cace5cf 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -postgresql
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 345beca6b0ff..e724b7d9ec59 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgda4
PORTVERSION?= 4.2.5
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/4$//}/${PORTVERSION:R}
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index ba0a10d7c044..3cbd8693a2ae 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgdamm
PORTVERSION= 3.99.21
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 9d0428e60377..80fe50a71fe4 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnomedb
PORTVERSION= 3.0.0
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/lsdb/Makefile b/databases/lsdb/Makefile
index 911e75c7bef4..3ff15497b52d 100644
--- a/databases/lsdb/Makefile
+++ b/databases/lsdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lsdb
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases elisp
MASTER_SITES= SFJP/${PORTNAME}/7488
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 70426d0cfd5d..6ea9bbe745f3 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mergeant
PORTVERSION= 0.67
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index 7b8df82e6279..f573f951c70b 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mysql-navigator
PORTVERSION= 1.4.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= databases kde
MASTER_SITES= SF/mysqlnavigator/mysqlnavigator/${PORTVERSION}
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 2372e75aa467..f5fbffc36245 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mysql-workbench-oss
PORTVERSION?= 5.1.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQLGUITools
diff --git a/databases/mysqlard/Makefile b/databases/mysqlard/Makefile
index 9a1daecdf6cb..6d18a9a30890 100644
--- a/databases/mysqlard/Makefile
+++ b/databases/mysqlard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mysqlard
PORTVERSION= 1.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases www
MASTER_SITES= http://gert.sos.be/downloads/mysqlar/
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 9493fa1bbb71..970d51e8a5f4 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GraphViz-DBI
PORTVERSION= 1.100860
+PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MARCEL
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index a65c93a84a26..1b7fb5dbf5df 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= POE-Component-RRDTool
PORTVERSION= 0.18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases perl5 devel
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 1404ab5b3764..105163413fbd 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RRD-Simple
PORTVERSION= 1.44
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Proc/NICOLAW
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 4d8873f9eb38..20f97760f825 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pgadmin3
PORTVERSION= 1.14.2
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index ee746356c4e9..b9c3ee4f82f0 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pgworksheet
PORTVERSION= 1.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases
MASTER_SITES= http://pgfoundry.org/frs/download.php/1695/
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 2f0a36d4ce69..cdfd6b399bab 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -6,6 +6,7 @@
PORTNAME= sql
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 932cf1fec79a..4efac746da9b 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -6,7 +6,7 @@
PORTNAME= rrdtool_lgpl
PORTVERSION= 1.0b1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases python
MASTER_SITES= SF/py-rrdtool/py-rrdtool/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-sqlkit/Makefile b/databases/py-sqlkit/Makefile
index a506e78519e5..1bcf7eb1e034 100644
--- a/databases/py-sqlkit/Makefile
+++ b/databases/py-sqlkit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sqlkit
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases python
MASTER_SITES= http://sqlkit.argolinux.org/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index fdf4d1435afb..ffd75b0dce70 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt-${DB}-plugin
PORTVERSION= 3.3.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index f557d9f7b70f..1a2ff29f0f79 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt-${DB}-plugin
PORTVERSION= 3.3.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index e470caebea33..85b01af2d59e 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt-${DB}-plugin
PORTVERSION= 3.3.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 7f6388bea188..ddd14f8b0f66 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt-${DB}-plugin
PORTVERSION= 3.3.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index d42fbbe6f063..90d520d2d011 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdman
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= SF/rrfw/${PORTNAME}/${PORTVERSION}
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index ee05b742237a..2c9bde1a92b4 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -18,7 +18,7 @@ LICENSE= GPLv2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
cairo.2:${PORTSDIR}/graphics/cairo \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
xml2:${PORTSDIR}/textproc/libxml2 \
pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 1f9b2223fbef..49ebe9256867 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.2.30
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -16,7 +16,7 @@ COMMENT= Round Robin Database Tools v1.2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LATEST_LINK= ${PORTNAME}12
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index ce34f921228e..4be522840a27 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sqliteman
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= SF
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index a2cc25225c85..b824c2fc061b 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tora
PORTVERSION= 2.1.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SF
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index afdde6622e48..c5c747f70c02 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -7,7 +7,7 @@
PORTNAME= virtuoso
PORTVERSION= 6.1.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-opensource-${PORTVERSION}
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index 0a2481cc0763..245a1e92fd53 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adesklets
PORTVERSION= 0.6.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28core%29/${PORTVERSION}
diff --git a/deskutils/akamaru/Makefile b/deskutils/akamaru/Makefile
index e65f0894eea7..395e2ceb6379 100644
--- a/deskutils/akamaru/Makefile
+++ b/deskutils/akamaru/Makefile
@@ -7,7 +7,7 @@
PORTNAME= akamaru
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnome
MASTER_SITES= http://people.freedesktop.org/~krh/
DISTNAME= ${PORTNAME}
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 75f4d91c094f..023d14880526 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -8,7 +8,7 @@
PORTNAME= alacarte
PORTVERSION= 0.13.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 9d1ef2da9309..3cacc15712a5 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -6,7 +6,7 @@
PORTNAME= basket
PORTVERSION= 1.0.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils kde
MASTER_SITES= http://basket.kde.org/downloads/
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 5fedec35a701..5221e1c26031 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-docklet
PORTVERSION= 1.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils audio
MASTER_SITES= http://mark.xnull.de/bmp-docklet/ \
${MASTER_SITE_LOCAL}
diff --git a/deskutils/bookreader/Makefile b/deskutils/bookreader/Makefile
index e82f8ded01ca..f2c82b1d3f69 100644
--- a/deskutils/bookreader/Makefile
+++ b/deskutils/bookreader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bookreader
PORTVERSION= 0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils kde
MASTER_SITES= SF/k${PORTNAME}/
DISTNAME= k${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 975bc9a0d7f7..07180bcb482f 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cairo-dock-plugins
DISTVERSION= 2.3.0~3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= http://launchpadlibrarian.net/73753265/ \
http://pazzle.otdux.com.ua/
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index 957c24f4ec7a..53cc94fd0bd8 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cairo-dock
DISTVERSION= 2.3.0~3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://launchpadlibrarian.net/73753213/
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index e179408dc032..3b74f123366a 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -7,7 +7,7 @@
PORTNAME= calibre
PORTVERSION= 0.8.50
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index c516d1c576c0..8eabd83084fc 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cdcat
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
GOOGLE_CODE:lib7zip
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 83ca8cfe36ca..70865139a817 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chmsee
PORTVERSION= 1.3.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 21e8e5539fb3..ca3bf2b293ef 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conduit
PORTVERSION= 0.3.17
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index 8c040fc3cc1c..009340810c16 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= contacts
PORTVERSION= 0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnome
MASTER_SITES= http://pimlico-project.org/sources/${PORTNAME}/
DIST_SUBDIR= gnome2
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 457beb5c7c05..f996320ddf26 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= deskbar-applet
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index cd4754625ffd..00bc5203d6db 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dlume
PORTVERSION= 0.2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_TUCOWS}
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index 0c728b6b756b..c34265e04a32 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dragstack
PORTVERSION= 1.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils kde
MASTER_SITES= SF
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 5f2f0551c230..c3824db3d541 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= drivel
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION}
diff --git a/deskutils/epoch/Makefile b/deskutils/epoch/Makefile
index 7d4796b49d30..1010513e6459 100644
--- a/deskutils/epoch/Makefile
+++ b/deskutils/epoch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epoch
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}${PORTVERSION}src
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index 01bc568af2ea..fa974cff2d24 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -7,7 +7,7 @@
PORTNAME= etask
PORTVERSION= 0.3.91
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils elisp
MASTER_SITES= http://members.chello.at/rene.weichselbaum/ \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index e831aa978609..a6ffec9bbee9 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -6,7 +6,7 @@
PORTNAME= everygui
PORTVERSION= 0.99.b
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnome
MASTER_SITES= SF
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 259a6881cf64..774f5246bc73 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbreader
PORTVERSION= 0.12.10
+PORTREVISION= 1
DISTVERSIONPREFIX= sources-
CATEGORIES= deskutils
MASTER_SITES= http://www.fbreader.org/
diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 24b6e221b941..2c48430003c9 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fet
PORTVERSION= 5.14.2
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= http://lalescu.ro/liviu/fet/download/ \
http://lalescu.ro/liviu/fet/download/old/ \
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index f54eb9f39cf9..4e5c8c2f2345 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fusenshi
PORTVERSION= 0.9.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils
MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/
EXTRACT_SUFX= .tgz
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index d34743d68e3a..4001919264fd 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ganyremote
PORTVERSION= 5.11.7
+PORTREVISION= 1
CATEGORIES= deskutils comms gnome
MASTER_SITES= SF/anyremote/${PORTNAME}/${PORTVERSION}
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index 3bc2fcf9a21d..6c239685b3bc 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gbirthday
PORTVERSION= 0.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= SF
diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 4c2971cfa2ee..3b4af7b97630 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= starterbar
PORTVERSION= 0.31.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gdesklets.info/archive/
PKGNAMEPREFIX= gdesklets-
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index ff766ec59867..2991dd17a4bd 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.36.2
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GENTOO/distfiles
# XXX currently broken: http://www.gdesklets.de/files/
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index ddda495a3caa..c62dff85ab42 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -7,6 +7,7 @@
PORTNAME= genius
PORTVERSION= 1.0.12
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME \
http://ftp.5z.com/pub/genius/
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index 0784dd7c867d..5d21ee21b2a8 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimmie
PORTVERSION= 0.2.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.beatniksoftware.com/gimmie/releases/ \
LOCAL/beech
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index 05148f3867e5..44e472396f09 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= reminder
PORTVERSION= 2.0.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/Plugins/ \
http://depot.fsck.ch/mirror/distfiles/
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 3f53540a2b6c..05b45765eedb 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -8,7 +8,7 @@
PORTNAME= glabels
PORTVERSION= 2.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index b0baaa8e5b0c..c4860aec572a 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glipper
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index feaff71525c1..ccecea2510ec 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-globalmenu
PORTVERSION= 0.7.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 469d9f27cf85..9f61db26b376 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnochm
PORTVERSION= 0.9.11
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils python gnome
MASTER_SITES= SF
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 8be175b4668f..8b1c4a17f989 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-blog
PORTVERSION= 0.9.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index 0035d5167ce1..455e426c8bb2 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-main-menu
PORTVERSION= 0.9.12
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 49995430bd87..dc7e82ab5dc6 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-utils
PORTVERSION= 2.32.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 7ee55a34a596..e33bbd893f15 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnote
PORTVERSION= 0.7.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 586d3e343047..0fb5c5ad4dad 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnotime
PORTVERSION= 2.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils gnome
MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
SF/qof/qof/${QOF_VERSION}:qof
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index da8af5535ddd..d1db55e38d12 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= google-gadgets
PORTVERSION= 0.11.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 223d0a837d63..b9e2688f30ff 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gourmet
PORTVERSION= 0.15.9
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= SF/grecipe-manager/0.15.8
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 7d5d44e5567d..9a4924be152a 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gruler
PORTVERSION= 0.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils
MASTER_SITES= http://linuxadvocate.org/projects/gruler/downloads/
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index d2ff12ab4c47..c74518de7cb8 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtg
PORTVERSION= 0.2.9
+PORTREVISION= 1
CATEGORIES= deskutils gnome python
MASTER_SITES= http://launchpad.net/gtg/0.3/${PORTVERSION}/+download/
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 76f8cabfdf2e..4b04f8449e9d 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtimer
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index defcae95c261..2c293b2e57a9 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkjournal
PORTVERSION= 0.3.5.b
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= deskutils gnome
MASTER_SITES= http://sourcefiles.org/Productivity_Tools/Diary/ \
LOCAL/beech
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index 52b1d3ed671d..07f994fdee0a 100644
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtodo
PORTVERSION= 0.14
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= deskutils gnome
MASTER_SITES= SF
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index db5e99cb4a85..64e2132c095d 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gTweakUI
PORTVERSION= 0.4.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils gnome
MASTER_SITES= SF
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 99a9e8ac2bd4..d84bb7943e1f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gucharmap
PORTVERSION= 2.32.1
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index c00e48b18227..80ce57f00a7d 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxmessage
PORTVERSION= 2.12.4
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= GNU \
LOCAL/martymac
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index 685223a79ab8..b5ece5a187d0 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxneur
PORTVERSION= 0.15.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://dists.xneur.ru/release-${PORTVERSION}/tgz/
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 03da8a423afb..9fdc3ca761ed 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hamster-applet
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index e8fadeec260d..9d8391d2fa51 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hot-babe
PORTVERSION= 0.2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils
MASTER_SITES= http://dindinx.net/hotbabe/downloads/ \
${MASTER_SITE_LOCAL}
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 2e81ec463c92..1e0c01e27fcd 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= howm
PORTVERSION= 1.3.9.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://howm.sourceforge.jp/a/
diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile
index aaff4f5c666a..f251ab36bc67 100644
--- a/deskutils/karamba/Makefile
+++ b/deskutils/karamba/Makefile
@@ -6,7 +6,7 @@
PORTNAME= karamba
PORTVERSION= 0.17
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils
MASTER_SITES= http://www.efd.lth.se/~d98hk/karamba/src/
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index c70fecd26814..44890390f9e6 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -7,7 +7,7 @@
PORTNAME= katapult
PORTVERSION= 0.3.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils kde
MASTER_SITES= SF
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index 942a1c69e5df..4d1e35a8b01d 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kbirthday
PORTVERSION= 0.7.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils kde
MASTER_SITES= http://www.gfai.de/~jaham/download/ \
http://freshmeat.net/redir/kbirthday/32531/url_tgz/
diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile
index 40696a7daedd..925173a925d7 100644
--- a/deskutils/kblticker/Makefile
+++ b/deskutils/kblticker/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kblticker
PORTVERSION= 0.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils kde
MASTER_SITES= SF
diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile
index 57e5487b2a01..38b9aee7fb95 100644
--- a/deskutils/kchm/Makefile
+++ b/deskutils/kchm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kchm
PORTVERSION= 0.6.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}new/${PORTNAME}new/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 6e1ec4eb9456..160ec0fb29bb 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kchmviewer
PORTVERSION= 6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= SF
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index 30b5a68a1640..2d41dc6ccce0 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kchmviewer
PORTVERSION= 3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTNAME= ${PORTNAME}-${PORTVERSION}-2
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 310407d5be4b..097f437842af 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 0de13379734d..d6f4b4889d8d 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdepim-runtime
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 51950fff8a85..bc9aa2fc38d7 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index b8156768795d..228abd55dc29 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 63be76bb8e59..0da8e2445c47 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index a3b91ac6c8c0..f0f5bffa6a5c 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdissert
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils kde
MASTER_SITES= http://freehackers.org/~tnagy/kdissert/ \
http://bsdguru.org/distfiles/
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index 01667e547d9f..ec151fa54154 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kickpim
PORTVERSION= 0.5.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_Society_
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
index 550f08455afb..717bb2cb7d4f 100644
--- a/deskutils/klipoquery/Makefile
+++ b/deskutils/klipoquery/Makefile
@@ -6,7 +6,7 @@
PORTNAME= klipoquery
PORTVERSION= 0.2.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils kde
MASTER_SITES= http://www.michael-vonrueden.de/${PORTNAME}/
diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile
index f2f5a4911592..a2de6b8df8d4 100644
--- a/deskutils/kluje/Makefile
+++ b/deskutils/kluje/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kluje
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils kde
MASTER_SITES= SF
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 614a194852c6..982bd4bfa853 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -7,13 +7,15 @@
PORTNAME= kmatrix3d
PORTVERSION= 0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils
MASTER_SITES= SF
MAINTAINER= gustau.perez@gmail.com
COMMENT= Eye candy for KDE, a new Matrix screensaver
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
DOCSDIR= ${PREFIX}/share/doc/HTML/en/kmatrix3d
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -25,6 +27,7 @@ USE_AUTOTOOLS= libtool automake:env autoheader:env
USE_KDELIBS_VER= 3
USE_BZIP2= yes
USE_PERL5_BUILD= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
AUTOTOOLSFILES= admin/cvs.sh
diff --git a/deskutils/kmatrix3d/files/patch-src__kmatrix3d.cpp b/deskutils/kmatrix3d/files/patch-src__kmatrix3d.cpp
new file mode 100644
index 000000000000..993cde0ae891
--- /dev/null
+++ b/deskutils/kmatrix3d/files/patch-src__kmatrix3d.cpp
@@ -0,0 +1,10 @@
+--- src/kmatrix3d.cpp.orig 2007-01-31 19:01:29.000000000 +0100
++++ src/kmatrix3d.cpp 2012-05-09 13:11:14.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <GL/glu.h>
+ #include <GL/glut.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include "kmatrix3d.h"
+ #include "kmatrix3dui.h"
+
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index dc09798eee96..a1e854485dc7 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knowit
PORTVERSION= 0.10
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils
MASTER_SITES= SF
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 93c70f0c8501..319e518b9928 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kompose
PORTVERSION= 0.5.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils kde
MASTER_SITES= BERLIOS
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index c417b2d27789..1529e873d4cf 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kooldock
PORTVERSION= 0.4.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/${PORTNAME}-${PORTVERSION}.tar.bz2
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index 46ef787ae172..537a78826252 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -6,7 +6,7 @@
PORTNAME= krefty
PORTVERSION= 0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils kde
MASTER_SITES= http://codeworks.gnomedia.com/krefty/
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 790eb54612d7..af6d0f5e4eaa 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -8,6 +8,7 @@
PORTNAME= krss
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index ab40e15af1a1..a65b01f078ca 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kruler
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index 4d123b56d1bb..cb55210d45d1 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksmoothdock
PORTVERSION= 4.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils kde
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}_automake-1.9
diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile
index 98bfdbcdedfc..705c99852891 100644
--- a/deskutils/ksshaskpass/Makefile
+++ b/deskutils/ksshaskpass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksshaskpass
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://kde-apps.org/CONTENT/content-files/
DISTNAME= 50971-${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile
index fa5208aa7629..e8cba9527cba 100644
--- a/deskutils/ktagebuch/Makefile
+++ b/deskutils/ktagebuch/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ktagebuch
PORTVERSION= 0.74
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils kde
MASTER_SITES= http://www.theblessing.net/programming/${PORTNAME}/
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index ec3f6ce7dc78..bf8051c67635 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= labyrinth
PORTVERSION= 0.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils python
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index a651b96e7b04..3ee7c915cad1 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= launchy
PORTVERSION= 2.5
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/Launchy%20on%20Linux/${PORTVERSION}
diff --git a/deskutils/libopensync-plugin-evolution2-devel/Makefile b/deskutils/libopensync-plugin-evolution2-devel/Makefile
index a56e3c53876d..6bbf3f6446dc 100644
--- a/deskutils/libopensync-plugin-evolution2-devel/Makefile
+++ b/deskutils/libopensync-plugin-evolution2-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopensync-plugin-evolution2
PORTVERSION= 0.36
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/
PKGNAMESUFFIX= -devel
diff --git a/deskutils/libopensync-plugin-evolution2/Makefile b/deskutils/libopensync-plugin-evolution2/Makefile
index 62d4b96a5b28..150bb9d489c3 100644
--- a/deskutils/libopensync-plugin-evolution2/Makefile
+++ b/deskutils/libopensync-plugin-evolution2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopensync-plugin-evolution2
PORTVERSION= 0.22
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index 4291325f8ecf..a3518e5beee2 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ljit
PORTVERSION= 0.2.5
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= deskutils
MASTER_SITES= http://kir.vtx.ru/ljit/dl/ \
http://freebsd.nsu.ru/distfiles/
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 7aafe6b20f18..12480007f1d4 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -7,6 +7,7 @@
PORTNAME= logjam
PORTVERSION= 4.6.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://andy-shev.github.com/LogJam/download/
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 3a03975138f4..fa3e05a115ce 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mdh
PORTVERSION= 1.9.60
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gozer.org/programs/gtk/files/
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile
index 1d82869583fc..0d3aa0a2993a 100644
--- a/deskutils/metabar/Makefile
+++ b/deskutils/metabar/Makefile
@@ -6,7 +6,7 @@
PORTNAME= metabar
PORTVERSION= 0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index f71d52652be1..930d7645e82f 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= multisync
PORTVERSION= 0.82
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils
MASTER_SITES= SF/multisync/OldFiles
DISTNAME= multisync-${PORTVERSION}
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index d323c9a9afa1..1e4bb85e75b1 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nagaina
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}-sources
diff --git a/deskutils/narval/Makefile b/deskutils/narval/Makefile
index 0a6efe7079d8..150df2305c78 100644
--- a/deskutils/narval/Makefile
+++ b/deskutils/narval/Makefile
@@ -8,7 +8,7 @@
PORTNAME= narval
PORTVERSION= 2.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils python
MASTER_SITES= LOGILAB
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 0345502e67de..3490fdeaf899 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -8,6 +8,7 @@
PORTNAME= nautilus-actions
PORTVERSION= 2.30.3
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index b39ccae242e1..e3e341a0e14d 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nautilus-locked-folder
PORTVERSION= 1.0.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils security
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 2b5dc134c28f..4e79dff906a8 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nautilus-open-terminal
PORTVERSION= 0.18
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 5f2fa28c5492..88cccc7dc605 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nautilus-sendto
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index 86ea47f1df6d..d570e6b200ea 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notecase
PORTVERSION= 1.9.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils textproc
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 590551655471..445d3a0b8361 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -8,6 +8,7 @@
PORTNAME= notification-daemon
PORTVERSION= 0.7.2
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index e35ab218fda9..c8e68b0a6523 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notify-osd
PORTVERSION= 0.9.29
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://launchpadlibrarian.net/43419242/ \
CRITICAL
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 071a43248942..003464c3265d 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ontv
PORTVERSION= 3.2.0
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 6b8e44be7460..e3104883d5c6 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= orage
PORTVERSION= 4.8.3
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/deskutils/org-mode.el/Makefile b/deskutils/org-mode.el/Makefile
index 21e7e37de634..f1a401763fa7 100644
--- a/deskutils/org-mode.el/Makefile
+++ b/deskutils/org-mode.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= org-mode.el
PORTVERSION= 7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils elisp
MASTER_SITES= http://orgmode.org/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index aaea422ee022..20fa56feef42 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osmo
PORTVERSION= 0.2.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}/
diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index 9ca6acb1fe83..5100491f50a6 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ZConf-BGSet
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index 7258d418ec88..6898fa8c6e78 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ZConf-Runner-GUI-GTK
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index 05f91c70e73c..998072928c77 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= parcellite
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index f8f70bf544a5..6fddeca408b0 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinot
PORTVERSION= 0.98
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
#MASTER_SITES= http://colinf.chez.com/pinot/
diff --git a/deskutils/planner.el/Makefile b/deskutils/planner.el/Makefile
index fd45cfe359a7..02077259db19 100644
--- a/deskutils/planner.el/Makefile
+++ b/deskutils/planner.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= planner.el
PORTVERSION= 3.42
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils elisp
MASTER_SITES= http://download.gna.org/planner-el/ \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index d53a1caa65e6..e4d6b2145043 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -8,6 +8,7 @@
PORTNAME= planner
PORTVERSION= 0.14.6
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index b2f203a94b19..f504b0178bea 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cwp
PORTVERSION= 1.6.2
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile
index f7cbeb5e2eec..42e87dca42e3 100644
--- a/deskutils/plasma-applet-daisy/Makefile
+++ b/deskutils/plasma-applet-daisy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= daisy
PORTVERSION= 0.0.4.25
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils kde
MASTER_SITES= http://cdlszm.org/downloads/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile
index 327857faf356..ee8702c80dcd 100644
--- a/deskutils/plasma-applet-fancytasks/Makefile
+++ b/deskutils/plasma-applet-fancytasks/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fancytasks
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index 14451d896b50..a1b465ac9da6 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= panelspacer
PORTVERSION= 0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils kde
MASTER_SITES= http://danakil.free.fr/linux/releases/${PORTNAME}-${PORTVERSION}/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index 99a32c9ec95f..7722bb178e62 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= playwolf
PORTVERSION= 0.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile
index 1b812b4ca94f..33aa7b686c83 100644
--- a/deskutils/plasma-applet-serverstatuswidget/Makefile
+++ b/deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= serverstatuswidget
PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index deb685cd948d..6988e7215e44 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simpleweatherforecast
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils kde
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index b665dbbe264d..aaeb6780e19e 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= teacooker
PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index 3a5cef744e2c..e1a828e23137 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yawp
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= SF
PKGNAMEPREFIX= plasma-applet-
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 0d19c9ee0375..54e76ab39fa8 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pybookreader
PORTVERSION= 0.5.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/PyBookReader/PyBookReader%2BOrnamentBook-${PORTVERSION}
DISTNAME= PyBookReader-${PORTVERSION}
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index bc68dcd30bcc..282f3e867d7b 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pypanel
PORTVERSION= 2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils
MASTER_SITES= SF
DISTNAME= PyPanel-${PORTVERSION}
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index 3683e01d54e5..70f981a5b68b 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -6,6 +6,7 @@
PORTNAME= q4wine
PORTVERSION= 0.120
+PORTREVISION= 1
CATEGORIES= deskutils emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index 98e4a8995323..c1883433ccf9 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qlabels
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils editors
MASTER_SITES= http://qlabels.p34.net/files/ \
http://www.sourcefiles.org/Utilities/Printer/
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index 4b7bec4a8592..e16b2058a297 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qorganizer
PORTVERSION= 3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= qOrganizer-${PORTVERSION}
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index 5ad5a93ceeec..2a0c448f0684 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qrfcview
PORTVERSION= 0.62
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= CENKES BERLIOS
EXTRACT_SUFX= .tgz
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index 7ca2fb4ae1ee..c65fd04eebaa 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtm
PORTVERSION= 1.3.7
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/catkin/${PORTNAME}-1.3 \
http://www.c-s.li/ports/
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 8dd690d6021d..4e7b81c4323b 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -7,6 +7,7 @@
PORTNAME= recoll
PORTVERSION= 1.17.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://www.lesbonscomptes.com/recoll/
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index f1aa48fd8b22..02e79d8111a9 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rednotebook
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= SF
MASTER_SITE_SUBDIR= rednotebook
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index dfd356e0bb7b..4ae89ace1dfe 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-memo
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/rox/Memo/${PORTVERSION}
DISTNAME= memo-${PORTVERSION}
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index e9625a7cb906..e2aa1eab084c 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rubrica
PORTVERSION= 2.0.10
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= BERLIOS
DISTNAME= ${PORTNAME}2-${PORTVERSION}
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index c2819f7ae7c6..2f181688723b 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= semantik
PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= http://${PORTNAME}.googlecode.com/files/ \
http://freehackers.org/~tnagy/
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index 27143cb31088..9f22a1978883 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silence
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= http://kde-apps.org/CONTENT/content-files/
DISTNAME= 124776-${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/snotes/Makefile b/deskutils/snotes/Makefile
index 980a2cbd9984..b849c67e8200 100644
--- a/deskutils/snotes/Makefile
+++ b/deskutils/snotes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snotes
PORTVERSION= 1.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= SF/s-notes/s-notes/${PORTVERSION}
diff --git a/deskutils/splashsetter/Makefile b/deskutils/splashsetter/Makefile
index 146b5a4c6b53..4c160ea6b80a 100644
--- a/deskutils/splashsetter/Makefile
+++ b/deskutils/splashsetter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= splashsetter
PORTVERSION= 0.6.5.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
diff --git a/deskutils/steadyflow/Makefile b/deskutils/steadyflow/Makefile
index d9ea6511bf18..808a37b4f428 100644
--- a/deskutils/steadyflow/Makefile
+++ b/deskutils/steadyflow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= steadyflow
PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ \
https://launchpadlibrarian.net/72208624/
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 4b37a891fc45..b2ca3d2febdf 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -6,7 +6,7 @@
PORTNAME= strigi
PORTVERSION= 0.7.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://rdieter.fedorapeople.org/strigi/
#MASTER_SITES= http://www.vandenoever.info/software/strigi/ \
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index e1dcdf94f284..d18e8d18c43f 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -7,6 +7,7 @@
PORTNAME= superswitcher
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 6d08c11b2b99..f06d0806140e 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -7,6 +7,7 @@
PORTNAME= taskcoach
PORTVERSION= 1.3.8
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
DISTNAME= TaskCoach-${PORTVERSION}
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 8fc080741558..02b225914771 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= taskjuggler
PORTVERSION= 2.4.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= http://www.taskjuggler.org/download/
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 4ee6a2a23216..78b75610945a 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= timer-applet
PORTVERSION= 2.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= SF/timerapplet/timerapplet/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/tomboy-plugin-latex/Makefile b/deskutils/tomboy-plugin-latex/Makefile
index 8e07f33e36a8..88c777d281b5 100644
--- a/deskutils/tomboy-plugin-latex/Makefile
+++ b/deskutils/tomboy-plugin-latex/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tomboy-plugin-latex
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://www.reitwiessner.de/programs/tomboy-latex/v${PORTVERSION}/
DISTNAME= tomboy-latex-${PORTVERSION}
diff --git a/deskutils/tomboy-plugin-reminder/Makefile b/deskutils/tomboy-plugin-reminder/Makefile
index fec91cc2a696..e5a23c3f1219 100644
--- a/deskutils/tomboy-plugin-reminder/Makefile
+++ b/deskutils/tomboy-plugin-reminder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tomboy-plugin-reminder
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://flukkost.nu/
DISTNAME= tomboy-reminder-${PORTVERSION}
diff --git a/deskutils/tomboy-plugin-todo/Makefile b/deskutils/tomboy-plugin-todo/Makefile
index 8f81da1cb31c..d5ff0c71afc0 100644
--- a/deskutils/tomboy-plugin-todo/Makefile
+++ b/deskutils/tomboy-plugin-todo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tomboy-plugin-todo
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://romain.blogreen.org/distfiles/
DISTNAME= tomboy-todo-${PORTVERSION}
diff --git a/deskutils/tomboy-plugin-wordcount/Makefile b/deskutils/tomboy-plugin-wordcount/Makefile
index 37009336dbac..83f45798120b 100644
--- a/deskutils/tomboy-plugin-wordcount/Makefile
+++ b/deskutils/tomboy-plugin-wordcount/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tomboy-plugin-wordcount
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://www.proven-corporation.com/~jhs/
DISTNAME= tomboy-wordcount-${PORTVERSION}
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 095f5c4b5079..05f213f19bcf 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tomboy
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index 6ce35f1de24a..28efeee77544 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -6,7 +6,7 @@
PORTNAME= tpb
PORTVERSION= 0.6.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 5db44907ebf3..456153ac05e3 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -7,7 +7,7 @@
PORTNAME= treeline
PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \
http://treeline.bellz.org/plugins/:plugins \
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index d41a4a84ece2..4ac94f6a28c2 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tuxcards
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://www.tuxcards.de/src/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 1d996d248331..7d46bbc95c09 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vboxgtk
PORTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils emulators gnome
MASTER_SITES= SF
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 007dd178c224..86394e7d6068 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= virt-manager
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= deskutils net-mgmt
MASTER_SITES= http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 1088bea19e6a..6f228c68713d 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vym
PORTVERSION= 2.0.12
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/vym/${PORTVERSION}
diff --git a/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 9c2ac74bc551..9c9e72ef1d2b 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wammu
PORTVERSION= 0.36
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://dl.cihar.com/wammu/v0/ \
http://dl.cihar.com.nyud.net/wammu/v0/
diff --git a/deskutils/x-tile/Makefile b/deskutils/x-tile/Makefile
index 349a30ee7a41..3d9b3d088a2d 100644
--- a/deskutils/x-tile/Makefile
+++ b/deskutils/x-tile/Makefile
@@ -7,6 +7,7 @@
PORTNAME= x-tile
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= deskutils devel python
MASTER_SITES= http://www.giuspen.com/software/
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 4ce3a4e8adcf..6dab5dce1398 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xchm
PORTVERSION= 1.20
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index 3e767d25ce7e..0ec20416a4a0 100644
--- a/deskutils/xfce4-generic-slider/Makefile
+++ b/deskutils/xfce4-generic-slider/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-generic-slider
PORTVERSION= 0.0.20100827
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= CRITICAL/
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 3cee83a1c6a6..de81ece2a477 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 1.7.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 52813bac3334..3b064f487874 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.7
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= deskutils xfce
MASTER_SITES= CRITICAL/
PKGNAMEPREFIX= xfce4-
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 4a02523125a2..ca33981f35ba 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notifyd
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index e8dc4caf00f3..1985d0fb6ecf 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tumbler
PORTVERSION= 0.1.25
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
PKGNAMEPREFIX= xfce4-
@@ -15,7 +16,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Thumbnail service for Xfce desktop
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2 \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 7908e1ff2ef6..620687612ca6 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.5.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 6303af094da4..0d3464b70552 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xneur
PORTVERSION= 0.15.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/deskutils/xpad-current/Makefile b/deskutils/xpad-current/Makefile
index 8a73246e2954..c705ce93252e 100644
--- a/deskutils/xpad-current/Makefile
+++ b/deskutils/xpad-current/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xpad
PORTVERSION= 4.1
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
PKGNAMESUFFIX= -current
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 9b563194f93b..c783fbfe26e1 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpad
PORTVERSION= 3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= http://launchpad.net/xpad/stable/${PORTVERSION}/+download/
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index fa73a1536653..02dd410139fa 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= znotes
PORTVERSION= 0.4.5
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 56745e800ae8..73bb4accc7a6 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adasdl
PORTVERSION= 20010504
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/AdaSDL_${PORTVERSION}/AdaSDL_${PORTVERSION}
DISTNAME= AdaSDL_${PORTVERSION}
diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index 38d72588c864..04a6dbc97d68 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -6,7 +6,7 @@
PORTNAME= alabastra
PORTVERSION= 0.21b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= Alabastra-${PORTVERSION}
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 9ffae9663b9d..3ee717d96442 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= allegro
DISTVERSION= 4.4.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/alleg/allegro/${PORTVERSION}
PKGNAMESUFFIX= -devel
@@ -41,7 +41,7 @@ PORTSCOUT= limit:^4\.3\.[0-9]*
CFLAGS+= -L${LOCALBASE}/lib
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib \
jack.0:${PORTSDIR}/audio/jack \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
post-install:
@cd ${WRKSRC}/docs/man/ && \
${FIND} . -type f -and -name "*.3" -exec ${INSTALL_MAN} {} ${PREFIX}/man/man3/{} \;
diff --git a/devel/allegro-devel/files/patch-loadpng.c b/devel/allegro-devel/files/patch-loadpng.c
new file mode 100644
index 000000000000..6243d8e18ac1
--- /dev/null
+++ b/devel/allegro-devel/files/patch-loadpng.c
@@ -0,0 +1,10 @@
+--- addons/loadpng/loadpng.c.orig 2010-03-03 04:18:36.000000000 +0100
++++ addons/loadpng/loadpng.c 2012-04-25 19:36:29.000000000 +0200
+@@ -6,6 +6,7 @@
+
+
+ #include <png.h>
++#include <zlib.h>
+ #include <allegro.h>
+ #include <allegro/internal/aintern.h>
+ #include "loadpng.h"
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index d7176d6d2b47..cc3c7d1f1b23 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -8,6 +8,7 @@
PORTNAME= anjuta-extras
PORTVERSION= 2.32.1.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 7cbca9112544..89b11b9c2838 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -8,7 +8,7 @@
PORTNAME= anjuta
PORTVERSION= 2.32.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile
index 3bf5ae3432ee..07881c25ca28 100644
--- a/devel/apiextractor/Makefile
+++ b/devel/apiextractor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apiextractor
PORTVERSION= 0.10.10
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index a52834802611..8ef541345e79 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -8,7 +8,7 @@
PORTNAME= autodia
PORTVERSION= 2.03
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Tree/TEEJAY
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile
index 29f45b9bb0a4..4374d735e1e2 100644
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modules
PORTVERSION= r20091106
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
PKGNAMEPREFIX= bennugd-
@@ -18,11 +18,11 @@ COMMENT= High level open source game development suite, modules
BUILD_DEPENDS= ${LOCALBASE}/lib/libbgdrtm.so:${PORTSDIR}/devel/bennugd-core
RUN_DEPENDS= ${LOCALBASE}/lib/libbgdrtm.so:${PORTSDIR}/devel/bennugd-core
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_SDL= sdl mixer
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd"
MAKE_JOBS_SAFE= yes
diff --git a/devel/bennugd-modules/files/patch-mod_map-file_png.c b/devel/bennugd-modules/files/patch-mod_map-file_png.c
new file mode 100644
index 000000000000..5479d7cbdd10
--- /dev/null
+++ b/devel/bennugd-modules/files/patch-mod_map-file_png.c
@@ -0,0 +1,37 @@
+--- mod_map/file_png.c.orig 2009-07-22 04:02:45.000000000 +0200
++++ mod_map/file_png.c 2012-05-27 11:54:18.000000000 +0200
+@@ -24,6 +24,7 @@
+ /* --------------------------------------------------------------------------- */
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "mod_map.h"
+
+@@ -89,7 +90,7 @@
+
+ /* Rutina de error */
+
+- if ( setjmp( png_ptr->jmpbuf ) )
++ if ( setjmp( png_jmpbuf(png_ptr) ) )
+ {
+ png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ;
+ file_close( png ) ;
+@@ -286,7 +287,7 @@
+
+ /* Fin */
+
+- if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ;
++ if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ;
+
+ bitmap->modified = 1 ;
+
+@@ -356,7 +357,7 @@
+
+ /* Error handling... */
+
+- if ( setjmp( png_ptr->jmpbuf ) )
++ if ( setjmp( png_jmpbuf(png_ptr) ) )
+ {
+ png_destroy_write_struct( &png_ptr, NULL ) ;
+ free( rowpointers ) ;
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 78279e39d711..ceee7afe8265 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= boaconstructor
PORTVERSION= 0.6.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
#MASTER_SITES= SF/boa-constructor/Boa-Constructor/${PORTVERSION}-alpha
MASTER_SITES= SF/boa-constructor/Boa-Constructor/${PORTVERSION}-beta
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index e1b97f690acf..a988b96e3d40 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bonobo
PORTVERSION= 1.0.22
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index 41ad5345b498..48bbdff7fcab 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bouml
PORTVERSION= 4.22.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SF \
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index f5c9f41e10c7..6862705d1926 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bug-buddy
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/bzapi/Makefile b/devel/bzapi/Makefile
index 4c72232e7d60..830d240df9ce 100644
--- a/devel/bzapi/Makefile
+++ b/devel/bzapi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bzapi
DISTVERSION= 165:82e75bdd00be
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= LOCAL/pgollucci
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 66909fe95837..f628aaa3bc61 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bzr-explorer
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://launchpadlibrarian.net/93535508/ \
http://www.c-s.li/ports/
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 8eebf54dba1b..1e7a04962fe9 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bzr-gtk
PORTVERSION= 0.100.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://launchpadlibrarian.net/65442805/ \
http://www.c-s.li/ports/
diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index e3be568d656b..1ef3061d0990 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cedet
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= devel elisp
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 79a96f87af71..cbffaf5c8fe6 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= clanlib
PORTVERSION= 0.8.1
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= http://www.clanlib.org/download/releases-0.8/
@@ -19,12 +19,12 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Cross-platform game SDK
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
mikmod:${PORTSDIR}/audio/libmikmod \
vorbis:${PORTSDIR}/audio/libvorbis
WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION}
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
diff --git a/devel/clanlib/files/patch-Sources-Display-Providers-png_provider_generic.cpp b/devel/clanlib/files/patch-Sources-Display-Providers-png_provider_generic.cpp
new file mode 100644
index 000000000000..11b53dc223ec
--- /dev/null
+++ b/devel/clanlib/files/patch-Sources-Display-Providers-png_provider_generic.cpp
@@ -0,0 +1,11 @@
+--- Sources/Display/Providers/png_provider_generic.cpp.orig 2006-10-27 03:55:01.000000000 +0200
++++ Sources/Display/Providers/png_provider_generic.cpp 2012-04-27 10:17:04.000000000 +0200
+@@ -107,7 +107,7 @@
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ cl_assert(false);
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ cl_assert(false);
diff --git a/devel/clewn/Makefile b/devel/clewn/Makefile
index 15945dddcc5b..a6f42d2216f2 100644
--- a/devel/clewn/Makefile
+++ b/devel/clewn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clewn
PORTVERSION= 1.14
+PORTREVISION= 1
CATEGORIES= devel editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index ae86957563eb..227f3ac68a7e 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cmake
PORTVERSION= 2.8.8
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
PKGNAMESUFFIX= -gui
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index b3e68ac87a08..413e25a1a8b8 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -7,6 +7,7 @@
PORTNAME= codeblocks
PORTVERSION= 10.05
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/crossvc/Makefile b/devel/crossvc/Makefile
index 705d849c6041..35929de85880 100644
--- a/devel/crossvc/Makefile
+++ b/devel/crossvc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= crossvc
PORTVERSION= 1.5.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://lincvs.com/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-0-generic-src
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index abddc597869e..c0d699d64a47 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cutter
PORTVERSION= 1.1.9
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 21033c1c55a5..1d0301056881 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cvsgraph
PORTVERSION= 1.7.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel graphics
MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index b85ef71bdd8e..877b481e8092 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= d-feet
PORTVERSION= 0.1.12
-#PORTREVISION= 0
+PORTREVISION= 1
#PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile
index ed10658cd01a..a2a093b213da 100644
--- a/devel/datadesigner/Makefile
+++ b/devel/datadesigner/Makefile
@@ -8,7 +8,7 @@
PORTNAME= datadesigner
PORTVERSION= 0.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= SF/dbdesign/${PORTNAME}/${PORTVERSION}
diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile
index 908edff2b587..f1ebc7864637 100644
--- a/devel/dbus-qt3/Makefile
+++ b/devel/dbus-qt3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dbus
PORTVERSION= 0.70
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 2288a162face..a5d4998c11fe 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dbus-sharp
PORTVERSION= 0.62
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
DISTNAME= dbus-${PORTVERSION}
diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index ae777e44aaf6..ad02031d79bb 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dcmtk
DISTVERSION= 3.6.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNAME}${PORTVERSION:S/.//g}/
@@ -14,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org
COMMENT= A toolkit to work with DICOM files
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_GNOME= libxml2
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index b5245ec3acb2..21df21c88cc6 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dconf
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 46e50d6f00e1..56d3fb537eb2 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= devhelp
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index dbf6337d6634..463f497478f1 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= diffuse
PORTVERSION= 0.4.6
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= SF
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index b693ca0c8f39..039569c74720 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= directfb
PORTVERSION= 1.4.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.directfb.org/downloads/Core/${DISTNAME:R}/
DISTNAME= DirectFB-${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER= anatoly.borodin@gmail.com
COMMENT= Graphic development lightweight API
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -27,7 +27,7 @@ OPTIONS= FREETYPE2 "Enable Freetype support" on \
UNIQUE "Enable Unique (WM Module)" off \
TESTS "Install test apps" off
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
diff --git a/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c b/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c
new file mode 100644
index 000000000000..10773d9c32a6
--- /dev/null
+++ b/devel/directfb/files/patch-interfaces-IDirectFBImageProvider-idirectfbimageprovider_png.c
@@ -0,0 +1,28 @@
+--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.orig 2011-05-05 20:00:29.000000000 +0200
++++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-05-01 09:15:37.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include <string.h>
+ #include <stdarg.h>
+
+@@ -207,7 +207,7 @@
+ if (!data->png_ptr)
+ goto error;
+
+- if (setjmp( data->png_ptr->jmpbuf )) {
++ if (setjmp( png_jmpbuf(data->png_ptr))) {
+ D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
+ goto error;
+ }
+@@ -292,7 +292,7 @@
+ rect = dst_data->area.wanted;
+ }
+
+- if (setjmp( data->png_ptr->jmpbuf )) {
++ if (setjmp( png_jmpbuf(data->png_ptr))) {
+ D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
+
+ if (data->stage < STAGE_IMAGE)
diff --git a/devel/directfb/files/patch-tools-directfb-csource.c b/devel/directfb/files/patch-tools-directfb-csource.c
new file mode 100644
index 000000000000..d692faea15b9
--- /dev/null
+++ b/devel/directfb/files/patch-tools-directfb-csource.c
@@ -0,0 +1,19 @@
+--- tools/directfb-csource.c.orig 2011-05-05 20:00:29.000000000 +0200
++++ tools/directfb-csource.c 2012-04-29 06:09:30.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <sys/stat.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include <directfb.h>
+
+@@ -338,7 +339,7 @@
+ if (!png_ptr)
+ goto cleanup;
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ if (desc->preallocated[0].data) {
+ free (desc->preallocated[0].data);
+ desc->preallocated[0].data = NULL;
diff --git a/devel/directfb/files/patch-tools-mkdfiff.c b/devel/directfb/files/patch-tools-mkdfiff.c
new file mode 100644
index 000000000000..1b41d23ae728
--- /dev/null
+++ b/devel/directfb/files/patch-tools-mkdfiff.c
@@ -0,0 +1,11 @@
+--- tools/mkdfiff.c.orig 2010-10-31 09:49:49.000000000 +0100
++++ tools/mkdfiff.c 2012-04-30 06:43:17.000000000 +0200
+@@ -97,7 +97,7 @@
+ if (!png_ptr)
+ goto cleanup;
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ if (desc->preallocated[0].data) {
+ free (desc->preallocated[0].data);
+ desc->preallocated[0].data = NULL;
diff --git a/devel/directfb/files/patch-tools-mkdgifft.cpp b/devel/directfb/files/patch-tools-mkdgifft.cpp
new file mode 100644
index 000000000000..4ac8f145d6c1
--- /dev/null
+++ b/devel/directfb/files/patch-tools-mkdgifft.cpp
@@ -0,0 +1,11 @@
+--- tools/mkdgifft.cpp.orig 2011-05-05 20:00:29.000000000 +0200
++++ tools/mkdgifft.cpp 2012-05-01 08:58:04.000000000 +0200
+@@ -595,7 +595,7 @@
+ if (!png_ptr)
+ goto cleanup;
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ if (desc->preallocated[0].data) {
+ free (desc->preallocated[0].data);
+ desc->preallocated[0].data = NULL;
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index a7c15e738e70..fbb2a3c9f7ba 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dissy
PORTVERSION= 10
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index a2b3b6bb8567..796671d91ad3 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= distel
PORTVERSION= 2011.03.13
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel elisp
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= olgeni
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index dd64ae690357..1bb422c35b67 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= doxygen
PORTVERSION= 1.8.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
http://ftp.stack.nl/pub/users/dimitri/
@@ -19,7 +20,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_BISON= build
USE_ICONV= yes
diff --git a/devel/dreampie/Makefile b/devel/dreampie/Makefile
index eceac660dae1..e7027ef38a12 100644
--- a/devel/dreampie/Makefile
+++ b/devel/dreampie/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dreampie
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://launchpadlibrarian.net/55587528/
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index d3312c4b0cc2..406789a8fa6b 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drpython
PORTVERSION= 3.11.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= SF/${PORTNAME}/DrPython%20Current/${PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index f95535cfbbcc..4e5e0a207dc5 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecb
PORTVERSION= 2.40
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel elisp
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME:U}%20${PORTVERSION}
diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile
index e73755ec6144..08aecb4ebd5d 100644
--- a/devel/ecos-tools/Makefile
+++ b/devel/ecos-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecos-tools
PORTVERSION= 0.0.${SNAPDATE}
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= tg
diff --git a/devel/eieio/Makefile b/devel/eieio/Makefile
index 1060de14be11..e2ae730eda81 100644
--- a/devel/eieio/Makefile
+++ b/devel/eieio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eieio
PORTVERSION= 0.17
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel elisp
MASTER_SITES= SF/cedet/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 5ec3105bb440..6c66c3346ab1 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= elib
PORTVERSION= 1.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel elisp
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ../old-gnu/emacs
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 6b5acd81c65a..8f35c7d80bce 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= esdl
PORTVERSION= 1.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile
index 8cb6fc311458..a8641ec895e5 100644
--- a/devel/esvn/Makefile
+++ b/devel/esvn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= esvn
PORTVERSION= 0.6.12
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/eSvn/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index db8d82dab69d..f61bf42ade50 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-gconf-tools
PORTVERSION= 0.1.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= http://people.redhat.com/dmalcolm/evolution-gconf-tools/
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 8b8097b93aa5..3baa22950068 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flatzebra
PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel games
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/
diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile
index 5515da0c85b7..816ea7bb7f20 100644
--- a/devel/flowdesigner/Makefile
+++ b/devel/flowdesigner/Makefile
@@ -8,7 +8,7 @@
PORTNAME= flowdesigner
PORTVERSION= 0.9.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/FlowDesigner/${PORTVERSION}
DISTNAME= FlowDesigner-${PORTVERSION}
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index bbe89fb1909e..b81785621323 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-image
diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile
index e079701429cf..63495f334784 100644
--- a/devel/fpc-newt/Makefile
+++ b/devel/fpc-newt/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -newt
diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile
index 9643985b8e32..da3b28bf4cee 100644
--- a/devel/fpc-sdl/Makefile
+++ b/devel/fpc-sdl/Makefile
@@ -6,6 +6,7 @@
#
PORTVERSION= 0
+PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -sdl
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index 6bdb9c5528ac..2e8e04f04430 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -7,7 +7,9 @@
PORTNAME= frama-c
DISTVERSIONPREFIX= Nitrogen-
+PORTREVISION= 1
DISTVERSION= 20111001
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://frama-c.com/download/ LOCAL/bf
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index e454117382cb..bd9d909e79e1 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gaphor
PORTVERSION= 0.9.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= SF
DIST_SUBDIR= gnome2
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 585890790e70..7a841e012f3f 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gaul
PORTVERSION= 0.1849.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/0.1849
DISTNAME= ${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 4a5254f22cbd..f89b14f1afc2 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gconf2
PORTVERSION= 2.32.0
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 6e9d33e0cf42..80a3435d5b69 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gconfmm
PORTVERSION= 2.0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 391c9bcd9e03..f1dbf522d8d1 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gconfmm
PORTVERSION= 2.28.2
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index cfdd5d9c07c2..606049b54a7c 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gdcm
PORTVERSION= ${GDCM_MAJ}.${GDCM_MIN}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION}
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 791a5292f0bc..d8f539c14d4d 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -7,6 +7,7 @@
PORTNAME= geany
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= devel editors
MASTER_SITES= http://download.geany.org/ SF
diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile
index 5a4911b791f3..56f5acde3ddc 100644
--- a/devel/generatorrunner/Makefile
+++ b/devel/generatorrunner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= generatorrunner
PORTVERSION= 0.6.16
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 573fb6590da8..496f95a0bb3e 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giggle
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/gio-sharp/Makefile b/devel/gio-sharp/Makefile
index b3fdf015e8be..a6340f0c92bf 100644
--- a/devel/gio-sharp/Makefile
+++ b/devel/gio-sharp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gio-sharp
PORTVERSION= 2.22.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 76dc9c065986..0f3f76597db7 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gitg
PORTVERSION= 0.0.8
+PORTREVISION= 1
CATEGORIES= devel deskutils gnome
MASTER_SITES= GNOME
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 3793f66ac6c1..fe9179e9be11 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= glade
PORTVERSION= 2.12.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 607d03cea87b..b8fc1ab79c56 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= glade3
PORTVERSION= 3.7.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index ca0a19361a0c..38a945c0c9a6 100644
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-vfs-monikers
PORTVERSION= 2.15.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 540f254749fd..2234f8a4856a 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 2.24.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 2c7e99fc5740..127694223136 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 1.0.5
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DISTNAME= gnome-vfs-${PORTVERSION}
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 188918335a1a..bc0fb36f9cc7 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-vfsmm
PORTVERSION= 2.26.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index c2d875cd7ff2..3358d0a4f718 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -10,7 +10,7 @@
PORTNAME= goffice
PORTVERSION= 0.8.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 5a0f8ad249e1..4dde1a7362d4 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -8,7 +8,7 @@
PORTNAME= goffice
PORTVERSION= 0.4.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile
index 2ed0716da1f4..ab465a6d10eb 100644
--- a/devel/goffice06/Makefile
+++ b/devel/goffice06/Makefile
@@ -8,7 +8,7 @@
PORTNAME= goffice
PORTVERSION= 0.6.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index e8ec7fafc96a..c459b464c852 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -8,7 +8,7 @@
PORTNAME= goffice
PORTVERSION= 0.2.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index e005cad1337a..867fe97732e2 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gps
PORTVERSION= 5.0.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://downloads.dragonlace.net/src/ \
http://dragonlace.mirrors.ada.cx/src/
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 716b45ded77f..83cec53db25e 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpsim
PORTVERSION= 0.22.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 6116664aed32..28a05c437e40 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -6,6 +6,7 @@
PORTNAME= grantlee
DISTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://downloads.${PORTNAME}.org/ \
http://www.loegria.net/${PORTNAME}/
diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile
index 68e8f37f8791..a413d324d35d 100644
--- a/devel/gstreamer-plugins-gconf/Makefile
+++ b/devel/gstreamer-plugins-gconf/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/devel/gstreamer-plugins-gconf/Makefile,v 1.6 2008/03/19 14:05:33 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
COMMENT= Gstreamer gconf plugin
diff --git a/devel/gstreamer-plugins-gnomevfs/Makefile b/devel/gstreamer-plugins-gnomevfs/Makefile
index ed689d4fb4f2..6bcd18a4b493 100644
--- a/devel/gstreamer-plugins-gnomevfs/Makefile
+++ b/devel/gstreamer-plugins-gnomevfs/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/devel/gstreamer-plugins-gnomevfs/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
COMMENT= Gstreamer gnomevfs plugin
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index c94a0cc5b32e..afc96c40ed6a 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkparasite
PORTVERSION= 20090819
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 8324453d6c30..e88906658fc2 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtranslator
PORTVERSION= 1.1.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 617a1b9138bd..f5fb16538aef 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guichan
PORTVERSION= 0.8.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 9e111d5d59e3..9c7f905fd285 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guikachu
PORTVERSION= 1.5.10
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 3
CATEGORIES= devel palm gnome
MASTER_SITES= http://cactus.rulez.org/projects/guikachu/download/
diff --git a/devel/guiloader-c++/Makefile b/devel/guiloader-c++/Makefile
index 6dc43b6c124f..d6de0a49064c 100644
--- a/devel/guiloader-c++/Makefile
+++ b/devel/guiloader-c++/Makefile
@@ -7,6 +7,7 @@
PORTNAME= guiloader-c++
PORTVERSION= 2.19.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/devel/guiloader/Makefile b/devel/guiloader/Makefile
index 7340e1538f33..f0b604fe8bed 100644
--- a/devel/guiloader/Makefile
+++ b/devel/guiloader/Makefile
@@ -7,6 +7,7 @@
PORTNAME= guiloader
PORTVERSION= 2.19.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index d8e354e0c0c0..3b97ec6cb81c 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gvfs
PORTVERSION= 1.6.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 21e4409bfd72..4fdcd260f2f5 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwenhywfar
PORTVERSION= 4.3.3
+PORTREVISION= 1
CATEGORIES= devel net security
MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 63f2f9cb31c2..8c3e40d69517 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hgview
PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= LOGILAB
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 76492f420f39..577827bebcd0 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gconf
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
index b28e40c8c8ed..f87bf23c123e 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -7,6 +7,7 @@
PORTNAME= glade
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 7b02963abb3f..9880acdb3abb 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -7,6 +7,7 @@
PORTNAME= threadscope
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hyena/Makefile b/devel/hyena/Makefile
index 8cb0057a9205..cdb1f2780947 100644
--- a/devel/hyena/Makefile
+++ b/devel/hyena/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hyena
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index 2c836af5e7e2..1dc15c799b2b 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hypersrc
PORTVERSION= 5.4.21
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= ftp://ftp.jimbrooks.org/hypersrc/%SUBDIR%/ \
http://www.home.earthlink.net/~jebrooks1/ftp/hypersrc/%SUBDIR%/
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index adb6eee6f2d2..961c5436a53a 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipython
PORTVERSION= 0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= http://archive.ipython.org/release/${PORTVERSION}/
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 0002e715d7eb..3e70f5b68ce7 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -9,7 +9,7 @@
PORTNAME= kaptain
PORTVERSION= 0.72
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 9c66ff851c3a..9ddf841476bf 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kcachegrind
PORTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= http://kcachegrind.sourceforge.net/
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 9ea40cc3f871..f55129e3dc7d 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdbg
PORTVERSION= 2.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel kde
MASTER_SITES= SF/${PORTNAME}/Source%20Code/${PORTVERSION}
diff --git a/devel/kdebindings4-python-krosspython/Makefile b/devel/kdebindings4-python-krosspython/Makefile
index 9230bea14f14..0a0300448ce5 100644
--- a/devel/kdebindings4-python-krosspython/Makefile
+++ b/devel/kdebindings4-python-krosspython/Makefile
@@ -7,6 +7,7 @@
PORTNAME= krosspython
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde python
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile
index 156f0541b2aa..7525a6078184 100644
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pykde4
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde python
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-python-pykdeuic4/Makefile b/devel/kdebindings4-python-pykdeuic4/Makefile
index d56a45f506e8..45bf9aa3f87d 100644
--- a/devel/kdebindings4-python-pykdeuic4/Makefile
+++ b/devel/kdebindings4-python-pykdeuic4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pykdeuic4
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde python
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-ruby-korundum/Makefile b/devel/kdebindings4-ruby-korundum/Makefile
index 00e9d2fe1ea3..6b53e5a02059 100644
--- a/devel/kdebindings4-ruby-korundum/Makefile
+++ b/devel/kdebindings4-ruby-korundum/Makefile
@@ -7,6 +7,7 @@
PORTNAME= korundum
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde ruby
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-ruby-qtruby/Makefile b/devel/kdebindings4-ruby-qtruby/Makefile
index 6cb7f8bd0158..41902d652606 100644
--- a/devel/kdebindings4-ruby-qtruby/Makefile
+++ b/devel/kdebindings4-ruby-qtruby/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtruby
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde ruby
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-smoke-smokekde/Makefile b/devel/kdebindings4-smoke-smokekde/Makefile
index 9088ea3b17da..c6ebe333b718 100644
--- a/devel/kdebindings4-smoke-smokekde/Makefile
+++ b/devel/kdebindings4-smoke-smokekde/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smokekde
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdebindings4-smoke-smokeqt/Makefile b/devel/kdebindings4-smoke-smokeqt/Makefile
index c04454f88e00..a6ad69f64d8f 100644
--- a/devel/kdebindings4-smoke-smokeqt/Makefile
+++ b/devel/kdebindings4-smoke-smokeqt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index a58d7d91aabe..4f792a9c787b 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 2788d4691f4f..f587826a2bc0 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 0dbcb591574b..ba2d11e4f90c 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kdesvn
DISTVERSION= 1.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= http://kdesvn.alwins-world.de/downloads/
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index a8d249c66d46..5541caaf6e07 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kdevelop
DISTVERSION= ${KDEVELOP_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 13bf74233fdb..40afb9fd65f5 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdevelop
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/src
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index d3b2e90e37e0..e307da2420a4 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdevelop
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 63ce62b80687..0a9d42000845 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdevelop
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 7669fad5e996..eaa9aac47071 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdevelop
PORTVERSION= 3.5.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 0aad344fba51..ba4c5ca809b2 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kdevplatform
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile
index aad9b20a00c6..160271c1e54e 100644
--- a/devel/klassmodeler/Makefile
+++ b/devel/klassmodeler/Makefile
@@ -8,7 +8,7 @@
PORTNAME= klassmodeler
PORTVERSION= 0.8.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= http://www.jameswells.net/KlassModeler/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}.bsd
diff --git a/devel/kodos/Makefile b/devel/kodos/Makefile
index dac04569fb34..d7478610d14c 100644
--- a/devel/kodos/Makefile
+++ b/devel/kodos/Makefile
@@ -9,7 +9,7 @@
PORTNAME= kodos
PORTVERSION= 2.4.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel python
MASTER_SITES= SF \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile
index d894b03c7656..b6499e89dde4 100644
--- a/devel/kprof/Makefile
+++ b/devel/kprof/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kprof
PORTVERSION= 1.3.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 7f0a96ce07a7..23964647f089 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kscope
PORTVERSION= 1.6.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel kde
MASTER_SITES= SF
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index f76dfa0be3b5..8d86f75e13a7 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kyra
PORTVERSION= 2.0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple Sprite engine written in C++
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index fa613065769d..de3b02b7db82 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lasi
PORTVERSION= 1.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
DISTNAME= libLASi-${PORTVERSION}
diff --git a/devel/lbpp/Makefile b/devel/lbpp/Makefile
index e565e5a3fa84..dd535ec5af06 100644
--- a/devel/lbpp/Makefile
+++ b/devel/lbpp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lbpp
PORTVERSION= 0.0.6b
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile
index 8a09ca10e2ec..07963cfe7933 100644
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= libYGP
PORTVERSION= 0.9.42
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/libymp/libymp/libYGP-${PORTVERSION}
DISTNAME= libYGP-${PORTVERSION}
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index d497ebe62b2a..f81c2ebf6422 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libast
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= http://www.eterm.org/download/ \
CRITICAL
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 4dd094f4b770..7ab098165288 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbonobomm
PORTVERSION= 1.3.8
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index b87d6be2e5af..f717a822fd4b 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libchipcard
PORTVERSION= 5.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file=01&dummy=/
diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
index eecc0662c71a..6aebeaf06560 100644
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libclaw
PORTVERSION= 1.5.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ Library Absolutely Wonderful
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
diff --git a/devel/libclaw/files/patch-png.hpp b/devel/libclaw/files/patch-png.hpp
new file mode 100644
index 000000000000..15e0afefa97d
--- /dev/null
+++ b/devel/libclaw/files/patch-png.hpp
@@ -0,0 +1,10 @@
+--- claw/png.hpp.orig 2008-07-08 11:52:14.000000000 +0200
++++ claw/png.hpp 2012-04-25 19:37:48.000000000 +0200
+@@ -32,6 +32,7 @@
+
+ #include <claw/image.hpp>
+ #include <png.h>
++#include <zlib.h>
+ #include <setjmp.h>
+ #include <iostream>
+ #include <string>
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 0abd5b5cc27d..77c572293ea3 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libdbusmenu-qt
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index 4439086c3649..aedf86d42899 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libdlna
PORTVERSION= 0.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://libdlna.geexbox.org/releases/ \
http://critical.ch/distfiles/ \
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index e923766340b3..828bf22804bf 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgconf-java
PORTVERSION= 2.12.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 69e93d655da1..07babc4e976e 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgdata
PORTVERSION= 0.6.6
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index e31fdf43620a..f4a38f281bf9 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libglade-java
PORTVERSION= 2.12.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index ea3f6f575b6a..877238f30a54 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libglade
PORTVERSION= 0.17
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 63a66c6f6f16..c35ccb33e9ba 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libglade2
PORTVERSION= 2.6.4
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 4f75569af2db..52ea2fec021d 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libglademm
PORTVERSION= 2.1.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 888a21f6c932..1c85d5eeeb60 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libglademm
PORTVERSION= 2.6.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 33dec365189e..a7288cf1d6c0 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.14 2010/04/10 08:51:16 kwm Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel gnome
PKGNAMESUFFIX= -gnome
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 51a54afb68ad..0634b5b414ff 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgsf
PORTVERSION= 1.14.21
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libmcs/Makefile b/devel/libmcs/Makefile
index 6e502fd5f12a..08244f94ffff 100644
--- a/devel/libmcs/Makefile
+++ b/devel/libmcs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libmcs
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://distfiles.atheme.org/
EXTRACT_SUFX= .tgz
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 2451455929b0..604ac3eb14b9 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libnotify
PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
index bd8837a5663a..2e3fccc55980 100644
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libparserutils
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.netsurf-browser.org/projects/releases/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 381c8e1d64a7..1a6da0582ad6 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= librcc
PORTVERSION= 0.2.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
#MASTER_SITES= SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION} \
MASTER_SITES= ${MASTER_SITE_LOCAL} \
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 7bdcc02ea11c..bc71bfa57f78 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libsigcx
PORTVERSION= 0.6.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 895786417da9..fd05790be058 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libslang2
PORTVERSION= 2.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v${PORTVERSION:R}/ \
ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PORTVERSION:R}/ \
@@ -52,7 +52,7 @@ PLIST_SUB+= PCRE="@comment "
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+= --without-png
diff --git a/devel/libsoup-gnome/Makefile b/devel/libsoup-gnome/Makefile
index dedc48f04bef..81afa06c01d7 100644
--- a/devel/libsoup-gnome/Makefile
+++ b/devel/libsoup-gnome/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/devel/libsoup-gnome/Makefile,v 1.3 2011/06/06 17:50:29 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
PKGNAMESUFFIX= -gnome
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 078ce7ba3c9d..6f1d9c1dbcfa 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libzvbi
PORTVERSION= 0.2.33
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/zapping/zvbi/${PORTVERSION}
DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Routines to access raw VBI capture devices
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
unicode.0:${PORTSDIR}/devel/libunicode
USE_GETTEXT= yes
diff --git a/devel/libzvbi/files/patch-src-exp-gfx.c b/devel/libzvbi/files/patch-src-exp-gfx.c
new file mode 100644
index 000000000000..5091955a012c
--- /dev/null
+++ b/devel/libzvbi/files/patch-src-exp-gfx.c
@@ -0,0 +1,16 @@
+--- src/exp-gfx.c.orig 2008-02-24 15:17:47.000000000 +0100
++++ src/exp-gfx.c 2012-05-26 12:49:12.000000000 +0200
+@@ -1672,11 +1672,11 @@
+ char title[80];
+ unsigned int i;
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ return FALSE;
+
+ png_set_write_fn (png_ptr,
+- (voidp) gfx,
++ gfx,
+ write_data,
+ flush_data);
+
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 11b7c49d81d7..31cba262ce75 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -7,6 +7,7 @@
PORTNAME= love
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= devel games
MASTER_SITES= http://cdn.bitbucket.org/rude/love/downloads/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index c94decc4bf1a..9906c853ce33 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= love
DISTVERSION= 0.5-0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index caa5f01d04e9..50f089abf385 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= m17n-lib
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.m17n.org/m17n-lib-download/ \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 5de19c005330..e38acfb1a6a2 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= magit
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= devel elisp
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://cloud.github.com/downloads/magit/magit/
diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index 3795f57c96d2..3217f9bf2d45 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mono-addins
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile
index d2a6dee009a6..3331107a2574 100644
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monodevelop-database
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/devel/monodevelop-java/Makefile b/devel/monodevelop-java/Makefile
index 8cf019e421ff..c99b39d6b190 100644
--- a/devel/monodevelop-java/Makefile
+++ b/devel/monodevelop-java/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monodevelop-java
PORTVERSION= 2.8.8.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/devel/monodevelop-python/Makefile b/devel/monodevelop-python/Makefile
index 0f1658d61d9f..b538642caf3f 100644
--- a/devel/monodevelop-python/Makefile
+++ b/devel/monodevelop-python/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monodevelop-python
PORTVERSION= 2.8.8.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/devel/monodevelop-vala/Makefile b/devel/monodevelop-vala/Makefile
index afdc27879e88..c591a9e11298 100644
--- a/devel/monodevelop-vala/Makefile
+++ b/devel/monodevelop-vala/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monodevelop-vala
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index e2c1a5d65291..c9c1044f8a46 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -8,6 +8,7 @@
PORTNAME= monodevelop
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 1e96ee9bbc5b..439366189552 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monotone-viz
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/
diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile
index 5630548bb0ac..0a72ffce801a 100644
--- a/devel/nemiver/Makefile
+++ b/devel/nemiver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nemiver
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 7a56bbefb98a..5bebe3fe16b6 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= newt
PORTVERSION= 0.52.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= https://fedorahosted.org/releases/n/e/newt/
PKGNAMESUFFIX= ${PYTHONSUFFIX}${TCLSUFFIX}
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index a6e305248d40..ac3f13f1e7f7 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ninja-ide
DISTVERSION= 2.0-beta2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://github.com/downloads/${PORTNAME}/${PORTNAME}/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index 46216a446f8a..eeddc3181268 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= notify-sharp
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://romain.blogreen.org/distfiles/
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index dfee1c9b1277..784f6731471c 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sdl
PORTVERSION= 0.7.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ocaml-
diff --git a/devel/ocamlweb/Makefile b/devel/ocamlweb/Makefile
index fe1134aec483..a8f4d16fc297 100644
--- a/devel/ocamlweb/Makefile
+++ b/devel/ocamlweb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ocamlweb
PORTVERSION= 1.34
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://www.lri.fr/~filliatr/ftp/ocamlweb/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTDOCS}
diff --git a/devel/otrs/Makefile b/devel/otrs/Makefile
index 20a7aff3b37c..0daaf19c8210 100644
--- a/devel/otrs/Makefile
+++ b/devel/otrs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= otrs
PORTVERSION= 3.1.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ftp.otrs.org/pub/otrs/ \
ftp://ftp.samurai.com/pub/otrs/ \
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 7c93a2a8bd00..9724ce71a491 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Algorithm-Accounting
PORTVERSION= 0.08
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile
index 872c0bd7b11f..7e03d53589cb 100644
--- a/devel/p5-Algorithm-Evolutionary/Makefile
+++ b/devel/p5-Algorithm-Evolutionary/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Algorithm-Evolutionary
PORTVERSION= 0.77
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Cairo-GObject/Makefile b/devel/p5-Cairo-GObject/Makefile
index 7d8485187ce1..77a58ad07578 100644
--- a/devel/p5-Cairo-GObject/Makefile
+++ b/devel/p5-Cairo-GObject/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Cairo-GObject
PORTVERSION= 1.001
+PORTREVISION= 1
CATEGORIES= devel graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:TSCH
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
index 9fc65e3cfe91..a93045284b25 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Data-TreeDumper-Renderer-GTK
PORTVERSION= 0.02
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 071a58fbfa64..4a2842fd74de 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Devel-ptkdb
PORTVERSION= 1.1091
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 51c3dd2243db..be4512e85e53 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -7,6 +7,7 @@
PORTNAME= FSA-Rules
PORTVERSION= 0.31
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DWHEELER
diff --git a/devel/p5-Gnome2-GConf/Makefile b/devel/p5-Gnome2-GConf/Makefile
index 37a298ee30f8..33532f59e196 100644
--- a/devel/p5-Gnome2-GConf/Makefile
+++ b/devel/p5-Gnome2-GConf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gnome2-GConf
PORTVERSION= 1.044
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Goo-Canvas/Makefile b/devel/p5-Goo-Canvas/Makefile
index 0a0a7f222666..6153f9432782 100644
--- a/devel/p5-Goo-Canvas/Makefile
+++ b/devel/p5-Goo-Canvas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Goo-Canvas
PORTVERSION= 0.06
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index 5c990b2ef628..a31a301bc00d 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Spell
PORTVERSION= 1.03
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel perl5
MASTER_SITES= SF/gtk2-perl/Gtk2_Spell/${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index c710808a1564..a46fd0674995 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Log-Accounting-SVK
PORTVERSION= 0.05
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index cae8243f693f..de6efab82a31 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Log-Accounting-SVN
PORTVERSION= 0.01
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-POE-Loop-Tk/Makefile b/devel/p5-POE-Loop-Tk/Makefile
index 944c4a735014..11f3e418ca46 100644
--- a/devel/p5-POE-Loop-Tk/Makefile
+++ b/devel/p5-POE-Loop-Tk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= POE-Loop-Tk
PORTVERSION= 1.304
+PORTREVISION= 1
CATEGORIES= devel tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index 4919a31c40e7..950851bb4b22 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Project-Gantt
PORTVERSION= 1.03
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index fb87a97990c8..8315fd739468 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RRDTool-OO
PORTVERSION= 0.32
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index aa99bca1a362..9d69989ecc89 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -5,7 +5,7 @@
PORTNAME= SDL
PORTVERSION= 2.2.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=SDL
@@ -16,7 +16,7 @@ MAINTAINER= ak@FreeBSD.org
COMMENT= Perl Bindings for SDL
BUILD_DEPENDS= p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_SDL= sdl
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index 28cd77506f4d..e73cef04c43b 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SVN-Statistics
PORTVERSION= 0.041
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index c1c9594a9add..2fb6d00e3d1d 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Sepia
PORTVERSION= 0.992
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index efa5203577fa..dc0b906f3aff 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Test-Parser
PORTVERSION= 1.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-doxygenfilter/Makefile b/devel/p5-doxygenfilter/Makefile
index 4b6cc8822c41..16e08595db48 100644
--- a/devel/p5-doxygenfilter/Makefile
+++ b/devel/p5-doxygenfilter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= doxygenfilter
PORTVERSION= 1.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel perl5
MASTER_SITES= SF/bigsister/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 0b6d36f685b5..1e35ea58eaa1 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pharmacy
PORTVERSION= 0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= SF
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index 35fa7d918b42..949f13526711 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pikdev
PORTVERSION= 0.9.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel kde
MASTER_SITES= http://pikdev.free.fr/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
@@ -16,7 +16,7 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Simple graphic IDE for the development of PIC-based applications
LIB_DEPENDS= fam.0:${PORTSDIR}/devel/gamin \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index 0c143b2272e7..217d5fb987b5 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= piklab
PORTVERSION= 0.15.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/newest%20release/${PORTVERSION}
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 69da1f319bcb..a59d1d12ed80 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= preps
PORTVERSION= 2.0.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel
MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/
PKGNAMESUFFIX= -gui
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 7f3e054d9412..e23e656abd72 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= prepstools
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://webpages.charter.net/stuffle/preps/download/files/
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 94889dcc1a9a..a6fcbfe4334e 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -8,7 +8,7 @@
PORTNAME= present
PORTVERSION= 0.0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index 69f841f5e5f8..91c368a5aab7 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= psvn
PORTVERSION= 915036
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel elisp
MASTER_SITES= http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 9f73fb80b18c..9086c755e3cc 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -7,7 +7,7 @@
PORTNAME= game
PORTVERSION= 1.8.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel python
MASTER_SITES= http://pygame.seul.org/ftp/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 41e2ca5bc366..6cf411bd10e8 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gobject
PORTVERSION= 2.28.6
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index dd11494882b8..c45c470cfa62 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= itools
PORTVERSION= 0.62.8
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://download.hforge.org/itools/0.62/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-libgsf/Makefile b/devel/py-libgsf/Makefile
index 4b79f63c4cef..6be28b2ce6b6 100644
--- a/devel/py-libgsf/Makefile
+++ b/devel/py-libgsf/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/devel/py-libgsf/Makefile,v 1.1 2006/10/04 00:34:55 ahze Exp $
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-liblarch/Makefile b/devel/py-liblarch/Makefile
index 0f7414945e7c..fde418d8c9fa 100644
--- a/devel/py-liblarch/Makefile
+++ b/devel/py-liblarch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liblarch
PORTVERSION= 0.1.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://gtg.fritalk.com/publique/gtg.fritalk.com/${PORTNAME}/0.1/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-liblarch_gtk/Makefile b/devel/py-liblarch_gtk/Makefile
index 386bb86a5f39..6eb704a4f5d2 100644
--- a/devel/py-liblarch_gtk/Makefile
+++ b/devel/py-liblarch_gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liblarch_gtk
PORTVERSION= 0.1.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/0.1/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index 865de5aed7c3..6250526a066a 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mwlib.rl
PORTVERSION= 0.12.8
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 4847a9738b9c..970f1544dc90 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -8,7 +8,7 @@
PORTNAME= notify
PORTVERSION= 0.1.1
DISTVERSIONPREFIX=python-
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel python
MASTER_SITES= http://www.galago-project.org/files/releases/source/notify-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index 99321e9d6a80..fb533592bf9b 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ocempgui
PORTVERSION= 0.2.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel python
MASTER_SITES= SF/ocemp/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index fb177edeadbf..7806116b099a 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pycallgraph
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MASTER_SITES= http://pycallgraph.slowchop.com/files/download/ \
http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 521831a2a689..526ca35b1013 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -6,6 +6,7 @@
PORTNAME= assistant
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index b53e5510f27c..4b3a9f9ad75c 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -6,6 +6,7 @@
PORTNAME= core
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 1266cc7f585d..903f201b5d16 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -6,6 +6,7 @@
PORTNAME= dbus
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 97a48a3ee770..22528e2a7ce2 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -6,6 +6,7 @@
PORTNAME= declarative
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 27cc8b639dd5..ea70f113978e 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -6,6 +6,7 @@
PORTNAME= designer
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index 7fe1eff2e8b4..9762978ea480 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -6,6 +6,7 @@
PORTNAME= designerplugin
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index bd5f8a9f3074..b39c96abd2a2 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -7,6 +7,7 @@
PORTNAME= help
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 9b09afc2be68..affb39234cd0 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 88721c779f18..2d11aabcc733 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -6,6 +6,7 @@
PORTNAME= script
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 09340bccb3b9..8eef71f22a2d 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scripttools
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index e8130807befe..218c42998212 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -6,6 +6,7 @@
PORTNAME= test
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index eda034e0e845..64a9be85faf9 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= roxlib
PORTVERSION= 2.0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= SF/rox/ROX-Lib/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index f096792627c0..291fed115765 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Pymacs
PORTVERSION= 0.22
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel editors python elisp
MASTER_SITES= http://pymacs.progiciels-bpi.ca/archives/ \
${MASTER_SITE_GENTOO}
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index 5222fd9045dc..2fc69ae59759 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyside-tools
PORTVERSION= 0.2.13
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 2874a2d54a4c..f6c742fb00a2 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyside
PORTVERSION= 1.1.0
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 515ba1e3c96f..39d16ef6aff4 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qbzr
PORTVERSION= 0.22.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://launchpadlibrarian.net/93533531/ \
http://www.c-s.li/ports/
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 61f1641e6d69..3441bc6c1670 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qct
PORTVERSION= 1.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel python
MASTER_SITES= http://qct.sourceforge.net/ \
ftp://ftp.ipt.ru/pub/download/${PORTNAME}/
diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index 9d6268b55ac7..893240eebb46 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qdevelop
PORTVERSION= 0.28
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= http://biord-software.org/downloads/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
index 203de142948a..1279d3edca88 100644
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qgit
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
PKGNAMESUFFIX= -qt4
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index 6389092cc511..219d057cff90 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qjson
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF
diff --git a/devel/qprog/Makefile b/devel/qprog/Makefile
index af1198e3cc73..13e8643c5473 100644
--- a/devel/qprog/Makefile
+++ b/devel/qprog/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qprog
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://bfoz.net/projects/${PORTNAME}/release/
DISTNAME= QProg_${PORTVERSION}
diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile
index dc6ca11e4478..f7fd4fb7bf05 100644
--- a/devel/qsa/Makefile
+++ b/devel/qsa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qsa
PORTVERSION= 1.1.5
+PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_QT}
MASTER_SITE_SUBDIR=../../${PORTNAME}/source
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index bbf8df9b691b..75b7223ffd82 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -6,6 +6,7 @@
PORTNAME= designerplugin
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index d7447037d385..0ba22163c2e5 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
diff --git a/devel/qssl/Makefile b/devel/qssl/Makefile
index 0859daab012d..fb30c7fc5f03 100644
--- a/devel/qssl/Makefile
+++ b/devel/qssl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qssl
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel security
MASTER_SITES= SF/psi/Common/Common
diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile
index 9bae23fed1ea..31b4aedec9e2 100644
--- a/devel/qsvn/Makefile
+++ b/devel/qsvn/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qsvn
DISTVERSION= 0.8.1
DISTVERSIONSUFFIX= -src
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://www.anrichter.net/projects/qsvn/chrome/site/
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index 78602bfc6338..e9d62351998b 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= assistant
PORTVERSION= 4.6.3
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index fc56b40af9bb..a216e850fa76 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,6 +8,7 @@
PORTNAME= assistant
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile
index 2b5f2205468a..eb388063325b 100644
--- a/devel/qt4-declarative/Makefile
+++ b/devel/qt4-declarative/Makefile
@@ -7,6 +7,7 @@
PORTNAME= declarative
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 1144032e10ee..8ba7ff24c7d2 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= designer
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile
index ad29da63574e..fe700249fc94 100644
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= help
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 65d6825c532d..8490ebb6f1eb 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -7,6 +7,7 @@
PORTNAME= help
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 851ca9ba2e13..e14df9fd3267 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libQtAssistantClient
PORTVERSION= 4.6.3
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index b0a37da1ad5d..74d3086b21ec 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,6 +8,7 @@
PORTNAME= linguist
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
index b86e8df44251..aa79fcd1a814 100644
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@@ -8,6 +8,7 @@
PORTNAME= makeqpf
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index d62636ea063a..cab8d623ca68 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qdbusviewer
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile
index 0ebbdde8792b..306ea197bf94 100644
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qdoc3
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel textproc
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 0eabf96da490..823f3ce917d3 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qt3support
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel x11-toolkits
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-qtsolutions-singleapplication/Makefile b/devel/qt4-qtsolutions-singleapplication/Makefile
index f594f7fe1932..d4dd8376ce94 100644
--- a/devel/qt4-qtsolutions-singleapplication/Makefile
+++ b/devel/qt4-qtsolutions-singleapplication/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qt4-qtsolutions-singleapplication
PORTVERSION= 20110722
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \
http://www.pcbsd.org/~kris/software/
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index b8fc3bd5e262..50718cd1a6f2 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qvfb
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile
index 4b76c5b2967a..6b351aaa3cbe 100644
--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scripttools
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index de05ab3c6a3f..9397aede8767 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= uic3
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 3599fce925f6..61879a182b4b 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtcreator
PORTVERSION= 2.5.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.qt.nokia.com/qtcreator/
DISTNAME= qt-creator-${PORTVERSION}-src
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index 42ecf1886da9..b3a94a8b4f21 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qtscriptgenerator
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 655acc23e393..95fb714780cd 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rapidsvn
PORTVERSION= 0.12.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.rapidsvn.org/download/release/0.12/
DISTNAME= ${PORTNAME}-0.12.0-1
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 49232bc29320..3a239698e1c7 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= regexxer
PORTVERSION= 0.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel textproc gnome
MASTER_SITES= SF
diff --git a/devel/ros-documentation/Makefile b/devel/ros-documentation/Makefile
index aaca718e0388..e12cf557fc09 100644
--- a/devel/ros-documentation/Makefile
+++ b/devel/ros-documentation/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-documentation
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/
DISTNAME= documentation-${PORTVERSION}
diff --git a/devel/ros-image_common/Makefile b/devel/ros-image_common/Makefile
index 88c8391ac9ce..c437805e033d 100644
--- a/devel/ros-image_common/Makefile
+++ b/devel/ros-image_common/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-image_common
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/
DISTNAME= image_common-${PORTVERSION}
diff --git a/devel/ros-laser_pipeline/Makefile b/devel/ros-laser_pipeline/Makefile
index a14e0367535f..cee2e7c6da29 100644
--- a/devel/ros-laser_pipeline/Makefile
+++ b/devel/ros-laser_pipeline/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-laser_pipeline
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/
DISTNAME= laser_pipeline-${PORTVERSION}
diff --git a/devel/ros-rx/Makefile b/devel/ros-rx/Makefile
index 28f02eac03d3..91d97dca7d82 100644
--- a/devel/ros-rx/Makefile
+++ b/devel/ros-rx/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ros-rx
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/:rel \
http://pr.willowgarage.com/downloads/:pr
diff --git a/devel/ros_tutorials/Makefile b/devel/ros_tutorials/Makefile
index 0ebf91878a6d..7a7fb1fdec07 100644
--- a/devel/ros_tutorials/Makefile
+++ b/devel/ros_tutorials/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ros_tutorials
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
DIST_SUBDIR= ros
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 66c5c2ae7d34..ea58e9371f9c 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rbbr
PORTVERSION= 0.6.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel ruby
MASTER_SITES= SF/ruby-gnome2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 86c18be68eba..9fbb9c523332 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl
PORTVERSION= 1.3.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel graphics audio ruby
MASTER_SITES= http://www.kmc.gr.jp/~ohai/rubysdl/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 65b513f1c0db..f7d29f68e2ab 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl_sge
PORTVERSION= 0.030809
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel graphics
MASTER_SITES= http://www.digitalfanatics.org/cal/sge/files/ \
http://www.sourcefiles.org/Programming/Libraries/Graphics/
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index ff664df17ce8..50855b6e2a75 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -11,7 +11,7 @@
PORTNAME= seed
PORTVERSION= 2.31.91
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index d794feca1f7b..59f434f8963f 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= semantic
PORTVERSION= 1.4.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel elisp
MASTER_SITES= SF/cedet/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index a0725e636052..3c761cbe7163 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sfml
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF
DISTNAME= SFML-${PORTVERSION}-sdk-linux-32
@@ -17,7 +17,7 @@ COMMENT= Simple and Fast Multimedia Library
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_GMAKE= yes
diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index db2ebcfaf7c3..50ca454b435e 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -7,7 +7,7 @@
PORTNAME= shiboken
PORTVERSION= 1.1.0
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.pyside.org/files/
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index b1a62c22fbfa..3a03cc6086d0 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simgear
PORTVERSION= 2.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel games
MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile
index c74b06c707d4..4a1d932e170e 100644
--- a/devel/simulavr/Makefile
+++ b/devel/simulavr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simulavr
PORTVERSION= 0.1.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index c988ae67b3c8..aef8718a25a2 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subcommander
PORTVERSION= 1.2.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/42385/
DISTNAME= Subcommander-${PORTVERSION}
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index f3c0b6ea8017..c10f83d9a2ec 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subcommander
PORTVERSION= 2.0.0.b5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/46766/
DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}p1
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index a0297ea8b9fc..289eb5419205 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= synfig
DISTVERSION= 0.63.05
+PORTREVISION= 1
CATEGORIES= devel graphics multimedia
MASTER_SITES= SF
@@ -18,7 +19,7 @@ LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
MagickWand:${PORTSDIR}/graphics/ImageMagick \
jpeg:${PORTSDIR}/graphics/jpeg \
mng:${PORTSDIR}/graphics/libmng \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
avcodec:${PORTSDIR}/multimedia/ffmpeg \
dv:${PORTSDIR}/multimedia/libdv \
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 4fe117ed7362..dca1b7e5f33c 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-vcs-plugin
PORTVERSION= 0.1.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 376c405b8f79..28ecef86eaa2 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -7,7 +7,7 @@
PORTNAME= titano
PORTVERSION= 0.0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel gnome
MASTER_SITES= SF
diff --git a/devel/tortoisehg2/Makefile b/devel/tortoisehg2/Makefile
index ccb3449185a6..7e7e8a281422 100644
--- a/devel/tortoisehg2/Makefile
+++ b/devel/tortoisehg2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tortoisehg
PORTVERSION= 2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/
diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index 93982f998d20..4e857f9e8780 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= umlgraph
PORTVERSION= 5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= http://www.umlgraph.org/
DISTNAME= UMLGraph-${PORTVERSION}
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 64a1f684dbcf..66ad037db7a1 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= universalindentgui
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 78f932f1e435..64aea4786e90 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= upp
PORTVERSION= 4193
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel x11-toolkits
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION}
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index 9b7ba2e424a1..d6d52878f82c 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -7,6 +7,7 @@
PORTNAME= valide
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://launchpadlibrarian.net/68237064/
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index af126073881b..e7df66513130 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wininfo
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= http://www.freedesktop.org/software/wininfo/
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index ad603ec4c45a..ff3b30ce128a 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -8,6 +8,7 @@
PORTNAME= winpdb
PORTVERSION= 1.4.8
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR= winpdb
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index 24b8b85f46df..179be4a67746 100644
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -6,6 +6,7 @@
PORTNAME= wxglade
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= devel x11-toolkits python
MASTER_SITES= SF
DISTNAME= wxGlade-${PORTVERSION}
diff --git a/devel/xtla/Makefile b/devel/xtla/Makefile
index c536426d5a24..0b6edcd3b444 100644
--- a/devel/xtla/Makefile
+++ b/devel/xtla/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtla
PORTVERSION= 1.2.1
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= devel elisp
MASTER_SITES= http://download.gna.org/xtla-el/ \
diff --git a/dns/gresolver/Makefile b/dns/gresolver/Makefile
index d48bc9c09bd4..56330e72214d 100644
--- a/dns/gresolver/Makefile
+++ b/dns/gresolver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gresolver
PORTVERSION= 0.0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= dns
MASTER_SITES= http://jodrell.net/files/unsupported/gresolver/
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index 4bf104af3cbb..af14317f1ab1 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -8,6 +8,7 @@
PORTNAME= abiword-docs
PORTVERSION= 2.8.4
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index bc6164976eca..bee43a93a248 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -8,7 +8,7 @@
PORTNAME= abiword
PORTVERSION= 2.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An open-source, cross-platform WYSIWYG word processor
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
wv-1.2:${PORTSDIR}/textproc/wv \
jpeg.11:${PORTSDIR}/graphics/jpeg \
fribidi.3:${PORTSDIR}/converters/fribidi \
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
new file mode 100644
index 000000000000..89b99694aacd
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
@@ -0,0 +1,11 @@
+--- src/af/util/xp/ut_png.cpp.orig 2010-04-14 23:50:11.000000000 +0200
++++ src/af/util/xp/ut_png.cpp 2012-04-28 06:58:49.000000000 +0200
+@@ -71,7 +71,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp b/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
new file mode 100644
index 000000000000..3c3cf410290c
--- /dev/null
+++ b/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
@@ -0,0 +1,20 @@
+--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2010-04-14 23:50:13.000000000 +0200
++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-04-28 07:25:54.000000000 +0200
+@@ -185,7 +185,7 @@
+ /** needed for the stejmp context */
+ UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
+ {
+- if (setjmp(m_pPNG->jmpbuf))
++ if (setjmp(png_jmpbuf(m_pPNG)))
+ {
+ DELETEP(m_pPngBB);
+ png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -446,7 +446,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(m_pPNG->jmpbuf))
++ if (setjmp(png_jmpbuf(m_pPNG)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 7484bb27499b..8f3c9754bcd0 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apel
PORTVERSION= ${APEL_VER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors elisp
MASTER_SITES= http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 000511213e83..42be21f3bdda 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -7,7 +7,7 @@
PORTNAME= biew
PORTVERSION= 6.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= SF/beye/biew/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 36c2eac58290..2427566b513b 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bless
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= http://download.gna.org/bless/
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 1bb9803f4af0..d9729d55a47c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= calligra
PORTVERSION= ${CALLIGRA_VERSION}
+PORTREVISION= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
@@ -15,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE graphic art and office suite
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
qca.2:${PORTSDIR}/devel/qca \
diff --git a/editors/code-browser/Makefile b/editors/code-browser/Makefile
index 0d934c9562e0..a7fb64fd8d8e 100644
--- a/editors/code-browser/Makefile
+++ b/editors/code-browser/Makefile
@@ -8,6 +8,7 @@
PORTNAME= code-browser
PORTVERSION= 3.18
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://tibleiz.net/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 7bb459e259f7..29e0a3e32a1a 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= codelite
DISTVERSION= 3.5.${SVN_REVISION}
+PORTREVISION= 1
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk.src
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index ea68c7b80f07..b9d436035421 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
PORTNAME= conglomerate
PORTVERSION= 0.9.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/Conglomerate%20XML%20Editor/${PORTVERSION}
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 2feb16403a47..001c27cdf1cb 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cream
PORTVERSION= 0.42
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/Cream/${PORTVERSION}
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 44755f88b262..a8d1a62eb4d3 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}.${EMACS_REV}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -162,7 +163,7 @@ LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_XPM)
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 243bc371fab1..d0abab27ad5d 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -149,7 +150,7 @@ LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_XPM)
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index f5910efc6aa7..4f2158d6ddd3 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= 21.3
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -30,7 +30,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_XORG= xpm
.endif
diff --git a/editors/emacs21/files/patch-src-xfns.c b/editors/emacs21/files/patch-src-xfns.c
index 7bd3eca788c0..82d69e484658 100644
--- a/editors/emacs21/files/patch-src-xfns.c
+++ b/editors/emacs21/files/patch-src-xfns.c
@@ -1,5 +1,14 @@
--- src/xfns.c.orig 2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c 2010-03-28 21:27:43.000000000 +0200
++++ src/xfns.c 2012-05-02 19:50:40.000000000 +0200
+@@ -8541,7 +8541,7 @@
+ {
+ xassert (png_ptr != NULL);
+ image_error ("PNG error: %s", build_string (msg), Qnil);
+- longjmp (png_ptr->jmpbuf, 1);
++ longjmp (png_jmpbuf(png_ptr), 1);
+ }
+
+
@@ -8641,7 +8641,7 @@
/* Check PNG signature. */
@@ -18,3 +27,12 @@
{
image_error ("Not a PNG image: `%s'", img->spec, Qnil);
UNGCPRO;
+@@ -8699,7 +8699,7 @@
+
+ /* Set error jump-back. We come back here when the PNG library
+ detects an error. */
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ {
+ error:
+ if (png_ptr)
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 2a538e092c6b..b22eeaa848f1 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -23,7 +23,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.endif
CONFLICTS= emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 243bc371fab1..d0abab27ad5d 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -149,7 +150,7 @@ LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_XPM)
diff --git a/editors/f4l/Makefile b/editors/f4l/Makefile
index a0108c0e139c..97d9c58f462b 100644
--- a/editors/f4l/Makefile
+++ b/editors/f4l/Makefile
@@ -7,7 +7,7 @@
PORTNAME= f4l
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors multimedia www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_beta_swfExport/${PORTVERSION}
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index d2b812e1dd6e..bf6a726fbb0f 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flim
PORTVERSION= ${FLIM_VER}
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= editors elisp
MASTER_SITES= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index cc40c85f65c8..6b19bfd9c9f2 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= editors lang
PKGNAMESUFFIX= -ide
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index 6960c0254881..7a927e62a6dc 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fxite
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 7ddfd62da9bc..7fb8d73f8600 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gedit-plugins
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index bd31ad794ce0..6a1bda362d7d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gedit
PORTVERSION= 2.30.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0a5222437baf..882099d9dd63 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ghex
PORTVERSION= 2.24.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 26c379b90e5f..d06297e468e1 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glimmer
PORTVERSION= 1.2.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= editors gnome python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 6226c977bb34..1509ea4c3b1f 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmanedit
PORTVERSION= 0.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors gnome
MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index f5b0972a16fc..f8854b294876 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuserv
PORTVERSION= 3.12.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= editors
MASTER_SITES= http://meltin.net/hacks/emacs/src/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 2e0e574fdb52..55ee5d07b2fa 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gobby
PORTVERSION= 0.4.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors
MASTER_SITES= http://releases.0x539.de/gobby/
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 64803d841dec..df8ea17e9df3 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwrite
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= editors python
MASTER_SITES= GOOGLE_CODE
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 318ba0f9c64e..7082ffa12e92 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jed
PORTVERSION= 0.99.19
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors
MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v${PORTVERSION:R}/ \
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 736471c4537e..5e0af2b9563c 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kate
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 39759da6a29b..08aa77ff60fa 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kile
PORTVERSION= 2.1.2
+PORTREVISION= 1
CATEGORIES= editors kde
MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${DISTVERSION}
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 50d6daa19776..5c4368a76f75 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kile
PORTVERSION= 2.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors kde
MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
diff --git a/editors/klat/Makefile b/editors/klat/Makefile
index 095823486064..82c6ac47c247 100644
--- a/editors/klat/Makefile
+++ b/editors/klat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klat
PORTVERSION= 0.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors
MASTER_SITES= http://research.edm.uhasselt.be/jori/klat/ \
http://research.edm.luc.ac.be/jori/klat/
diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile
index 432be083cf52..90727234a0d9 100644
--- a/editors/klat4/Makefile
+++ b/editors/klat4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klat4
PORTVERSION= 0.6.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= editors
MASTER_SITES= http://klat.algebraic.ru/
diff --git a/editors/komodo-edit/Makefile b/editors/komodo-edit/Makefile
index 0f59beaeb95a..1ccc7c74e411 100644
--- a/editors/komodo-edit/Makefile
+++ b/editors/komodo-edit/Makefile
@@ -6,7 +6,7 @@
PORTNAME= komodo-edit
PORTVERSION= 6.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://downloads.activestate.com/Komodo/releases/${PORTVERSION}/
DISTNAME= Komodo-Edit-${PORTVERSION}-8334-linux-libcpp6-x86
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 31896b801140..407af31ea257 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kxmleditor
PORTVERSION= 1.1.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= editors kde
MASTER_SITES= SF/${PORTNAME}/KXMLEditor/${PORTVERSION}
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index b66d4d76d6bd..68f37ff09243 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lazarus
PORTVERSION= 0.9.30.4
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= editors devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} \
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 8a292f3e64c8..608486797ac9 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= leafpad
PORTVERSION= 0.8.18.1
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index bcfdd53495da..20a0829ec4f0 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= leo
PORTVERSION= 4.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors python
MASTER_SITES= SF/${PORTNAME}/Leo/${PORTVERSION}%20final
DISTNAME= Leo-${PORTVERSION}-final
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 62968f8cd07f..a4cebea0b629 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -8,6 +8,7 @@
PORTNAME= lfhex
PORTVERSION= 0.42
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://stoopidsimple.com/files/
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 05ed5ebf823f..97e56d19eb5b 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -7,7 +7,7 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 3
+PORTREVISION= 4
MASTER_SITE_SUBDIR= src/${PORTVERSION}/
MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \
@@ -51,7 +51,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
graphite2.2:${PORTSDIR}/graphics/graphite2 \
nss3.1:${PORTSDIR}/security/nss \
SampleICC.2:${PORTSDIR}/graphics/sampleicc \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
cmis-0.2.0:${PORTSDIR}/net/libcmis \
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 8a30c157b455..66acbc147640 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= madedit
PORTVERSION= 0.2.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 356782fbd62c..d748c28fbb92 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mlview
PORTVERSION= 0.8
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 2cadf30e8f63..c6747a7a865c 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mode-info
PORTVERSION= 0.8.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= editors elisp
MASTER_SITES= http://namazu.org/~tsuchiya/elisp/
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index 9ff59076e101..6b5954d8ce1e 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -7,7 +7,7 @@
PORTNAME= morla
PORTVERSION= 0.16.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors textproc
MASTER_SITES= http://www.morlardf.net/src/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index d8e62aa03547..c0aad455e4e8 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mousepad
PORTVERSION= 0.2.16
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= editors xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e023633ee7f4..a6980f23e756 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= apache-openoffice
PORTVERSION= 3.4.${SVNREVISION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors java
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index fa46a0d5edc6..11007803dcea 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice.org-vcltesttool
PORTVERSION= 2.4.${SNAPDATE}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
diff --git a/editors/p5-Vimana/Makefile b/editors/p5-Vimana/Makefile
index 75c6b3df31d6..3a91a69c9700 100644
--- a/editors/p5-Vimana/Makefile
+++ b/editors/p5-Vimana/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Vimana
PORTVERSION= 2010.09303
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:CORNELIUS
diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
index 2813cafb5bd4..e21aa5f0729b 100644
--- a/editors/pdfedit/Makefile
+++ b/editors/pdfedit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdfedit
PORTVERSION= 0.4.5
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 6f442353ff84..c1d2aa1c37ee 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -9,7 +9,7 @@
PORTNAME= poedit
PORTVERSION= 1.4.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.4.6/
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 6fe79a5bcc1d..53fa5e7e9844 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= psgml
PORTVERSION= 1.3.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= editors elisp
MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 8939dac16995..767bf07f2b5a 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -7,7 +7,7 @@
PORTNAME= room
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors python
MASTER_SITES= https://launchpad.net/pyroom/${PORTVERSION:R}/${PORTVERSION}/+download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 758a08593b7d..43981cd6a65a 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -6,7 +6,7 @@
PORTNAME= rospell
PORTVERSION= 2009.02.r2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors textproc # this should/will be romanian ;)
MASTER_SITES= SF
MASTER_SITE_SUBDIR= rospell/rospell/2008.00
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 2a6929910af8..6cc5191e0f4a 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-edit
PORTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF/rox/Edit/${PORTVERSION}
DISTNAME= edit-${PORTVERSION}
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 9e6e19c4efcb..34cf1b27511b 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scite
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index c670718aa200..cb95026ffaa7 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scribes
PORTVERSION= 0.3.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/Stable%20Branch/${PORTNAME}-${PORTVERSION}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index acc4dcc1c706..57633c38da0e 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= semi
PORTVERSION= ${SEMI_VER}
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= editors elisp
MASTER_SITES= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi/semi-1.14-for-flim-1.14/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 4591a5b8f7bb..865d890ab1fa 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slime
PORTVERSION= 20110714
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index 6809a2701b3a..d1f4afcc1395 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SPE
PORTVERSION= 0.8.4.h
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors devel python
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= python
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 9158aa90a15a..7d21269f5ed2 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= speedbar
PORTVERSION= 0.14.b4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= editors elisp
MASTER_SITES= SF/cedet/${PORTNAME}/1.4beta4 \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 7019f4f5a1e5..bd4f3c04ee54 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tamago
PORTVERSION= 4.0.6.0.20041122.18
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors elisp
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/e/egg
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index fc09ea8104cb..234e4537675c 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tea
DISTVERSION= 33.0.0
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}-editor/${PORTNAME}-editor/${PORTVERSION} \
http://semiletov.ho.ua/${PORTNAME}-releases/
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index bdef16142df0..2b98000d60cf 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ted
PORTVERSION= 2.22
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
EXTRACT_SUFX= .src.tar.gz
@@ -17,7 +18,7 @@ COMMENT= X11 based RTF editor
LICENSE= GPLv2
LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
paper.2:${PORTSDIR}/print/libpaper
RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
@@ -30,6 +31,7 @@ USE_XORG= xext xft
USE_ICONV= yes
USE_GHOSTSCRIPT_RUN= yes
GNU_CONFIGURE= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
diff --git a/editors/ted/files/patch-bitmap-bmpng.c b/editors/ted/files/patch-bitmap-bmpng.c
new file mode 100644
index 000000000000..7f9a5b18f25f
--- /dev/null
+++ b/editors/ted/files/patch-bitmap-bmpng.c
@@ -0,0 +1,10 @@
+--- bitmap/bmpng.c.orig 2012-04-01 11:57:27.000000000 +0200
++++ bitmap/bmpng.c 2012-05-04 12:44:03.000000000 +0200
+@@ -4,6 +4,7 @@
+ # include "bmintern.h"
+ # include "bmio.h"
+ # include <png.h>
++# include <pngpriv.h>
+ # include <appDebugon.h>
+ # include <sioFileio.h>
+ # include <utilEndian.h>
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 3e9b8652cd28..f94a2cb7acb7 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= texmacs
PORTVERSION= 1.0.7.14
+PORTREVISION= 1
CATEGORIES= editors print
MASTER_SITES= ftp://ftp.texmacs.org/TeXmacs/tmftp/source/ \
http://www.predatorlabs.net/dl/
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 83033082a21b..39ee3bd9f5ec 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -8,6 +8,7 @@
PORTNAME= texmaker
PORTVERSION= 3.3.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= http://www.xm1math.net/texmaker/
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 85c59e480089..5280e97a1f01 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texmakerx
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::}
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index eb7f7579b4a6..c599ee914ecd 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= textroom
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= SF
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index ccf8ec72f964..63af8365e551 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texworks
PORTVERSION= 0.2.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index 4f5795f78dad..56b69cb84728 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tree-widget
PORTVERSION= 2.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= editors elisp
MASTER_SITES= SF/emhacks/${PORTNAME}/${PORTVERSION} \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index a9e483ad2259..7c9df4e97ea8 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -13,7 +13,7 @@ PORTNAME?= vim
PATCHLEVEL= 515
PORTVERSION= 7.3.${PATCHLEVEL}
RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= editors
MASTER_SITES= ${MASTER_SITE_VIM}
DISTFILES= ${RELEASE}${EXTRACT_SUFX}
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 6a8d1e46914c..b9fe688e3dbd 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= winefish
DISTVERSION= 1.3.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= editors print
MASTER_SITES= http://download.berlios.de/winefish/ \
http://nivi.interfree.it/distfiles/winefish/
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 50aad21a0a72..b74841065459 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -40,15 +40,15 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${POR
.if !defined(WITHOUT_X11)
BUILD_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
-USE_XORG+= x11 xft xpm
+USE_XORG+= x11 xft xpm xbitmaps
CONFIGURE_ARGS=--with-xpm --with-xft=all
# XXX: needed until port updated to work nicely with autoconf >= 2.64
# see files/patch-configure.ac for more details
-CFLAGS+= -I${LOCALBASE}/include/freetype2
+CFLAGS+= -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/libpng15
.endif
XEMACS_REL= 21.5
diff --git a/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c b/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..768bd74aae5a
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig 2007-02-21 11:49:33.000000000 +0100
++++ src/glyphs-eimage.c 2012-05-02 20:02:02.000000000 +0200
+@@ -61,6 +61,7 @@
+
+ #define message message_ /* Yuck */
+ #include <png.h>
++#include <pngpriv.h>
+ #undef message
+
+ END_C_DECLS
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 44e45cc62c87..ca1a34a4b2be 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-devel
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
@@ -26,10 +26,11 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
.if !defined(WITHOUT_X11)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
USE_XORG+= xbitmaps x11 ice xext xaw xt xmu
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.endif
XEMACS_MAJOR_VER?= 21
diff --git a/editors/xemacs-devel/files/patch-glyphs-eimage.c b/editors/xemacs-devel/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..768bd74aae5a
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig 2007-02-21 11:49:33.000000000 +0100
++++ src/glyphs-eimage.c 2012-05-02 20:02:02.000000000 +0200
+@@ -61,6 +61,7 @@
+
+ #define message message_ /* Yuck */
+ #include <png.h>
++#include <pngpriv.h>
+ #undef message
+
+ END_C_DECLS
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b4eff16e82da..ad1350cbe8a2 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -91,11 +91,12 @@ CONFIGURE_ARGS+= --without-postgresql
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
.endif
.if !defined(WITHOUT_X11)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff
-USE_XORG= xpm x11
+USE_XORG= xpm x11 xbitmaps xaw
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
USE_MOTIF= yes
WITH_SCROLLBARS= --with-scrollbars=motif
diff --git a/editors/xemacs/files/patch-src__glyphs-eimage.c b/editors/xemacs/files/patch-src__glyphs-eimage.c
new file mode 100644
index 000000000000..fc854bd37715
--- /dev/null
+++ b/editors/xemacs/files/patch-src__glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig 2007-08-20 21:52:28.000000000 +0200
++++ src/glyphs-eimage.c 2012-05-02 20:05:31.000000000 +0200
+@@ -65,6 +65,7 @@
+ extern "C" {
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 68d8cb218d5b..44e19c10ad9c 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-mule
PORTVERSION= ${XEMACS_VER}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -38,7 +38,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs21-mule
.endif
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
@@ -48,10 +48,11 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XORG= xpm
+USE_XORG= xpm xbitmaps xaw
STRIP=
USE_AUTOTOOLS= autoconf213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
+CFLAGS+= -I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS= --with-x11 \
--with-mule \
diff --git a/editors/xemacs21-mule/files/patch-glyphs-eimage.c b/editors/xemacs21-mule/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..f1469697ff6c
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig 2007-08-20 21:52:28.000000000 +0200
++++ src/glyphs-eimage.c 2012-05-02 20:31:49.000000000 +0200
+@@ -65,6 +65,7 @@
+ extern "C" {
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index a04a634c92ec..bdf082249761 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmlcopyeditor
PORTVERSION= 1.2.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors
MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 125b9e4f0ed5..2274036a2696 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xmleditor
PORTVERSION= 0.5.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= editors
MASTER_SITES= SF
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 974ffd6fd789..8f892b64041c 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yzis
PORTVERSION= 1.0.a.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= editors
MASTER_SITES= http://labs.freehackers.org/attachments/download/45/ \
http://contribs.martymac.org/FreeBSD-ports/distfiles/
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index e9cef232a07a..b1f89cc87442 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zim
PORTVERSION= 0.56
+PORTREVISION= 1
CATEGORIES= editors python
MASTER_SITES= http://www.zim-wiki.org/downloads/
diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index fb8f3b81198c..8f34208d2474 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aqemu
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index d2a5bb9b0875..cb88fe11dc1e 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -7,7 +7,7 @@
PORTNAME= atari800
PORTVERSION= 2.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= SF SF/${PORTNAME}/ROM/Original%20XL%20ROM:x
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip:x
@@ -18,7 +18,7 @@ MAINTAINER= gamato@users.sf.net
COMMENT= Atari 8-bit computer emulator
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RESTRICTED= "xf25 contains copyright ROMs and cannot be distributed."
diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile
index 6a896a490591..8dd1ca13bb61 100644
--- a/emulators/bsnes/Makefile
+++ b/emulators/bsnes/Makefile
@@ -6,6 +6,7 @@
PORTNAME= bsnes
PORTVERSION= 0.88
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//}-source
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 374d85e2170a..8b3ba1a8856a 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -8,6 +8,7 @@
PORTNAME= catapult
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION}
DISTNAME= openmsx-${PORTNAME}-${PORTVERSION}
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 6fc429090d53..98e8feb6714c 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dboxfe
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index 446a92ebf018..4e2a9bc678ef 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -7,7 +7,7 @@
PORTNAME= desmume
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF
diff --git a/emulators/dolphin-emu-devel/Makefile b/emulators/dolphin-emu-devel/Makefile
index c6f3bb0a1b23..ff77adf4eef9 100644
--- a/emulators/dolphin-emu-devel/Makefile
+++ b/emulators/dolphin-emu-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dolphin-emu
PORTVERSION= 3.0.r${REVDATE}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 95cda2087bff..1554213e83c1 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -7,14 +7,14 @@
PORTNAME= dosbox
PORTVERSION= 0.74
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= SF
MAINTAINER= knyght@gmail.com
COMMENT= An emulator of a PC with DOS
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_SDL= sdl net sound
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index 62fd11be7279..89bdffb2ae53 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -7,7 +7,7 @@
PORTNAME= e-uae
DISTVERSION= 0.8.29.w4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= http://www.rcdrummond.net/uae/${DISTNAME}/
DISTNAME= e-uae-0.8.29-WIP4
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 9cfc6cb0fcfd..5cd03ce3007c 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fceux
PORTVERSION= 2.1.4a
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= SF/fceultra/Source%20Code/2.1.4%20src/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index e83bdfcc43b8..0266ed326d99 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fuse
PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
@@ -15,6 +15,7 @@ MAINTAINER= yuri.pankov@gmail.com
COMMENT= Free Unix (Sinclair ZX-)Spectrum Emulator
LIB_DEPENDS= spectrum.8:${PORTSDIR}/emulators/libspectrum \
+ png15:${PORTSDIR}/graphics/png \
gcrypt.18:${PORTSDIR}/security/libgcrypt
LICENSE= GPLv2
diff --git a/emulators/fuse/files/patch-screenshot.c b/emulators/fuse/files/patch-screenshot.c
new file mode 100644
index 000000000000..25205faf3088
--- /dev/null
+++ b/emulators/fuse/files/patch-screenshot.c
@@ -0,0 +1,10 @@
+--- screenshot.c.orig 2011-01-12 22:36:28.000000000 +0100
++++ screenshot.c 2012-05-09 12:59:50.000000000 +0200
+@@ -49,6 +49,7 @@
+ #ifdef USE_LIBPNG
+
+ #include <png.h>
++#include <zlib.h>
+
+ static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
+ size_t height, size_t width );
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index eaac69ab3291..9851ca754227 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gens
PORTVERSION= 2.12a
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Gens%20Source%20Code/Gens%20WIP%20linux
DISTNAME= Gens212a1SrcL
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index f0fe5e29611a..7e2b88a6c604 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gngeo
PORTVERSION= 0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 48ccb70a7c1e..7ec1b3768a6d 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gns3
PORTVERSION= 0.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF/gns-3/GNS3/${PORTVERSION}
DISTNAME= GNS3-${PORTVERSION}-src
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index 9d3344957598..b9e3ff051e3e 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsnes9x
PORTVERSION= 3.12
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/GSnes9x/${PORTVERSION}
DISTNAME= GSnes9x-${PORTVERSION}
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 53ab5efd587d..dfcabae2fe8a 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gxmame
DISTVERSION= 0.35beta2
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.35beta2
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index ddcab29c51f0..10c485d6620f 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hatari
PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= BERLIOS
@@ -18,7 +18,7 @@ LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
BUILD_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2
USE_BZIP2= yes
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 6bb98cc27e07..5b82f310b542 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hugo
PORTVERSION= 2.12
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= emulators
MASTER_SITES= http://www.zeograd.com/download/
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index ced64af0f356..49602933a18a 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kcemu
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION}
DISTNAME= KCemu-${PORTVERSION}
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile
index f677f90061f9..27ddd98fb045 100644
--- a/emulators/lisaem/Makefile
+++ b/emulators/lisaem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lisaem
DISTVERSION= 1.2.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://lisaem.sunder.net/downloads/
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index ba13461c9c81..7098bdb5967d 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mupen64plus
PORTVERSION?= 1.99.4
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index ceb5822b1020..3c5c2969a2cd 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -10,7 +10,7 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
.if ${PKGNAMESUFFIX} == "-core"
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.else
PLIST= ${WRKDIR}/pkg-plist
.endif
@@ -20,7 +20,7 @@ MAN6= mupen64plus.6
.endif
.if ${PKGNAMESUFFIX} == "-video-rice"
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if ${PKGNAMESUFFIX} != "-core"
diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile
index ea19cf2259eb..91dcf05a6cdb 100644
--- a/emulators/mupen64plus-rsp-z64/Makefile
+++ b/emulators/mupen64plus-rsp-z64/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -rsp-z64
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index 6e75069f60fb..ded04bd40bf3 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -video-arachnoid
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index a841738fdae2..8b3caee2989d 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -video-glide64
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index f516a88b5986..750361357662 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -video-z64
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index a0c96d5e1943..36b40c1acb8f 100644
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nonpareil
PORTVERSION= 0.79
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://nonpareil.brouhaha.com/download/
@@ -17,6 +17,8 @@ COMMENT= Simulator for many HP calculators
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_BISON= build
USE_GNOME= gtk20 libxml2
USE_SDL= sdl
diff --git a/emulators/nonpareil/files/patch-src_printer.c b/emulators/nonpareil/files/patch-src_printer.c
new file mode 100644
index 000000000000..e0a435bd1d81
--- /dev/null
+++ b/emulators/nonpareil/files/patch-src_printer.c
@@ -0,0 +1,10 @@
+--- src/printer.c.orig 2012-05-09 13:00:47.000000000 +0200
++++ src/printer.c 2012-05-09 13:01:08.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <gtk/gtk.h>
+
+ #include <png.h>
++#include <zlib.h>
+
+ #include "util.h"
+ #include "display.h"
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 84436d213aff..1bf8efdc3c39 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators kld
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 57663a528569..6f3473e98e15 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openmsx
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= Open source MSX emulator
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
ogg:${PORTSDIR}/audio/libogg \
vorbis:${PORTSDIR}/audio/libvorbis \
theora:${PORTSDIR}/multimedia/libtheora
diff --git a/emulators/osmose/Makefile b/emulators/osmose/Makefile
index a2f8966aa4ce..c0ed53cce4b5 100644
--- a/emulators/osmose/Makefile
+++ b/emulators/osmose/Makefile
@@ -7,6 +7,7 @@
PORTNAME= osmose
PORTVERSION= 0.9.96
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://bcz.asterope.fr/osmose/
DISTNAME= Osmose-${PORTVERSION:S/./-/g}-QT
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 576e7df2cffc..ec5e9ac450a9 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pcsxr
PORTVERSION= 1.9.92.r76026
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 02bc543778ab..64e4d9773eaa 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qemu
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot
@@ -107,7 +107,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --disable-vnc-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_CURL)
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index e06b93f0ff0f..8b27ec2dd890 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qmc2
PORTVERSION= 0.35
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF
diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile
index 67edafd5e1f8..4f955b5ddef6 100644
--- a/emulators/qtemu/Makefile
+++ b/emulators/qtemu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtemu
PORTVERSION= 1.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= SF
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 0381646d8dd3..3cee40691b56 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= raine
PORTVERSION= 0.43.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= emulators games
MASTER_SITES= http://www.rainemu.com/html/archive/
DISTNAME= ${PORTNAME}s-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT= Arcade Emulator for M68000, M68020 and Z80 based hardware
BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vga.1:${PORTSDIR}/graphics/svgalib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/emulators/raine/files/patch-patch-source_png_savepng.c b/emulators/raine/files/patch-patch-source_png_savepng.c
new file mode 100644
index 000000000000..110b12470e39
--- /dev/null
+++ b/emulators/raine/files/patch-patch-source_png_savepng.c
@@ -0,0 +1,11 @@
+--- source/png/savepng.c.orig 2005-08-17 12:20:36.000000000 +0200
++++ source/png/savepng.c 2012-05-06 17:19:09.000000000 +0200
+@@ -188,7 +188,7 @@
+ goto Error;
+
+ /* Set error handling. */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file. */
+ goto Error;
+ }
diff --git a/emulators/raine/files/patch-source_png_loadpng.c b/emulators/raine/files/patch-source_png_loadpng.c
new file mode 100644
index 000000000000..87bc1b566d0f
--- /dev/null
+++ b/emulators/raine/files/patch-source_png_loadpng.c
@@ -0,0 +1,29 @@
+--- source/png/loadpng.c.orig 2005-08-18 10:52:15.000000000 +0200
++++ source/png/loadpng.c 2012-05-06 15:58:26.000000000 +0200
+@@ -275,7 +275,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ pack_fclose(fp);
+@@ -337,7 +337,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ /* If we get here, we had a problem reading the file */
+@@ -435,7 +435,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ /* If we get here, we had a problem reading the file */
diff --git a/emulators/skyeye/Makefile b/emulators/skyeye/Makefile
index d7ec4207c21b..5ddc53a9ee4b 100644
--- a/emulators/skyeye/Makefile
+++ b/emulators/skyeye/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skyeye
PORTVERSION= 1.2
-PORTREVISION= 5
+PORTREVISION= 6
DISTVERSIONPREFIX=v
DISTVERSIONSUFFIX=_Rel
CATEGORIES= emulators
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index cef89b9c2f10..0b2b02c1fbda 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snes9express
PORTVERSION= 1.43
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 19fea75a19fd..ee4624399099 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snes9x
PORTVERSION= 1.52r79
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= http://snes9x-gtk.googlecode.com/files/
PKGNAMESUFFIX= -gtk
@@ -16,7 +16,7 @@ DISTNAME= snes9x-1.52-src
MAINTAINER= root@cooltrainer.org
COMMENT= Super Nintendo Entertainment System(SNES) Emulator
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_PERL5= 5.8.1+
USE_BZIP2= yes
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 5aecba0af2eb..621940706c6d 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snes9x
PORTVERSION= 1.51
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= http://files.ipherswipsite.com/snes9x/ \
http://www.lysator.liu.se/snes9x/${PORTVERSION}/
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= acm@FreeBSD.org
COMMENT= Super Nintendo Entertainment System(SNES) Emulator
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_XORG= x11 sm ice xext
@@ -79,7 +79,7 @@ SNES9X_BIN= snes9x
.endif
.if !defined(WITHOUT_SCREENSHOT)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-screenshot
.else
CONFIGURE_ARGS+= --without-screenshot
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 8a584aed0394..3bfe8bde9d50 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stella
PORTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= acm@FreeBSD.org
COMMENT= A multi-platform Atari 2600 VCS emulator
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/emulators/tiemu2/Makefile b/emulators/tiemu2/Makefile
index 17af976cfedf..025935784697 100644
--- a/emulators/tiemu2/Makefile
+++ b/emulators/tiemu2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tiemu2
PORTVERSION= 2.08
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= http://www.ticalc.org/pub/unix/ \
http://freebsd.nsu.ru/distfiles/tiemu/
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index 2e6555ba2ac9..610c9fcfd978 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tiemu3
PORTVERSION= 3.03
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= SF/gtktiemu/tiemu-linux/TIEmu%20${DISTVERSION}
DISTNAME= tiemu-${DISTVERSION}
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index f4b78356ffd6..619b7e9ac305 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tilem
PORTVERSION= 0.973
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 6f172f9a4193..9bf22eda9b7d 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uae
PORTVERSION= 0.8.29
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://www.amigaemulator.org/files/sources/develop/
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index b4918986cd8d..df0c17d77d32 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -6,7 +6,7 @@
PORTNAME= vba
PORTVERSION= 1.7.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/VisualBoyAdvance/${PORTVERSION}
DISTNAME= VisualBoyAdvance-src-${PORTVERSION}
@@ -15,13 +15,16 @@ MAINTAINER= arundel@h3c.de
COMMENT= Open Source Gameboy Advance emulator
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_SDL= sdl
-CONFIGURE_ARGS= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" LIBS="-lintl"
+USE_GETTEXT= yes
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl"
WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
PLIST_SUB= INSTALL_GTK2="@comment "
diff --git a/emulators/vba/files/patch-src-Util.cpp b/emulators/vba/files/patch-src-Util.cpp
new file mode 100644
index 000000000000..d9c2d7f2ed3e
--- /dev/null
+++ b/emulators/vba/files/patch-src-Util.cpp
@@ -0,0 +1,11 @@
+--- src/Util.cpp.orig 2004-05-20 19:42:37.000000000 +0200
++++ src/Util.cpp 2012-05-02 20:49:07.000000000 +0200
+@@ -79,7 +79,7 @@
+ return false;
+ }
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr,NULL);
+ fclose(fp);
+ return false;
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index eb395ebb7a05..c538374ebfb2 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,7 +6,7 @@
PORTNAME= vice
PORTVERSION= 2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= emulators
MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
gif:${PORTSDIR}/graphics/giflib \
mp3lame:${PORTSDIR}/audio/lame
.if defined(VICE_WITH_XAW3D)
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 60e547e1b7e1..e1575e9cbbcf 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.0.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
@@ -25,7 +25,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
as86:${PORTSDIR}/devel/dev86 \
xsltproc:${PORTSDIR}/textproc/libxslt \
kmk:${PORTSDIR}/devel/kBuild
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xslt.2:${PORTSDIR}/textproc/libxslt \
curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= /boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 2fd27c60d92d..0ac5406f0cc2 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -7,6 +7,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.1.16
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
@@ -24,7 +25,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
xsltproc:${PORTSDIR}/textproc/libxslt \
kmk:${PORTSDIR}/devel/kBuild-devel \
gtar:${PORTSDIR}/archivers/gtar
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xslt.2:${PORTSDIR}/textproc/libxslt \
curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= /boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index fffb0202c850..00fd26a4ec2f 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -7,14 +7,14 @@
PORTNAME= visualboyadvance-m
PORTVERSION= 1.8.0r${SVN_REV}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://update.cooltrainer.org/emulators/visualboyadvance-m/
MAINTAINER= root@cooltrainer.org
COMMENT= Game Boy Advance emulator with GTK frontend
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
sfml-system.1:${PORTSDIR}/devel/sfml
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 209c789c9174..5cba372bfce4 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= VisualOS
PORTVERSION= 1.0.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= emulators gnome
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 894e860e9a9c..72c1e9a16cfb 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vmips
PORTVERSION= 1.3.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= emulators
MASTER_SITES= SF \
http://www.dgate.org/vmips/releases/vmips-${PORTVERSION}/
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ba136073cc88..00843f7bcb78 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wine
DISTVERSION= 1.5.5
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -24,7 +25,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
xml2:${PORTSDIR}/textproc/libxml2
CONFLICTS_INSTALL= wine-1.4*
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 4ba7185e766d..340236439c39 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wine
DISTVERSION= 1.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -24,7 +25,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
xml2:${PORTSDIR}/textproc/libxml2
CONFLICTS_INSTALL= wine-1.5.*
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 6b7c29f66f1c..ae43f34beb13 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxmupen64plus
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://cdn.bitbucket.org/auria/wxmupen64plus/downloads/
DIST_SUBDIR= ${PORTNAME:S/wx//}
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 9cb834b9b4bc..ed579f37d141 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yabause
PORTVERSION= 0.9.11.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/1.1/1/g}/
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 1a54a31da7d9..9169b432b3c5 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zsnes
PORTVERSION= 1.51
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT= Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
# This must be >= 0.98!
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS_REASON= non-portable, for a portable emulator see emulators/snes9x
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+= --disable-cpucheck
MAN1= zsnes.1
PLIST_FILES= bin/zsnes
-CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/emulators/zsnes/files/patch-zpng.c b/emulators/zsnes/files/patch-zpng.c
new file mode 100644
index 000000000000..11fe1536d4f4
--- /dev/null
+++ b/emulators/zsnes/files/patch-zpng.c
@@ -0,0 +1,10 @@
+--- zip/zpng.c.orig 2007-01-16 00:06:29.000000000 +0100
++++ zip/zpng.c 2012-05-06 16:01:13.000000000 +0200
+@@ -21,6 +21,7 @@
+
+ #ifndef NO_PNG
+ #include <png.h>
++#include <pngpriv.h>
+ #endif
+
+ #ifdef __UNIXSDL__
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index f0b151e8e058..4cdd5308c5b2 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aqbanking
PORTVERSION= 5.0.23
+PORTREVISION= 1
CATEGORIES= finance
MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=03&release=93&file=01&dummy=/
diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile
index ee5df696a074..1474a3ec1111 100644
--- a/finance/eqonomize-kde3/Makefile
+++ b/finance/eqonomize-kde3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eqonomize
PORTVERSION= 0.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
PKGNAMESUFFIX= -kde3
diff --git a/finance/eqonomize-kde4/Makefile b/finance/eqonomize-kde4/Makefile
index d2421aa6acc9..1b0ea1166046 100644
--- a/finance/eqonomize-kde4/Makefile
+++ b/finance/eqonomize-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eqonomize
PORTVERSION= 0.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
PKGNAMESUFFIX= -kde4
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index ac22c38b0e58..99196047d86f 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnofin
PORTVERSION= 0.8.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= finance deskutils gnome
MASTER_SITES= SF
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index ce13df912542..a90845489767 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnucash-docs
PORTVERSION= 2.4.1
+PORTREVISION= 1
CATEGORIES= finance gnome
MASTER_SITES= SF/gnucash/${PORTNAME}/${PORTVERSION} \
http://www.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 8fd4847dc519..8dc7a46d43fb 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnucash
PORTVERSION= 2.4.10
+PORTREVISION= 1
CATEGORIES= finance gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index fc15ff2dabee..d117383c9d07 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= grisbi
PORTVERSION= 0.8.9
+PORTREVISION= 1
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index b0d8a3029b77..a206a2cc93cd 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -7,7 +7,7 @@
PORTNAME= homebank
PORTVERSION= 4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
MASTER_SITES= http://homebank.free.fr/public/
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index 03b6002fcdc7..9e9d8b7bd8e3 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kexchange
PORTVERSION= 1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= finance kde
MASTER_SITES= SF
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index d8f886cb278b..4d4afbb1e805 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= khacc
PORTVERSION= 3.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= finance
MASTER_SITES= SF/qhacc/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index a5635e1ef0f2..4fd9c081d9df 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmymoney
PORTVERSION= 4.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance kde
MASTER_SITES= SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 93bc6fa49e68..b47bea4b2806 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmymoney2
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/KMyMoney/${PORTVERSION}
diff --git a/finance/libalkimia/Makefile b/finance/libalkimia/Makefile
index 9f488cb32c5e..85cfefe24529 100644
--- a/finance/libalkimia/Makefile
+++ b/finance/libalkimia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libalkimia
PORTVERSION= 4.3.2
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= http://kde-apps.org/CONTENT/content-files/
DISTNAME= 137323-${PORTNAME}-${PORTVERSION}
diff --git a/finance/openerp-server/Makefile b/finance/openerp-server/Makefile
index 37c82978f46f..b7e02036916a 100644
--- a/finance/openerp-server/Makefile
+++ b/finance/openerp-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openerp-server
PORTVERSION= 6.0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= finance python
MASTER_SITES= http://www.openerp.com/download/stable/source/
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 01d677b70202..f8f3de251724 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qhacc
PORTVERSION= 3.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index 650582fa50d1..8819a1853885 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtstalker
PORTVERSION= 0.36
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= finance kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index ccd757f481b3..baca44ae8c4b 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sabernetdcs
PORTVERSION= 2.0.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= finance www
MASTER_SITES= SF/${PORTNAME}/SaberNet%20DCS/${PORTVERSION}
PKGNAMESUFFIX= -client
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 42830de3e66b..c59679a12900 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= skrooge
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= http://skrooge.org/files/
diff --git a/finance/trytond/Makefile b/finance/trytond/Makefile
index 7702ba78d4bb..ec06463f95f5 100644
--- a/finance/trytond/Makefile
+++ b/finance/trytond/Makefile
@@ -7,6 +7,7 @@
PORTNAME= trytond
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= finance python
MASTER_SITES= http://downloads.tryton.org/1.4/
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index 0e34f2ac7f29..645d7e9221c9 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtrader
PORTVERSION= 0.99.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/french/alphabet_sounds_fr/Makefile b/french/alphabet_sounds_fr/Makefile
index 16d45faeb9f2..0fdce66b7f42 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= 9
+PORTREVISION= 10
CATEGORIES= french games
MASTER_SITES= SF/childsplay/OldFiles
DISTNAME= alphabet_sounds_fr
diff --git a/french/aster/Makefile b/french/aster/Makefile
index ee1706af231e..08a24c9c9b5b 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aster
DISTVERSION= ${ASTER_DISTVERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= french cad
MAINTAINER= thierry@FreeBSD.org
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index 7c89ad5982f3..561ed7828163 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= french kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index 53a942d6dd0d..2cef7d5a8abb 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= french kde
MAINTAINER= kde@FreeBSD.org
diff --git a/french/tvdownloader/Makefile b/french/tvdownloader/Makefile
index 812a802697c4..e9af92baa1ff 100644
--- a/french/tvdownloader/Makefile
+++ b/french/tvdownloader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tvdownloader
PORTVERSION= 0.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= french multimedia
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR=
diff --git a/ftp/bareftp/Makefile b/ftp/bareftp/Makefile
index d3a1bf6aad80..64c7d9ec9728 100644
--- a/ftp/bareftp/Makefile
+++ b/ftp/bareftp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bareftp
PORTVERSION= 0.3.8
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= http://www.bareftp.org/release/
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 8fa6774ccb49..164bd1e4f965 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= filezilla
PORTVERSION= 3.5.3
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
DISTNAME= FileZilla_${PORTVERSION}_src
diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile
index 578fe24ce4a8..a42b03d72bf4 100644
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ftpcube
PORTVERSION= 0.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ftp python
MASTER_SITES= SF
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 5fa5eb572e49..80f2c69ca09f 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gftp
PORTVERSION= 2.0.19
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= ftp
MASTER_SITES= http://gftp.seul.org/ \
ftp://gftp.seul.org/pub/gftp/
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 607229f7b77c..7043c8268416 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwget
PORTVERSION= 1.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ftp gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
index 75e40c6657bb..e56c3cc6abde 100644
--- a/ftp/kasablanca/Makefile
+++ b/ftp/kasablanca/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kasablanca
PORTVERSION= 0.4.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= ftp kde
MASTER_SITES= BERLIOS \
http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 187a10ce67ca..7ac76b306381 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kbear
PORTVERSION= 3.0.a.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= ftp kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.0alpha1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}-1.src
diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile
index 9b4e8baf8193..730e21ac4d16 100644
--- a/ftp/kftpgrabber/Makefile
+++ b/ftp/kftpgrabber/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kftpgrabber
PORTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= ftp kde
MASTER_SITES= http://www.kftp.org/uploads/files/
diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile
index b46eb8c83d52..34fa9a60bb12 100644
--- a/ftp/kpum/Makefile
+++ b/ftp/kpum/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kpum
PORTVERSION= 0.5.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= ftp
MASTER_SITES= SF
diff --git a/ftp/multiget/Makefile b/ftp/multiget/Makefile
index 3a0b98c25be7..035c0cd426b4 100644
--- a/ftp/multiget/Makefile
+++ b/ftp/multiget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= multiget
PORTVERSION= 1.1.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ftp www
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile
index 4ce912c7b181..43e9d5539b76 100644
--- a/ftp/plasma-applet-ftpmonitor/Makefile
+++ b/ftp/plasma-applet-ftpmonitor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ftpmonitor
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp kde
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= plasma-applet-
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index ef05507d142c..3d429883e0f0 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pureadmin
PORTVERSION= 0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= ftp
MASTER_SITES= SF/purify/Default/${PORTVERSION}
diff --git a/ftp/scythia/Makefile b/ftp/scythia/Makefile
index d9ef600ac556..6b7bd455ee56 100644
--- a/ftp/scythia/Makefile
+++ b/ftp/scythia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scythia
DISTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= http://scythia.free.fr/wp-content/ \
ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ab08b4b65f10..3c4cd57012f7 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= urlgfe
PORTVERSION= 0.7.1
-PORTREVISION?= 13
+PORTREVISION?= 14
CATEGORIES= ftp www
MASTER_SITES= SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION}
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 3ab2c906ccc1..c0ba3e2313be 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= 0ad
DISTVERSION= alpha.10
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/zero-ad/releases
DISTFILES= ${PORTNAME}-${SVNREV}-alpha-unix-build.tar.xz \
@@ -20,7 +21,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
cmake:${PORTSDIR}/devel/cmake
LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \
execinfo:${PORTSDIR}/devel/libexecinfo \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
ogg:${PORTSDIR}/audio/libogg \
vorbis:${PORTSDIR}/audio/libvorbis \
curl:${PORTSDIR}/ftp/curl \
diff --git a/games/4stattack/Makefile b/games/4stattack/Makefile
index f84ad8a0c7fe..a8f5c9b4dea8 100644
--- a/games/4stattack/Makefile
+++ b/games/4stattack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 4stattack
PORTVERSION= 2.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/forcedattack/4stAttack/${PORTVERSION}
DISTNAME= 4stAttack-${PORTVERSION}
diff --git a/games/54321/Makefile b/games/54321/Makefile
index a1685c1a639d..00e3e4f9ea82 100644
--- a/games/54321/Makefile
+++ b/games/54321/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 54321
PORTVERSION= 1.0.2001.11.16
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://www.nklein.com/products/54321/${PORTVERSION}/
DISTNAME= ${PORTNAME}
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= llwang@infor.org
COMMENT= 54321 is five games in four-, three-, or two-dimensions for one player
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_SDL= image sdl
USE_GMAKE= yes
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 78d8c6fa0cfb..1ac19a489301 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -8,7 +8,7 @@
PORTNAME= adgali
PORTVERSION= 0.2.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games devel
MASTER_SITES= http://adgali.apiou.org/download/
@@ -18,7 +18,7 @@ COMMENT= An open source game library useful for 2D game development
LICENSE= GPLv2
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2 \
execinfo.1:${PORTSDIR}/devel/libexecinfo
diff --git a/games/adgali/files/patch-src-input-imageio-agl_pngio.c b/games/adgali/files/patch-src-input-imageio-agl_pngio.c
index 9a7155464ad0..53ad107e4dee 100644
--- a/games/adgali/files/patch-src-input-imageio-agl_pngio.c
+++ b/games/adgali/files/patch-src-input-imageio-agl_pngio.c
@@ -1,5 +1,5 @@
--- src/input/imageio/agl_pngio.c.orig 2003-06-24 01:58:47.000000000 +0200
-+++ src/input/imageio/agl_pngio.c 2010-03-30 11:23:50.000000000 +0200
++++ src/input/imageio/agl_pngio.c 2012-05-01 09:02:25.000000000 +0200
@@ -65,7 +65,7 @@
unsigned char buf[8];
@@ -9,6 +9,15 @@
return 0;
}
+@@ -106,7 +106,7 @@
+ }
+
+ /* standard png error handler */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ agl_error("Error reading the PNG file");
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -131,7 +131,7 @@
/* see pnglib for these calls */
@@ -18,3 +27,12 @@
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png_ptr);
+@@ -171,7 +171,7 @@
+ *rowp = (png_bytep) pixelp;
+ /* standard png error handler redeclared to free the agl image if an
+ * error occurs */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ agl_error("Error reading the PNG file");
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index bf5bcd5fa752..70194dad05b3 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= afternoonstalker
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \
LOCAL/martymac
diff --git a/games/agame/Makefile b/games/agame/Makefile
index cce5e4200b21..f4df6e2c96e6 100644
--- a/games/agame/Makefile
+++ b/games/agame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= agame
PORTVERSION= 1577
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://zevv.nl/play/code/game/ \
http://critical.ch/distfiles/ \
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 44d268d6dfe4..486168e196d6 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alephone
PORTVERSION= 20120128
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/marathon/Aleph%20One/2012-01-28
DISTNAME= AlephOne-${PORTVERSION}
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index def4b0301327..50c4b5ef4cf3 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alienarena
PORTVERSION= 2011.753
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \
http://ftp.jeuxlinux.fr/files/ \
@@ -51,8 +52,9 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.if defined(WITH_CLIENT)
BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \
+ freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
USE_GL= yes
USE_OPENAL= soft alut
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 69da252d1e68..4a41a3ac6149 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -7,7 +7,7 @@
PORTNAME= allacrost
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION}
DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A single player 2D role-playing game
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
ogg.7:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
boost_thread.4:${PORTSDIR}/devel/boost-libs
@@ -34,7 +34,7 @@ USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --datadir=${DATADIR}
-CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/allacrost/files/patch-src-engine-video-image.cpp b/games/allacrost/files/patch-src-engine-video-image.cpp
new file mode 100644
index 000000000000..46f36cd87638
--- /dev/null
+++ b/games/allacrost/files/patch-src-engine-video-image.cpp
@@ -0,0 +1,10 @@
+--- src/engine/video/image.cpp.orig 2010-05-17 01:38:27.000000000 +0200
++++ src/engine/video/image.cpp 2012-05-03 05:56:08.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include <math.h>
+
+ #include "video.h"
++#include "pngpriv.h"
+
+ using namespace std;
+ using namespace hoa_utils;
diff --git a/games/allacrost/files/patch-src-engine-video-image_base.cpp b/games/allacrost/files/patch-src-engine-video-image_base.cpp
new file mode 100644
index 000000000000..6ce0a13b3a14
--- /dev/null
+++ b/games/allacrost/files/patch-src-engine-video-image_base.cpp
@@ -0,0 +1,10 @@
+--- src/engine/video/image_base.cpp.orig 2010-05-17 01:38:27.000000000 +0200
++++ src/engine/video/image_base.cpp 2012-05-03 05:51:57.000000000 +0200
+@@ -18,6 +18,7 @@
+
+ #include "image_base.h"
+ #include "video.h"
++#include "pngpriv.h"
+
+ using namespace std;
+ using namespace hoa_utils;
diff --git a/games/amoebax/Makefile b/games/amoebax/Makefile
index 7460ba68fcec..1fb26e2972f9 100644
--- a/games/amoebax/Makefile
+++ b/games/amoebax/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amoebax
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.emma-soft.com/games/amoebax/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/anki/Makefile.inc b/games/anki/Makefile.inc
index b6b441cc3e75..5d6d099b4626 100644
--- a/games/anki/Makefile.inc
+++ b/games/anki/Makefile.inc
@@ -2,7 +2,7 @@
PORTNAME= anki
PORTVERSION= 1.2.11
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE \
http://ankisrs.net/download/mirror/
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index e21e2c6638e8..b7d6f7c5152e 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -8,7 +8,7 @@
PORTNAME= armagetron
PORTVERSION= 0.2.8.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}ad/${PORTNAME}ad-src/${PORTVERSION}
DISTNAME= armagetronad-${PORTVERSION}
@@ -24,7 +24,7 @@ CXXFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
xml2.5:${PORTSDIR}/textproc/libxml2
OPTIONS= MUSIC "Compile in support for background music" on \
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 30d6852ab423..e2df070bf129 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asc
PORTVERSION= 2.4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
http://www.asc-hq.org/music/
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index 0203ea93a871..00bede844c1c 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -7,7 +7,7 @@
PORTNAME= assaultcube
PORTVERSION= 1.1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
DISTFILES= AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index ce0ea20d0165..32b525a3476f 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -8,7 +8,7 @@
PORTNAME= atomix
PORTVERSION= 2.14.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/avoision/Makefile b/games/avoision/Makefile
index 2d4ca788b313..9b7acf71fcfd 100644
--- a/games/avoision/Makefile
+++ b/games/avoision/Makefile
@@ -7,6 +7,7 @@
PORTNAME= avoision
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/avsn/
@@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \
lua-5.1:${PORTSDIR}/lang/lua \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
physfs.1:${PORTSDIR}/devel/physfs
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index ecf40c4be482..6648b9ce157c 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= btanks
PORTVERSION= 0.9.8083
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index 6a6e6867944b..ff9e89cf438a 100644
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@@ -7,7 +7,7 @@
PORTNAME= belooted
PORTVERSION= 0.1.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://boby.joe.free.fr/dev/belooted/files/ \
LOCAL/martymac
diff --git a/games/biloba/Makefile b/games/biloba/Makefile
index f2e7c7978ac6..5f9c33b3e78b 100644
--- a/games/biloba/Makefile
+++ b/games/biloba/Makefile
@@ -7,7 +7,7 @@
PORTNAME= biloba
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Biloba/${PORTVERSION}
diff --git a/games/biniax2/Makefile b/games/biniax2/Makefile
index a5e34a5c2e0b..271f8863997e 100644
--- a/games/biniax2/Makefile
+++ b/games/biniax2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= biniax2
PORTVERSION= 1.30
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://mordred.dir.bg/biniax/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index 1ae284431e4c..41e959d6caa7 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blackjack
PORTVERSION= 1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index d4f62abccf8f..70921583fc6c 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -7,6 +7,7 @@
PORTNAME= blinken
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index 1fa1c394cabb..bf85c339960e 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blinkensisters
PORTVERSION= 0.5.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Blinkensisters%20-%20Lost%20Pixels/LostPixels%20${PORTVERSION}
diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile
index adc69a75790f..67b56642e22e 100644
--- a/games/bloboats/Makefile
+++ b/games/bloboats/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bloboats
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://mirror.kapsi.fi/bloboats.dy.fi/ \
CRITICAL
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 6c5209df6dc4..e370304dfef4 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blokish
PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}
diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile
index 1eb369ee943a..d877ae11c301 100644
--- a/games/bloodfrontier/Makefile
+++ b/games/bloodfrontier/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bloodfrontier
DISTVERSION= B2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Blood%20Frontier%20Beta%202
DISTNAME= ${PORTNAME}-${DISTVERSION}-linux
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 9d08884fdcdc..0cc1f4292f43 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bomberclone
PORTVERSION= 0.11.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index fd345baebe22..f5833f85dd14 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bombermaze
PORTVERSION= 0.6.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= SF
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index a7ba0538b5bb..789718158e08 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bomns
PORTVERSION= 0.99.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/greenridge/Bomns%20for%20Linux/Bomns%20for%20Linux%20${PORTVERSION}
diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index 3822a12da115..c170688f1862 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= boswars
PORTVERSION= 2.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.boswars.org/dist/releases/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -17,7 +17,7 @@ COMMENT= A real-time strategy game
LICENSE= GPLv2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
theora.0:${PORTSDIR}/multimedia/libtheora \
vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/games/brainparty/Makefile b/games/brainparty/Makefile
index ac6a53e20a3e..ae8439ce88ad 100644
--- a/games/brainparty/Makefile
+++ b/games/brainparty/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brainparty
PORTVERSION= 0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.tuxradar.com/files/brainparty/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/brickshooter/Makefile b/games/brickshooter/Makefile
index 8dfc50324f88..7f7ecbe18b6d 100644
--- a/games/brickshooter/Makefile
+++ b/games/brickshooter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brickshooter
PORTVERSION= 0.04
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://bilious.homelinux.org/~paxed/brickshooter/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/brikx/Makefile b/games/brikx/Makefile
index 7957d6e87587..e983650729cb 100644
--- a/games/brikx/Makefile
+++ b/games/brikx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brikx
PORTVERSION= 0.4.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
# SF/brikx/Brikx/${PORTVERSION}
diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index d70877a4f901..9ccbe3ec882e 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -7,14 +7,14 @@
PORTNAME= briquolo
PORTVERSION= 0.5.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://briquolo.free.fr/download/
MAINTAINER= martymac@FreeBSD.org
COMMENT= Breakout clone with an OpenGL 3D representation
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2
diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile
index f036ee028945..9a63389a4623 100644
--- a/games/brutalchess/Makefile
+++ b/games/brutalchess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brutalchess
PORTVERSION= 0.5.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTNAME}-alpha-${PORTVERSION}
DISTNAME= ${PORTNAME}-alpha-${PORTVERSION}-src
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 80d7b7f80d37..4d9fe040c425 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bubbros
PORTVERSION= 1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/bub-n-bros/bub-n-bros/${PORTVERSION}
diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile
index 2da0750c31f6..1e7c458fb3dd 100644
--- a/games/bugsquish/Makefile
+++ b/games/bugsquish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bugsquish
PORTVERSION= 0.0.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/bugsquish/src/
diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile
index 21021ee13314..a9b11217f482 100644
--- a/games/bumprace/Makefile
+++ b/games/bumprace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bumprace
PORTVERSION= 1.5.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://user.cs.tu-berlin.de/~karlb/bumprace/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 0327949d14d1..773244d7ce7d 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= burgerspace
PORTVERSION= 1.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \
LOCAL/martymac
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index ed56794d2cbf..8bd28307a3ea 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -8,6 +8,7 @@
PORTNAME= burrtools
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF \
http://www.c-s.li/ports/
@@ -17,7 +18,7 @@ COMMENT= A puzzle solver
LICENSE= GPLv3
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xmlwrapp.5:${PORTSDIR}/textproc/xmlwrapp \
fltk.1:${PORTSDIR}/x11-toolkits/fltk \
boost_thread:${PORTSDIR}/devel/boost-libs
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 8970d67e5a82..889fa722156d 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bygfoot
PORTVERSION= 2.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/games/caph/Makefile b/games/caph/Makefile
index 3a7a421f41be..96e86e6a864b 100644
--- a/games/caph/Makefile
+++ b/games/caph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= caph
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/caphgame/${PORTNAME}/caphgame-${PORTVERSION}/
DISTNAME= caphgame-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= caphgame-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Physics-based sandbox game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/doc/caph/COPYING
diff --git a/games/cave9/Makefile b/games/cave9/Makefile
index 845cfac5b5fe..276f921dc19b 100644
--- a/games/cave9/Makefile
+++ b/games/cave9/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cave9
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index 7888b7f38878..9fff2381b978 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ceferino
PORTVERSION= 0.97.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/ceferino/descargas/
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index 962878661219..7af440fa755a 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chanta
PORTVERSION= 0.15
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/chanta/descargas/
diff --git a/games/chapping/Makefile b/games/chapping/Makefile
index 759f7d1a43f1..730c7d40e9ab 100644
--- a/games/chapping/Makefile
+++ b/games/chapping/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chapping
PORTVERSION= 0.43
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://forja.rediris.es/frs/download.php/760/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index a7d468c52a46..5d53cf83058b 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cheech
PORTVERSION= 0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/games/childsplay_plugins/Makefile b/games/childsplay_plugins/Makefile
index 68d3a4bccb66..a2033014d515 100644
--- a/games/childsplay_plugins/Makefile
+++ b/games/childsplay_plugins/Makefile
@@ -7,6 +7,7 @@
PORTNAME= childsplay_plugins
PORTVERSION= 0.90
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/childsplay/childsplay-plugins/${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/games/chroma/Makefile b/games/chroma/Makefile
index 25bca9d1dd63..fc4439246daa 100644
--- a/games/chroma/Makefile
+++ b/games/chroma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chroma
PORTVERSION= 1.08
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.level7.org.uk/chroma/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 196ec139acb2..e45647b593b3 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chromium-bsu
PORTVERSION= 0.9.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVERSION}
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index a5ec99497dda..8912d3dca04b 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= circuslinux
PORTVERSION= 1.0.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/circus-linux/src/
diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile
index 1c776ec45bd3..ebd621cedae9 100644
--- a/games/colorcode/Makefile
+++ b/games/colorcode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= colorcode
PORTVERSION= 0.7.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://colorcode.laebisch.com/download/
DISTNAME= ColorCode-${PORTVERSION}
diff --git a/games/concentration/Makefile b/games/concentration/Makefile
index 698aab5ac6e1..523ca5fe66d2 100644
--- a/games/concentration/Makefile
+++ b/games/concentration/Makefile
@@ -7,7 +7,7 @@
PORTNAME= concentration
PORTVERSION= 1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.shiftygames.com/concentration/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 1348e4176d1f..0db91162440b 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cosmosmash
DISTVERSION= 1.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \
LOCAL/martymac
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 83b52f43f9f6..6d06be2031ba 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= crack-attack
PORTVERSION= 1.1.14
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/games/cretan-hubris/Makefile b/games/cretan-hubris/Makefile
index b36cd038b50c..2aee291178d4 100644
--- a/games/cretan-hubris/Makefile
+++ b/games/cretan-hubris/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cretan-hubris
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/radius-engine/egp/
@@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \
lua-5.1:${PORTSDIR}/lang/lua \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
physfs.1:${PORTSDIR}/devel/physfs
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 1a5f9d33821e..548a891c9b4c 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= criticalmass
PORTVERSION= 1.0.0
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Critical%20Mass/${PORTVERSION}
@@ -16,6 +16,8 @@ DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= An SDL/OpenGL space shoot\'em up game
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
CONFLICTS= shaaft-[0-9]*
USE_BZIP2= yes
@@ -23,6 +25,7 @@ USE_SDL= image mixer sdl
USE_GL= gl
USE_XORG= x11
GNU_CONFIGURE= yes
+CFLAGS= -I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS= --disable-optimize
MAN6= critter.6
diff --git a/games/criticalmass/files/patch-game__main.cpp b/games/criticalmass/files/patch-game__main.cpp
new file mode 100644
index 000000000000..4ec7f7f7e7b0
--- /dev/null
+++ b/games/criticalmass/files/patch-game__main.cpp
@@ -0,0 +1,10 @@
+--- game/main.cpp.orig 2005-09-12 04:04:52.000000000 +0200
++++ game/main.cpp 2012-05-11 17:51:11.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <zlib.h>
+
+ void migrateConfig( void)
+ {
diff --git a/games/criticalmass/files/patch-utilssdl_PNG.cpp b/games/criticalmass/files/patch-utilssdl_PNG.cpp
new file mode 100644
index 000000000000..60965df5faf4
--- /dev/null
+++ b/games/criticalmass/files/patch-utilssdl_PNG.cpp
@@ -0,0 +1,19 @@
+--- utilssdl/PNG.cpp.orig 2004-12-18 03:41:42.000000000 +0100
++++ utilssdl/PNG.cpp 2012-05-08 07:00:15.000000000 +0200
+@@ -13,6 +13,7 @@
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
+ #include <PNG.hpp>
++#include "pngpriv.h"
+
+ //Save SDL surface as png
+ bool PNG::Save( SDL_Surface *img, const string &filename)
+@@ -72,7 +73,7 @@
+ return false;
+ }
+
+- if( setjmp(_png->jmpbuf))
++ if( setjmp(_png->longjmp_buffer))
+ {
+ fclose( fp);
+ png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 52074143e93f..cabb113bcd70 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= crossfire-client
PORTVERSION= 1.70.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/crossfire/crossfire-${PORTVERSION}
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index d076db2b2eff..eb25d7bd3240 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crossfire
PORTVERSION= 1.70.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -server
@@ -18,7 +19,7 @@ COMMENT= Server for multiplayer graphical arcade and adventure game
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index ffd6eaa14711..9186509b9292 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -8,7 +8,7 @@
PORTNAME= csmash
PORTVERSION= 0.6.6
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= games
MASTER_SITES= SF/cannonsmash/CannonSmash/${PORTVERSION}
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 1a2a08860556..63c78de54904 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cube
PORTVERSION= 2005.08.29
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2005_08_29
DISTFILES= ${CUBE_DATA} ${CUBE_SRC}
diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile
index c897903b2d3f..055b33e5ff7b 100644
--- a/games/cuyo/Makefile
+++ b/games/cuyo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cuyo
PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://mirror.publicns.net/pub/nongnu/cuyo/
DISTNAME= ${PORTNAME}-2.~-1.1
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index bbd34e105e0a..b1897f463d5d 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= d2x-xl
PORTVERSION= 1.14.121
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/d2x-xl/Linux/Archive:source \
SF/d2x-xl/Linux:source \
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 94ee5db824f5..dae4d220be1c 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -7,7 +7,7 @@
PORTNAME= d2x
PORTVERSION= 0.2.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://offload2.icculus.org:9090/d2x/src/
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 18bc14585e91..94652050e018 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= daimonin
PORTVERSION= 0.10.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file=
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/dangen/Makefile b/games/dangen/Makefile
index 62cf7ac5a0b2..66f93118f098 100644
--- a/games/dangen/Makefile
+++ b/games/dangen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dangen
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.interq.or.jp/libra/oohara/dangen/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 70ba6392d6c8..6362b87ec0ba 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dangerdeep
PORTVERSION= 0.3.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/danger_from_the_deep-src/${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile
index c4f5ac745eff..f7d38b07cbcb 100644
--- a/games/demonquake/Makefile
+++ b/games/demonquake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= demonquake
PORTVERSION= 0.16.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake1/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Another improved Quake engine based on FuhQuake
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_DOS2UNIX= yes
@@ -58,10 +58,6 @@ MAKE_ENV+= BUILD_DEMONQUAKE_SDL=YES
PLIST_FILES+= bin/${PORTNAME}-sdl
.endif
-post-patch:
- ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/gl_image.c
-
do-install:
.if !defined(WITHOUT_GLX)
${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin
diff --git a/games/demonquake/files/patch-gl_image.c b/games/demonquake/files/patch-gl_image.c
new file mode 100644
index 000000000000..ba72bffe524a
--- /dev/null
+++ b/games/demonquake/files/patch-gl_image.c
@@ -0,0 +1,37 @@
+--- gl_image.c.orig 2012-04-27 12:56:30.000000000 +0200
++++ gl_image.c 2012-04-27 12:58:31.000000000 +0200
+@@ -21,6 +21,7 @@
+
+ #include "quakedef.h"
+ #include <png.h>
++#include <zlib.h>
+
+ int image_width, image_height;
+
+@@ -470,7 +471,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct (&png, &pnginfo, NULL);
+ fclose (fin);
+@@ -496,7 +497,7 @@
+ }
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
+- png_set_gray_1_2_4_to_8 (png);
++ png_set_expand_gray_1_2_4_to_8 (png);
+
+ if (png_get_valid(png, pnginfo, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha (png);
+@@ -582,7 +583,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (fp);
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 89d7d4ea804f..83295121c522 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -7,7 +7,7 @@
PORTNAME= deng
PORTVERSION= 1.9.0b6.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.9
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/}
@@ -17,7 +17,7 @@ COMMENT= An enhanced Doom, Heretic and Hexen source port
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GL= gl glu
@@ -31,6 +31,7 @@ BUILD_WRKSRC= ${BUILDDIR}
INSTALL_WRKSRC= ${BUILDDIR}
USE_CMAKE= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--export-dynamic"
MAN6= doomsday.6
diff --git a/games/deng/files/patch-gl_png.c b/games/deng/files/patch-gl_png.c
new file mode 100644
index 000000000000..0d0fb58a0f84
--- /dev/null
+++ b/games/deng/files/patch-gl_png.c
@@ -0,0 +1,10 @@
+--- doomsday/engine/portable/src/gl_png.c.orig 2010-04-07 22:52:50.000000000 +0200
++++ doomsday/engine/portable/src/gl_png.c 2012-04-29 06:31:36.000000000 +0200
+@@ -32,6 +32,7 @@
+ // HEADER FILES ------------------------------------------------------------
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+
+ #include "de_base.h"
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 262edf8b828d..e89004ce1221 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= diameter
PORTVERSION= 0.4.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/game${PORTNAME}/game${PORTNAME}/${PORTNAME}-0.4.0
@@ -15,6 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Arcade-style game with elements of economy and adventure
BUILD_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
@@ -33,6 +34,6 @@ DATADIR= ${PREFIX}/share/gamediameter
post-patch:
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|; /^CFLAGS=.*march/ d; \
- /PKG_CONFIG/ s|libpng|libpng14|' ${WRKSRC}/configure
+ /PKG_CONFIG/ s|libpng|libpng15|' ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/games/dodgindiamond2/Makefile b/games/dodgindiamond2/Makefile
index 0a77180e2a14..16449b65fad3 100644
--- a/games/dodgindiamond2/Makefile
+++ b/games/dodgindiamond2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dodgindiamond2
PORTVERSION= 0.2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.usebox.net/jjm/dd2/releases/
DISTNAME= dd2-${PORTVERSION}
diff --git a/games/easysok/Makefile b/games/easysok/Makefile
index 39e139754cff..aadfeb1c081a 100644
--- a/games/easysok/Makefile
+++ b/games/easysok/Makefile
@@ -6,7 +6,7 @@
PORTNAME= easysok
PORTVERSION= 0.3.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games kde
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-kde3
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index b3c1845ef47a..287d88227ede 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eboard
PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF \
SF/${PORTNAME}/eboard-extras/pack%201%20patchlevel%202/:p1 \
@@ -20,6 +20,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= johans@FreeBSD.org
COMMENT= GTK+ chess board interface (mainly for FICS and chessd)
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
EXTRAS= 1pl2 2
USE_BZIP2= yes
HAS_CONFIGURE= yes
diff --git a/games/eboard/files/patch-cimg.cc b/games/eboard/files/patch-cimg.cc
new file mode 100644
index 000000000000..476a4f82df2a
--- /dev/null
+++ b/games/eboard/files/patch-cimg.cc
@@ -0,0 +1,10 @@
+--- cimg.cc.orig 2008-02-22 16:51:22.000000000 +0100
++++ cimg.cc 2012-05-08 07:19:55.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include "cimg.h"
+
+ CImg::CImg(int w,int h) {
diff --git a/games/edge/Makefile b/games/edge/Makefile
index 5a4dfb87b650..5c1a4f0ccd09 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= edge
PORTVERSION= 1.35
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \
SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad
@@ -24,7 +24,7 @@ LICENSE_COMB= dual
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
GLEW.1:${PORTSDIR}/graphics/glew \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/Edge-${PORTVERSION}-source
diff --git a/games/edge/files/patch-epi__image_png.cc b/games/edge/files/patch-epi__image_png.cc
new file mode 100644
index 000000000000..89672145e28c
--- /dev/null
+++ b/games/edge/files/patch-epi__image_png.cc
@@ -0,0 +1,37 @@
+--- epi/image_png.cc.orig 2010-06-08 15:36:37.000000000 +0200
++++ epi/image_png.cc 2012-04-27 13:02:14.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #undef _SETJMP_H // workaround for some weirdness in pngconf.h
+ #include <png.h>
++#include <zlib.h>
+
+ namespace epi
+ {
+@@ -96,7 +97,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fprintf(stderr, "PNG_Load - Error loading PNG image !\n");
+ goto failed;
+@@ -238,7 +239,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fprintf(stderr, "PNG: Error loading PNG image !\n");
+ goto failed;
+@@ -315,7 +318,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fprintf(stderr, "PNG: Error saving PNG image !\n");
+ goto failed;
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index fd485ae13fbe..5f1d56d98f05 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -6,7 +6,7 @@
PORTNAME= eduke32
PORTVERSION= 20110627
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/ \
http://dukeworld.duke4.net/eduke32/synthesis/old/${PORTVERSION}-${SVNREVISION}/
diff --git a/games/egl/Makefile b/games/egl/Makefile
index 48728f379e2f..6a4b0d0f1520 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= egl
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://egl.quakedev.com/files/:src \
ftp://ftp.alepulver.com.ar/distfiles/:data
@@ -41,8 +41,10 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.if defined(WITH_CLIENT)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GL= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
+MAKE_ENV*= CFLAGS="${CFLAGS}"
PLIST_SUB+= CLIENT=""
EGL_BIN+= egl
.else
diff --git a/games/egl/files/patch-renderer__rf_image.c b/games/egl/files/patch-renderer__rf_image.c
index 0205ae4daf96..1811e4922906 100644
--- a/games/egl/files/patch-renderer__rf_image.c
+++ b/games/egl/files/patch-renderer__rf_image.c
@@ -1,7 +1,14 @@
-
---- renderer/rf_image.c.orig 2010-07-08 22:47:22.720284451 +0200
-+++ renderer/rf_image.c 2010-07-08 22:53:00.496664288 +0200
-@@ -44,7 +44,7 @@
+--- renderer/rf_image.c.orig 2012-04-29 06:34:41.000000000 +0200
++++ renderer/rf_image.c 2012-04-29 06:35:42.000000000 +0200
+@@ -32,6 +32,7 @@
+ #else
+ # include <jpeglib.h>
+ # include <png.h>
++# include <pngpriv.h>
+ #endif
+
+ #define MAX_IMAGE_HASH (MAX_IMAGES/4)
+@@ -44,7 +45,7 @@
image_t *r_lmTextures[R_MAX_LIGHTMAPS];
static image_t r_imageList[MAX_IMAGES];
static image_t *r_imageHashTree[MAX_IMAGE_HASH];
@@ -10,7 +17,7 @@
static byte r_intensityTable[256];
static byte r_gammaTable[256];
-@@ -261,21 +261,6 @@
+@@ -261,21 +262,6 @@
cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
}
@@ -32,7 +39,7 @@
/*
=============
R_LoadJPG
-@@ -610,7 +595,7 @@
+@@ -610,7 +596,7 @@
png_set_filler (png_ptr, 0xFF, PNG_FILLER_AFTER);
if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth < 8)
@@ -41,5 +48,3 @@
if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_tRNS_to_alpha (png_ptr);
-
-
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index db0fcb49fc85..7deed23773db 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -6,7 +6,7 @@
PORTNAME= egoboo
PORTVERSION= 2.7.5
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Linux%20Source%20Distro/${PORTVERSION}
diff --git a/games/el/Makefile b/games/el/Makefile
index 47b791c540a5..15ba62e71b2b 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= el
PORTVERSION= 192
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
@@ -16,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
COMMENT= Eternal Lands is a free 3D MMORPG
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis \
cal3d.12:${PORTSDIR}/graphics/cal3d
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 0628498264f7..aa74312779d2 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ember
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
http://amber.worldforge.org/ember/releases/stable/
diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index 8b48f6c1c39b..4a9193f8c972 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= singularity
PORTVERSION= 0.30b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= endgame-
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 675c9c017103..a9f76c103d83 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enigma
PORTVERSION= 1.01
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= BERLIOS/enigma-game
DISTNAME= ${PORTNAME}-${PORTVERSION}-64bit
@@ -15,7 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-64bit
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Enigma is a reimplementation of Oxyd, a puzzle game
-LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2
+LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
+ png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet
USE_GMAKE= yes
@@ -26,7 +27,7 @@ USE_SDL= image mixer sdl ttf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-cxxlua \
--with-libintl-prefix="${LOCALBASE}"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -I${LUA_INCDIR}
LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
MAKE_JOBS_SAFE= yes
diff --git a/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c b/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c
new file mode 100644
index 000000000000..925b9655d5e9
--- /dev/null
+++ b/games/enigma/files/patch-src_enigma-core_IMG_SavePNG.c
@@ -0,0 +1,33 @@
+--- lib-src/enigma-core/IMG_SavePNG.c.orig 2007-09-08 14:20:05.000000000 +0200
++++ lib-src/enigma-core/IMG_SavePNG.c 2012-05-11 17:55:39.000000000 +0200
+@@ -1,13 +1,14 @@
+ #include "SDL.h"
+ #include "IMG_SavePNG.h"
+ #include "png.h"
++#include "pngpriv.h"
+ #include <stdlib.h>
+ #include <setjmp.h>
+
+ #define IMG_SetError(a) SDL_SetError(a)
+
+ /* Save a PNG type image to an SDL datasource */
+-static void png_write_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_write_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWops *src;
+
+@@ -84,12 +85,12 @@
+ png_bytep *row_pointers = 0;
+
+ /* Set error handling. */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_ptr->longjmp_buffer)) {
+ IMG_SetError("Error writing the PNG file");
+ }
+ else {
+ int colortype;
+- png_set_write_fn(png_ptr, src, png_write_data, png_io_flush);
++ png_set_write_fn(png_ptr, src, local_png_write_data, png_io_flush);
+ /* Set the image information here. Width and height are up to 2^31,
+ * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+ * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index 23ea3c82f31e..76d62661088d 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ensemblist
PORTVERSION= 040126
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Assemble given shapes from primitives
LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_GL= glut
diff --git a/games/etracer/Makefile b/games/etracer/Makefile
index 50bb3edc3eff..94cd8dd98666 100644
--- a/games/etracer/Makefile
+++ b/games/etracer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= etracer
PORTVERSION= 0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/extremetuxracer/extreme-tuxracer/${PORTVERSION}
DISTNAME= extremetuxracer-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= extremetuxracer-${PORTVERSION}
MAINTAINER= peter_dunning@dsl.pipex.com
COMMENT= The latest and greatest fork of the classic Tux Racer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= mixer sdl
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --with-tcl="${TCL_LIBDIR}" \
--with-gl-inc="${LOCALBASE}/include"
post-patch:
- ${REINPLACE_CMD} -e 's|libpng12|libpng14|g' \
+ ${REINPLACE_CMD} -e 's|libpng12|libpng15|g' \
${WRKSRC}/configure
${REINPLACE_CMD} -e 's|int_p_NULL|NULL|g' \
-e 's|png_infopp_NULL|NULL|g' \
diff --git a/games/excido/Makefile b/games/excido/Makefile
index ffe17d63011f..c897bd06c3a4 100644
--- a/games/excido/Makefile
+++ b/games/excido/Makefile
@@ -7,7 +7,7 @@
PORTNAME= excido
PORTVERSION= 0.1.5c
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= http://offload2.icculus.org:9090/excido/ \
http://offload1.icculus.org:9090/excido/
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 64c73b8df453..7a00fcb57635 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ezquake
PORTVERSION= 1.9
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION}:ezquake \
@@ -24,7 +24,7 @@ EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip \
7z:${PORTSDIR}/archivers/p7zip
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
pcre.1:${PORTSDIR}/devel/pcre \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_DOS2UNIX= *.[ch] Makefile*
USE_GMAKE= yes
@@ -85,10 +85,6 @@ do-extract:
post-patch:
@${REINPLACE_CMD} -e 's|libtcl\.so|libtcl${TCL_VER:S/.//}|' \
${WRKSRC}/embed_tcl.h
-# Resolve name collision with jpeg-8 and API png
- ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
- -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/image.c
do-install:
.for dir in ezquake qw
diff --git a/games/ezquake/files/patch-image.c b/games/ezquake/files/patch-image.c
new file mode 100644
index 000000000000..ebf71794c41b
--- /dev/null
+++ b/games/ezquake/files/patch-image.c
@@ -0,0 +1,119 @@
+--- image.c.orig 2012-05-03 06:08:56.000000000 +0200
++++ image.c 2012-05-03 06:20:20.000000000 +0200
+@@ -534,7 +534,7 @@
+ static void (*qpng_write_info)(png_structp, png_infop);
+ static void (*qpng_read_info)(png_structp, png_infop);
+ static void (*qpng_set_expand)(png_structp);
+-static void (*qpng_set_gray_1_2_4_to_8)(png_structp);
++static void (*qpng_set_expand_gray_1_2_4_to_8)(png_structp);
+ static void (*qpng_set_palette_to_rgb)(png_structp);
+ static void (*qpng_set_tRNS_to_alpha)(png_structp);
+ static void (*qpng_set_gray_to_rgb)(png_structp);
+@@ -570,7 +570,7 @@
+ {"png_write_info", (void **) &qpng_write_info},
+ {"png_read_info", (void **) &qpng_read_info},
+ {"png_set_expand", (void **) &qpng_set_expand},
+- {"png_set_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8},
++ {"png_set_expand_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8},
+ {"png_set_palette_to_rgb", (void **) &qpng_set_palette_to_rgb},
+ {"png_set_tRNS_to_alpha", (void **) &qpng_set_tRNS_to_alpha},
+ {"png_set_gray_to_rgb", (void **) &qpng_set_gray_to_rgb},
+@@ -734,7 +734,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ qpng_destroy_read_struct(&png_ptr, &pnginfo, NULL);
+ #ifndef WITH_FTE_VFS
+ fclose(fin);
+@@ -784,7 +784,7 @@
+ }
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
+- qpng_set_gray_1_2_4_to_8(png_ptr);
++ qpng_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ if (qpng_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS))
+ qpng_set_tRNS_to_alpha(png_ptr);
+@@ -888,7 +888,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ qpng_destroy_write_struct(&png_ptr, &info_ptr);
+ #ifndef WITH_FTE_VFS
+ fclose(fp);
+@@ -983,7 +983,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ qpng_destroy_write_struct(&png_ptr, &info_ptr);
+ #ifndef WITH_FTE_VFS
+ fclose(fp);
+@@ -1158,7 +1158,7 @@
+
+ // Set the return adress that PNGLib should return to if
+ // an error occurs during reading.
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &pnginfo, NULL);
+ #ifndef WITH_FTE_VFS
+@@ -1233,7 +1233,7 @@
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
+ {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS))
+@@ -1281,7 +1281,7 @@
+ if (!png_get_hIST(png_ptr, pnginfo, &histogram))
+ histogram = NULL;
+
+- png_set_dither(png_ptr, quake_pal, 256, 256, histogram, true);
++ png_set_quantize(png_ptr, quake_pal, 256, 256, histogram, true);
+ }
+ #endif // !GLQUAKE
+
+@@ -1507,7 +1507,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ #ifndef WITH_FTE_VFS
+ fclose(fp);
+@@ -1598,7 +1598,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ #ifndef WITH_FTE_VFS
+ fclose(fp);
+@@ -2360,7 +2360,7 @@
+ }
+
+ GLOBAL(void)
+-jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen)
++local_jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen)
+ {
+ my_source_mgr *src;
+
+@@ -2471,7 +2471,7 @@
+
+ jpeg_create_decompress(&cinfo);
+
+- jpeg_mem_src(&cinfo, infile, length);
++ local_jpeg_mem_src(&cinfo, infile, length);
+
+ (void) jpeg_read_header(&cinfo, TRUE);
+
diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile
index 136bf07cb234..61be95bc1369 100644
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= f1spirit-remake
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
# Original braingames site is really slow
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
diff --git a/games/farblazer/Makefile b/games/farblazer/Makefile
index 78695c58c5e8..3a73e63b458e 100644
--- a/games/farblazer/Makefile
+++ b/games/farblazer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= farblazer
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.pygame.org/gamelets/games/
diff --git a/games/fbg2/Makefile b/games/fbg2/Makefile
index 1d2c00da0115..306fadae77d3 100644
--- a/games/fbg2/Makefile
+++ b/games/fbg2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbg2
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/fbg/
@@ -22,7 +23,7 @@ LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \
lua-5.1:${PORTSDIR}/lang/lua \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
physfs.1:${PORTSDIR}/devel/physfs
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile
index 39f112e440b0..4e42d216be11 100644
--- a/games/fgkicker/Makefile
+++ b/games/fgkicker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fgkicker
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.larfeliz.be/projects/files/fgkicker/
EXTRACT_SUFX= .tgz
diff --git a/games/fgrun/Makefile b/games/fgrun/Makefile
index 118a2307ebd0..12b8e5dd33b3 100644
--- a/games/fgrun/Makefile
+++ b/games/fgrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fgrun
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index b29edea1f590..8e474f37231c 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fillets-ng
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION}:source \
SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${DATAVERSION}:data
diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index 5ab3884872aa..69e3dd516a34 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fishsupper
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/flare/Makefile b/games/flare/Makefile
index 30d1fc4b3904..3ffdb58cd345 100644
--- a/games/flare/Makefile
+++ b/games/flare/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flare
DISTVERSION= 015_1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://cloud.github.com/downloads/clintbellanger/flare/ \
http://mirror.amdmi3.ru/files/
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 82f3e2634fca..57316c0ebfc5 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flightgear-atlas
PORTVERSION= 0.3.1.20090529
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
http://freebsd.unixfreunde.de/sources/
@@ -23,7 +23,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index a871bb91336d..e6c44d3c9fea 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flightgear
PORTVERSION= 2.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
# see http://www.flightgear.org/templates.js
MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile
index a14e093e33fb..3080cb457d3f 100644
--- a/games/flobopuyo/Makefile
+++ b/games/flobopuyo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flobopuyo
PORTVERSION= 0.20
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.ios-software.com/flobopuyo/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index a5b44415fe3b..6bffa7ac500f 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flyhard
PORTVERSION= 0.42
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.markboyd.me.uk/games/flyhard/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.markboyd.me.uk/games/flyhard/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Game resembling Thrust, but with lots of shooting and puzzles
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
GNU_CONFIGURE= yes
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 23beadfa9d84..b807cf1610b5 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -7,14 +7,14 @@
PORTNAME= foobillard
PORTVERSION= 3.0a
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://foobillard.sunsite.dk/dnl/
MAINTAINER= thomas@bsdunix.ch
COMMENT= A free OpenGL-billard game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
OPTIONS= SDL "Use SDL instead of glut" off \
diff --git a/games/formido/Makefile b/games/formido/Makefile
index ad51b3a32fca..f4c354044d09 100644
--- a/games/formido/Makefile
+++ b/games/formido/Makefile
@@ -7,7 +7,7 @@
PORTNAME= formido
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://koti.mbnet.fi/lsoft/formido/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index b6466580b9bd..a79edb25293d 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freeciv
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
@@ -30,7 +31,7 @@ MAN6= freeciv-server.6 freeciv-client.6 \
.ifndef WITHOUT_X11
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
ggz.5:${PORTSDIR}/games/libggz \
ggz-gtk.1:${PORTSDIR}/games/ggz-gtk-client \
ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index a52806d5fb2c..10729f86b030 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freedink-dfarc
PORTVERSION= 3.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= freedink
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index e868c58226ef..b4efeb2f9113 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freedink
PORTVERSION= 1.08.${PORTVER}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= freedink
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index c90f999da31d..9f1b6321151f 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freedoko
PORTVERSION= 0.7.11
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/free-doko/FreeDoko%20source
DISTNAME= FreeDoko_${PORTVERSION}.src
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index b6652a722ab9..4c2fd7f346ad 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freedroid
PORTVERSION= 1.0.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}Classic/FreedroidClassic-${PORTVERSION}
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index 2249a35bda17..d42f8544d7f6 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freedroidrpg
PORTVERSION= 0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/freedroid/freedroidRPG/freedroidRPG-${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\\1/}/
diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile
index 2ba014e4a194..96a5021e01bc 100644
--- a/games/freeorion/Makefile
+++ b/games/freeorion/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freeorion
PORTVERSION= 0.3.13.3795
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= oliver
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index ea320bed6c9f..d0650d265095 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freesci
PORTVERSION= 0.3.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games emulators
MASTER_SITES= http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \
http://teksolv.de/~jameson/
diff --git a/games/freesynd/Makefile b/games/freesynd/Makefile
index aef6c457527a..3894308802b7 100644
--- a/games/freesynd/Makefile
+++ b/games/freesynd/Makefile
@@ -7,14 +7,14 @@
PORTNAME= freesynd
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= FreeSynd GPLed reimplementation of the classic Bullfrog game Syndicate
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_ZIP= yes
diff --git a/games/freetennis/Makefile b/games/freetennis/Makefile
index 1fdaf206893c..ab868e672af6 100644
--- a/games/freetennis/Makefile
+++ b/games/freetennis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freetennis
PORTVERSION= 0.4.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile
index 08998014aab5..1e974621533e 100644
--- a/games/frogatto/Makefile
+++ b/games/frogatto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= frogatto
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.frogatto.com/files/
@@ -16,7 +16,8 @@ COMMENT= An old-school 2D classic adventure platformer game
NO_PACKAGE= Package will be 144M, set FORCE_PACKAGE if you really want it
-LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/games/frogatto/files/patch-src-IMG_savepng.cpp b/games/frogatto/files/patch-src-IMG_savepng.cpp
new file mode 100644
index 000000000000..939b4c614bc0
--- /dev/null
+++ b/games/frogatto/files/patch-src-IMG_savepng.cpp
@@ -0,0 +1,10 @@
+--- src/IMG_savepng.cpp.orig 2011-04-08 16:11:45.000000000 +0200
++++ src/IMG_savepng.cpp 2012-05-25 18:51:10.000000000 +0200
+@@ -27,6 +27,7 @@
+
+ #ifdef IMPLEMENT_SAVE_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+
+ #include <stdlib.h>
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 3c376a3cdc47..8d623683f4ca 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -7,7 +7,7 @@
PORTNAME= frozenbubble
PORTVERSION= 2.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.frozen-bubble.org/data/
DISTNAME= frozen-bubble-${PORTVERSION}
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 222e9f726fcb..79b5a60ae791 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fteqw
PORTVERSION= 3343
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Source/${PORTVERSION}
DISTNAME= ftesrc${PORTVERSION}-all
@@ -42,8 +42,9 @@ FTE_TARGETS+= fteqw.sv
.if !defined(WITHOUT_GL) || !defined(WITHOUT_SDL)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.endif
.if !defined(WITHOUT_GL)
@@ -71,11 +72,6 @@ post-patch:
${WRKSRC}/gl/gl_alias.c ${WRKSRC}/common/com_mesh.c
@${REINPLACE_CMD} -e 's/__linux__/__unix__/' \
${WRKSRC}/common/plugin.c ${WRKSRC}/server/svq3_game.c
-# Resolve name collision with jpeg-8 and API png14
- ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
- -e 's|jpeg_mem_dest|local_jpeg_mem_dest|' \
- -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/client/image.c
do-install:
.for f in ${FTE_TARGETS}
diff --git a/games/fteqw/files/patch-client__image.c b/games/fteqw/files/patch-client__image.c
new file mode 100644
index 000000000000..60892907796a
--- /dev/null
+++ b/games/fteqw/files/patch-client__image.c
@@ -0,0 +1,74 @@
+--- client/image.c.orig 2012-05-26 14:26:41.000000000 +0200
++++ client/image.c 2012-05-26 14:27:18.000000000 +0200
+@@ -551,6 +551,8 @@
+ #pragma comment(lib, "../libs/libpng.lib")
+ #else
+ #include <png.h>
++ #include <pngpriv.h>
++ #include <zlib.h>
+ #endif
+ #endif
+
+@@ -610,7 +612,7 @@
+ return (png_rgba = NULL);
+ }
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ error:
+ if (data)
+@@ -636,7 +638,7 @@
+ }
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
+- png_set_gray_1_2_4_to_8(png);
++ png_set_expand_gray_1_2_4_to_8(png);
+
+ if (png_get_valid( png, pnginfo, PNG_INFO_tRNS ))
+ png_set_tRNS_to_alpha(png);
+@@ -712,7 +714,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return false;
+@@ -879,7 +881,7 @@
+ #define GLOBAL(x) x
+
+ GLOBAL(void)
+-jpeg_mem_src (j_decompress_ptr cinfo, qbyte * infile, int maxlen)
++local_jpeg_mem_src (j_decompress_ptr cinfo, qbyte * infile, int maxlen)
+ {
+ my_source_mgr *src;
+
+@@ -945,7 +947,7 @@
+ }
+ jpeg_create_decompress(&cinfo);
+
+- jpeg_mem_src(&cinfo, infile, length);
++ local_jpeg_mem_src(&cinfo, infile, length);
+
+ (void) jpeg_read_header(&cinfo, TRUE);
+
+@@ -1041,7 +1043,7 @@
+ dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+ }
+
+-void jpeg_mem_dest (j_compress_ptr cinfo, vfsfile_t *vfs)
++void local_jpeg_mem_dest (j_compress_ptr cinfo, vfsfile_t *vfs)
+ {
+ my_destination_mgr *dest;
+
+@@ -1101,7 +1103,7 @@
+
+ buffer = screendata;
+
+- jpeg_mem_dest(&cinfo, outfile);
++ local_jpeg_mem_dest(&cinfo, outfile);
+ cinfo.image_width = screenwidth;
+ cinfo.image_height = screenheight;
+ cinfo.input_components = 3;
diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile
index a5367951ea6c..99db1c609e10 100644
--- a/games/fuhquake/Makefile
+++ b/games/fuhquake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fuhquake
PORTVERSION= 0.31
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \
ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \
@@ -45,8 +45,9 @@ IGNORE= needs at least one client (GLX or X11)
.if defined(WITH_GLX)
USE_GL= yes
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
+CFLAGS+= -I${LOCALBASE}/include/libpng15
PLIST_SUB+= GLX=""
CLIENTS+= glx
.else
diff --git a/games/fuhquake/files/patch-image.c b/games/fuhquake/files/patch-image.c
new file mode 100644
index 000000000000..24084f0116ad
--- /dev/null
+++ b/games/fuhquake/files/patch-image.c
@@ -0,0 +1,38 @@
+--- image.c.orig 2004-01-07 00:43:22.000000000 +0100
++++ image.c 2012-05-26 15:10:53.000000000 +0200
+@@ -24,6 +24,8 @@
+
+ #ifdef WITH_PNG
+ #include "png.h"
++#include "zlib.h"
++#include "pngpriv.h"
+ #endif
+
+ #ifdef WITH_JPEG
+@@ -569,7 +571,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_ptr->longjmp_buffer)) {
+ qpng_destroy_read_struct(&png_ptr, &pnginfo, NULL);
+ fclose(fin);
+ return NULL;
+@@ -678,7 +680,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_ptr->longjmp_buffer)) {
+ qpng_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return false;
+@@ -743,7 +745,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_ptr->longjmp_buffer)) {
+ qpng_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return false;
diff --git a/games/fxsudoku/Makefile b/games/fxsudoku/Makefile
index b51852158d9d..3d1c2f8be6ba 100644
--- a/games/fxsudoku/Makefile
+++ b/games/fxsudoku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fxsudoku
PORTVERSION= 0.5.1
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= games
MASTER_SITES= http://www.fifthplanet.net/files/
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index b343dc1fdeae..c59beb7f5c59 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galaxyhack
PORTVERSION= 1.74
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index 2a42000a75e2..efa115e483bc 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galaxymage
PORTVERSION= 0.3.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/tactics/
diff --git a/games/gbottler/Makefile b/games/gbottler/Makefile
index ae75db557d54..acff49a5c435 100644
--- a/games/gbottler/Makefile
+++ b/games/gbottler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gbottler
PORTVERSION= 0.1.7
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gbottler/45155
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 24c21a6b4408..77552758f1b1 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gbrainy
PORTVERSION= 2.1.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= http://gent.softcatala.org/jmas/gbrainy/
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 33bb0a96e9b6..58b0ed1ac715 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcompris
PORTVERSION= 12.01
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
diff --git a/games/gdado/Makefile b/games/gdado/Makefile
index cd6c0ccd4ad3..b7aae564efb5 100644
--- a/games/gdado/Makefile
+++ b/games/gdado/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdado
PORTVERSION= 2.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/souce%20code/${PORTNAME}-${PORTVERSION}
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index 19418a9fcda5..7046e928d371 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gemrb
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= games emulators
MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources
@@ -16,7 +17,7 @@ COMMENT= GemRB (Game engine made with preRendered Background)
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
USE_CMAKE= yes
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index a25c3ee545c7..97f9331ab53e 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ggz-gtk-client
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MAINTAINER= kde@FreeBSD.org
diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index 688cb521d2ca..79dd92712838 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/games/ggz-gtk-games/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ggz-gtk-games
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MAINTAINER= kde@FreeBSD.org
diff --git a/games/ggz-kde-client/Makefile b/games/ggz-kde-client/Makefile
index 4e28414b0d0a..28680e3db894 100644
--- a/games/ggz-kde-client/Makefile
+++ b/games/ggz-kde-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ggz-kde-client
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile
index 1df210dc2e9c..9923211c6017 100644
--- a/games/ggz-sdl-games/Makefile
+++ b/games/ggz-sdl-games/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ggz-sdl-games
PORTVERSION= ${GGZ_VERSION}
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MAINTAINER= kde@FreeBSD.org
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 2cbf11c71a99..83c78cf25bd6 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glaxium
PORTVERSION= 0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://xhosxe.free.fr/glaxium/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= An OpenGL based space-ship "shoot-em-up" game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_SDL= sdl mixer
USE_GL= glut
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 4f4bbf2b95f5..2de22cdfaae8 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glchess
PORTVERSION= 1.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 7372a7698b3f..bbe8b81e2b4b 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glife
PORTVERSION= 0.2.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= SF
DISTNAME= gLife-${PORTVERSION}
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index f6982885dac5..7ab813ca14d4 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glob2
PORTVERSION= 0.9.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R}
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 5a250c7dcc8d..017078b63741 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gltron
PORTVERSION= 0.70
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
EXTRACT_SUFX= -source.tar.gz
@@ -15,7 +15,7 @@ EXTRACT_SUFX= -source.tar.gz
MAINTAINER= lx@FreeBSD.org
COMMENT= A 3D worm game for two players for X Window System
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GL= gl
USE_SDL= sdl sound
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 3d9d869910b4..965be03fde11 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnmm
PORTVERSION= 0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games gnome
MASTER_SITES= SF
DIST_SUBDIR= gnome
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 1e0fc88f31d2..37a29625780a 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gno3dtet
PORTVERSION= 1.96.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games gnome
MASTER_SITES= http://eseb.net/ftp/gno3dtet/
EXTRACT_SUFX= .tgz
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 13e820b9ed6b..c6bb209b7866 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-games-extra-data
PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 25341e53f7c8..98191df11d82 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-games
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 187c2a8776d8..b844d391ac9d 100644
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomeattacks
PORTVERSION= 0.3
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games gnome
MASTER_SITES= SF
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 2efb84cd5b08..6a68ed58f4cd 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomebreakout
PORTVERSION= 0.5.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= http://www.users.on.net/~mipearson/
DISTNAME= gnome-breakout-${PORTVERSION}
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 5dd09be34e51..cab50d6147ee 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomechess
PORTVERSION= 0.3.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-chess/0.3
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index 7747603a729f..8704a966a3a6 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomekiss
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games gnome
MASTER_SITES= http://devel.tlrmx.org/kiss/source/
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 9ec8455e9009..3f1b44527ad6 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomememoryblocks
PORTVERSION= 0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games gnome
MASTER_SITES= SF/gnome-memblocks/gnome-memblocks/${PORTVERSION}
DISTNAME= gnome-memblocks-${PORTVERSION}
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 7ba3702213f4..403bd794c407 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomermind
PORTVERSION= 1.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games gnome
MASTER_SITES= SF/${PORTNAME}/GnomerMind/${PORTVERSION}%20_Dreaming%20clovers_
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index 3ca66db4068c..ebd70ab18992 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomesudoku
PORTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games gnome
MASTER_SITES= SF/gnome-sudoku/gnome-sudoku/${PORTVERSION}
DISTNAME= gnome-sudoku-${PORTVERSION}
diff --git a/games/gnono/Makefile b/games/gnono/Makefile
index 800f3abe8c5a..51f4273da4ea 100644
--- a/games/gnono/Makefile
+++ b/games/gnono/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnono
PORTVERSION= 1.9.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 26e80e2e16b2..b6b2f8f8ca57 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnubg
PORTVERSION= 0.15
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://www.gnubg.org/media/sources/:src \
${MASTER_SITE_GNU_ALPHA:S/$/:ts/}
@@ -22,6 +22,7 @@ COMMENT= GNU Backgammon
BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
gdbm.4:${PORTSDIR}/databases/gdbm \
+ png15:${PORTSDIR}/graphics/png \
gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2 \
gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
@@ -72,7 +73,7 @@ post-extract:
${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_ts0.bd.gz > ${WRKSRC}/gnubg_ts0.bd
post-patch:
- ${REINPLACE_CMD} -e 's|libpng12|libpng14|g' ${WRKSRC}/configure.in
+ ${REINPLACE_CMD} -e 's|libpng12|libpng15|g' ${WRKSRC}/configure.in
pre-configure:
cd ${WRKSRC} && ./autogen.sh
diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile
index 5d678c0438cd..355a11d49224 100644
--- a/games/gnudoku/Makefile
+++ b/games/gnudoku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GNUDoku
PORTVERSION= 0.93
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://offload2.icculus.org:9090/~jcspray/GNUDoku/
diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index 98b7090cb8b6..5fb1b498acb3 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnurobbo
PORTVERSION= 0.66
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*$/\1/}/
EXTRACT_SUFX= -source.tar.gz
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 0f6c84a70ec1..b46e02cf64fe 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnurobots
PORTVERSION= 1.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= GNU
diff --git a/games/goonies/Makefile b/games/goonies/Makefile
index 5c9928d4ea2f..b3bedbc9d815 100644
--- a/games/goonies/Makefile
+++ b/games/goonies/Makefile
@@ -7,7 +7,7 @@
PORTNAME= goonies
PORTVERSION= 1.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://goonies.jorito.net/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index c9e277333eae..335e07d81df7 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gracer
PORTVERSION= 0.1.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF
@@ -16,14 +16,15 @@ COMMENT= A 3D motor sport simulator
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tcl84.1:${PORTSDIR}/lang/tcl84
USE_GL= glut
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= autoconf213
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/tcl8.4
USE_GMAKE= yes
diff --git a/games/gracer/files/patch-gr_texture.c b/games/gracer/files/patch-gr_texture.c
index 3b51ba7f4485..7f998b5e9d25 100644
--- a/games/gracer/files/patch-gr_texture.c
+++ b/games/gracer/files/patch-gr_texture.c
@@ -1,5 +1,5 @@
--- common/gr_texture.c.orig 2000-03-01 05:27:18.000000000 +0100
-+++ common/gr_texture.c 2010-03-30 11:19:05.000000000 +0200
++++ common/gr_texture.c 2012-05-03 20:29:17.000000000 +0200
@@ -419,7 +419,7 @@
if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
goto ERROR;
@@ -9,3 +9,12 @@
goto ERROR;
}
+@@ -431,7 +431,7 @@
+ if (!info_ptr) {
+ goto ERROR;
+ }
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ goto ERROR;
+ }
+ png_init_io (png_ptr, file);
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 653b03b39e01..0d5efa0ce6e3 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gretools
PORTVERSION= 1.2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION:R}
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index c861773e0649..63d863ac9c0b 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -7,6 +7,7 @@
PORTNAME= grhino
PORTVERSION= 0.16.1
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= SF/rhino/GRhino/${PORTVERSION}
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 6cb47ab2a964..3c3eb84e9f68 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gtetrinet
PORTVERSION= 0.7.11
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games gnome ipv6
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index dc5c64874af5..15630839c5e7 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkatlantic
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://download.tuxfamily.org/gtkatlantic/downloads/v0.4/
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 33d1e1760721..20a553ce6afa 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkballs
PORTVERSION= 3.1.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://gtkballs.antex.ru/dist/
diff --git a/games/gtklife/Makefile b/games/gtklife/Makefile
index 5035a14b71ea..88797b967eca 100644
--- a/games/gtklife/Makefile
+++ b/games/gtklife/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtklife
PORTVERSION= 5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://ironphoenix.org/tril/gtklife/
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index ae7b93b3cac2..4e05e7214422 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkpool
PORTVERSION= 0.5.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ftp://ftp.seul.org/pub/gtkpool/ \
http://www.sourcefiles.org/Games/Sports/Pool/
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index 09f26805dd1c..abee847cc3a9 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkradiant
PORTVERSION= 1.5.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/:id|} \
http://www.bsd-geek.de/FreeBSD/distfiles/:fb
@@ -23,7 +23,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion
LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
mhash.2:${PORTSDIR}/security/mhash \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/GPL/GtkRadiant
@@ -38,9 +38,6 @@ DATADIR= ${PREFIX}/lib/${PORTNAME}
post-patch:
@${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript
- @${REINPLACE_CMD} -e 's/png_infopp_NULL/NULL/' \
- -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/plugins/imagepng/plugin.cpp
@${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \
${XARGS} ${REINPLACE_CMD} -e \
's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/'
diff --git a/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp b/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp
new file mode 100644
index 000000000000..c06c1abd68ea
--- /dev/null
+++ b/games/gtkradiant/files/patch-plugins__imagepng__plugin.cpp
@@ -0,0 +1,41 @@
+--- plugins/imagepng/plugin.cpp.orig 2006-02-10 23:01:20.000000000 +0100
++++ plugins/imagepng/plugin.cpp 2012-05-26 20:07:52.000000000 +0200
+@@ -41,7 +41,7 @@
+ void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
+ {
+ globalErrorStream() << "libpng error: " << error_msg << "\n";
+- longjmp(png_ptr->jmpbuf, 0);
++ longjmp(png_jmpbuf(png_ptr), 0);
+ }
+
+ void user_read_data(png_structp png_ptr, png_bytep data, png_uint_32 length)
+@@ -87,9 +87,9 @@
+ }
+
+ // configure the read function
+- png_set_read_fn(png_ptr, (voidp)&p_fbuffer, (png_rw_ptr)&user_read_data);
++ png_set_read_fn(png_ptr, &p_fbuffer, (png_rw_ptr)&user_read_data);
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ &end_info);
+ return 0;
+@@ -108,7 +108,7 @@
+ png_set_palette_to_rgb(png_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha(png_ptr);
+@@ -153,7 +153,7 @@
+ png_read_end(png_ptr, info_ptr);
+
+ /* free up the memory structure */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ free(row_pointers);
+
diff --git a/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c b/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c
new file mode 100644
index 000000000000..4b5d3d74507f
--- /dev/null
+++ b/games/gtkradiant/files/patch-tools__quake3__q3map2__image.c
@@ -0,0 +1,19 @@
+--- tools/quake3/q3map2/image.c.orig 2006-02-10 23:01:20.000000000 +0100
++++ tools/quake3/q3map2/image.c 2012-05-26 20:56:51.000000000 +0200
+@@ -35,6 +35,7 @@
+
+ /* dependencies */
+ #include "q3map2.h"
++#include "pngpriv.h"
+
+
+
+@@ -180,7 +181,7 @@
+ png->io_ptr = &pb; /* hack! */
+
+ /* set error longjmp */
+- if( setjmp( png->jmpbuf ) )
++ if( setjmp( png_jmpbuf(png) ) )
+ {
+ Sys_Printf( "WARNING: An error occurred reading PNG image\n" );
+ png_destroy_read_struct( &png, &info, &end );
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index d3d0a3808dae..4b25adaabf45 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtktetcolor
PORTVERSION= 0.6.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= SUNSITE/games \
http://canopus.iacp.dvo.ru/~panov/gtktetcolor/
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 8c893e898c37..cb61073a5abe 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gturing
PORTVERSION= 0.1.1
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= games gnome
MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/
diff --git a/games/gweled/Makefile b/games/gweled/Makefile
index 4320c0f52fbe..1736eac9bcc1 100644
--- a/games/gweled/Makefile
+++ b/games/gweled/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gweled
PORTVERSION= 0.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games gnome
MASTER_SITES= http://sebdelestaing.free.fr/gweled/Release/
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index 49b1f6915a6e..3948893612a2 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hangman
PORTVERSION= 0.9.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.shiftygames.com/hangman/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 55227ed46920..2c767e6e73f4 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hedgewars
PORTVERSION= 0.9.17
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.gna.org/hedgewars/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/hex/Makefile b/games/hex/Makefile
index a01b5ffc5f83..ba0ca749ff79 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hex
PORTVERSION= 0.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://www.earth.li/projectpurple/files/
diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile
index 2d483d900b35..83da773d3f29 100644
--- a/games/hexalate/Makefile
+++ b/games/hexalate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hexalate
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://gottcode.org/${PORTNAME}/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile
index 9242d28b5665..3b34e4bc9ac9 100644
--- a/games/hexglass/Makefile
+++ b/games/hexglass/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hexglass
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index c7f383f477a5..213ebf25d06b 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hexxagon
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/
diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile
index 96a14fd74e73..07fdec14a32e 100644
--- a/games/highmoon/Makefile
+++ b/games/highmoon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= highmoon
PORTVERSION= 1.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://highmoon.gerdsmeier.net/
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index cc8ba5b928c4..50cd24ced347 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= holotz-castle
PORTVERSION= 1.3.13
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/games/instead/Makefile b/games/instead/Makefile
index 9d6ca89f613f..cd104c791d69 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -6,6 +6,7 @@
PORTNAME= instead
PORTVERSION= 1.7.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/intensityengine/Makefile b/games/intensityengine/Makefile
index 9adf6b9f63a3..e06f7cef4ea0 100644
--- a/games/intensityengine/Makefile
+++ b/games/intensityengine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= intensityengine
DISTVERSION= r20100129
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
diff --git a/games/interlogic/Makefile b/games/interlogic/Makefile
index 1566773b98b7..8b18f23e094f 100644
--- a/games/interlogic/Makefile
+++ b/games/interlogic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= interlogic
PORTVERSION= 0.30
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.0
DISTNAME= interLOGIC-src-${PORTVERSION}
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 6508b8467d22..6ce8af989226 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= irrlamb
PORTVERSION= 0.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/games/jag/Makefile b/games/jag/Makefile
index ea51e3cf26ce..bf8e3c20d406 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jag
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://jag.xlabsoft.com/files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index 1c47d90b0eb7..87d9699e25e3 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jfk
PORTVERSION= 0.1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://hop.at/jfk/
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 96daa4335aea..b40c491e1ee3 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -6,7 +6,7 @@
PORTNAME= jfsw
PORTVERSION= 20051009
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://users.on.net/~jonof/buildport/
DISTFILES= ${PORTNAME}_src_${PORTVERSION}.zip \
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index 3841dc02caa2..89fd75a23a1f 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jigzo
PORTVERSION= 0.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/jigzo/ \
http://mirror.amdmi3.ru/distfiles/
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= An OpenGL jigsaw puzzle game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_SDL= sdl mixer
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 63460f5fb1fa..0c2b46676a5a 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= joequake
PORTVERSION= 0.15b1329
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://joequake.runecentral.com/
DISTNAME= ${PORTNAME}-v${PORTVERSION}-source
@@ -18,7 +18,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Improved NQ engine with ZQuake and FuhQuake graphical effects
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/src
diff --git a/games/jools/Makefile b/games/jools/Makefile
index 4ba5d077ae9f..22a44a2b9bb8 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -6,7 +6,7 @@
PORTNAME= jools
PORTVERSION= 0.20
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://pessimization.com/software/jools/
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 6db54fa18e58..52f186af2694 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kajongg
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/games/kamikaze/Makefile b/games/kamikaze/Makefile
index d4d02088f742..f51f522b1bad 100644
--- a/games/kamikaze/Makefile
+++ b/games/kamikaze/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kamikaze
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= http://kamikaze.coolprojects.org/download/
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 1baab35fe82c..920faaad84fd 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kanagram
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index d85ceec6b41a..b0328dbb64b6 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kanatest
PORTVERSION= 0.4.8
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://clayo.org/kanatest/
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index ae9531cb9fda..680c3c58a93e 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kardsgt
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SAVANNAH
diff --git a/games/kartofel/Makefile b/games/kartofel/Makefile
index 3dcc6c42d6e2..634b17b7bd46 100644
--- a/games/kartofel/Makefile
+++ b/games/kartofel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kartofel
PORTVERSION= 1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://kartofel.jfedor.org/downloads/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile
index 05b3a35f594f..16c4109c4849 100644
--- a/games/kcheckers/Makefile
+++ b/games/kcheckers/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kcheckers
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/qcheckers/${PORTNAME}/${PORTVERSION}
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index e38a3b90bc80..ae54d0d3c726 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdegames
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 80190ccd2922..820d2dc58637 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdegames
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile
index e35d3f35868f..eb0d4f498599 100644
--- a/games/kfreerings/Makefile
+++ b/games/kfreerings/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kfreerings
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games kde
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b./beta/}
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 9cbf0b3a6fe5..8e7980fdb9e9 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -7,6 +7,7 @@
PORTNAME= khangman
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index 18bb1cf77a1a..29b8b1d2015d 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kiki
PORTVERSION= 1.0.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
EXTRACT_SUFX= -src.tgz
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 6e8a01013922..5743c2ff0d74 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= klavaro
PORTVERSION= 1.9.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/
diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile
index 7b418e7e9b6f..df415b1f441e 100644
--- a/games/kmancala/Makefile
+++ b/games/kmancala/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmancala
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games kde
MASTER_SITES= http://horinek.net/~dal/ \
LOCAL/makc
diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile
index f63438226613..faad2cd166fa 100644
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kmastermind
PORTVERSION= 2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTNAME= 20292-${PORTNAME}-${PORTVERSION}
diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile
index 320d048fdaec..58956ce485ed 100644
--- a/games/kmquake2/Makefile
+++ b/games/kmquake2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmquake2
PORTVERSION= 0.19
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \
http://qexpo2005.quakedev.com/uploaded/54/:data \
@@ -88,7 +88,7 @@ MAKE_ENV+= KMQ2_ADDONS="${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}"
.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
USE_OPENAL= al
USE_GL= yes
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 74b750d5261b..15531ebdfdfa 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knights
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games kde
MASTER_SITES= http://dl.dropbox.com/u/2888238/Knights/
diff --git a/games/knights/Makefile b/games/knights/Makefile
index ee5d12c6747d..ac97b0304451 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knights
PORTVERSION= 0.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games kde
MASTER_SITES= SF
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 0c03bf89cc28..1ff5f63a37e3 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kobodeluxe
PORTVERSION= 0.5.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://olofson.net/kobodl/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile
index 980566fff42a..e13ed82f2492 100644
--- a/games/kpicframer/Makefile
+++ b/games/kpicframer/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kpicframer
PORTVERSION= 0.5
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile
index 49a2789917ec..9f6ce4a26e49 100644
--- a/games/kpictorial/Makefile
+++ b/games/kpictorial/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kpictorial
PORTVERSION= 0.9.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile
index 0e1aec9706e0..9900250a109e 100644
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kpuzzle
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games kde
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-final
diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index 8c782121cf59..2bab12b837a6 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksudoku
PORTVERSION= 0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/ktritoc/Makefile b/games/ktritoc/Makefile
index 652da9a5ea15..517aa90da3af 100644
--- a/games/ktritoc/Makefile
+++ b/games/ktritoc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ktritoc
PORTVERSION= 1.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games kde
MASTER_SITES= http://www.heni-online.de/files/
diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile
index a7b0a44bbdd8..f4b59eaace62 100644
--- a/games/kwappen/Makefile
+++ b/games/kwappen/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kwappen
PORTVERSION= 1.1.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games kde
MASTER_SITES= http://www.lcs-chemie.de/
diff --git a/games/lander/Makefile b/games/lander/Makefile
index 449cc0615b8d..95c13f8ffdc4 100644
--- a/games/lander/Makefile
+++ b/games/lander/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lander
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.nickg.me.uk/files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index c94c019e4859..b264f02c75dd 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -7,14 +7,14 @@
PORTNAME= lbreakout2
PORTVERSION= 2.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/lgames/${PORTNAME}/${PORTVERSION}
MAINTAINER= mmendez@gmail.com
COMMENT= The polished successor to LBreakout
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_SDL= mixer net sdl
USE_GMAKE= yes
@@ -24,7 +24,7 @@ CONFIGURE_ARGS= --enable-sdl-net \
--disable-nls
MAKE_JOBS_SAFE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
diff --git a/games/lbreakout2/files/patch-stk.c b/games/lbreakout2/files/patch-stk.c
new file mode 100644
index 000000000000..c3dace58d2c9
--- /dev/null
+++ b/games/lbreakout2/files/patch-stk.c
@@ -0,0 +1,35 @@
+--- gui/stk.c.orig 2005-03-28 19:18:42.000000000 +0200
++++ gui/stk.c 2012-05-03 07:07:35.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include "stk.h"
+
+ //#define STK_DEBUG
+@@ -54,7 +55,7 @@
+
+ /* Load a PNG type image from an SDL datasource */
+ #define IMG_SetError SDL_SetError
+-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWops *src;
+
+@@ -105,13 +106,13 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if ( setjmp(png_ptr->jmpbuf) ) {
++ if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ IMG_SetError("Error reading the PNG file.");
+ goto done;
+ }
+
+ /* Set up the input control */
+- png_set_read_fn(png_ptr, src, png_read_data);
++ png_set_read_fn(png_ptr, src, local_png_read_data);
+
+ /* Read PNG header info */
+ png_read_info(png_ptr, info_ptr);
diff --git a/games/legesmotus/Makefile b/games/legesmotus/Makefile
index 54bb4cb4ca18..8255799f398f 100644
--- a/games/legesmotus/Makefile
+++ b/games/legesmotus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= legesmotus
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index d6ea73b7ef8d..450d98c24452 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lianliankan
DISTVERSION= 2.3beta1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/llk-linux/llk-linux-source/2.3beta1
DISTNAME= llk_linux-${DISTVERSION}
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index a455c1ebb9c6..2f2435a41fce 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lincity-ng
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index bd628de2237b..3c46acf3f25f 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -7,14 +7,14 @@
PORTNAME= lincity
PORTVERSION= 1.13.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Lincity%20Development%20Source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rich city simulation game for X
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
.if ${CC} == "clang"
USE_CSTD= c89
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index 812a74c7c0ce..6d3eac7e3696 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liquidwar
PORTVERSION= 5.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \
${MASTER_SITE_SAVANNAH} \
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 5d346e8eabec..f16782627697 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lordsawar
PORTVERSION= 0.1.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index 764045b4abd3..32eb8fbfee0a 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lucidlife
PORTVERSION= 0.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org:9090/~jcspray/LucidLife/
diff --git a/games/luola/Makefile b/games/luola/Makefile
index 0c721f8db69e..05e7600d0288 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -7,7 +7,7 @@
PORTNAME= luola
PORTVERSION= 1.3.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= http://www.luolamies.org/software/luola/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 7a4120e50177..d36f9e72f62b 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= macopix
PORTVERSION= 1.7.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
MAINTAINER= ports@FreeBSD.org
COMMENT= Window sitter for X11
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile
index e6ef599a085a..1116ab354ba2 100644
--- a/games/madbomber/Makefile
+++ b/games/madbomber/Makefile
@@ -7,7 +7,7 @@
PORTNAME= madbomber
PORTVERSION= 0.2.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/madbomber/src/
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index def0587670ce..4e070e121abb 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mahjong
PORTVERSION= 1.12.1
+PORTREVISION= 1
CATEGORIES= games net
MASTER_SITES= http://mahjong.julianbradfield.org/Source/%SUBDIR%/
MASTER_SITE_SUBDIR= . Old
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index b4369f802829..ede1a83261ac 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= marsnomercy
PORTVERSION= 0.2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/mars/mars/${PORTVERSION}
DISTNAME= mars-${PORTVERSION}-src
diff --git a/games/meandmyshadow/Makefile b/games/meandmyshadow/Makefile
index 6a3bbe880a47..df7fc7d992af 100644
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= meandmyshadow
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 791e1791cec2..27105060fdab 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -7,7 +7,7 @@
PORTNAME= megaglest
PORTVERSION= 3.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/current_release/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}.3
@@ -17,7 +17,7 @@ COMMENT= Open source 3D real-time strategy game
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
vorbis.4:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= ${DATADIR}/tutorials/basic_tutorial/basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
@@ -33,6 +33,7 @@ USE_OPENAL= al alut
USE_SDL= yes
USE_WX= 2.8+
+CFLAGS+= -I${LOCALBASE}/include/libpng15
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS= EDITOR "Install MegaGlest Editor" off
diff --git a/games/megaglest/files/patch-PNGReader.cpp b/games/megaglest/files/patch-PNGReader.cpp
new file mode 100644
index 000000000000..b05496007b98
--- /dev/null
+++ b/games/megaglest/files/patch-PNGReader.cpp
@@ -0,0 +1,10 @@
+--- source/shared_lib/sources/graphics/PNGReader.cpp.orig 2012-05-03 20:07:04.000000000 +0200
++++ source/shared_lib/sources/graphics/PNGReader.cpp 2012-05-03 20:07:48.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "pixmap.h"
+ #include <stdexcept>
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+
+ #include "leak_dumper.h"
diff --git a/games/memonix/Makefile b/games/memonix/Makefile
index 398cac11dcf5..384e2bc4bb69 100644
--- a/games/memonix/Makefile
+++ b/games/memonix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= memonix
PORTVERSION= 1.6.070713
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.viewizard.com/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/meritous/Makefile b/games/meritous/Makefile
index 4e1d08b0b771..c0259d2c43ad 100644
--- a/games/meritous/Makefile
+++ b/games/meritous/Makefile
@@ -7,7 +7,7 @@
PORTNAME= meritous
PORTVERSION= 1.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.asceai.net/files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 812a542ca733..cc20b775ee6f 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -7,6 +7,7 @@
PORTNAME= minetest
DISTVERSION= 0.4.dev-20120122-1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
@@ -51,7 +52,7 @@ CXXFLAGS+= -O3 -ffast-math -fomit-frame-pointer -funroll-loops
.if !defined(WITHOUT_CLIENT)
USE_GL= gl
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CMAKE_ARGS+= -DBUILD_CLIENT=1
PLIST_SUB+= CLIENT=""
.else
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 988e46d196fc..7bdad5fe8568 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mirrormagic
PORTVERSION= 2.0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/mkhexgrid/Makefile b/games/mkhexgrid/Makefile
index 1adcf3960a73..998330a50ba1 100644
--- a/games/mkhexgrid/Makefile
+++ b/games/mkhexgrid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mkhexgrid
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.nomic.net/~uckelman/mkhexgrid/releases/ \
http://aaron.daltons.ca/freebsd/
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 330cb11a4540..9ec583d75318 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monkeybubble
PORTVERSION= 0.4.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= http://home.gna.org/monkeybubble/downloads/
DISTNAME= monkey-bubble-${PORTVERSION}
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 3f8b626293bc..0d8c9ce18e74 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monster
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= http://people.iola.dk/olau/monster-masher/source/
PKGNAMESUFFIX= -masher
diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index ab19a1dd33e5..f8d2cf1efb3e 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monsterz
PORTVERSION= 0.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://sam.zoy.org/monsterz/
diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index 5026d3f2d1f1..1697a6f26755 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moonlander
PORTVERSION= 1.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR=pool/main/m/moon-lander
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index 0d501e423ddd..a3182d3bac94 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= motogt
PORTVERSION= 20110505
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/motogt/
DISTNAME= MotoGT-${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= 2D top-viewed motorcycle racing game
LIB_DEPENDS= sfml-system.1:${PORTSDIR}/devel/sfml \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2 CCbySA
LICENSE_COMB= multi
@@ -29,6 +29,7 @@ USE_ZIP= yes
BUILD_WRKSRC= ${WRKSRC}/src
MAKEFILE= Makefile.lnx
MAKE_JOBS_UNSAFE= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
SUB_FILES= motogt
diff --git a/games/motogt/files/patch-src-MakeData.cpp b/games/motogt/files/patch-src-MakeData.cpp
index d9ef4fa1299d..6f5cafff82cd 100644
--- a/games/motogt/files/patch-src-MakeData.cpp
+++ b/games/motogt/files/patch-src-MakeData.cpp
@@ -1,14 +1,16 @@
---- src/MakeData.cpp.orig 2011-01-10 20:40:30.000000000 +0300
-+++ src/MakeData.cpp 2011-09-26 23:15:04.000000000 +0400
-@@ -5,6 +5,7 @@
+--- src/MakeData.cpp.orig 2011-01-10 18:40:30.000000000 +0100
++++ src/MakeData.cpp 2012-05-03 20:21:33.000000000 +0200
+@@ -4,7 +4,9 @@
+ #include <cstdio>
#define PNG_DEBUG 3
#include <png.h>
++#include <pngpriv.h>
#include <fstream>
+#include <sys/stat.h>
#include "global.h"
#include "Config.h"
#include "Confirm.h"
-@@ -376,7 +377,12 @@
+@@ -376,7 +378,12 @@
}
fname[2]='0'+i;
fname[1]='0'+j;
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index e6c1a83ab96c..6ef7d2e7e495 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mt_gtk_client
PORTVERSION= 0.1.98
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= maitretarot
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 0d579798f2fb..48d9c7578f56 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mudmagic
PORTVERSION= 1.9
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.mudmagic.com/mud-client/downloads/
@@ -16,7 +16,7 @@ COMMENT= A GTK+ based MUD client
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
pcre.1:${PORTSDIR}/devel/pcre \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
expat:${PORTSDIR}/textproc/expat2 \
sqlite3.8:${PORTSDIR}/databases/sqlite3
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 8e828fbc078b..5a8273f2bc34 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -7,6 +7,7 @@
PORTNAME= naev
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
${MASTER_SITE_GOOGLE_CODE}
@@ -15,7 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
COMMENT= A 2d action/rpg space game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data
diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index 48dcf3503fc3..d6eca46a2db5 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -7,14 +7,14 @@
PORTNAME= nazghul
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= A computer role-playing game engine
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_SDL= sdl image mixer
USE_GMAKE= yes
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index e964ef26f9a1..3ac3fd1790b6 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nethack
PORTVERSION= 3.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES?= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index cef5ba63592a..dfd3a05be614 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nethack
PORTVERSION= 3.4.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES?= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index 0b33c4ce2708..b214fe9d2d40 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netpanzer
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= LOCAL/madpilot/netpanzer
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 8cc0fcf6f002..e4d04f5a61ae 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -7,7 +7,7 @@
PORTNAME= NetSpades
PORTVERSION= 4.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://www.ece.rice.edu/~brentmh/spades/
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index cb26b590f901..d7321fbedfe2 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -7,7 +7,7 @@
PORTNAME= neverball
PORTVERSION= 1.5.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \
http://offload2.icculus.org:9090/neverball/ \
@@ -16,7 +16,7 @@ MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Tilt the floor to guide a ball through an obstacle course
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
physfs.1:${PORTSDIR}/devel/physfs
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 9aff1de1051f..ce7da0c397c7 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nexuiz
PORTVERSION= 2.5.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \
SF/${PORTNAME}/mappack/nexmappack_r2:mappack
@@ -55,7 +55,7 @@ PLIST_SUB+= MAPPACK="@comment "
.if defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT)
LIB_DEPENDS+= modplug.1:${PORTSDIR}/audio/libmodplug \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
theora.0:${PORTSDIR}/multimedia/libtheora
.endif
diff --git a/games/nil/Makefile b/games/nil/Makefile
index 314a2cb0d0fe..3f79792f03f0 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nil
DISTVERSION= 20050603-1400
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/NiL%20%28old%29/${PORTNAME}-20050603
DISTNAME= ${PORTNAME}-cvs-backup-${DISTVERSION}
diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile
index 4f68730d6c9e..043ea12d83f5 100644
--- a/games/nimuh/Makefile
+++ b/games/nimuh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nimuh
PORTVERSION= 1.02
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/Nimuh%20SRC%20%28Source%20Code%29
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index 415a1030a086..e250a97a7944 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ninix-aya
PORTVERSION= 4.3.9
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ninix-aya/54987
@@ -18,7 +19,7 @@ COMMENT= Ninix-aya is a compatible with desktop mascot program "Ukagaka"
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet \
${PYNUMPY} \
diff --git a/games/njam/Makefile b/games/njam/Makefile
index c0f4690e4e35..adb5f711bf61 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= njam
PORTVERSION= 1.25
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index 01a529c6ecc9..d2a2e3138435 100644
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= noegnud
PORTVERSION= 0.8.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
SF/nethack/nethack/3.4.2:nethack
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index 3105da0b4442..94f3e3396e13 100644
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= noegnud
PORTVERSION= 0.8.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
SF/nethack/nethack/3.4.2:nethack
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index a9afdb53e314..3c62f8e34845 100644
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= noegnud
PORTVERSION= 0.8.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
SF/nethack/nethack/3.4.3:nethack
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index d8b4b7b00b32..28220b0e36ee 100644
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= noegnud
PORTVERSION= 0.8.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/noegnud/downloads/${PORTVERSION}/:noegnud \
SF/slashem/slashem-source/0.0.6E4F8:slashem
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index c52042de9769..c76e10db72c6 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nuclearchess
PORTVERSION= 1.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.linux-games.com/nuclearchess/
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index 9587eca54cbd..ae9e958fba80 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= numptyphysics
DISTVERSION= 0.3.r20090104
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/ \
diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index 8eea3a50063c..3390ff97008b 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oolite
PORTVERSION= 1.76
+PORTREVISION= 1
CATEGORIES= games gnustep
MASTER_SITES= ${MASTER_SITE_BERLIOS} http://jens.ayton.se/oolite/deps/:js
MASTER_SITE_SUBDIR= oolite-linux
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 8d27a2808a5f..3ea2e38a840f 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openalchemist
PORTVERSION= 0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -24,7 +24,7 @@ LICENSE_PERMS_CCbySA= ${_LICENSE_PERMS_DEFAULT}
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_AUTOTOOLS= aclocal automake autoconf
# Necessary to find pkg.m4 (PKG_CHECK_MODULES)
diff --git a/games/opencity/Makefile b/games/opencity/Makefile
index b646b9e754f9..19fa5ce6d945 100644
--- a/games/opencity/Makefile
+++ b/games/opencity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opencity
PORTVERSION= 0.0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+)\..*$/\1/}/
DISTNAME= ${PORTNAME}-${PORTVERSION}stable
diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile
index fb64d10a0a26..8172f8e014fa 100644
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openlierox
DISTVERSION= 0.59_beta9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/}
DISTNAME= OpenLieroX_${DISTVERSION}.src
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index f17c06df4a7b..9b702f4701ed 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openmortal
PORTVERSION= 0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/openpref/Makefile b/games/openpref/Makefile
index cbab677e0cd4..825c939a5884 100644
--- a/games/openpref/Makefile
+++ b/games/openpref/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openpref
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}
diff --git a/games/opensonic/Makefile b/games/opensonic/Makefile
index 3aeec8e55dac..cfa63f17b97b 100644
--- a/games/opensonic/Makefile
+++ b/games/opensonic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opensonic
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION}
DISTNAME= opensnc-src${PORTVERSION}
diff --git a/games/openssn/Makefile b/games/openssn/Makefile
index 26b31db372a3..d208f9300789 100644
--- a/games/openssn/Makefile
+++ b/games/openssn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openssn
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 2fecc7656a2d..e1c8cdb03629 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openttd
PORTVERSION= 1.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \
@@ -20,7 +20,7 @@ COMMENT= An open source clone of Microprose Transport Tycoon Deluxe
LICENSE= GPLv2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
lzo2.2:${PORTSDIR}/archivers/lzo2
USE_XZ= yes
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index 6f95983a9b45..192284d0af69 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openyahtzee
PORTVERSION= 1.9.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Open%20Yahtzee/Open%20Yahtzee%20${PORTVERSION}
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index 689dd6570400..b08e9f458d42 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -7,7 +7,7 @@
PORTNAME= optimax
PORTVERSION= 0.63
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.corewar.info/optimax/dload/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}_unix
diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index 96cd3b4b37b7..7be732f26efe 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= orbital_eunuchs_sniper
PORTVERSION= 1.30
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://offload2.icculus.org:9090/oes/ \
http://offload1.icculus.org:9090/oes/
diff --git a/games/osgg/Makefile b/games/osgg/Makefile
index 8d85aa4fa7b6..2ba648dc36eb 100644
--- a/games/osgg/Makefile
+++ b/games/osgg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osgg
PORTVERSION= 0.99
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/paintown/Makefile b/games/paintown/Makefile
index 470a764d6404..bb351fe9d295 100644
--- a/games/paintown/Makefile
+++ b/games/paintown/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paintown
PORTVERSION= 3.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
@@ -18,7 +18,7 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS+= alleg.42:${PORTSDIR}/devel/allegro \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
USE_SCONS= yes
diff --git a/games/paintown/files/patch-IMG_png.c b/games/paintown/files/patch-IMG_png.c
new file mode 100644
index 000000000000..fce0773fe601
--- /dev/null
+++ b/games/paintown/files/patch-IMG_png.c
@@ -0,0 +1,35 @@
+--- src/util/sdl/image/IMG_png.c.orig 2012-04-29 06:46:37.000000000 +0200
++++ src/util/sdl/image/IMG_png.c 2012-04-30 06:37:36.000000000 +0200
+@@ -70,6 +70,7 @@
+ #define MACOS
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+
+
+ static struct {
+@@ -288,7 +289,7 @@
+ }
+
+ /* Load a PNG type image from an SDL datasource */
+-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWops *src;
+
+@@ -347,13 +348,13 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if ( setjmp(png_ptr->jmpbuf) ) {
++ if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ error = "Error reading the PNG file.";
+ goto done;
+ }
+
+ /* Set up the input control */
+- lib.png_set_read_fn(png_ptr, src, png_read_data);
++ lib.png_set_read_fn(png_ptr, src, local_png_read_data);
+
+ /* Read PNG header info */
+ lib.png_read_info(png_ptr, info_ptr);
diff --git a/games/paintown/files/patch-IMG_savepng.c b/games/paintown/files/patch-IMG_savepng.c
new file mode 100644
index 000000000000..b16cb6c054f0
--- /dev/null
+++ b/games/paintown/files/patch-IMG_savepng.c
@@ -0,0 +1,28 @@
+--- src/util/sdl/image/IMG_savepng.c.orig 2012-04-29 06:46:37.000000000 +0200
++++ src/util/sdl/image/IMG_savepng.c 2012-05-01 10:22:57.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <SDL/SDL_byteorder.h>
+ #endif
+ #include <png.h>
++#include <zlib.h>
+ #include "IMG_savepng.h"
+
+ int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression){
+@@ -50,7 +52,7 @@
+ return ret;
+ }
+
+-static void png_write_data(png_structp png_ptr,png_bytep data, png_size_t length){
++static void local_png_write_data(png_structp png_ptr,png_bytep data, png_size_t length){
+ SDL_RWops *rp = (SDL_RWops*) png_get_io_ptr(png_ptr);
+ SDL_RWwrite(rp,data,1,length);
+ }
+@@ -89,7 +90,7 @@
+ goto savedone;
+ }
+ /* setup custom writer functions */
+- png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
++ png_set_write_fn(png_ptr,(voidp)src,local_png_write_data,NULL);
+
+ if (setjmp(png_jmpbuf(png_ptr))){
+ SDL_SetError("Unknown error writing PNG");
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 232b0f6b4287..eeb670e0665e 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -7,7 +7,7 @@
PORTNAME= palomino
PORTVERSION= 20120310
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.palomino3d.org/sim/
DISTFILES= ${PORTNAME}_src_${PORTVERSION}.txz \
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index 46836245caac..49d063c7b6a1 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peg-e
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://gottcode.org/peg-e/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index edb39ebea069..2844fb42db5a 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pengpong
PORTVERSION= 0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-linux
diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index db720f8e41c4..f6bd7fa400a5 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -7,14 +7,14 @@
PORTNAME= penguin-command
PORTVERSION= 1.6.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A clone of the classic game Missile Command
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_SDL= mixer image sdl
diff --git a/games/pets/Makefile b/games/pets/Makefile
index 99a92ba56eb2..4bb752323f74 100644
--- a/games/pets/Makefile
+++ b/games/pets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pets
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://www.loria.fr/~rougier/pub/Software/
diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile
index fc6522fe67d1..5275f4aa00e7 100644
--- a/games/phlipple/Makefile
+++ b/games/phlipple/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phlipple
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index dc74c3a674ad..e6f9ed739f76 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinball
PORTVERSION= 0.3.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/pinedit/Makefile b/games/pinedit/Makefile
index b39845b382af..24c39f8ea2a1 100644
--- a/games/pinedit/Makefile
+++ b/games/pinedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinedit
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/pinball/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 09fa59829eb5..c151dfb8ef0c 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -7,14 +7,14 @@
PORTNAME= pingus
PORTVERSION= 0.7.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://pingus.seul.org/files/
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Lemmings-like game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
boost_regex.4:${PORTSDIR}/devel/boost-libs \
physfs.1:${PORTSDIR}/devel/physfs
diff --git a/games/pingus/files/patch-src-screenshot.cpp b/games/pingus/files/patch-src-screenshot.cpp
new file mode 100644
index 000000000000..4f6cc17dd13e
--- /dev/null
+++ b/games/pingus/files/patch-src-screenshot.cpp
@@ -0,0 +1,11 @@
+--- src/screenshot.cpp.orig 2007-09-30 18:07:08.000000000 +0200
++++ src/screenshot.cpp 2012-04-29 06:49:26.000000000 +0200
+@@ -159,7 +159,7 @@
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem reading the file
+ fclose(fp);
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index fd254e969f9f..fd6a35800ded 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pink-pony
PORTVERSION= 1.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index b07393b37ebe..4a3013afa2a5 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pioneers
PORTVERSION= 0.12.5
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= SF/pio/Source/
diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index b93ee7956ba5..09a2f095ca5d 100644
--- a/games/pipenightdreams/Makefile
+++ b/games/pipenightdreams/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pipenightdreams
PORTVERSION= 0.10.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://www.libsdl.org/projects/pipenightdreams/packages/
diff --git a/games/plutocracy/Makefile b/games/plutocracy/Makefile
index 7d60a409b670..14d57869dc98 100644
--- a/games/plutocracy/Makefile
+++ b/games/plutocracy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plutocracy
PORTVERSION= 0.0.20081229
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
@@ -16,6 +16,8 @@ COMMENT= Multiplayer 3D economy/trade-based RTS
LICENSE= GPLv2
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_BZIP2= yes
USE_SDL= sdl pango
USE_GL= gl glu
diff --git a/games/plutocracy/files/patch-r_surface.c b/games/plutocracy/files/patch-r_surface.c
new file mode 100644
index 000000000000..c11b0240c375
--- /dev/null
+++ b/games/plutocracy/files/patch-r_surface.c
@@ -0,0 +1,20 @@
+--- src/render/r_surface.c.orig 2008-12-26 20:15:17.000000000 +0100
++++ src/render/r_surface.c 2012-05-09 12:14:42.000000000 +0200
+@@ -269,7 +269,7 @@
+ png_set_read_fn(png_ptr, (voidp)&file, (png_rw_ptr)user_png_read);
+
+ /* If an error occurs in libpng, it will longjmp back here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ C_warning("Error loading PNG '%s'", filename);
+ goto cleanup;
+ }
+@@ -397,7 +397,7 @@
+ (png_flush_ptr)user_png_flush);
+
+ /* If an error occurs in libpng, it will longjmp back here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ C_warning("Error saving PNG '%s'", filename);
+ goto cleanup;
+ }
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 20c0fc8366fd..36034261d3b0 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pokerth
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
DISTNAME= PokerTH-${PORTVERSION}-src
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index cef77dd07a72..a43ec6ba5b15 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pongix
PORTVERSION= 0.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/pongix/descargas/
diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile
index 6b41d1e1b04f..59f9efa4f56c 100644
--- a/games/pouetchess/Makefile
+++ b/games/pouetchess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pouetchess
PORTVERSION= 0.1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.11
DISTNAME= pouetChess_0.11_src
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index 12bccf610bfd..13c153e1e77c 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ppracer
DISTVERSION= 0.5alpha
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D downhill racing game... kind of like TuxRacer Improved
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
@@ -28,7 +28,7 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h)
post-patch:
@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
- -e 's,libpng12,libpng14,g' ${WRKSRC}/configure
+ -e 's,libpng12,libpng15,g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,RacingMode::,,' ${WRKSRC}/src/racingmode.h
.include <bsd.port.mk>
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index 3201bb464144..3ad6bf04b3dc 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -7,14 +7,14 @@
PORTNAME= pushover
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Pushover/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A puzzle game where the goal is to push over all dominoes
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 972d9a00b379..bd9b550ca74b 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mnemosyne
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games python
MASTER_SITES= SF/${PORTNAME}-proj/${PORTNAME}/${PORTNAME:S/^m/M/}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/games/py-pychess/Makefile b/games/py-pychess/Makefile
index e65f4f91c64a..8d1ec5fdf597 100644
--- a/games/py-pychess/Makefile
+++ b/games/py-pychess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pychess
DISTVERSION= 0.10rc1
-PORTREVISION= 1
+PORTREVISION= 2
#PORTEPOCH= 0
CATEGORIES= games python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
diff --git a/games/pyawale/Makefile b/games/pyawale/Makefile
index 20ff6ddabbe1..c6d92872eb87 100644
--- a/games/pyawale/Makefile
+++ b/games/pyawale/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyawale
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/pyawale/
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 8d8e91e0c3c0..09e55c1dc336 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pydance
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://people.freebsd.org/~sylvio/pydance/ \
http://icculus.org/pyddr/ \
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index da95f9426e29..bebd1a45682f 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pykawari
PORTVERSION= 8.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/kawari/kawari/${PORTVERSION}
DISTNAME= kawari-${PORTVERSION:S/.//g}
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index dd47dd6668ec..250320ecef6e 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pysycache
PORTVERSION= 2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games python
MASTER_SITES= http://download.gna.org/py4childs/${PORTNAME}/v${PORTVERSION}/
DIST_SUBDIR= ${PORTNAME}
diff --git a/games/q15/Makefile b/games/q15/Makefile
index 44a0126e1bf3..ee2e986f4078 100644
--- a/games/q15/Makefile
+++ b/games/q15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q15
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://silversoft.net/src/
diff --git a/games/q2p/Makefile b/games/q2p/Makefile
index 29c8a521d984..2fcd66094d23 100644
--- a/games/q2p/Makefile
+++ b/games/q2p/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q2p
PORTVERSION= 0.2.20061231
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Q2P/
DISTNAME= Q2P-0.2-2006-12-31
@@ -41,7 +41,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL)
USE_GL= glu
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.endif
.if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL)
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index 62388b5f1b54..583e5193606c 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q2pro
PORTVERSION= ${SVN_REV}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alepulver
@@ -68,7 +68,7 @@ PLIST_SUB+= GAME="@comment "
.if !defined(WITHOUT_GL)
USE_GL= yes
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
ALL_TARGET+= ref_newgl
PLIST_SUB+= GL=""
.else
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index bc1d6c30f1be..23eb3a689198 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qgo
PORTVERSION= 1.5.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}
diff --git a/games/qnetchess/Makefile b/games/qnetchess/Makefile
index 5106010a930e..59d268fe1cb4 100644
--- a/games/qnetchess/Makefile
+++ b/games/qnetchess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= QNetChess
PORTVERSION= 1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://www.silversoft.net/src/
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 054f027d3cc2..1f33083f2351 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qnetwalk
PORTVERSION= 1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://qt.osdn.org.ua/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index 2698ed2dac74..efdb627388e0 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qonk
PORTVERSION= 0.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/quackle/Makefile b/games/quackle/Makefile
index 7e33babc0eeb..39390eec9ddb 100644
--- a/games/quackle/Makefile
+++ b/games/quackle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quackle
PORTVERSION= 0.97
+PORTREVISION= 1
DISTVERSIONSUFFIX= -source
CATEGORIES= games
MASTER_SITES= http://people.csail.mit.edu/jasonkb/quackle/downloads/%SUBDIR%/
diff --git a/games/quadra/Makefile b/games/quadra/Makefile
index 149a73fde0b6..5f89b0e495c6 100644
--- a/games/quadra/Makefile
+++ b/games/quadra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quadra
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://kbrandt.sdf-eu.org/FreeBSD/distfiles/ \
ftp://ftp.bsdforen.de/pub/BSDForen/distfiles/ \
@@ -15,7 +16,7 @@ MASTER_SITES= http://kbrandt.sdf-eu.org/FreeBSD/distfiles/ \
MAINTAINER= kbrandt@sdf-eu.org
COMMENT= A tetris like game with multiplayer support
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_SDL= sdl
@@ -25,7 +26,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS+= -I${LOCALBASE}/include/libpng
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/${PORTNAME} \
diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile
index f8b499aed7db..c26dcf6b2a16 100644
--- a/games/quake2max/Makefile
+++ b/games/quake2max/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quake2max
PORTVERSION= 0.45
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \
${MASTER_SITE_LOCAL:S/$/:data/}
@@ -48,7 +48,7 @@ Q2MAX_DATA= ${PORTNAME}.044.rar
.if defined(WITH_GLX) || defined(WITH_SDLGL)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GL= yes
.endif
diff --git a/games/quake2max/files/patch-ref_gl__sul_png.c b/games/quake2max/files/patch-ref_gl__sul_png.c
new file mode 100644
index 000000000000..9061bd5a9a32
--- /dev/null
+++ b/games/quake2max/files/patch-ref_gl__sul_png.c
@@ -0,0 +1,11 @@
+--- ref_gl/sul_png.c.orig 2005-12-27 10:57:45.000000000 +0100
++++ ref_gl/sul_png.c 2012-04-29 06:53:31.000000000 +0200
+@@ -177,7 +177,7 @@
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ free(rgbdata);
diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index 18add39c6e5f..205c7d635b72 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qudos
PORTVERSION= 0.40.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/QuDos/
DISTNAME= QuDos-${PORTVERSION}-src
@@ -68,7 +68,7 @@ PLIST_SUB+= ${mod}="@comment "
.if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL)
USE_GL= yes
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.endif
.if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL)
diff --git a/games/qudos/files/patch-src__ref_gl__gl_local.h b/games/qudos/files/patch-src__ref_gl__gl_local.h
new file mode 100644
index 000000000000..aa9dce66ef0d
--- /dev/null
+++ b/games/qudos/files/patch-src__ref_gl__gl_local.h
@@ -0,0 +1,10 @@
+--- src/ref_gl/gl_local.h.orig 2006-06-10 12:22:27.000000000 +0200
++++ src/ref_gl/gl_local.h 2012-04-25 06:13:42.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <GL/glext.h>
+
+ #include <png.h>
++#include <zlib.h>
+ #include <jpeglib.h>
+
+ #include "../client/ref.h"
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 11be16a8ed7a..22c310e989a4 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= r1q2
PORTVERSION= 7904
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/
DISTNAME= ${PORTNAME}-b${PORTVERSION}-src
@@ -69,8 +69,9 @@ PLIST_SUB+= GAME="@comment "
USE_GL= yes
USE_SDL= sdl
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
ALL_TARGET+= ref_gl
+CFLAGS+= -I${LOCALBASE}/include/libpng15
PLIST_SUB+= REF_GL=""
.else
PLIST_SUB+= REF_GL="@comment "
@@ -83,9 +84,6 @@ BROKEN= Does not compile on sparc64
post-patch:
@${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \
${BUILD_WRKSRC}/game/Makefile
-# Resolve name collision with jpeg-8
- ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
- ${WRKSRC}/ref_gl/gl_image.c
pre-build:
@${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \;
diff --git a/games/r1q2/files/patch-ref_gl__gl_image.c b/games/r1q2/files/patch-ref_gl__gl_image.c
new file mode 100644
index 000000000000..7ce3e30e3899
--- /dev/null
+++ b/games/r1q2/files/patch-ref_gl__gl_image.c
@@ -0,0 +1,28 @@
+--- ref_gl/gl_image.c.orig 2012-04-29 06:56:19.000000000 +0200
++++ ref_gl/gl_image.c 2012-04-29 06:56:40.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include "gl_local.h"
+ #include <png.h>
++#include <pngpriv.h>
+ #include <jpeglib.h>
+
+ image_t gltextures[MAX_GLTEXTURES];
+@@ -1520,7 +1521,7 @@
+ cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
+ }
+
+-void jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
++void local_jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len)
+ {
+ cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+ cinfo->src->init_source = jpg_null;
+@@ -1561,7 +1562,7 @@
+
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_decompress(&cinfo);
+- jpeg_mem_src(&cinfo, rawdata, rawsize);
++ local_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ jpeg_read_header(&cinfo, true);
+ jpeg_start_decompress(&cinfo);
+
diff --git a/games/railroad-rampage/Makefile b/games/railroad-rampage/Makefile
index 1edd1d458a3a..6dd48be8b46d 100644
--- a/games/railroad-rampage/Makefile
+++ b/games/railroad-rampage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= railroad-rampage
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
DISTNAME= RailroadRampage_${PORTVERSION}_Linux
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index 633e05d76c4e..a046dc1b5a7b 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= redeclipse
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_linux_bsd
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 334419d9fb4c..6be5467282ff 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rockdodger
PORTVERSION= 0.6.0a
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/spacerocks/spacerocks/${PORTVERSION}
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 859e4e5ea0ce..9c25a0bf1099 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RealTimeBattle
PORTVERSION= 1.0.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF${PORTNAME:}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext
diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
index c15a899d4bce..b4e04d4c8236 100644
--- a/games/sauerbraten/Makefile
+++ b/games/sauerbraten/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sauerbraten
PORTVERSION= 20100728
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2010_07_19
DISTNAME= ${PORTNAME}_2010_07_28_justice_edition_linux
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index df31fd7f4a67..157ab9541d30 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}
DISTNAME= Scorched3D-${SCORCH_VERSION}-src
@@ -19,7 +20,7 @@ LICENSE= GPLv2
LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \
vorbis.4:${PORTSDIR}/audio/libvorbis \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
fftw3.6:${PORTSDIR}/math/fftw3 \
fftw3f.6:${PORTSDIR}/math/fftw3-float \
expat.6:${PORTSDIR}/textproc/expat2
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index b045fb6d1981..fe75f126412c 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scourge
PORTVERSION= 0.21.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/.src/}
diff --git a/games/scramble/Makefile b/games/scramble/Makefile
index 94c4f2c0aece..f75a3676964d 100644
--- a/games/scramble/Makefile
+++ b/games/scramble/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scramble
PORTVERSION= 0.9.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.shiftygames.com/scramble/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 8dc97bf5d6cc..11c9979b5661 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scummvm-tools
DISTVERSION= 1.0.0rc1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games emulators
MASTER_SITES= SF/scummvm/${PORTNAME}/${DISTVERSION}
@@ -20,7 +20,7 @@ BUILD_DEPENDS= lame:${PORTSDIR}/audio/lame \
oggenc:${PORTSDIR}/audio/vorbis-tools \
oggdec:${PORTSDIR}/audio/vorbis-tools \
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
USE_BZIP2= yes
@@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
MAKE_JOBS_SAFE= yes
LDFLAGS+= -L${LOCALBASE}/lib
-CXXFLAGS= -I${LOCALBASE}/include
+CXXFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
OPTIONS= WX "Build wxWidgets GUI" On
diff --git a/games/scummvm-tools/files/patch-encode_dxa.cpp b/games/scummvm-tools/files/patch-encode_dxa.cpp
new file mode 100644
index 000000000000..08dbb53b08d0
--- /dev/null
+++ b/games/scummvm-tools/files/patch-encode_dxa.cpp
@@ -0,0 +1,10 @@
+--- encode_dxa.cpp.orig 2009-08-23 15:44:34.000000000 +0200
++++ encode_dxa.cpp 2012-04-29 06:59:57.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "util.h"
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ const uint32 typeDEXA = 0x41584544;
+ const uint32 typeFRAM = 0x4d415246;
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index f053674fbfdd..9902bcc1a328 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdb
PORTVERSION= 1.0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://stage.gamecreation.org/shotgund/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile
index b82928ad37a2..2039af142292 100644
--- a/games/sdl-ball/Makefile
+++ b/games/sdl-ball/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl-ball
PORTVERSION= 1.01
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/sdlCC/Makefile b/games/sdlCC/Makefile
index 717c78952c2c..fa5dfe888909 100644
--- a/games/sdlCC/Makefile
+++ b/games/sdlCC/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdlCC
PORTVERSION= 0.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://chinesecheckers.vegard2.no/ \
http://jcatki.no-ip.org/files/
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile
index beae0fe9c8c7..50fe684b20b7 100644
--- a/games/sdlquake2/Makefile
+++ b/games/sdlquake2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdlquake2
PORTVERSION= 0.1.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://koti.mbnet.fi/~turol/sdlquake2/
@@ -33,10 +33,11 @@ PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///}
.if defined(WITH_CLIENT)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GL= yes
USE_SDL= sdl
MAKE_ENV+= BUILD_CLIENT=YES
+CFLAGS+= -I${LOCALBASE}/include/libpng15
PLIST_SUB+= CLIENT=""
.else
PLIST_SUB+= CLIENT="@comment "
@@ -56,11 +57,6 @@ PLIST_SUB+= GAME=""
PLIST_SUB+= GAME="@comment "
.endif
-post-patch:
-# Resolve name collision with jpeg-8
- ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
- ${WRKSRC}/gl_image.c
-
do-install:
${MKDIR} ${LIBDIR}/baseq2
.if defined(WITH_CLIENT)
diff --git a/games/sdlquake2/files/patch-gl_image.c b/games/sdlquake2/files/patch-gl_image.c
index f5cce181947b..9b4bbeef3e08 100644
--- a/games/sdlquake2/files/patch-gl_image.c
+++ b/games/sdlquake2/files/patch-gl_image.c
@@ -1,6 +1,14 @@
---- ./gl_image.c.orig Thu May 19 17:56:13 2005
-+++ ./gl_image.c Sun Feb 26 11:23:56 2006
-@@ -555,7 +555,7 @@
+--- gl_image.c.orig 2005-05-19 22:56:13.000000000 +0200
++++ gl_image.c 2012-04-29 07:01:09.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include "gl_local.h"
+ #include <png.h>
++#include <pngpriv.h>
+ #include <jpeglib.h>
+ #include "redblack.h"
+
+@@ -555,7 +556,7 @@
size_t Pos;
} TPngFileBuffer;
@@ -9,7 +17,7 @@
{
TPngFileBuffer *PngFileBuffer=(TPngFileBuffer*)png_get_io_ptr(Png);
memcpy(buf,PngFileBuffer->Buffer+PngFileBuffer->Pos,size);
-@@ -1007,17 +1007,17 @@
+@@ -1007,24 +1008,24 @@
=================================================================
*/
@@ -30,3 +38,20 @@
{
cinfo->src->next_input_byte += (size_t) num_bytes;
+ cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
+ }
+
+-void jpeg_mem_src(j_decompress_ptr cinfo, byte *mem, int len)
++void local_jpeg_mem_src(j_decompress_ptr cinfo, byte *mem, int len)
+ {
+ cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small)((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+ cinfo->src->init_source = jpg_null;
+@@ -1065,7 +1066,7 @@
+
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_decompress(&cinfo);
+- jpeg_mem_src(&cinfo, rawdata, rawsize);
++ local_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ jpeg_read_header(&cinfo, true);
+ jpeg_start_decompress(&cinfo);
+
diff --git a/games/sea-defender/Makefile b/games/sea-defender/Makefile
index 3e554c145448..449bf9c14a4f 100644
--- a/games/sea-defender/Makefile
+++ b/games/sea-defender/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sea-defender
PORTVERSION= r20100723
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile
index 6ad918c14c23..971be053fdfa 100644
--- a/games/secretmaryochronicles/Makefile
+++ b/games/secretmaryochronicles/Makefile
@@ -7,6 +7,7 @@
PORTNAME= secretmaryochronicles
PORTVERSION= 1.10.git20120512
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
# SF/smclone/Secret%20Maryo%20Chronicles/${PORTVERSION}
@@ -17,7 +18,7 @@ COMMENT= Secret Maryo Chronicles two-dimensional platform game
LIB_DEPENDS= CEGUIBase-0.7.5.0:${PORTSDIR}/graphics/cegui \
boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_AUTOTOOLS= aclocal:env autoheader:env autoconf:env automake:env
diff --git a/games/senken/Makefile b/games/senken/Makefile
index f1f4bc86b938..a2da624265bc 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -6,7 +6,7 @@
PORTNAME= senken
PORTVERSION= 0.3.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 4205e0dd8317..2ebd6cffd356 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= shaaft
PORTVERSION= 0.5.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= SF/criticalmass/OldFiles
DISTNAME= Shaaft-${PORTVERSION}
@@ -15,13 +15,15 @@ DISTNAME= Shaaft-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL 3D falling block game similar to Blockout
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
CONFLICTS= criticalmass-*
USE_BZIP2= yes
USE_SDL= mixer image sdl
USE_GL= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-optimize
DATADIR= ${PREFIX}/share/Shaaft
diff --git a/games/shaaft/files/patch-PNG.cpp b/games/shaaft/files/patch-PNG.cpp
new file mode 100644
index 000000000000..04a62f44fc70
--- /dev/null
+++ b/games/shaaft/files/patch-PNG.cpp
@@ -0,0 +1,19 @@
+--- utilssdl/PNG.cpp.orig 2003-03-03 03:32:18.000000000 +0100
++++ utilssdl/PNG.cpp 2012-05-09 12:16:57.000000000 +0200
+@@ -13,6 +13,7 @@
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
+ #include <PNG.hpp>
++#include <pngpriv.h>
+
+ //Save SDL surface as png
+ bool PNG::Save( SDL_Surface *img, const string &filename)
+@@ -72,7 +73,7 @@
+ return false;
+ }
+
+- if( setjmp(_png->jmpbuf))
++ if( setjmp(png_jmpbuf(_png)))
+ {
+ fclose( fp);
+ png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile
index 8e8cef7052e5..e2807981e128 100644
--- a/games/shootingstar/Makefile
+++ b/games/shootingstar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= shootingstar
PORTVERSION= 1.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://www.2ndpoint.fi/projektit.xml/shootingstar/files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/simplevaders/Makefile b/games/simplevaders/Makefile
index a8e8d85a925a..b477f4335f29 100644
--- a/games/simplevaders/Makefile
+++ b/games/simplevaders/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simplevaders
PORTVERSION= 0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://dusted.dk/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/six/Makefile b/games/six/Makefile
index 062af2adbaa3..28ad7edf2abe 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -6,7 +6,7 @@
PORTNAME= six
PORTVERSION= 0.5.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games kde
MASTER_SITES= http://six.retes.hu/download/
diff --git a/games/solarconquest/Makefile b/games/solarconquest/Makefile
index e1c81f3e5252..919e92655623 100644
--- a/games/solarconquest/Makefile
+++ b/games/solarconquest/Makefile
@@ -7,7 +7,7 @@
PORTNAME= solarconquest
PORTVERSION= 0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://games.sajthelper.com/ \
${MASTER_SITE_LOCAL} \
diff --git a/games/solarwolf/Makefile b/games/solarwolf/Makefile
index 92f0b55da833..6c7c1ffb4cb0 100644
--- a/games/solarwolf/Makefile
+++ b/games/solarwolf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= solarwolf
PORTVERSION= 1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.pygame.org/shredwheat/solarwolf/
diff --git a/games/sopwith/Makefile b/games/sopwith/Makefile
index f9e746ae6aca..18e9435478d3 100644
--- a/games/sopwith/Makefile
+++ b/games/sopwith/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sopwith
PORTVERSION= 1.7.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/sdl-${PORTNAME}/sdl_${PORTNAME}/${PORTVERSION}
diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile
index 2c1073805d3e..6e2081789b2c 100644
--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@@ -6,7 +6,7 @@
PORTNAME= spacehulk
PORTVERSION= 1.5.b1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games kde
MASTER_SITES= http://r.vinot.free.fr/spacehulk/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b1/-beta1/}
diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index 5cab92d52094..0871e92961d7 100644
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spacejunk
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index abf9bbe85ac6..aa02fed411cb 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= spellathon
PORTVERSION= 5.79
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/spring/Makefile b/games/spring/Makefile
index 94900d1b98eb..390a6066033c 100644
--- a/games/spring/Makefile
+++ b/games/spring/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spring
PORTVERSION= 0.82.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 83c6bbe4ee9f..cd073da8826b 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -7,6 +7,7 @@
PORTNAME= springlobby
PORTVERSION= 0.143
+PORTREVISION= 1
CATEGORIES= games net
MASTER_SITES= http://www.springlobby.info/tarballs/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 2af0ff260507..4e82826cd549 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stepmania
PORTVERSION= 20071121
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMESUFFIX= -devel
@@ -17,7 +17,7 @@ MAINTAINER= braddo@tranceaddict.net
COMMENT= Stepmania dance and rhythm game
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
m.3:${PORTSDIR}/misc/compat5x
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index fbe5fb4ab3b6..a1da99ba4e14 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stonesoup
PORTVERSION= 0.10.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION}
DISTNAME= stone_soup-${PORTVERSION}-nodeps
@@ -69,7 +70,7 @@ MAKE_ARGS+= TILES=y
PLIST_SUB+= SDL=""
PKGNAMESUFFIX= -sdl
BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
USE_SDL= sdl image
.else
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
index 3edf3c7439fd..0972dbbfe986 100644
--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stransball2
PORTVERSION= 1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
http://braingames.bugreport.nl/stransball2/
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 060d324dd23a..f54275d67301 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stratagus
PORTVERSION= 2.2.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://launchpadlibrarian.net/59493540/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .orig.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Free cross-platform real-time strategy gaming engine
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS= MIKMOD "Enable Mikmod support" off \
MNG "Enable MNG support" off \
@@ -32,6 +32,7 @@ USE_AUTOTOOLS= aclocal autoheader autoconf
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-extra-includes=${LUA_INCDIR} \
+ --with-extra-includes=${LOCALBASE}/include/libpng15 \
--with-extra-libs=${LUA_LIBDIR} \
--without-gles
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/stratagus/files/patch-png.cpp b/games/stratagus/files/patch-png.cpp
new file mode 100644
index 000000000000..17e24efaf1c2
--- /dev/null
+++ b/games/stratagus/files/patch-png.cpp
@@ -0,0 +1,28 @@
+--- src/video/png.cpp.orig 2010-11-20 12:23:28.000000000 +0100
++++ src/video/png.cpp 2012-04-29 07:12:14.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "stratagus.h"
+ #include "video.h"
+@@ -147,7 +148,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ fprintf(stderr, "Error reading the PNG file.\n");
+ ret = -1;
+ goto done;
+@@ -343,7 +344,7 @@
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
diff --git a/games/stroq/Makefile b/games/stroq/Makefile
index 4da4273f8b1d..cf8e15679ea3 100644
--- a/games/stroq/Makefile
+++ b/games/stroq/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stroq
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20sources
diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile
index 1266918ec427..e4863b587d86 100644
--- a/games/sumwars/Makefile
+++ b/games/sumwars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sumwars
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/sumwars/${PORTVERSION}
DISTNAME= sumwars-${PORTVERSION}-src
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index cda28335293c..69b8a8e108c8 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -8,7 +8,7 @@
PORTNAME= super_methane_brothers
PORTVERSION= 1.4.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/methane/Methane%20Stable/Methane%20V${PORTVERSION}
DISTNAME= methane-${PORTVERSION}
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index d4bac0fed27d..aa16169cf435 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= supertux
PORTVERSION= 0.1.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index eb50a4ff3c9c..bb93d568505f 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -7,7 +7,7 @@
PORTNAME= supertuxkart
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION}
EXTRACT_SUFX= -src.tar.bz2
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 64dac6c21913..6e13a6a7137c 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -6,7 +6,7 @@
PORTNAME= taxipilot
PORTVERSION= 0.9.2
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= games kde
MASTER_SITES= SF
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index bc448fe13042..19f1d6a18e2c 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tbe
PORTVERSION= 8.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Milestone%20${PORTVERSION}
DISTNAME= TheButterflyEffect-m${PORTVERSION}.src
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index b9b28f316065..93620e08a610 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tecnoballz
PORTVERSION= 0.92
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://linux.tlk.fr/games/TecnoballZ/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 8ad932e57207..acf6e00bf6ae 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= teg
PORTVERSION= 0.11.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= SF
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index d37f01e52c7d..a548a6a3c500 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tenebrae
PORTVERSION= 1.04
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://tenebrae.sourceforge.net/downloads/
DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \
@@ -16,7 +16,7 @@ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Quake 1 source port with advanced graphics
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
USE_DOS2UNIX= yes
diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile
index 7a4e24497b94..38184a79b7d5 100644
--- a/games/tetzle/Makefile
+++ b/games/tetzle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tetzle
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://gottcode.org/tetzle/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile
index cb0f8c78aec4..04e6c18024f8 100644
--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thegrind
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/radius-engine/ld21/
@@ -17,7 +18,7 @@ LICENSE= GPLv2
LIB_DEPENDS= radius:${PORTSDIR}/graphics/radius-engine \
lua-5.1:${PORTSDIR}/lang/lua \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
physfs.1:${PORTSDIR}/devel/physfs
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index 145ebc7e5a04..28d257d5d0ba 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tmw
PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/themanaworld/The%20Mana%20World/${PORTVERSION}/:src
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src
@@ -17,7 +17,7 @@ MAINTAINER= mva@FreeBSD.org
COMMENT= A free open source 2D MMORPG in development
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
curl.6:${PORTSDIR}/ftp/curl \
physfs.1:${PORTSDIR}/devel/physfs
BUILD_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan
@@ -26,6 +26,7 @@ RUN_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan
USE_CMAKE= yes
USE_SDL= sdl gfx image mixer net ttf
USE_BZIP2= yes
+USE_GETTEXT= yes
NO_WRKSUBDIR= yes
DATADIR= ${PREFIX}/share/mana
diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile
index f882af616f96..3e34f124d5bb 100644
--- a/games/tomatoes/Makefile
+++ b/games/tomatoes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tomatoes
PORTVERSION= 1.5
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= SF
DISTFILES= ${PORTNAME}-linux-src-${PORTVERSION}5${EXTRACT_SUFX} \
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 7445281cb412..c873a8c12e4f 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= torcs
DISTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT= The Open Racing Car Simulator
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
diff --git a/games/torrent/Makefile b/games/torrent/Makefile
index 4cc366b6e1c9..7701f5d0c942 100644
--- a/games/torrent/Makefile
+++ b/games/torrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= torrent
PORTVERSION= 0.8.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.shiftygames.com/torrent/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index a39009f05144..a688586c36e4 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= toycars
PORTVERSION= 0.3.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 7989b12a0f40..fa2ee126d0b9 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trackballs
PORTVERSION= 1.1.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index efd89dcbdf9d..b8aea5db46fe 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -7,7 +7,7 @@
PORTNAME= traindirector
PORTVERSION= 3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.backerstreet.com/traindir/
DISTNAME= tdir36src
diff --git a/games/tremor/Makefile b/games/tremor/Makefile
index 1af6486edf27..16b7b7893e0e 100644
--- a/games/tremor/Makefile
+++ b/games/tremor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tremor
PORTVERSION= 3.2.4.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \
http://tremor.quakedev.com/:data
@@ -21,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Quake engine based on JoeQuake
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
USE_BZIP2= yes
@@ -91,10 +91,6 @@ post-extract:
-d ${WRKDIR}
.endif
-post-patch:
- ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/image.c
-
do-install:
.if !defined(WITHOUT_GLX)
${INSTALL_PROGRAM} ${WRKSRC}/quake/${PORTNAME}-glx ${PREFIX}/bin
diff --git a/games/tremor/files/patch-src__image.c b/games/tremor/files/patch-src__image.c
new file mode 100644
index 000000000000..ed6eb370bd52
--- /dev/null
+++ b/games/tremor/files/patch-src__image.c
@@ -0,0 +1,37 @@
+--- image.c.orig 2005-03-25 21:39:36.000000000 +0100
++++ image.c 2012-05-01 09:41:47.000000000 +0200
+@@ -20,6 +20,7 @@
+ // image.c -- handling images
+
+ #include "quakedef.h"
++#include "zlib.h"
+
+ #define IMAGE_MAX_DIMENSIONS 4096
+
+@@ -489,7 +490,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct (&png_ptr, &pnginfo, NULL);
+ fclose (fin);
+@@ -523,7 +524,7 @@
+ }
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
+- png_set_gray_1_2_4_to_8 (png_ptr);
++ png_set_expand_gray_1_2_4_to_8 (png_ptr);
+
+ if (png_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha (png_ptr);
+@@ -609,7 +610,7 @@
+ return false;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (fp);
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index b7163880971a..887dac39d47f 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trigger
PORTVERSION= 0.5.2.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION}
DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \
diff --git a/games/trophy/Makefile b/games/trophy/Makefile
index f697192802ac..f973d36d0ccf 100644
--- a/games/trophy/Makefile
+++ b/games/trophy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= trophy
PORTVERSION= 2.0.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 407c0806f39f..9f392b41955f 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tuxmath
PORTVERSION= 2.0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= http://alioth.debian.org/frs/download.php/3571/ \
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 9cd12b1e9a23..04642f5e9e28 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tuxpaint-config
PORTVERSION= 0.0.12
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION}
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index b7ed77309f6b..6187d643d274 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tuxpaint
PORTVERSION= 0.9.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/tuxpaint/files/patch-tuxpaint.c b/games/tuxpaint/files/patch-tuxpaint.c
new file mode 100644
index 000000000000..69e26b6152c0
--- /dev/null
+++ b/games/tuxpaint/files/patch-tuxpaint.c
@@ -0,0 +1,10 @@
+--- src/tuxpaint.c.orig 2009-06-18 22:51:58.000000000 +0200
++++ src/tuxpaint.c 2012-05-09 12:18:19.000000000 +0200
+@@ -410,6 +410,7 @@
+ #endif
+
+ #include <png.h>
++#include <pngpriv.h>
+ #define FNAME_EXTENSION ".png"
+ #ifndef PNG_H
+ #error "---------------------------------------------------"
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index 60414c910c03..d539eeede184 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tuxpuck
PORTVERSION= 0.8.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= games
MASTER_SITES= http://www.sourcefiles.org/Games/Sports/Miscellaneous/
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Shufflepuck Cafe Clone
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis \
freetype.9:${PORTSDIR}/print/freetype2
@@ -25,6 +25,7 @@ USE_GMAKE= yes
ALL_TARGET= tuxpuck
MAKE_JOBS_UNSAFE= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MANCOMPRESSED= yes
MAN6= tuxpuck.6
PLIST_FILES= bin/tuxpuck
diff --git a/games/tuxpuck/files/patch-png.c b/games/tuxpuck/files/patch-png.c
new file mode 100644
index 000000000000..b548b04b8943
--- /dev/null
+++ b/games/tuxpuck/files/patch-png.c
@@ -0,0 +1,30 @@
+--- png.c.orig 2002-11-08 11:50:29.000000000 +0100
++++ png.c 2012-04-30 06:40:16.000000000 +0200
+@@ -10,9 +10,10 @@
+ #define MACOS
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+
+ /* png code */
+-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWops *src;
+
+@@ -74,13 +75,13 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ SDL_SetError("Error reading the PNG file.");
+ goto done;
+ }
+
+ /* Set up the input control */
+- png_set_read_fn(png_ptr, src, png_read_data);
++ png_set_read_fn(png_ptr, src, local_png_read_data);
+
+ /* Read PNG header info */
+ png_read_info(png_ptr, info_ptr);
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 4493124f8023..b9d84459d86b 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tuxtype
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://alioth.debian.org/frs/download.php/3270/ \
http://alioth.debian.org/frs/download.php/3540/:t4k_common
diff --git a/games/twitch/Makefile b/games/twitch/Makefile
index 9183640a2e20..f9b67c49b647 100644
--- a/games/twitch/Makefile
+++ b/games/twitch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twitch
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Twitch/${PORTVERSION}
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index a4c41a1663f9..0376d9f91d63 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ufoai
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source
@@ -18,7 +18,7 @@ COMMENT= A strategy game featuring tactical combat
LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
curl:${PORTSDIR}/ftp/curl \
execinfo:${PORTSDIR}/devel/libexecinfo \
theora.0:${PORTSDIR}/multimedia/libtheora \
diff --git a/games/ufoai/files/patch-images.c b/games/ufoai/files/patch-images.c
new file mode 100644
index 000000000000..b2983addf4ba
--- /dev/null
+++ b/games/ufoai/files/patch-images.c
@@ -0,0 +1,10 @@
+--- src/shared/images.c.orig 2010-11-29 17:46:35.000000000 +0100
++++ src/shared/images.c 2012-04-25 06:15:32.000000000 +0200
+@@ -32,6 +32,7 @@
+
+ #include <jpeglib.h>
+ #include <png.h>
++#include <zlib.h>
+
+ /** image formats, tried in this order */
+ static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL };
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 46e1d5422aac..ba4942934f13 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ultimatestunts
PORTVERSION= 0.7.6.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= srcdata-
DISTVERSION= ${PORTVERSION:S/.//g}
CATEGORIES= games
diff --git a/games/umark/Makefile b/games/umark/Makefile
index 634538179eb5..1c131ae1a743 100644
--- a/games/umark/Makefile
+++ b/games/umark/Makefile
@@ -7,7 +7,7 @@
PORTNAME= umark
DISTVERSION= 2.0.0-Beta3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games benchmarks
MASTER_SITES= SF/ut2k3botbench/UMark%20for%20Linux/2.0.0%20Beta%203
DISTNAME= UMark-for-Linux-v${DISTVERSION:S/.//g}
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index ffeef41a627c..1165b5ae7cde 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,7 +14,7 @@
PORTNAME= uqm
PORTVERSION= 0.6.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= SF/sc2/UQM/${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 43dd245cf415..df7671a70f9c 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vamos
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF
@@ -16,7 +17,7 @@ COMMENT= An automotive simulation framework
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_OPENAL= al alut
USE_GL= glut
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index f451494cca3a..64e1ad9ff315 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vavoom
PORTVERSION= 1.33
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_CMAKE= yes
diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile
index dbca88416d0b..f70f0b54a1cd 100644
--- a/games/vdrift/Makefile
+++ b/games/vdrift/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdrift
PORTVERSION= 20100630
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DATE_VERSION}
DISTNAME= ${PORTNAME}-${DATE_VERSION}-src
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index d32f695b0d22..73683d12277a 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vectoroids
PORTVERSION= 1.1.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 662329ae1208..a473e70129a5 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vegastrike
PORTVERSION= 0.5.0
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= vegastrike-source-${PORTVERSION}
diff --git a/games/violetland/Makefile b/games/violetland/Makefile
index 6ab1a1589f02..03f44fca06c8 100644
--- a/games/violetland/Makefile
+++ b/games/violetland/Makefile
@@ -7,7 +7,7 @@
PORTNAME= violetland
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index a2dfa940bf5e..15c25f188979 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -7,7 +7,7 @@
PORTNAME= viruskiller
PORTVERSION= 1.03
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.parallelrealities.co.uk/download/viruskiller/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index af313c24a7d0..57af8140eecd 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -7,7 +7,7 @@
PORTNAME= volleyball
PORTVERSION= 0.8.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/volleyball/descargas/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/vor/Makefile b/games/vor/Makefile
index 796378b88956..a44f53af57fa 100644
--- a/games/vor/Makefile
+++ b/games/vor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vor
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://qualdan.com/vor/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile
index 7d5e5cfdfaab..592382ac358b 100644
--- a/games/vultures-eye/Makefile
+++ b/games/vultures-eye/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vultures
PORTVERSION= 2.1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= http://www.darkarts.co.za/projects/vultures/attachment/wiki/downloads/${PORTVERSION}/
PKGNAMESUFFIX= -eye
@@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}-full${EXTRACT_SUFX}?format=raw
MAINTAINER= llwang@infor.org
COMMENT= A graphical interface for NetHack 3.4.3 forked from Falcon's Eye
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
@@ -28,14 +28,10 @@ HAS_CONFIGURE= yes
CONFIGURE_WRKSRC= ${WRKSRC}/sys/unix
CONFIGURE_SCRIPT= setup.sh
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}"
+CFLAGS+= -I${LOCALBASE}/include/libpng15
+MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}" BASECFLAGS="${CFLAGS}"
MAKE_JOBS_UNSAFE= yes
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|png_infopp_NULL|NULL|g' \
- ${WRKSRC}/win/vultures/util/tiletrans.c
-
pre-configure:
@${CHMOD} 755 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/games/vultures-eye/files/patch-win-vultures-GNUmakefile b/games/vultures-eye/files/patch-win-vultures-GNUmakefile
index 3219b4ebc37f..3cbbee856ce9 100644
--- a/games/vultures-eye/files/patch-win-vultures-GNUmakefile
+++ b/games/vultures-eye/files/patch-win-vultures-GNUmakefile
@@ -1,5 +1,5 @@
---- win/vultures/GNUmakefile.orig Thu May 25 01:17:43 2006
-+++ win/vultures/GNUmakefile Thu May 25 01:28:16 2006
+--- win/vultures/GNUmakefile.orig 2006-06-06 21:23:29.000000000 +0200
++++ win/vultures/GNUmakefile 2012-05-03 21:04:37.000000000 +0200
@@ -12,7 +12,7 @@
ifndef SDL_CONFIG
OS := $(shell uname -s)
@@ -9,3 +9,12 @@
else
SDL_CONFIG := sdl-config
endif
+@@ -48,7 +48,7 @@
+
+ # objects and libs for tiletrans
+ TTOBJ := $(NHSRC)/monst.o $(NHSRC)/objects.o $(BUILDDIR)/util/tiletrans.o $(BUILDDIR)/util/tilespec.o
+-TTCFLAGS = -g -O2 -Wall $(SDL_CFLAGS) # tiletrans uses SDL_endian.h to become endian-safe
++TTCFLAGS = -g -O2 -Wall $(BASECFLAGS) $(SDL_CFLAGS) # tiletrans uses SDL_endian.h to become endian-safe
+ TTLIBS := -L/usr/local/lib -lpng -lm -lz
+ TILESRC := ./gamedata/graphics/tilesrc
+ TTOUTPUT := $(BUILDDIR)/vultures_gametiles.c $(BUILDDIR)/vultures_gametiles.h gamedata/graphics/gametiles.bin
diff --git a/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c b/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c
new file mode 100644
index 000000000000..0304cc186bd6
--- /dev/null
+++ b/games/vultures-eye/files/patch-win-vultures-util-tiletrans.c
@@ -0,0 +1,37 @@
+--- win/vultures/util/tiletrans.c.orig 2006-06-06 21:23:19.000000000 +0200
++++ win/vultures/util/tiletrans.c 2012-05-03 20:12:10.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include "tiletrans.h"
+
+ #include "png.h"
++#include "pngpriv.h"
+ #include "SDL_endian.h"
+
+ #include "config.h"
+@@ -130,7 +131,7 @@
+ if (info_ptr == NULL)
+ {
+ fclose(fp);
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return 1;
+ }
+
+@@ -138,7 +139,7 @@
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ /* If we get here, we had a problem reading the file */
+ return 1;
+@@ -181,7 +182,7 @@
+ /* At this point you have read the entire image */
+
+ /* clean up after the read, and free any memory allocated */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* close the file */
+ fclose(fp);
diff --git a/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c b/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c
index 6d10fc13ed8c..53556f084338 100644
--- a/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c
+++ b/games/vultures-eye/files/patch-win-vultures-vultures_gfl.c
@@ -1,6 +1,6 @@
---- win/vultures/vultures_gfl.c.orig Tue Jun 6 21:23:28 2006
-+++ win/vultures/vultures_gfl.c Sat Jun 17 00:12:45 2006
-@@ -11,7 +11,7 @@
+--- win/vultures/vultures_gfl.c.orig 2006-06-06 21:23:28.000000000 +0200
++++ win/vultures/vultures_gfl.c 2012-05-03 22:41:55.000000000 +0200
+@@ -11,9 +11,10 @@
#endif
#include <SDL.h>
@@ -8,4 +8,16 @@
+/* #include <SDL_image.h> */
#include "png.h"
++#include "pngpriv.h"
+ #include "vultures_gfl.h"
+ #include "vultures_gen.h"
+@@ -73,7 +74,7 @@
+ goto out;
+
+ /* Set up error handling */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ goto out;
+
+ png_set_read_fn(png_ptr, (char *)srcbuf, vultures_png_read_callback);
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 0a3625e64353..21b0ff117331 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wargus
PORTVERSION= 2.2.5.5
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://launchpadlibrarian.net/59493162/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -15,7 +16,7 @@ EXTRACT_SUFX= .orig.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= stratagus:${PORTSDIR}/games/stratagus
LICENSE= GPLv2
@@ -23,10 +24,9 @@ NOT_FOR_ARCHS= sparc64
USE_GMAKE= yes
USE_GNOME= gtk20 gnomehack
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
SUB_FILES= ${PORTNAME} pkg-message
-MAKE_ARGS+= CFLAGS+=-I${LOCALBASE}/include LDFLAGS+=-L${LOCALBASE}/lib
+MAKE_ARGS+= CFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15" LDFLAGS+=-L${LOCALBASE}/lib
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
diff --git a/games/wargus/files/patch-wartool.c b/games/wargus/files/patch-wartool.c
new file mode 100644
index 000000000000..7161df10796a
--- /dev/null
+++ b/games/wargus/files/patch-wartool.c
@@ -0,0 +1,20 @@
+--- wartool.c.orig 2010-11-22 22:44:24.000000000 +0100
++++ wartool.c 2012-05-05 12:37:53.000000000 +0200
+@@ -62,6 +62,8 @@
+ #endif
+ #include <ctype.h>
+ #include <png.h>
++#include <zlib.h>
++#include <pngpriv.h>
+
+ #include "endian.h"
+ #include "xmi2mid.h"
+@@ -1876,7 +1878,7 @@
+ return 1;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ // FIXME: must free buffers!!
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index cddfd72e99c0..d5a6efac8153 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= warmux
DISTVERSION= 11.04.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/${PORTNAME}/ \
http://download.gna.org/${PORTNAME}/archive/
diff --git a/games/warmux/files/patch-src-graphic.surface.cpp b/games/warmux/files/patch-src-graphic.surface.cpp
new file mode 100644
index 000000000000..866d8818c618
--- /dev/null
+++ b/games/warmux/files/patch-src-graphic.surface.cpp
@@ -0,0 +1,10 @@
+--- src/graphic/surface.cpp.orig 2011-04-28 21:03:06.000000000 +0200
++++ src/graphic/surface.cpp 2012-05-09 12:06:52.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 30ac894df76d..8397ac7de015 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -7,7 +7,7 @@
PORTNAME= warzone2100
PORTVERSION= 2.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
mad.2:${PORTSDIR}/audio/libmad \
ogg.7:${PORTSDIR}/audio/libogg \
physfs.1:${PORTSDIR}/devel/physfs \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vorbis.4:${PORTSDIR}/audio/libvorbis \
GLC.0:${PORTSDIR}/graphics/quesoglc \
theora.0:${PORTSDIR}/multimedia/libtheora \
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index bde61325e1e3..daab00e17998 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wesnoth
PORTVERSION= 1.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
http://files.wesnoth.org/
@@ -15,12 +15,13 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERS
MAINTAINER= philip@FreeBSD.org
COMMENT= A fantasy turn-based strategy game
-LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
-
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
+ png15:${PORTSDIR}/graphics/png
+
CONFLICTS= wesnoth-devel-[0-9]*
USE_SDL= image mixer net ttf
diff --git a/games/wesnoth/files/patch-src-tools-exploder_utils.cpp b/games/wesnoth/files/patch-src-tools-exploder_utils.cpp
new file mode 100644
index 000000000000..82e3f5397be3
--- /dev/null
+++ b/games/wesnoth/files/patch-src-tools-exploder_utils.cpp
@@ -0,0 +1,10 @@
+--- src/tools/exploder_utils.cpp.orig 2012-05-09 12:03:45.000000000 +0200
++++ src/tools/exploder_utils.cpp 2012-05-09 12:04:21.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include "game_config.hpp"
+ #include "serialization/string_utils.hpp"
+ #include <png.h>
++#include <zlib.h>
+
+ exploder_point::exploder_point(const std::string &s)
+ : x(0)
diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile
index 0f2fc6b06a38..f058ac1ce0da 100644
--- a/games/whichwayisup/Makefile
+++ b/games/whichwayisup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= whichwayisup
PORTVERSION= 0.7.9
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSION= ${PORTVERSION:S/.//g}
CATEGORIES= games
MASTER_SITES= http://www.hectigo.net/games/whichwayisup/
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 8f46dbfef84b..9f1360f16a3f 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -7,7 +7,7 @@
PORTNAME= widelands
DISTVERSION= build16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://launchpadlibrarian.net/69520494/ \
http://mirror.amdmi3.ru/distfiles/
@@ -17,12 +17,13 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Realtime strategy game inspired by Settlers II
LIB_DEPENDS= ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
GLEW.1:${PORTSDIR}/graphics/glew
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
USE_BZIP2= yes
USE_CMAKE= yes
+USE_GETTEXT= yes
CMAKE_OUTSOURCE=yes
CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \
-DWL_INSTALL_DATADIR="share/widelands" \
@@ -31,6 +32,7 @@ CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \
USE_LUA= 5.1+
USE_SDL= sdl mixer image net ttf gfx
USE_PYTHON_BUILD=2.5+
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/widelands
diff --git a/games/widelands/files/patch-src-graphic-SDL_mng.cc b/games/widelands/files/patch-src-graphic-SDL_mng.cc
new file mode 100644
index 000000000000..b7abbd1cc1e0
--- /dev/null
+++ b/games/widelands/files/patch-src-graphic-SDL_mng.cc
@@ -0,0 +1,35 @@
+--- src/graphic/SDL_mng.cc.orig 2011-04-15 20:40:26.000000000 +0200
++++ src/graphic/SDL_mng.cc 2012-05-03 23:15:20.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <SDL_endian.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ /* Chunk structure */
+ struct chunk_t {
+@@ -230,7 +231,7 @@
+ }
+
+ /* png_read_data callback; return <size> bytes from wherever */
+-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWread(static_cast<SDL_RWops *>(png_get_io_ptr(ctx)), area, size, 1);
+ }
+@@ -276,13 +277,13 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ SDL_SetError("Error reading the PNG file.");
+ goto done;
+ }
+
+ /* Set up the input control */
+- png_set_read_fn(png_ptr, src, png_read_data);
++ png_set_read_fn(png_ptr, src, local_png_read_data);
+
+ /* tell PNG not to read the signature */
+ png_set_sig_bytes(png_ptr, 8);
diff --git a/games/windstille/Makefile b/games/windstille/Makefile
index 37fc658589ac..8f93bb96717a 100644
--- a/games/windstille/Makefile
+++ b/games/windstille/Makefile
@@ -7,7 +7,7 @@
PORTNAME= windstille
PORTVERSION= 0.3.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= games
MASTER_SITES= BERLIOS CENKES
@@ -17,7 +17,7 @@ COMMENT= Classic 2D jump-n-shoot game
LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \
ogg.7:${PORTSDIR}/audio/libogg \
vorbis.4:${PORTSDIR}/audio/libvorbis \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
squirrel.0:${PORTSDIR}/lang/squirrel \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
diff --git a/games/wop/Makefile b/games/wop/Makefile
index 4d1db88d030e..6b575b86c538 100644
--- a/games/wop/Makefile
+++ b/games/wop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wop
PORTVERSION= 0.4.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= http://wormsofprey.org/download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 4e68d4abdb95..f3e2779b0fe5 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xblast
PORTVERSION= 2.10.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION} \
SF/${PORTNAME}/Images/${IMAGES_DATE}:images \
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 015137b00f63..fc865a5bc700 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xboard
PORTVERSION= 4.6.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= xboard
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index f1d384c19261..32942ddc4cb2 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xbubble
PORTVERSION= 0.5.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle Bobble clone for Unix/X11 platforms
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
MAN6= xbubble.6
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-CPPFLAGS+= -I${LOCALBASE}/include/libpng
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib -lintl
.include <bsd.port.mk>
diff --git a/games/xbubble/files/patch-src-loadpng.c b/games/xbubble/files/patch-src-loadpng.c
index d7bf605ecb2a..3a0c67cf9712 100644
--- a/games/xbubble/files/patch-src-loadpng.c
+++ b/games/xbubble/files/patch-src-loadpng.c
@@ -1,6 +1,14 @@
--- src/loadpng.c.orig 2003-09-30 14:55:20.000000000 +0200
-+++ src/loadpng.c 2010-03-30 12:09:13.000000000 +0200
-@@ -55,7 +55,7 @@
++++ src/loadpng.c 2012-04-29 13:39:04.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "gettext.h"
+
+@@ -55,7 +56,7 @@
}
/* ensure that we opened a PNG file */
fread( header, 1, 8, fd );
@@ -9,3 +17,12 @@
fclose(fd);
fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file);
return NULL;
+@@ -73,7 +74,7 @@
+ return NULL;
+ }
+ /* libpng does a longjmp here when it encounters an error */
+- if ( setjmp( png_ptr->jmpbuf ) ) {
++ if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+ png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+ fclose(fd);
+ return NULL;
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 23c2342331d9..7bb07cea5c85 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcowsay
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.nickg.me.uk/files/ \
http://www.predatorlabs.net/dl/
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index 5090c8793faf..f08577920af7 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xglk
PORTVERSION= 411
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.ifarchive.org/if-archive/programming/glk/implementations/
DISTNAME= ${PORTNAME}-0${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT= X Windows Implementation of the Glk API
WRKSRC= ${WRKDIR}/${PORTNAME}
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg png15:${PORTSDIR}/graphics/png
USE_XORG= x11
diff --git a/games/xglk/files/patch-xglk_pict.c b/games/xglk/files/patch-xglk_pict.c
new file mode 100644
index 000000000000..4249ca2c01c1
--- /dev/null
+++ b/games/xglk/files/patch-xglk_pict.c
@@ -0,0 +1,11 @@
+--- xglk_pict.c.orig 1999-08-26 20:42:12.000000000 +0200
++++ xglk_pict.c 2012-04-29 07:14:20.000000000 +0200
+@@ -385,7 +385,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we jump here, we had a problem reading the file */
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ if (rowarray)
diff --git a/games/xlogical/Makefile b/games/xlogical/Makefile
index b659e7e992f0..4617c9c58459 100644
--- a/games/xlogical/Makefile
+++ b/games/xlogical/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xlogical
PORTVERSION= 1.0p8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://changeling.ixionstudios.com/xlogical/downloads/ \
http://freebsd.portsreview.info/downloads/
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 6f7ff5a86302..c61d8f836bf9 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmoto
PORTVERSION= 0.5.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \
http://mirror.amdmi3.ru/distfiles/
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Challenging 2D motocross platform game
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
curl.6:${PORTSDIR}/ftp/curl \
xdg-basedir.2:${PORTSDIR}/x11/libxdg-basedir
diff --git a/games/xmoto/files/patch-tim_png.cpp b/games/xmoto/files/patch-tim_png.cpp
new file mode 100644
index 000000000000..b91bbbb515cb
--- /dev/null
+++ b/games/xmoto/files/patch-tim_png.cpp
@@ -0,0 +1,10 @@
+--- src/image/tim_png.cpp.orig 2012-04-25 06:16:33.000000000 +0200
++++ src/image/tim_png.cpp 2012-04-25 06:16:57.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include "tim.h"
+ #include "png.h"
++#include "zlib.h"
+
+ /*==============================================================================
+ Types
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 320fde43edfd..5328490ca053 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xonotic
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://hagger.rbi.informatik.uni-frankfurt.de/xonotic/ \
http://dl.xonotic.org/
@@ -15,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A fast-paced, chaotic, and intense multiplayer first person shooter
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
MANUAL_PACKAGE_BUILD= huge
diff --git a/games/xorgramana/Makefile b/games/xorgramana/Makefile
index 4a20d9721c18..6ada83aec3d5 100644
--- a/games/xorgramana/Makefile
+++ b/games/xorgramana/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorgramana
PORTVERSION= 0.0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.jwm-art.net/XorGramana/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index a2d1d3b44c72..07e8c9a37e7c 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpilot-ng
PORTVERSION= 4.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX?= -server
diff --git a/games/xpired/Makefile b/games/xpired/Makefile
index 1f78fe8c844f..0b6532052693 100644
--- a/games/xpired/Makefile
+++ b/games/xpired/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpired
PORTVERSION= 1.22
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-linux/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-linux_source
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 6294d143a893..05041a02c262 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xqf
PORTVERSION= 1.0.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index baf853c50c8d..1db1b9f15b88 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscorch
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.xscorch.org/releases/
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 6df6f91721c3..f68c3d6bf010 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xteddy
PORTVERSION= 2.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/
diff --git a/games/xwordpy/Makefile b/games/xwordpy/Makefile
index 19a87d023f2a..21a0081f6ac5 100644
--- a/games/xwordpy/Makefile
+++ b/games/xwordpy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xwordpy
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://x-word.org/
DISTNAME= xword-${PORTVERSION}
diff --git a/games/xye/Makefile b/games/xye/Makefile
index e411cfc1c958..b63c50312569 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xye
PORTVERSION= 0.9.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF
diff --git a/games/zatacka/Makefile b/games/zatacka/Makefile
index 830a7a584e96..12104aea1982 100644
--- a/games/zatacka/Makefile
+++ b/games/zatacka/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zatacka
PORTVERSION= 0.1.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 285c1c08f1b1..0d9e766ba2ab 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zaz
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index d20e2b4fa940..eb645a137152 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zoom
PORTVERSION= 1.1.5
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.logicalshift.co.uk/unix/zoom/ \
http://mirror.4bit.ws/
@@ -15,7 +16,7 @@ MAINTAINER= dhn@FreeBSD.org
COMMENT= Z-Interpreter for X with full V6 support
LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_CSTD= gnu89
USE_PERL5= yes
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 0f5d4c860e62..463e7bd9144f 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -7,6 +7,7 @@
PORTNAME= BBBike
PORTVERSION= 3.17
+PORTREVISION= 1
CATEGORIES= german
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
diff --git a/german/bsdforen-firefox-searchplugin/Makefile b/german/bsdforen-firefox-searchplugin/Makefile
index cc5a144115b4..588acd501cb1 100644
--- a/german/bsdforen-firefox-searchplugin/Makefile
+++ b/german/bsdforen-firefox-searchplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bsdforen-firefox-searchplugin
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= german www
MASTER_SITES= http://www.crashmail.de/files/ \
http://people.bsdgroup.de/~steve/files/
diff --git a/german/bsdgroup-firefox-searchplugin/Makefile b/german/bsdgroup-firefox-searchplugin/Makefile
index 8801dd6fd611..bc8443c88d2c 100644
--- a/german/bsdgroup-firefox-searchplugin/Makefile
+++ b/german/bsdgroup-firefox-searchplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bsdgroup-firefox-searchplugin
PORTVERSION= 0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= german www
MASTER_SITES= http://www.crashmail.de/files/ \
http://people.bsdgroup.de/~steve/files/
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index 4e3e1f76b7fb..4ce2c473e111 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= german kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index ce898c5683a6..055fd48a8fe4 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES?= german kde
MAINTAINER= kde@FreeBSD.org
diff --git a/german/kheisereg/Makefile b/german/kheisereg/Makefile
index 59fe7116f7b7..9be8275af130 100644
--- a/german/kheisereg/Makefile
+++ b/german/kheisereg/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kheisereg
PORTVERSION= 0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= german kde
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= markus
diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile
index 38524bb59668..327304f20f02 100644
--- a/german/ksteak/Makefile
+++ b/german/ksteak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksteak
PORTVERSION= 1.0.0.p2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= german kde
MASTER_SITES= http://www.der-fritz.de/ksteak/
DISTNAME= ksteak-1.0.0pre2
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index acceeb9c66f3..e327b36c8636 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tipp10
PORTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= german
MASTER_SITES= http://www.tipp10.com/en/download/
DISTNAME= tipp10_source_v2-1-0
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 444d5e7bc6bd..619c74f17b53 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Coin
PORTVERSION= 3.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \
ftp://ftp.coin3d.org/pub/coin/src/all/
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 09251677ef90..629e120facdf 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= EZWGL
PORTVERSION= 1.50
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics devel
MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/
DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz
@@ -16,13 +16,13 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The EZ Widget and Graphics Library
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_XORG= x11 xext
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
.include <bsd.port.pre.mk>
diff --git a/graphics/EZWGL/files/patch-EZ_Png.c b/graphics/EZWGL/files/patch-EZ_Png.c
new file mode 100644
index 000000000000..2cbe00f9e1ab
--- /dev/null
+++ b/graphics/EZWGL/files/patch-EZ_Png.c
@@ -0,0 +1,19 @@
+--- lib/EZ_Png.c.orig 1999-12-03 22:49:22.000000000 +0100
++++ lib/EZ_Png.c 2012-04-27 07:56:25.000000000 +0200
+@@ -37,6 +37,7 @@
+ #if defined(HAVE_LIBPNG) && defined(PNG_SUPPORT)
+ #undef EXTERN
+ #include <png.h>
++#include <pngpriv.h>
+
+ static int EZ_ReadPng(fname, w_ret, h_ret, p_ret, rgb_return)
+ char *fname;
+@@ -61,7 +62,7 @@
+ fclose(fp);
+ return(0);
+ }
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(fp);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 82145a91ad1e..8f4415a2f6ac 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.1.15
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
@@ -22,9 +22,10 @@ CONFLICTS= GraphicsMagick-1.[23].*
LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
fpx.[2-9]:${PORTSDIR}/graphics/libfpx \
jbig:${PORTSDIR}/graphics/jbigkit \
+ png15:${PORTSDIR}/graphics/png \
wmflite:${PORTSDIR}/graphics/libwmf \
xml2:${PORTSDIR}/textproc/libxml2
-OTHERGRAPHICS= jasper jpeg lcms png tiff
+OTHERGRAPHICS= jasper jpeg lcms tiff
LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
@@ -56,6 +57,7 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CFLAGS+= -DPNG_DEPSTRUCT=
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/GraphicsMagick/files/patch-coders__png.c b/graphics/GraphicsMagick/files/patch-coders__png.c
index 49c65302d833..ff6d44b05c8c 100644
--- a/graphics/GraphicsMagick/files/patch-coders__png.c
+++ b/graphics/GraphicsMagick/files/patch-coders__png.c
@@ -1,6 +1,32 @@
--- coders/png.c.orig 2008-01-18 00:34:17.000000000 +0100
-+++ coders/png.c 2010-03-28 19:51:04.000000000 +0200
-@@ -2038,10 +2038,10 @@
++++ coders/png.c 2012-04-29 07:23:05.000000000 +0200
+@@ -73,6 +73,7 @@
+ #if defined(HasPNG)
+ #include "png.h"
+ #include "zlib.h"
++#include "pngpriv.h"
+
+ #if PNG_LIBPNG_VER > 95
+ /*
+@@ -1365,7 +1366,7 @@
+ " libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING,
+ message);
+ (void) ThrowException2(&image->exception,CoderError,message,image->filename);
+- longjmp(ping->jmpbuf,1);
++ longjmp(png_jmpbuf(ping),1);
+ }
+
+ static void PNGWarningHandler(png_struct *ping,png_const_charp message)
+@@ -1660,7 +1661,7 @@
+ ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image)
+ }
+ png_pixels=(unsigned char *) NULL;
+- if (setjmp(ping->jmpbuf))
++ if (setjmp(png_jmpbuf(ping)))
+ {
+ /*
+ PNG image is corrupt.
+@@ -2038,10 +2039,10 @@
/*
Image has a transparent background.
*/
@@ -15,7 +41,7 @@
if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
{
transparent_color.red=transparent_color.opacity;
-@@ -2547,7 +2547,7 @@
+@@ -2547,7 +2548,7 @@
index=indexes[x];
if (index < ping_info->num_trans)
q->opacity=
@@ -24,7 +50,16 @@
q++;
}
else if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
-@@ -6229,12 +6229,12 @@
+@@ -6030,7 +6031,7 @@
+ png_set_write_fn(ping,image,png_put_data,png_flush_data);
+ png_pixels=(unsigned char *) NULL;
+
+- if (setjmp(ping->jmpbuf))
++ if (setjmp(png_jmpbuf(ping)))
+ {
+ /*
+ PNG write failed.
+@@ -6229,12 +6230,12 @@
/*
Identify which colormap entry is transparent.
*/
@@ -40,7 +75,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
-@@ -6254,7 +6254,7 @@
+@@ -6254,7 +6255,7 @@
index=indexes[x];
assert((unsigned long) index < number_colors);
@@ -49,7 +84,7 @@
ScaleQuantumToChar(p->opacity));
}
p++;
-@@ -6262,14 +6262,14 @@
+@@ -6262,14 +6263,14 @@
}
ping_info->num_trans=0;
for (i=0; i < (long) number_colors; i++)
@@ -66,7 +101,7 @@
/*
Identify which colormap entry is the background color.
*/
-@@ -6388,12 +6388,12 @@
+@@ -6388,12 +6389,12 @@
if (ping_info->bit_depth == 1)
mask=0x0001;
ping_info->valid|=PNG_INFO_tRNS;
@@ -84,7 +119,7 @@
(ScaleQuantumToChar(MaxRGB-p->opacity));
}
if (ping_info->valid & PNG_INFO_tRNS)
-@@ -6413,7 +6413,7 @@
+@@ -6413,7 +6414,7 @@
{
if (p->opacity != OpaqueOpacity)
{
@@ -93,7 +128,7 @@
{
break; /* Can't use RGB + tRNS for multiple
transparent colors. */
-@@ -6426,7 +6426,7 @@
+@@ -6426,7 +6427,7 @@
}
else
{
@@ -102,7 +137,7 @@
break; /* Can't use RGB + tRNS when another pixel
having the same RGB samples is
transparent. */
-@@ -6444,10 +6444,10 @@
+@@ -6444,10 +6445,10 @@
ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */
if (image->depth == 8)
{
@@ -117,7 +152,7 @@
}
}
}
-@@ -6463,7 +6463,7 @@
+@@ -6463,7 +6464,7 @@
{
ping_info->color_type=PNG_COLOR_TYPE_GRAY;
if (save_image_depth == 16 && image->depth == 8)
@@ -126,7 +161,7 @@
}
if (image->depth > QuantumDepth)
image->depth=QuantumDepth;
-@@ -6577,14 +6577,14 @@
+@@ -6577,14 +6578,14 @@
/*
Identify which colormap entry is transparent.
*/
@@ -144,7 +179,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
-@@ -6604,21 +6604,21 @@
+@@ -6604,21 +6605,21 @@
index=indexes[x];
assert((unsigned long) index < number_colors);
@@ -169,7 +204,7 @@
}
/*
-@@ -6636,10 +6636,10 @@
+@@ -6636,10 +6637,10 @@
image->depth=8;
if ((save_image_depth == 16) && (image->depth == 8))
{
@@ -184,7 +219,7 @@
}
}
-@@ -6666,8 +6666,8 @@
+@@ -6666,8 +6667,8 @@
" Setting up bKGD chunk");
png_set_bKGD(ping,ping_info,&background);
@@ -195,7 +230,7 @@
}
}
if (logging)
-@@ -7174,7 +7174,7 @@
+@@ -7174,7 +7175,7 @@
#endif
if (ping_info->valid & PNG_INFO_tRNS)
{
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 355ac6e6e0a6..fae3f1e3ccc4 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.2/
@@ -19,10 +19,11 @@ COMMENT= Fast image processing tools based on ImageMagick
CONFLICTS= GraphicsMagick-1.[13].*
LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
+ png15:${PORTSDIR}/graphics/png \
jbig:${PORTSDIR}/graphics/jbigkit \
wmflite:${PORTSDIR}/graphics/libwmf \
xml2:${PORTSDIR}/textproc/libxml2
-OTHERGRAPHICS= jasper jpeg lcms png tiff
+OTHERGRAPHICS= jasper jpeg lcms tiff
LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
FPX "Enable FlashPIX support" on \
@@ -54,7 +55,7 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CFLAGS+= -DPNG_DEPSTRUCT=
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
test check:
diff --git a/graphics/GraphicsMagick12/files/patch-coders__png.c b/graphics/GraphicsMagick12/files/patch-coders__png.c
index df3c5041e522..dcf0b339174d 100644
--- a/graphics/GraphicsMagick12/files/patch-coders__png.c
+++ b/graphics/GraphicsMagick12/files/patch-coders__png.c
@@ -1,6 +1,32 @@
--- coders/png.c.orig 2010-01-06 23:01:31.000000000 +0100
-+++ coders/png.c 2010-03-28 17:21:20.000000000 +0200
-@@ -1955,13 +1955,13 @@
++++ coders/png.c 2012-05-10 04:50:59.000000000 +0200
+@@ -75,6 +75,7 @@
+ #if defined(HasPNG)
+ #include "png.h"
+ #include "zlib.h"
++#include "pngpriv.h"
+
+ #if PNG_LIBPNG_VER > 95
+ /*
+@@ -1292,7 +1293,7 @@
+ " libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING,
+ message);
+ (void) ThrowException2(&image->exception,CoderError,message,image->filename);
+- longjmp(ping->jmpbuf,1);
++ longjmp(png_jmpbuf(ping),1);
+ }
+
+ static void PNGWarningHandler(png_struct *ping,png_const_charp message)
+@@ -1593,7 +1594,7 @@
+ ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image);
+ }
+ png_pixels=(unsigned char *) NULL;
+- if (setjmp(ping->jmpbuf))
++ if (setjmp(png_jmpbuf(ping)))
+ {
+ /*
+ PNG image is corrupt.
+@@ -1955,13 +1956,13 @@
Image has a transparent background.
*/
transparent_color.red=
@@ -18,7 +44,7 @@
if (ping_info->color_type == PNG_COLOR_TYPE_GRAY)
{
transparent_color.red=transparent_color.opacity;
-@@ -2469,7 +2469,7 @@
+@@ -2469,7 +2470,7 @@
index=indexes[x];
if (index < ping_info->num_trans)
q->opacity=
@@ -27,7 +53,16 @@
else
q->opacity=OpaqueOpacity;
q++;
-@@ -6258,13 +6258,13 @@
+@@ -6054,7 +6055,7 @@
+ AcquireSemaphoreInfo(&png_semaphore);
+ #endif
+
+- if (setjmp(ping->jmpbuf))
++ if (setjmp(png_jmpbuf(ping)))
+ {
+ /*
+ PNG write failed.
+@@ -6258,13 +6259,13 @@
/*
Identify which colormap entry is transparent.
*/
@@ -44,7 +79,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
-@@ -6284,7 +6284,7 @@
+@@ -6284,7 +6285,7 @@
index=indexes[x];
assert((unsigned long) index < number_colors);
@@ -53,7 +88,7 @@
ScaleQuantumToChar(p->opacity));
}
p++;
-@@ -6292,14 +6292,14 @@
+@@ -6292,14 +6293,14 @@
}
ping_info->num_trans=0;
for (i=0; i < (long) number_colors; i++)
@@ -70,7 +105,7 @@
/*
Identify which colormap entry is the background color.
*/
-@@ -6441,12 +6441,12 @@
+@@ -6441,12 +6442,12 @@
(p->opacity != OpaqueOpacity))
{
ping_info->valid|=PNG_INFO_tRNS;
@@ -88,7 +123,7 @@
(ScaleQuantumToChar(MaxRGB-p->opacity));
}
}
-@@ -6467,7 +6467,7 @@
+@@ -6467,7 +6468,7 @@
{
if (p->opacity != OpaqueOpacity)
{
@@ -97,7 +132,7 @@
{
break; /* Can't use RGB + tRNS for multiple
transparent colors. */
-@@ -6480,7 +6480,7 @@
+@@ -6480,7 +6481,7 @@
}
else
{
@@ -106,7 +141,7 @@
break; /* Can't use RGB + tRNS when another pixel
having the same RGB samples is
transparent. */
-@@ -6498,10 +6498,10 @@
+@@ -6498,10 +6499,10 @@
ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */
if (image->depth == 8)
{
@@ -121,7 +156,7 @@
}
}
}
-@@ -6517,7 +6517,7 @@
+@@ -6517,7 +6518,7 @@
{
ping_info->color_type=PNG_COLOR_TYPE_GRAY;
if (save_image_depth == 16 && image->depth == 8)
@@ -130,7 +165,7 @@
}
if (image->depth > QuantumDepth)
image->depth=QuantumDepth;
-@@ -6701,13 +6701,13 @@
+@@ -6701,13 +6702,13 @@
ping_info->num_trans=0;
if (ping_info->num_trans != 0)
{
@@ -147,7 +182,7 @@
}
}
-@@ -6726,10 +6726,10 @@
+@@ -6726,10 +6727,10 @@
image->depth=8;
if ((save_image_depth == 16) && (image->depth == 8))
{
@@ -162,7 +197,7 @@
}
}
-@@ -6756,8 +6756,8 @@
+@@ -6756,8 +6757,8 @@
" Setting up bKGD chunk");
png_set_bKGD(ping,ping_info,&background);
@@ -173,7 +208,7 @@
}
}
if (logging)
-@@ -7332,7 +7332,7 @@
+@@ -7332,7 +7333,7 @@
#endif
if (ping_info->valid & PNG_INFO_tRNS)
{
@@ -182,3 +217,16 @@
ping_info->valid&=(~PNG_INFO_tRNS);
}
png_destroy_write_struct(&ping,&ping_info);
+@@ -8416,10 +8416,10 @@
+ {
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " TERM delay: %lu",
+- (png_uint_32) (mng_info->ticks_per_second*final_delay/100));
++ (uint64_t) (mng_info->ticks_per_second*final_delay/100));
+ if (image->iterations == 0)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+- " TERM iterations: %lu",PNG_MAX_UINT);
++ " TERM iterations: %lu", (uint64_t)PNG_MAX_UINT);
+ else
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Image iterations: %lu",
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 0a72072a3034..bee8a2196025 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.3.15
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
@@ -19,10 +20,11 @@ COMMENT= Fast image processing tools based on ImageMagick
CONFLICTS= GraphicsMagick-1.[12].*
LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
+ png15:${PORTSDIR}/graphics/png \
jbig:${PORTSDIR}/graphics/jbigkit \
wmflite:${PORTSDIR}/graphics/libwmf \
xml2:${PORTSDIR}/textproc/libxml2
-OTHERGRAPHICS= jasper jpeg lcms png tiff
+OTHERGRAPHICS= jasper jpeg lcms tiff
LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
diff --git a/graphics/IPA/Makefile b/graphics/IPA/Makefile
index be09377ebee5..bac89da5a714 100644
--- a/graphics/IPA/Makefile
+++ b/graphics/IPA/Makefile
@@ -8,6 +8,7 @@
PORTNAME= IPA
PORTVERSION= 1.08
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.prima.eu.org/IPA/ CPAN/Prima/KARASIK
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 41b722c615fb..59d9629ef297 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ImageMagick
DISTVERSION= 6.7.7-0
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
http://image_magick.veidrodis.com/image_magick/ \
@@ -190,7 +191,7 @@ PLIST_SUB+= JPEG="@comment "
.endif
.if !defined(WITHOUT_IMAGEMAGICK_PNG)
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+= --without-png
diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile
index 5699315b1119..bd03e838e060 100644
--- a/graphics/a2png/Makefile
+++ b/graphics/a2png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= a2png
PORTVERSION= 0.1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index cde5ed737a0b..fef5fcac9f8e 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aaphoto
PORTVERSION= 0.41
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://log69.com/downloads/
DISTNAME= ${PORTNAME}_sources_v${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT= Auto Adjust Photo, automatic color correction of photos
LIB_DEPENDS= jasper:${PORTSDIR}/graphics/jasper \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LICENSE= GPLv3
diff --git a/graphics/aaphoto/files/patch-aaphoto.c b/graphics/aaphoto/files/patch-aaphoto.c
new file mode 100644
index 000000000000..adb518502a76
--- /dev/null
+++ b/graphics/aaphoto/files/patch-aaphoto.c
@@ -0,0 +1,10 @@
+--- aaphoto.c.orig 2011-01-26 16:39:58.000000000 +0100
++++ aaphoto.c 2012-04-23 19:07:00.000000000 +0200
+@@ -243,6 +243,7 @@
+ #ifndef __BMP_ONLY__
+ #include <jasper/jasper.h>
+ #include <png.h>
++#include <zlib.h>
+ #include <jpeglib.h>
+ #endif
+
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index 494e1ea34dbb..0e03dbc264e7 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aeskulap
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.bms-austria.com/%7Epipelka/${PORTNAME}/
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 8029678f2a96..0a7ae383aeb1 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= agave
PORTVERSION= 0.4.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics gnome
MASTER_SITES= http://download.gna.org/colorscheme/releases/
diff --git a/graphics/albumshaper/Makefile b/graphics/albumshaper/Makefile
index be7e464b0388..4922cac63400 100644
--- a/graphics/albumshaper/Makefile
+++ b/graphics/albumshaper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= albumshaper
PORTVERSION= 2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index 78a949236f6f..1de19cbc2e99 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ale
PORTVERSION= 0.8.11.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://auricle.dyndns.org/ALE/download/
diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile
index ea2174c6f699..ca80f98378e0 100644
--- a/graphics/alpng/Makefile
+++ b/graphics/alpng/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alpng
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}13
diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile
index b78a78159231..d888addbb738 100644
--- a/graphics/amanith/Makefile
+++ b/graphics/amanith/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanith
PORTVERSION= 0.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://www.amanith.org/download/files/ \
http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/
@@ -17,7 +17,7 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= C++ CrossPlatform framework designed for 2d & 3d vector graphics
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index b1b6e45bc2c4..ad3b71900e4b 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -7,6 +7,7 @@
PORTNAME= amide
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 93c96ee4c535..0ea8b342215b 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nsgd
PORTVERSION= 2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics www
MASTER_SITES= http://www.aolserver.cz/download/
PKGNAMEPREFIX= aolserver-
diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile
index c569c55c5a24..f4d5ac550df4 100644
--- a/graphics/apngasm/Makefile
+++ b/graphics/apngasm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= apngasm
PORTVERSION= 2.6
+PORTREVISION= 1
DISTVERSIONSUFFIX=-src
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
@@ -31,7 +32,7 @@ PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.pre.mk>
.if !defined(NO_SHARED)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
BUILD_DEPENDS+= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
LDFLAGS+= -static
diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index efc785e75bee..bfabb97961b4 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apvlv
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index fc13f9fb85b8..b3cabb3fba4b 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -8,7 +8,7 @@
PORTNAME= aqsis
PORTVERSION= 1.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
DISTNAME= Aqsis-${PORTVERSION}-Source
diff --git a/graphics/asciio/Makefile b/graphics/asciio/Makefile
index e98424348f68..11d0640135bf 100644
--- a/graphics/asciio/Makefile
+++ b/graphics/asciio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asciio
PORTVERSION= 1.02.71
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://mirror.switch.ch/ftp/mirror/CPAN/authors/id/N/NK/NKH/ \
CRITICAL
diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index fa834b7bd480..28b6ed36bb28 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -7,7 +7,7 @@
PORTNAME= autopano-sift-C
PORTVERSION= 2.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -18,7 +18,7 @@ RESTRICTED= May be covered by patents
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
pano13:${PORTSDIR}/graphics/libpano13
CONFLICTS= autopano-sift-[0-9]*
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index 6d6a255d3e85..18cf651f73f3 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= autoq3d
DISTVERSION= 1.40
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 6b46b117823d..ac3ecc3a0c72 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -7,21 +7,21 @@
PORTNAME= autotrace
PORTVERSION= 0.31.1
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert bitmap to vector graphics
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
MagickWand.5:${PORTSDIR}/graphics/ImageMagick
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
MAN1= autotrace.1
diff --git a/graphics/autotrace/files/patch-input-png.c b/graphics/autotrace/files/patch-input-png.c
new file mode 100644
index 000000000000..88ca2ebfa153
--- /dev/null
+++ b/graphics/autotrace/files/patch-input-png.c
@@ -0,0 +1,10 @@
+--- input-png.c.orig 2002-10-10 22:44:14.000000000 +0200
++++ input-png.c 2012-04-29 12:34:51.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include "message.h"
+ #include "xstd.h"
+ #include <png.h>
++#include <pngpriv.h>
+ #include "input-png.h"
+
+ static volatile char rcsid[]="$Id: input-png.c,v 1.16 2002/10/05 19:38:25 masata-y Exp $";
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 0fd4b0e59d3c..aeaf11563f86 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aview
PORTVERSION= 1.3.0.r1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/aa-project/${PORTNAME}/1.3.0rc1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 99c1355ef5a8..96f6aa776699 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ayam
PORTVERSION= 1.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}.src
diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile
index 4a090c35c0c8..bb7e0de75283 100644
--- a/graphics/bbrb/Makefile
+++ b/graphics/bbrb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbrb
PORTVERSION= 0.4.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 63a8bb7f5199..4bb1cb131879 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -6,6 +6,7 @@
PORTNAME= blender
PORTVERSION= 2.63
+PORTREVISION= 1
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org
COMMENT= 3D modeling/rendering/animation/gaming package
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_XORG= x11 xext xmu
diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index cc1c3c518ace..389637478f81 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmeps
PORTVERSION= 2.2.22
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5
MASTER_SITES= SF/dktools/dktools/dktools-${PORTVERSION}
DISTNAME= dktools-${PORTVERSION}
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/bsdlic.txt
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
netpbm:${PORTSDIR}/graphics/netpbm \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
USE_PERL5= yes
diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile
index 2a7e2521a557..8e47515306ae 100644
--- a/graphics/bmp-rootvis/Makefile
+++ b/graphics/bmp-rootvis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-rootvis
PORTVERSION= 0.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= bmp-plugins
diff --git a/graphics/box/Makefile b/graphics/box/Makefile
index 4d8dc7681e6b..062ef1aad98c 100644
--- a/graphics/box/Makefile
+++ b/graphics/box/Makefile
@@ -7,6 +7,7 @@
PORTNAME= box
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}c/Box%20-%20the%20compiler/${DISTNAME}/
diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile
index 00c4de6edd22..d33948c08acf 100644
--- a/graphics/boxer/Makefile
+++ b/graphics/boxer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= boxer
PORTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/boxc/${PORTNAME:C/^b/B/}%20-%20the%20Box%20GUI/${DISTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index b92065c13333..999a9e56b0f1 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cairo-java
PORTVERSION= 1.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 47df7fc2bcff..4ded27affaba 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.10.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH?= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -20,7 +20,7 @@ COMMENT= Vector graphics library with cross-device output support
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
pixman-1.9:${PORTSDIR}/x11/pixman
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index f71a7ca6e206..947b917ea120 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= cairomm
PORTVERSION= 1.10.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 9b363925cd1f..4a7dc96f60cb 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cbrpager
PORTVERSION= 0.9.22
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 9c9c0dd01e98..241a9ce57d2d 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cegui
PORTVERSION= 0.7.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics devel
MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.7.5
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index ece1ef6728e7..913ed929403c 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cfdg
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= graphics math
MASTER_SITES= http://www.contextfreeart.org/download/ \
http://glyphic.s3.amazonaws.com/cfa/download/
@@ -16,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= anatoly.borodin@gmail.com
COMMENT= Context Free Design Grammar compiler
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 3c6fc5d6ae03..ff4975c7dc23 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chbg
PORTVERSION= 1.5
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics gnome
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
@@ -15,6 +15,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Change Background Picture with time period
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_GNOME= gdkpixbuf
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/graphics/chbg/files/patch-absimg.c b/graphics/chbg/files/patch-absimg.c
new file mode 100644
index 000000000000..62662be69d8c
--- /dev/null
+++ b/graphics/chbg/files/patch-absimg.c
@@ -0,0 +1,11 @@
+--- src/absimg.c.orig 2001-01-08 19:42:18.000000000 +0100
++++ src/absimg.c 2012-05-09 12:34:28.000000000 +0200
+@@ -96,7 +96,7 @@
+
+ pngi = png_create_info_struct(pngw);
+
+- if (setjmp(pngw->jmpbuf))
++ if (setjmp(png_jmpbuf(pngw)))
+ {
+ png_destroy_write_struct(&pngw, &pngi);
+ fclose(f);
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 41877d79f9fe..75cfaffff4f4 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cimg
PORTVERSION= 1.4.9
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= graphics devel
MASTER_SITES= SF/${PORTNAME} \
@@ -46,7 +46,7 @@ LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard
USE_FORTRAN= yes
. if !defined(WITH_DEBUG)
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff \
opencv_legacy.2:${PORTSDIR}/graphics/opencv \
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 1af947b41ed0..1e9e85c9651d 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cinepaint
PORTVERSION= 0.22
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${PORTVERSION}-1
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An editing tool used for painting and retouching of movies
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
lcms.1:${PORTSDIR}/graphics/lcms \
tiff.4:${PORTSDIR}/graphics/tiff \
ftgl.2:${PORTSDIR}/graphics/ftgl
@@ -27,7 +27,7 @@ USE_PYTHON= yes
USE_GNOME= gtk12
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_XORG= xpm
+USE_XORG= xpm xi xext xft xinerama
MAN1= cinepaint.1 cinepainttool.1
@@ -38,7 +38,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
OPTIONS= OPENEXR "Use OpenEXR" on
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
.include <bsd.port.pre.mk>
diff --git a/graphics/cinepaint/files/patch-plug-ins-png-png.c b/graphics/cinepaint/files/patch-plug-ins-png-png.c
new file mode 100644
index 000000000000..88a9234da8f0
--- /dev/null
+++ b/graphics/cinepaint/files/patch-plug-ins-png-png.c
@@ -0,0 +1,28 @@
+--- plug-ins/png/png.c.orig 2006-11-24 21:52:55.000000000 +0100
++++ plug-ins/png/png.c 2012-04-27 19:08:52.000000000 +0200
+@@ -59,6 +59,7 @@
+ #include "libgimp/stdplugins-intl.h"
+
+ #include <png.h> /* PNG library definitions */
++#include <pngpriv.h>
+
+ /*
+ * Constants...
+@@ -405,7 +406,7 @@
+ info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+
+- if (setjmp (pp->jmpbuf))
++ if (setjmp (png_jmpbuf(pp)))
+ {
+ g_message ("%s\nPNG error. File corrupted?", filename);
+ return image;
+@@ -824,7 +825,7 @@
+ info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+
+- if (setjmp (pp->jmpbuf))
++ if (setjmp (png_jmpbuf(pp)))
+ {
+ g_message ("%s\nPNG error. Couldn't save image", filename);
+ return 0;
diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index 94fedc8e6b4c..5e57509886fc 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= claraocr
PORTVERSION= 20031214
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics accessibility
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR=distfiles
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 6d1684fafdc6..e324f2197649 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clutter-box2d
PORTVERSION= 0.10.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/0.10/
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index c629bff1d2da..b8ca60cfffd4 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clutter-gtk
PORTVERSION= 0.10.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GNOME \
http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 76c73370e31f..8681562a5ff5 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -8,6 +8,7 @@
PORTNAME= clutter
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GNOME \
http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index be7f6b9754fd..3a330a16e0b0 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -7,7 +7,7 @@
PORTNAME= comical
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index e4903216b965..754902d59817 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -6,14 +6,14 @@
PORTNAME= corona
PORTVERSION= 1.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphics library that supports most image formats
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_AUTOTOOLS= libtool
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/corona/files/patch-OpenPNG.cpp b/graphics/corona/files/patch-OpenPNG.cpp
new file mode 100644
index 000000000000..16b474290a6c
--- /dev/null
+++ b/graphics/corona/files/patch-OpenPNG.cpp
@@ -0,0 +1,19 @@
+--- src/OpenPNG.cpp.orig 2002-12-26 02:52:21.000000000 +0100
++++ src/OpenPNG.cpp 2012-04-30 21:33:15.000000000 +0200
+@@ -6,6 +6,7 @@
+
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include "Debug.h"
+ #include "Open.h"
+ #include "SimpleImage.h"
+@@ -39,7 +40,7 @@
+ void PNG_error_function(png_structp png_ptr, png_const_charp warning) {
+ // copied from libpng's pngerror.cpp, but without the fprintf
+ jmp_buf jmpbuf;
+- memcpy(jmpbuf, png_ptr->jmpbuf, sizeof(jmp_buf));
++ memcpy(jmpbuf, png_ptr->longjmp_buffer, sizeof(jmp_buf));
+ longjmp(jmpbuf, 1);
+ }
+
diff --git a/graphics/corona/files/patch-SavePNG.cpp b/graphics/corona/files/patch-SavePNG.cpp
new file mode 100644
index 000000000000..ce159f6a50c6
--- /dev/null
+++ b/graphics/corona/files/patch-SavePNG.cpp
@@ -0,0 +1,9 @@
+--- src/SavePNG.cpp.orig 2003-07-17 01:09:48.000000000 +0200
++++ src/SavePNG.cpp 2012-05-01 09:51:29.000000000 +0200
+@@ -1,5 +1,6 @@
+ #include <memory>
+ #include <png.h>
++#include <pngpriv.h>
+ #include "Debug.h"
+ #include "Save.h"
+ #include "Types.h"
diff --git a/graphics/crw/Makefile b/graphics/crw/Makefile
index f1baefb50561..83e971ab5dbf 100644
--- a/graphics/crw/Makefile
+++ b/graphics/crw/Makefile
@@ -7,22 +7,25 @@
PORTNAME= crw
PORTVERSION= 1.03
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to process Canon camera RAW (.crw) files
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
MAN1= crw.1
MANCOMPRESSED= yes
PLIST_FILES= bin/crw
+#CFLAGS+= -I${LOCALBASE}/include/libpng15
+
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local/lib,${LOCALBASE}/lib,' \
- -e 's,/usr/local/include,${LOCALBASE}/include,' \
+ -e 's,CFLAGS=,CFLAGS+=,' \
+ -e 's,/usr/local/include,${LOCALBASE}/include,' \
${WRKSRC}/Makefile
.include <bsd.port.mk>
diff --git a/graphics/crw/files/patch-crw.c b/graphics/crw/files/patch-crw.c
new file mode 100644
index 000000000000..c9c3a8a5aabc
--- /dev/null
+++ b/graphics/crw/files/patch-crw.c
@@ -0,0 +1,11 @@
+--- crw.c.orig 2002-07-23 01:17:37.000000000 +0200
++++ crw.c 2012-04-27 07:23:34.000000000 +0200
+@@ -1394,7 +1394,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return;
+ }
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return;
+ }
diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 1d8dcd834712..b880c0d5e687 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cthumb
PORTVERSION= 4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics www
MASTER_SITES= SF
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 5fa0cbc13a50..72d8126b7dcf 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= curator
PORTVERSION= 2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics www python
MASTER_SITES= SF
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index 8de037908150..3703b42479ec 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -7,14 +7,14 @@
PORTNAME= danpei
PORTVERSION= 2.9.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= bu7cher@yandex.ru
COMMENT= Image Viewer for X Window System with thumbnail preview feature
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
.if !defined(WITHOUT_IMAGEMAGICK)
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
diff --git a/graphics/danpei/files/patch-image_cache.c b/graphics/danpei/files/patch-image_cache.c
new file mode 100644
index 000000000000..b5c7888df007
--- /dev/null
+++ b/graphics/danpei/files/patch-image_cache.c
@@ -0,0 +1,11 @@
+--- src/image_cache.c.orig 2003-08-08 09:17:58.000000000 +0200
++++ src/image_cache.c 2012-05-03 23:39:36.000000000 +0200
+@@ -782,7 +782,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose (fp);
+ return FALSE;
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 5f986b93e414..232609f91d91 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= darknock
DISTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 85889bf34f99..2f033e2f2ee5 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -7,6 +7,7 @@
PORTNAME= darktable
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index 74e777c5e86d..1f8c79b53cf3 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dataplot
PORTVERSION= 20090821
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \
LOCAL/beech:source \
@@ -21,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A free software system for statistical visualization
LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USE_FORTRAN= yes
diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile
index cb9c66b79240..a01a08a4115f 100644
--- a/graphics/dc20ctrl/Makefile
+++ b/graphics/dc20ctrl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dc20ctrl
PORTVERSION= 0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.paternostro.org/~ugo/binaries/
@@ -16,7 +16,7 @@ COMMENT= Digital camera control and download tool for Kodak DC20 camera
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
MAKE_ARGS= -DUSE_JPEG -DUSE_TIFF -DUSE_PNG
diff --git a/graphics/dc20ctrl/files/patch-ad b/graphics/dc20ctrl/files/patch-pixmaps.c
index 982285d0386a..8b910130f60c 100644
--- a/graphics/dc20ctrl/files/patch-ad
+++ b/graphics/dc20ctrl/files/patch-pixmaps.c
@@ -1,6 +1,14 @@
-diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c
---- work/dc20ctrl-0.4/pixmaps.c Tue Feb 17 09:19:47 1998
-+++ pixmaps.c Mon Feb 5 18:42:18 2001
+--- pixmaps.c.orig 1998-02-17 18:19:47.000000000 +0100
++++ pixmaps.c 2012-04-30 21:36:08.000000000 +0200
+@@ -446,7 +446,7 @@
+ if (p) {
+ if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) != NULL) {
+ if ((info_ptr = png_create_info_struct(png_ptr)) != NULL) {
+- if (setjmp(png_ptr->jmpbuf) == 0) {
++ if (setjmp(png_jmpbuf(png_ptr)) == 0) {
+ png_init_io(png_ptr, fp);
+ png_set_IHDR(png_ptr, info_ptr, p->width, p->height, 8, (p->components == 1) ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ png_write_info(png_ptr, info_ptr);
@@ -504,26 +504,32 @@
* Build the image name
*/
@@ -40,4 +48,3 @@ diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c
break;
}
-Only in dc20ctrl-0.4/: rep
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index c49d625f322e..bb2389bfe83d 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -8,7 +8,7 @@
PORTNAME= devil
PORTVERSION= 1.7.8
PORTEPOCH= 1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/openil/DevIL/${PORTVERSION}
DISTNAME= DevIL-${PORTVERSION}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--enable-mng
CONFIGURE_ENV+= libpng_app=no
CONFIGURE_ARGS+=--disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_TIFF)
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index a941727bcc25..c0dfb727ef80 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dia
DISTVERSION= 0.97.1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
@@ -18,7 +18,8 @@ MAINTAINER?= gnome@FreeBSD.org
COMMENT= Diagram creation program, similar to Visio
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/graphics/dia/files/patch-export_png.c b/graphics/dia/files/patch-export_png.c
new file mode 100644
index 000000000000..c8553994dc9c
--- /dev/null
+++ b/graphics/dia/files/patch-export_png.c
@@ -0,0 +1,11 @@
+--- plug-ins/libart/export_png.c.orig 2009-11-28 13:49:21.000000000 +0100
++++ plug-ins/libart/export_png.c 2012-05-08 07:23:21.000000000 +0200
+@@ -178,7 +178,7 @@
+ }
+
+ /* set error handling ... */
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ fclose(fp);
+ png_destroy_write_struct(&png, &info);
+ message_error(_("Error occurred while writing PNG"));
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index ce84c8471ee2..5bad5748180c 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= diacanvas2
PORTVERSION= 0.15.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= SF/diacanvas/DiaCanvas2/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index 950545e8e0fd..3a7603395f7b 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= digikam-doc
PORTVERSION= 0.9.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME:S/-doc//}/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 72a6cf58900b..0153e8459b80 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= digikam
DISTVERSION= 1.9.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= SF
@@ -17,7 +17,7 @@ COMMENT= An advanced digital photo management application for KDE4
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
lcms.1:${PORTSDIR}/graphics/lcms \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jasper.4:${PORTSDIR}/graphics/jasper \
lqr-1.3:${PORTSDIR}/graphics/liblqr-1 \
kipi.8:${PORTSDIR}/graphics/libkipi-kde4 \
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index c2822fb780c7..a4336fd8dc5d 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= digikam
DISTVERSION= 0.9.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= SF
@@ -20,7 +20,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \
lcms.1:${PORTSDIR}/graphics/lcms \
kdcraw.4:${PORTSDIR}/graphics/libkdcraw \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
jasper.4:${PORTSDIR}/graphics/jasper
@@ -34,6 +34,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS= --without-included-sqlite3
MAN1= digitaglinktree.1
diff --git a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp
index 6309033f8f68..2f5bb7f5202c 100644
--- a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp
+++ b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp
@@ -1,6 +1,14 @@
--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 07:19:41.000000000 +0200
-+++ digikam/kioslave/digikamthumbnail.cpp 2010-03-29 19:04:20.000000000 +0200
-@@ -370,7 +370,7 @@
++++ digikam/kioslave/digikamthumbnail.cpp 2012-05-04 00:15:30.000000000 +0200
+@@ -94,6 +94,7 @@
+ #include <sys/shm.h>
+ #include <sys/time.h>
+ #include <png.h>
++#include <pngpriv.h>
+ }
+
+ using namespace KIO;
+@@ -370,7 +371,7 @@
unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f);
@@ -9,7 +17,16 @@
{
fclose(f);
return qimage;
-@@ -465,7 +465,7 @@
+@@ -392,7 +393,7 @@
+ return qimage;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -465,7 +466,7 @@
{
png_set_gray_to_rgb(png_ptr);
if (png_get_bit_depth(png_ptr, info_ptr) < 8)
diff --git a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp
index 6e0baf03bb97..df06684da2ad 100644
--- a/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp
+++ b/graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp
@@ -1,5 +1,5 @@
--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 07:19:41.000000000 +0200
-+++ digikam/libs/dimg/loaders/pngloader.cpp 2010-03-29 18:35:49.000000000 +0200
++++ digikam/libs/dimg/loaders/pngloader.cpp 2012-05-05 08:00:13.000000000 +0200
@@ -88,7 +88,11 @@
unsigned char buf[PNG_BYTES_TO_CHECK];
@@ -36,7 +36,17 @@
png_set_gray_to_rgb(png_ptr);
if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel
-@@ -526,7 +538,11 @@
+@@ -403,7 +415,8 @@
+
+ QMap<int, QByteArray>& metaData = imageMetaData();
+
+- png_charp profile_name, profile_data=NULL;
++ png_charp profile_name=NULL;
++ png_byte *profile_data=NULL;
+ png_uint_32 profile_size;
+ int compression_type;
+
+@@ -526,7 +539,11 @@
// PNG error handling. If an error occurs during writing, libpng
// will jump here
@@ -49,3 +59,12 @@
{
DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
fclose(f);
+@@ -599,7 +616,7 @@
+
+ if (!profile_rawdata.isEmpty())
+ {
+- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
++ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (png_byte*) profile_rawdata.data(), profile_rawdata.size());
+ }
+
+ // -------------------------------------------------------------------
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 1164c98b26b4..a83cac27604b 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= divxcalc
PORTVERSION= 0.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://www.axllent.org/uploads/files/divxcalc/
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index e2a9a10e3254..a78b89741071 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= djview
PORTVERSION= 4.9
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/djvu/DjView/${PORTVERSION}
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 0e8624867d28..b82ef627bfbd 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= djvulibre
PORTVERSION= 3.5.24
+PORTREVISION= 1
CATEGORIES= graphics www
MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION}
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index fb0e1373e826..d8a583241295 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dmtx-utils
PORTVERSION= 0.7.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
MASTER_SITE_SUBDIR=libdmtx/libdmtx/${PORTVERSION}
diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile
index 63a4c53cf855..ef91dc00303e 100644
--- a/graphics/easypaint/Makefile
+++ b/graphics/easypaint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= easypaint
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://qt-apps.org/CONTENT/content-files/
DISTNAME= 140877-easyPaint
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index 5e760ed1badf..b0e36a982aa4 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecg2png
PORTVERSION= 0.30
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= http://www.cardiothink.com/downloads/ecg2png/
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 6ffafad7d785..16f408c5460a 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -7,6 +7,7 @@
PORTNAME= edje
DISTVERSION= 1.0.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= http://download.enlightenment.org/releases/ \
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 9aa1c4624b19..ffd74be98b27 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= edje_viewer
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= graphics enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 95b7b124ff75..08d9960eb095 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= electriceyes
PORTVERSION= 0.3.12
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/ee/0.3
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index bb6d87cd2090..61c812ef0a16 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= electrix
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= graphics print
MASTER_SITES= SF/${PORTNAME:L}/${PORTVERSION}
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index f848c9e6e518..1e3c3b3836f5 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enblend
PORTVERSION= 3.1.r20080615
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= vd/enblend
@@ -33,7 +33,7 @@ USE_AUTOTOOLS= automake:env autoconf:env
USE_GCC= 4.4+
USE_GL= glew glut
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
MAN1= enblend.1 enfuse.1
diff --git a/graphics/enblend/files/patch-png.cxx b/graphics/enblend/files/patch-png.cxx
index 2a513b548c54..44c19933dc57 100644
--- a/graphics/enblend/files/patch-png.cxx
+++ b/graphics/enblend/files/patch-png.cxx
@@ -1,11 +1,223 @@
--- src/vigra_impex/png.cxx.orig 2007-11-25 00:46:55.000000000 +0100
-+++ src/vigra_impex/png.cxx 2010-03-29 11:49:42.000000000 +0200
-@@ -276,7 +276,7 @@
++++ src/vigra_impex/png.cxx 2012-05-27 11:57:18.000000000 +0200
+@@ -64,6 +64,7 @@
+ extern "C"
+ {
+ #include <png.h>
++#include <pngpriv.h>
+ }
+
+ #if PNG_LIBPNG_VER < 10201
+@@ -82,7 +83,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+- longjmp( png_ptr->jmpbuf, 1 );
++ longjmp( png_jmpbuf(png_ptr), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -214,7 +215,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+ }
+@@ -222,14 +223,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+ }
+@@ -245,13 +246,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+ &interlace_method, &compression_method, &filter_method );
+@@ -265,7 +266,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -274,9 +275,9 @@
+
+ // expand gray values to at least one byte size
if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
- png_set_gray_1_2_4_to_8(png);
+ png_set_expand_gray_1_2_4_to_8(png);
bit_depth = 8;
}
+@@ -284,7 +285,7 @@
+ #if 0
+ // strip alpha channel
+ if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+ png_set_strip_alpha(png);
+ color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -326,7 +327,7 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
+- char * profilePtr;
++ png_byte * profilePtr;
+ png_uint_32 profileLen;
+ if (info->valid & PNG_INFO_iCCP) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+@@ -341,7 +342,7 @@
+ // image gamma
+ double image_gamma = 0.45455;
+ if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+ png_get_gAMA( png, info, &image_gamma );
+ }
+@@ -350,26 +351,26 @@
+ double screen_gamma = 2.2;
+
+ // set gamma correction
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+ png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+
+ // interlace handling, get number of read passes needed
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+ n_interlace_passes = png_set_interlace_handling(png);
+
+ // update png library state to reflect any changes that were made
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+ png_read_update_info( png, info );
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+ n_channels = png_get_channels(png, info);
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+ rowsize = png_get_rowbytes(png, info);
+
+@@ -380,7 +381,7 @@
+ void PngDecoderImpl::nextScanline()
+ {
+ for (int i=0; i < n_interlace_passes; i++) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
+ png_read_row(png, row_data.begin(), NULL);
+ }
+@@ -546,7 +547,7 @@
+ vigra_postcondition( png != 0, "could not create the write struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+ }
+@@ -557,7 +558,7 @@
+ }
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+@@ -572,7 +573,7 @@
+ void PngEncoderImpl::finalize()
+ {
+ // write the IHDR
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+ png_set_IHDR( png, info, width, height, bit_depth, color_type,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -580,7 +581,7 @@
+
+ // set resolution
+ if (x_resolution > 0 && y_resolution > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+ png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5),
+ (png_uint_32) (y_resolution * 254 + 0.5),
+@@ -589,7 +590,7 @@
+
+ // set offset
+ if (position.x > 0 && position.y > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+ png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+ }
+@@ -598,12 +599,12 @@
+ // set icc profile
+ if (iccProfile.size() > 0) {
+ png_set_iCCP(png, info, "icc", 0,
+- (char *)iccProfile.begin(), iccProfile.size());
++ (png_const_bytep)iccProfile.begin(), iccProfile.size());
+ }
+ #endif
+
+ // write the info struct
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+ png_write_info( png, info );
+
+@@ -635,10 +636,10 @@
+ }
+
+ // write the whole image
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+ png_write_image( png, row_pointers.begin() );
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+ png_write_end(png, info);
+ }
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 34bfca699dcc..8292760c0c53 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enfle
PORTVERSION= 20101006
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://enfle.fennel.org/files/stable/
@@ -20,7 +20,7 @@ LIB_DEPENDS= arc.1:${PORTSDIR}/archivers/libarc \
jpeg.11:${PORTSDIR}/graphics/jpeg \
mng.1:${PORTSDIR}/graphics/libmng \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
theora.0:${PORTSDIR}/multimedia/libtheora
RUN_DEPENDS:= ${BUILD_DEPENDS}
@@ -42,7 +42,7 @@ CONFIGURE_ARGS= --with-ungif
PKGDEINSTALL= ${PKGINSTALL}
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/graphics/enfle/files/patch-plugins-loader-png-png.c b/graphics/enfle/files/patch-plugins-loader-png-png.c
index eab0c8c1ed78..956b39a4fdcb 100644
--- a/graphics/enfle/files/patch-plugins-loader-png-png.c
+++ b/graphics/enfle/files/patch-plugins-loader-png-png.c
@@ -1,6 +1,14 @@
---- plugins/loader/png/png.c.orig 2006-03-12 09:24:16.000000000 +0100
-+++ plugins/loader/png/png.c 2010-03-29 16:51:07.000000000 +0200
-@@ -156,7 +156,7 @@
+--- plugins/loader/png/png.c.orig 2010-10-06 14:47:32.000000000 +0200
++++ plugins/loader/png/png.c 2012-05-04 07:30:47.000000000 +0200
+@@ -34,6 +34,7 @@
+ #error Install libpng
+ #endif
+ #endif
++# include <pngpriv.h>
+
+ #include "enfle/loader-plugin.h"
+ #include "utils/libstring.h"
+@@ -156,7 +157,7 @@
int try_when_error;
unsigned int i, num_text;
int num_trans;
@@ -9,7 +17,7 @@
png_bytep trans;
//debug_message("png loader: load() called\n");
-@@ -260,7 +260,7 @@
+@@ -260,7 +261,7 @@
color_type = png_get_color_type(png_ptr, info_ptr);
/* Set the transparent color */
@@ -18,7 +26,7 @@
//p->transparent_disposal = info->transparent_disposal;
switch (color_type) {
case PNG_COLOR_TYPE_PALETTE:
-@@ -273,13 +273,13 @@
+@@ -273,13 +274,13 @@
break;
case PNG_COLOR_TYPE_RGB:
case PNG_COLOR_TYPE_RGB_ALPHA:
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 6f1b8cd1d650..19baba1b1844 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eog-plugins
PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index f752f1ce9e83..e50f622e47ca 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eog
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index 3633ebbfbf1a..a4a39ac625d4 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eos-movrec
DISTVERSION= 0.3.1_beta
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3_beta
@@ -24,6 +25,7 @@ QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
DISTVERSIONSUFFIX= -src
+PORTREVISION= 1
PLIST_FILES= bin/eos_movrec
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 6769e1988be3..b5acfb7dfce2 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epdfview
PORTVERSION= 0.1.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics print gnome
MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
http://mirror.slitaz.org/sources/packages/e/
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index c29240263186..6bba48f0ffee 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -8,6 +8,7 @@
PORTNAME= epix
PORTVERSION= 1.2.10
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://mathcs.holycross.edu/~ahwang/epix/
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index c5ca44798ec6..b5e766a444fd 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eps2png
PORTVERSION= 2.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JV
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 3d980a166b4c..8ce5a14f9f7f 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epstool
PORTVERSION= 3.08
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:S/$/:1/} \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/:2
diff --git a/graphics/ethumb/Makefile b/graphics/ethumb/Makefile
index 82aca400ccac..2de31a02dd4c 100644
--- a/graphics/ethumb/Makefile
+++ b/graphics/ethumb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ethumb
PORTVERSION= 0.1.1.56361
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile
index 57c1c280f376..0fc83d46f930 100644
--- a/graphics/evas-loader-png/Makefile
+++ b/graphics/evas-loader-png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= loader-png
DISTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= graphics enlightenment
MASTER_SITES= http://download.enlightenment.org/releases/ \
http://files.roorback.net/e17/2011-05-25/base/
@@ -16,7 +17,7 @@ DISTNAME= evas-${DISTVERSION}
MAINTAINER= magik@roorback.net
COMMENT= A hardware accelerated canvas API (PNG loader)
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
LICENSE= BSD
diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile
index 35c395971a1d..c2f40be0549c 100644
--- a/graphics/evas-loader-svg/Makefile
+++ b/graphics/evas-loader-svg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= loader-svg
DISTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= graphics enlightenment
MASTER_SITES= http://download.enlightenment.org/releases/ \
http://files.roorback.net/e17/2011-05-25/base/
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 1450b8ab2665..96b37d8a46cb 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= evas
DISTVERSION= 1.0.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= # none
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index d1756ab905de..a96df8f8bb19 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evince
PORTVERSION= 2.32.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index 2285e89e7046..a5ee2fc2da89 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -6,7 +6,7 @@
PORTNAME= evolvotron
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 972ad1ce4fe1..ae64f17c59da 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -7,6 +7,7 @@
PORTNAME= exact-image
PORTVERSION= 0.8.7
+PORTREVISION= 1
CATEGORIES= graphics perl5 python
MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf
@@ -19,7 +20,7 @@ BUILD_DEPENDS= swig>=1.3.32:${PORTSDIR}/devel/swig13
LIB_DEPENDS= agg.2:${PORTSDIR}/graphics/agg \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib \
jasper.4:${PORTSDIR}/graphics/jasper \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
@@ -30,7 +31,7 @@ LIB_DEPENDS= agg.2:${PORTSDIR}/graphics/agg \
CFLAGS+= -fPIC
#hack to get custom exactcode configure script to enable tiff support with
#broken headers on c++ in base system:
-CPPFLAGS+= -fpermissive
+CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/libpng15
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/graphics/exact-image/files/patch-codecs__png.cc b/graphics/exact-image/files/patch-codecs__png.cc
index 06b835b25a95..a5fc65d2ad75 100644
--- a/graphics/exact-image/files/patch-codecs__png.cc
+++ b/graphics/exact-image/files/patch-codecs__png.cc
@@ -1,6 +1,15 @@
---- codecs/png.cc.orig 2009-04-27 19:52:17.000000000 +0200
-+++ codecs/png.cc 2010-03-29 15:07:59.000000000 +0200
-@@ -71,7 +71,7 @@
+--- codecs/png.cc.orig 2010-03-03 22:04:44.000000000 +0100
++++ codecs/png.cc 2012-04-25 19:08:13.000000000 +0200
+@@ -17,6 +17,8 @@
+
+ #include <stdlib.h>
+ #include <png.h>
++#include <zlib.h>
++#include <pngpriv.h>
+
+ #include <iostream>
+
+@@ -71,7 +73,7 @@
/* Allocate/initialize the memory for image information. REQUIRED. */
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
@@ -9,7 +18,7 @@
return 0;
}
-@@ -82,7 +82,7 @@
+@@ -82,7 +84,7 @@
if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
@@ -18,7 +27,7 @@
/* If we get here, we had a problem reading the file */
return 0;
}
-@@ -99,7 +99,7 @@
+@@ -99,7 +101,7 @@
png_read_info (png_ptr, info_ptr);
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
@@ -27,7 +36,7 @@
image.w = width;
image.h = height;
-@@ -132,7 +132,7 @@
+@@ -132,7 +134,7 @@
#if 0 // no longer needed
/* Expand grayscale images to the full 8 bits from 2, or 4 bits/pixel */
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth > 1 && bit_depth < 8) {
@@ -36,7 +45,7 @@
image.bps = 8;
}
#endif
-@@ -196,11 +196,11 @@
+@@ -196,11 +198,11 @@
for (int pass = 0; pass < number_passes; ++pass)
for (unsigned int y = 0; y < height; ++y) {
row_pointers[0] = image.getRawData() + y * stride;
@@ -50,7 +59,7 @@
/* that's it */
return true;
-@@ -224,7 +224,7 @@
+@@ -224,7 +226,7 @@
/* Allocate/initialize the memory for image information. REQUIRED. */
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
@@ -59,7 +68,7 @@
return false;
}
-@@ -244,7 +244,6 @@
+@@ -244,7 +246,6 @@
else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
png_set_compression_level(png_ptr, quality);
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index e44bf4480a2d..5e1afe4f13ad 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= exrtools
PORTVERSION= 0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://scanline.ca/exrtools/ \
CRITICAL
@@ -18,7 +18,7 @@ COMMENT= Utilities for manipulating with HDR images in OpenEXR format
LICENSE= GPLv2
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
diff --git a/graphics/exrtools/files/patch-pngoutput.c b/graphics/exrtools/files/patch-pngoutput.c
new file mode 100644
index 000000000000..b3dab36ac666
--- /dev/null
+++ b/graphics/exrtools/files/patch-pngoutput.c
@@ -0,0 +1,10 @@
+--- src/pngoutput.c.orig 2003-12-08 18:33:27.000000000 +0100
++++ src/pngoutput.c 2012-04-25 06:41:11.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <png.h>
++#include <zlib.h>
+ #include "pngoutput.h"
+
+ struct pngoutput_s
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 2b8f0f09de07..68b4bf18423b 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= f-spot
PORTVERSION= 0.8.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile
index 7d32157fa216..edcbfee2e2a4 100644
--- a/graphics/fbm/Makefile
+++ b/graphics/fbm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbm
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/convert
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index d3cd2b134d2e..0c8a3647c69f 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -7,6 +7,7 @@
PORTNAME= feh
PORTVERSION= 2.5
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://feh.finalrewind.org/ \
${MASTER_SITE_LOCAL}
diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile
index f7d16c4904ce..3c3299b32b61 100644
--- a/graphics/figurine/Makefile
+++ b/graphics/figurine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= figurine
PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
index 102fdd7b0886..115ea8957985 100644
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flam3
PORTVERSION= 2.7.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://flam3.com/ \
http://interwebfun.org/distfiles/
@@ -15,7 +15,7 @@ MASTER_SITES= http://flam3.com/ \
MAINTAINER= john.c.prather@gmail.com
COMMENT= A Flame Renderer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
xml2.5:${PORTSDIR}/textproc/libxml2 \
jpeg.11:${PORTSDIR}/graphics/jpeg
@@ -27,5 +27,6 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.include <bsd.port.mk>
diff --git a/graphics/flam3/files/patch-png.c b/graphics/flam3/files/patch-png.c
new file mode 100644
index 000000000000..fa5a620a4b31
--- /dev/null
+++ b/graphics/flam3/files/patch-png.c
@@ -0,0 +1,10 @@
+--- png.c.orig 2008-11-12 02:39:40.000000000 +0100
++++ png.c 2012-04-25 06:46:07.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+
+ #include "config.h"
diff --git a/graphics/flip/Makefile b/graphics/flip/Makefile
index 80dc2da704ad..1eb3dcb9df58 100644
--- a/graphics/flip/Makefile
+++ b/graphics/flip/Makefile
@@ -8,7 +8,7 @@
PORTNAME= flip
PORTVERSION= 2.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.reptilelabour.com/software/files/flip/
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index 8aad91394d27..cff13cb3ba67 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flphoto
PORTVERSION= 1.3.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/fltk/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
@@ -16,11 +16,13 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A basic image management and display program
LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
- fltk.1:${PORTSDIR}/x11-toolkits/fltk
+ fltk.1:${PORTSDIR}/x11-toolkits/fltk \
+ png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
+USE_XORG= xinerama
GNU_CONFIGURE= yes
MAN1= flphoto.1
diff --git a/graphics/flphoto/files/patch-image.cxx b/graphics/flphoto/files/patch-image.cxx
new file mode 100644
index 000000000000..ad2b8d472e83
--- /dev/null
+++ b/graphics/flphoto/files/patch-image.cxx
@@ -0,0 +1,10 @@
+--- image.cxx.orig 2006-11-18 14:56:11.000000000 +0100
++++ image.cxx 2012-05-09 12:28:28.000000000 +0200
+@@ -92,6 +92,7 @@
+
+ #ifdef HAVE_LIBPNG
+ # include <png.h>
++# include <zlib.h>
+ #endif // HAVE_LIBPNG
+
+
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index fc594e3110e3..a226d82feb70 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fly
PORTVERSION= 2.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://fossies.org/unix/www/ \
http://martin.gleeson.com/fly/dist/
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index ffba0f853228..a779492eb0ec 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fnlib
PORTVERSION= 0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/enlightenment/OldFiles
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 3f3b0da2f6ac..37392f7be1da 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fotoxx
PORTVERSION= 11.03
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://kornelix.squarespace.com/downloads/ \
http://www.rodperson.com/DL/
diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index ac619e63dbf9..bb6a1421ebf2 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -cairo
diff --git a/graphics/fpc-fpvectorial/Makefile b/graphics/fpc-fpvectorial/Makefile
index d403d8130cbd..471328fc0ff0 100644
--- a/graphics/fpc-fpvectorial/Makefile
+++ b/graphics/fpc-fpvectorial/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -fpvectorial
diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile
index a663a7cf6436..19403ab8f5de 100644
--- a/graphics/fpc-graph/Makefile
+++ b/graphics/fpc-graph/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -graph
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index af5f0057b928..0f18f36888e5 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -imagemagick
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index e930cb3a1c42..7bce131d5a71 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -libgd
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index b9b2f7a8e4b8..85b3df6c972a 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -libpng
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index 6bbc766d3ac4..6059b9d47eb9 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -rsvg
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 2a40c1df2dd5..0931eeea8025 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fracplanet
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index a895311b6705..32aee242571a 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fractorama
PORTVERSION= 1.6.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= CRITICAL
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index 37610e028831..e0fba2ded3c0 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fraqtive
PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/fraqtive/Fraqtive/Fraqtive%20${PORTVERSION}/
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index abae0cab5ad1..bc7736640626 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -32,13 +32,13 @@ IGNORE= cannot build OpenCV and gavl plugins simultaneously
.endif
.if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Frei0r OpenCV plugins
PKGNAMESUFFIX= -plugins-opencv
LIB_DEPENDS+= opencv_legacy.2:${PORTSDIR}/graphics/opencv
FREI0R_PLUGINS= facebl0r facedetect
.elif defined(BUILDING_FREI0R_GAVL)
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Frei0r gavl plugins
PKGNAMESUFFIX= -plugins-gavl
LIB_DEPENDS+= gavl.1:${PORTSDIR}/multimedia/gavl
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 246b1fbbf771..3ca2dc8b28b6 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -7,7 +7,7 @@
PORTNAME= frontline
PORTVERSION= 0.5.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics gnome
MASTER_SITES= SF/autotrace/FrontLine/${PORTVERSION}
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index 8ace7afb3c43..a18539fe939d 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fv
PORTVERSION= 1.03
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.eaflux.com/fv/sources/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT= A viewer of hdr/pfm images
LICENSE= GPLv2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
USE_GL= glut
@@ -25,9 +26,9 @@ USE_GMAKE= yes
ALL_TARGET= ${PORTNAME}
MAKE_JOBS_SAFE= yes
-CXXFLAGS+= $$(pkg-config --cflags libpng14) \
+CXXFLAGS+= $$(pkg-config --cflags libpng15) \
-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= $$(pkg-config --libs libpng14) \
+LDFLAGS+= $$(pkg-config --libs libpng15) \
-L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm ${PTHREAD_LIBS}
PORTDOCS= AUTHORS ChangeLog README
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 080d36722a8b..da44f6834684 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fyre
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://releases.navi.cx/fyre/
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index ae194aa0ce49..7412a548909b 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= g2
PORTVERSION= 0.40
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index 6a3f4f978f41..96f00a512987 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcolor2
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics gnome
MASTER_SITES= SF
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 1f30c8644f94..7abb796badad 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gd
PORTVERSION= 2.0.35
-PORTREVISION?= 7
+PORTREVISION?= 8
PORTEPOCH= 1
CATEGORIES+= graphics
MASTER_SITES= http://www.libgd.org/releases/ \
@@ -19,7 +19,7 @@ MAINTAINER?= dinoex@FreeBSD.org
COMMENT?= A graphics library for fast creation of images
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
CONFLICTS= bazaar-1.*
diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile
index 3a73d0031260..70a7d5b38e11 100644
--- a/graphics/gdal-grass/Makefile
+++ b/graphics/gdal-grass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdal-grass
PORTVERSION= 1.4.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://download.osgeo.org/gdal/
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index c361a453c45d..f35e80f6baa4 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdal
PORTVERSION= 1.9.0
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/ \
ftp://ftp.remotesensing.org/pub/gdal/ \
@@ -183,7 +184,7 @@ CONFIGURE_ARGS+=--with-php
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-png=${LOCALBASE}
.endif
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 3682d9827bbd..4370a5703fd3 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdchart
PORTVERSION= 0.11.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.fred.net/brv/chart/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 5f538988e7c3..d7fe1c7dd517 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= gdk-pixbuf
PORTVERSION= 0.22.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES?= graphics
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22
@@ -17,7 +17,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT?= A graphic library for GTK+
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/gdk-pixbuf/files/patch-io-png.c b/graphics/gdk-pixbuf/files/patch-io-png.c
new file mode 100644
index 000000000000..1c54d8b77770
--- /dev/null
+++ b/graphics/gdk-pixbuf/files/patch-io-png.c
@@ -0,0 +1,29 @@
+--- gdk-pixbuf/io-png.c.orig 2001-01-24 21:59:23.000000000 +0100
++++ gdk-pixbuf/io-png.c 2012-04-24 22:50:30.000000000 +0200
+@@ -175,7 +175,7 @@
+ return NULL;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
+ return NULL;
+ }
+@@ -311,7 +311,7 @@
+ return NULL;
+ }
+
+- if (setjmp (lc->png_read_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ if (lc->png_info_ptr)
+ png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
+ g_free(lc);
+@@ -366,7 +366,7 @@
+ lc->max_row_seen_in_chunk = -1;
+
+ /* Invokes our callbacks as needed */
+- if (setjmp (lc->png_read_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ return FALSE;
+ } else {
+ png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index f0229354ce89..73a127b0a42b 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= gdk-pixbuf
PORTVERSION= 2.23.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES?= graphics
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gdk-pixbuf/${PORTVERSION:R}
@@ -64,7 +64,7 @@ PLIST_SUB+= JPEG="@comment "
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+=--without-libpng
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index 1fbc76607233..15b1d7b95277 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gdtclft
PORTVERSION= 2.2.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics tcl
MASTER_SITES= http://www.graphviz.org/pub/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 487549f81830..ce7d2838ccc8 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -7,14 +7,14 @@
PORTNAME= geeqie
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Lightweight image viewer forked from GQview
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GNOME= gtk20 desktopfileutils
GNU_CONFIGURE= yes
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index d9e5911c2c3b..89a0f93d1153 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gegl
PORTVERSION= 0.1.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.1/
@@ -152,7 +152,7 @@ CONFIGURE_ARGS+=--disable-mmx \
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+=--without-libpng
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 65cea0b6f9ac..7f7935c725c1 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= geomorph
PORTVERSION= 0.50
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
@@ -15,7 +15,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Height field generator and editor
-LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
+ png15:${PORTSDIR}/graphics/png
USE_GL= yes
USE_GMAKE= yes
@@ -39,7 +40,7 @@ CFLAGS+= -O0
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/usr/local/share/geomorph/GeoMorph.xpm|geomorph.xpm|' \
${WRKSRC}/geomorph.desktop
@${FIND} ${WRKSRC} -exec ${GREP} -q /usr/local/share/geomorph {} \; -print | \
diff --git a/graphics/geomorph/files/patch-src-utils-writepng.c b/graphics/geomorph/files/patch-src-utils-writepng.c
new file mode 100644
index 000000000000..b4a0e142681a
--- /dev/null
+++ b/graphics/geomorph/files/patch-src-utils-writepng.c
@@ -0,0 +1,19 @@
+--- src/utils/writepng.c.orig 2008-01-23 03:14:22.000000000 +0100
++++ src/utils/writepng.c 2012-05-04 12:28:50.000000000 +0200
+@@ -20,6 +20,7 @@
+ */
+
+ #include <png.h>
++#include <zlib.h>
+ #include <stdlib.h>
+ #include "./utils.h"
+
+@@ -75,7 +76,7 @@
+
+ /* Set error handling. */
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+ fclose(fp);
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 916b66089064..fc60403999f1 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giblib
PORTVERSION= 1.2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index acfb62ffc034..82f549f4939e 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gif2png
PORTVERSION= 2.5.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.catb.org/~esr/gif2png/
MAINTAINER= saper@saper.info
COMMENT= Converts GIF images to a PNG format
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_PYTHON_RUN= yes
GNU_CONFIGURE= yes
diff --git a/graphics/gif2png/files/patch-gif2png.h b/graphics/gif2png/files/patch-gif2png.h
new file mode 100644
index 000000000000..bcb02608a70b
--- /dev/null
+++ b/graphics/gif2png/files/patch-gif2png.h
@@ -0,0 +1,11 @@
+--- gif2png.h.orig 2010-10-20 00:11:28.000000000 +0200
++++ gif2png.h 2012-04-25 06:50:10.000000000 +0200
+@@ -2,6 +2,8 @@
+
+ /* get png type definitions */
+ #include "png.h"
++#include "pngpriv.h"
++#include "zlib.h"
+
+ #define GIFterminator ';'
+ #define GIFextension '!'
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index ffedf411a40d..70aee8d00d0d 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -7,14 +7,15 @@
PORTNAME= gimageview
PORTVERSION= 0.2.27
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Yet another GTK+ based image viewer
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+ png15:${PORTSDIR}/graphics/png
USE_GMAKE= yes
WANT_GNOME= yes
diff --git a/graphics/gimageview/files/patch-png_loader.c b/graphics/gimageview/files/patch-png_loader.c
new file mode 100644
index 000000000000..79ad00553117
--- /dev/null
+++ b/graphics/gimageview/files/patch-png_loader.c
@@ -0,0 +1,11 @@
+--- plugins/image_loader/png_loader.c.orig 2004-05-23 16:08:16.000000000 +0200
++++ plugins/image_loader/png_loader.c 2012-05-09 12:30:01.000000000 +0200
+@@ -255,7 +255,7 @@
+ return NULL;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) goto ERROR;
++ if (setjmp (png_jmpbuf(png_ptr))) goto ERROR;
+
+ context.gio = gio;
+ context.bytes_read = 0;
diff --git a/graphics/gimageview/files/patch-png_saver.c b/graphics/gimageview/files/patch-png_saver.c
new file mode 100644
index 000000000000..960992e1b04a
--- /dev/null
+++ b/graphics/gimageview/files/patch-png_saver.c
@@ -0,0 +1,11 @@
+--- plugins/image_saver/png_saver.c.orig 2004-05-23 16:08:11.000000000 +0200
++++ plugins/image_saver/png_saver.c 2012-05-11 17:57:12.000000000 +0200
+@@ -130,7 +130,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (handle);
+ return FALSE;
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index b52f65810f0e..c5341864990e 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimmage
PORTVERSION= 0.2.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= BERLIOS CENKES
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index ca7197708b0e..8a15942683b3 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gimp-app
DISTVERSION= 2.6.12
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -25,7 +25,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNU Image Manipulation Program
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
lcms.1:${PORTSDIR}/graphics/lcms \
@@ -194,7 +194,7 @@ post-patch:
${WRKSRC}/plug-ins/pygimp/Makefile.in
@${REINPLACE_CMD} -e 's/-u /-Wl,-u,/' \
${WRKSRC}/app/Makefile.in
- @${REINPLACE_CMD} -e 's|"libpng"|"libpng14"|' \
+ @${REINPLACE_CMD} -e 's|"libpng"|"libpng15"|' \
-e 's|x86_64|amd64|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} '/curl.types.h/d' ${WRKSRC}/plug-ins/file-uri/uri-backend-libcurl.c
diff --git a/graphics/gimp-data-extras/Makefile b/graphics/gimp-data-extras/Makefile
index 295827f1530d..ef04f989e5fd 100644
--- a/graphics/gimp-data-extras/Makefile
+++ b/graphics/gimp-data-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimp-data-extras
PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile
index d884f1f19c60..a4ea08a49654 100644
--- a/graphics/gimp-focusblur-plugin/Makefile
+++ b/graphics/gimp-focusblur-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= focusblur
PORTVERSION= 3.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://registry.gimp.org/files/
PKGNAMEPREFIX= gimp-
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index e3cf5208d8e5..b5eb5892bf03 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmic
PORTVERSION= 1.5.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/old
diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index 411f580f1df4..ec7476339c98 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp-lqr-plugin
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://liquidrescale.wdfiles.com/local--files/en:download-page-sources/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index ae4e8111ce29..2a836c5db6cf 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= resynthesizer
PORTVERSION= 0.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.logarithmic.net/pfh-files/resynthesizer/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile
index d0dba7767292..6683f02f23f6 100644
--- a/graphics/gimp-save-for-web/Makefile
+++ b/graphics/gimp-save-for-web/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gimp-save-for-web
PORTVERSION= 0.29.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://registry.gimp.org/files/
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 4e86714cde05..0cab7aecd45b 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giram
PORTVERSION= 0.3.5
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= graphics
MASTER_SITES= http://freebsd.nsu.ru/distfiles/
diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile
index 69bf135e75af..f35c780f1004 100644
--- a/graphics/gkrellkam/Makefile
+++ b/graphics/gkrellkam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellkam
PORTVERSION= 0.3.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 8f906ec62fce..9c696444cb94 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gkrellkam
PORTVERSION= 2.0.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 44888bd91d06..5537303caeb6 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gle-graphics
PORTVERSION= 4.0.12
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics print
MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${PORTVERSION}
DISTNAME= GLE-${PORTVERSION}-src
@@ -40,7 +40,7 @@ post-patch:
.if !defined(WITHOUT_BITMAP_IMAGES)
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiffxx.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} --with-tiff=${LOCALBASE} --with-png=${LOCALBASE}
.else
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index d42917177d1c..6ba46b9a711a 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gliv
PORTVERSION= 1.9.7
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://guichaz.free.fr/gliv/files/
diff --git a/graphics/glosm/Makefile b/graphics/glosm/Makefile
index 4a41f79d7b71..2381b5cccb31 100644
--- a/graphics/glosm/Makefile
+++ b/graphics/glosm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glosm
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= http://cloud.github.com/downloads/AMDmi3/glosm/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,7 +15,7 @@ MASTER_SITES= http://cloud.github.com/downloads/AMDmi3/glosm/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= 3D OpenGL renderer for OpenStreetMap
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
expat.6:${PORTSDIR}/textproc/expat2
USE_BZIP2= yes
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index 2de93e1a95d1..0cf952ac6980 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glpng
PORTVERSION= 1.45
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.wyatt100.freeserve.co.uk/ \
http://mirror.amdmi3.ru/distfiles/
@@ -16,7 +16,7 @@ DISTNAME= glpng
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Library to easily load PNG files as an OpenGL textures
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GL= gl
USE_ZIP= yes
@@ -26,11 +26,6 @@ AR?= /usr/bin/ar
WRKSRC= ${WRKDIR}/src
-post-patch:
- @${REINPLACE_CMD} -e 's|png/|libpng/|' \
- -e 's|!png_check_sig(header, 8)|png_sig_cmp(header, 0, 8)|' \
- ${WRKSRC}/glpng.c
-
do-build:
${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c
${CC} ${CFLAGS} -fPIC -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o
diff --git a/graphics/glpng/files/patch-glpng.c b/graphics/glpng/files/patch-glpng.c
new file mode 100644
index 000000000000..5a74cc264149
--- /dev/null
+++ b/graphics/glpng/files/patch-glpng.c
@@ -0,0 +1,49 @@
+--- glpng.c.orig 2000-07-10 21:27:10.000000000 +0200
++++ glpng.c 2012-04-27 08:58:12.000000000 +0200
+@@ -25,11 +25,11 @@
+ #include <windows.h>
+ #endif
+
++#include "png.h"
+ #include <GL/glpng.h>
+ #include <GL/gl.h>
+ #include <stdlib.h>
+ #include <math.h>
+-#include "png/png.h"
+
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+@@ -269,14 +269,14 @@
+ if (pinfo == NULL) return 0;
+
+ fread(header, 1, 8, fp);
+- if (!png_check_sig(header, 8)) return 0;
++ if (png_sig_cmp(header, 0, 8)) return 0;
+
+ png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ info = png_create_info_struct(png);
+ endinfo = png_create_info_struct(png);
+
+ // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -373,14 +373,14 @@
+ png_uint_32 i;
+
+ fread(header, 1, 8, fp);
+- if (!png_check_sig(header, 8)) return 0;
++ if (png_sig_cmp(header, 0, 8)) return 0;
+
+ png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ info = png_create_info_struct(png);
+ endinfo = png_create_info_struct(png);
+
+ // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index c377c6d89790..787578966380 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmt
PORTVERSION= 4.5.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://falcon.grdl.noaa.gov/pub/${PORTNAME}/ \
ftp://ftp.soest.hawaii.edu/${PORTNAME}/ \
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 7d1a211f1de4..e9ffa3c7c2d7 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index c361664af0a5..588bde415b2c 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -7,23 +7,24 @@
PORTNAME= gnofract4d
PORTVERSION= 3.14
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= SF
MAINTAINER= sylvio@FreeBSD.org
COMMENT= Weird GNOME fractal generator
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+ png15:${PORTSDIR}/graphics/png
LICENSE= BSD
-BROKEN= does not compile
-
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui lthack \
pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+CFLAGS+= -I${LOCALBASE}/include
PORTDOCS= README COPYING
INSTALLS_EGGINFO= yes
PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}
@@ -49,7 +50,7 @@ post-patch:
@${REINPLACE_CMD} -e '249,251d' ${WRKSRC}/setup.py
# fixup library detection
- @${REINPLACE_CMD} -e "s/libpng/libpng14/" ${WRKSRC}/setup.py
+ @${REINPLACE_CMD} -e "s/libpng/libpng15/" ${WRKSRC}/setup.py
@${REINPLACE_CMD} \
-e "s,/usr/include/jpeglib.h,${LOCALBASE}/include/jpeglib.h," \
${WRKSRC}/setup.py
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 5aab641c9512..90352a7b7444 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomeiconedit
PORTVERSION= 1.2.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics gnome
MASTER_SITES= SF/giconedit/giconedit-${PORTVERSION}/tar.gz
DISTNAME= gnome-iconedit-${PORTVERSION}
@@ -15,6 +15,8 @@ DISTNAME= gnome-iconedit-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A small GNOME Icon Editor
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/gnomeiconedit/files/patch-io.c b/graphics/gnomeiconedit/files/patch-io.c
new file mode 100644
index 000000000000..f1bd243ace64
--- /dev/null
+++ b/graphics/gnomeiconedit/files/patch-io.c
@@ -0,0 +1,11 @@
+--- src/io.c.orig 2000-06-22 17:24:20.000000000 +0200
++++ src/io.c 2012-05-22 07:40:49.000000000 +0200
+@@ -294,7 +294,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ GtkWidget *errorbox;
+
+ /* Error handler */
diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index c174b5922a83..c0df6e0215d8 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gocr
PORTVERSION= 0.49
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www-e.uni-magdeburg.de/jschulen/ocr/
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 66d5e97355cb..832ab4a42865 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= goocanvas
PORTVERSION= 0.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= GNOME
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index fe7c35ac8da7..1a82c1c5bb05 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= goocanvasmm
PORTVERSION= 0.15.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GNOME
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index 5423eeeb25cd..c4776e9d8816 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gource
PORTVERSION= 0.32
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile
index 33c8d07344cb..c9a3b2cd0b2c 100644
--- a/graphics/gozer/Makefile
+++ b/graphics/gozer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gozer
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index b1214c1f4874..05f678eed632 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gpaint
PORTVERSION= 0.3.3
DISTVERSIONPREFIX= 2-
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNU_ALPHA}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index d9d521596852..cbcbf8ea3711 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpicview
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/lxde/GPicView%20%28image%20Viewer%29/GPicView%20${PORTVERSION}
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index 579491552213..c2280ee5c3ba 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -7,14 +7,14 @@
PORTNAME= gqview
PORTVERSION= 2.1.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/unstable/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another gtk2-based graphic file viewer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 20396ef9e529..181328124dfd 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,14 +7,14 @@
PORTNAME= gqview
PORTVERSION= 2.0.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= lme@FreeBSD.org
COMMENT= Another gtk2-based graphic file viewer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 7e4ba4a800f0..979010ee18dc 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grads
PORTVERSION= 1.9b4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics science math
MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \
ftp://grads.iges.org/grads/:other
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits2.a:${PORTSDIR}/science/udunits \
${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
CONFIGURE_ENV+= SUPPLIBS="${LOCALBASE}"
diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile
index 096ef61004de..366c281961cd 100644
--- a/graphics/grafx2/Makefile
+++ b/graphics/grafx2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grafx2
PORTVERSION= 2.3.1781
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/src
CFLAGS+= -DHAVE_SYS_PARAM_H -DHAVE_SYS_UCRED_H -DHAVE_SYS_MOUNT_H
LIB_DEPENDS= X11:${PORTSDIR}/x11/libX11 \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.include <bsd.port.pre.mk>
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 3b0ac826b2da..aaee48e9e27a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graphviz
PORTVERSION= 2.28.0
+PORTREVISION= 1
CATEGORIES= graphics tk
MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/
@@ -14,7 +15,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= Graph Visualization Software from AT&T and Bell Labs
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
expat.6:${PORTSDIR}/textproc/expat2 \
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index e0eceb7e7a1f..2ee4580f1280 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= grx
PORTVERSION= 2.4.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://grx.gnu.de/download/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@@ -59,7 +60,7 @@ CONFIGURE_ARGS+=--disable-jpeg
.endif
.if defined(WITH_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+=--enable-png
.else
CONFIGURE_ARGS+=--disable-png
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index cc4c2268e927..8eee6ae74057 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gscan2pdf
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index d9723048444f..b07f28026c72 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gsculpt
PORTVERSION= 0.99.47
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
DISTNAME= gSculpt-${PORTVERSION}-alpha-src
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 7ee8e56d2a6e..1c164f879f47 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsnapshot
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile
index f9ec2a574507..7f355a036c7e 100644
--- a/graphics/gstreamer-plugins-cairo/Makefile
+++ b/graphics/gstreamer-plugins-cairo/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.6 2008/03/19 14:05:34 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer vector graphics plugin
diff --git a/graphics/gstreamer-plugins-gdkpixbuf/Makefile b/graphics/gstreamer-plugins-gdkpixbuf/Makefile
index f124f1982f4d..24601644918e 100644
--- a/graphics/gstreamer-plugins-gdkpixbuf/Makefile
+++ b/graphics/gstreamer-plugins-gdkpixbuf/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer image decoder plugin
diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile
index b1ecaafbab66..b004db76e981 100644
--- a/graphics/gstreamer-plugins-gl/Makefile
+++ b/graphics/gstreamer-plugins-gl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gstreamer-plugins-gl
PORTVERSION= 0.10.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-gl/
DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer OpenGL video plugin
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile
index 847abc85da42..efbf8fa03ccd 100644
--- a/graphics/gstreamer-plugins-libcaca/Makefile
+++ b/graphics/gstreamer-plugins-libcaca/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/gstreamer-plugins-libcaca/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer color ascii art plugin
diff --git a/graphics/gstreamer-plugins-libpng/Makefile b/graphics/gstreamer-plugins-libpng/Makefile
index 50367404bc5f..dd8c0e3ceb0a 100644
--- a/graphics/gstreamer-plugins-libpng/Makefile
+++ b/graphics/gstreamer-plugins-libpng/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/graphics/gstreamer-plugins-libpng/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Gstreamer png plugin
diff --git a/graphics/gstreamer-plugins-opencv/Makefile b/graphics/gstreamer-plugins-opencv/Makefile
index 0b3319b9f217..4caddeb53f23 100644
--- a/graphics/gstreamer-plugins-opencv/Makefile
+++ b/graphics/gstreamer-plugins-opencv/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= Gstreamer opencv real time computer vision plugin
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 5679eeb0124a..1656e306dace 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gthumb
PORTVERSION= 2.14.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index c9226973d762..686a97a8e064 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtimelapse
DISTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here)
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index b856663bdb44..fbde4eb0673b 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-update-icon-cache
PORTVERSION= 2.24.6
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 8894f828d17b..5c1a3f90fa18 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkam
PORTVERSION= 0.1.18
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/gphoto/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 641db45ab1d1..95241ebdc1ad 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkdps
PORTVERSION= 0.3.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
# ftp://ftp.gyve.org/pub/gtkDPS/
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 2f422c0575cd..46836917baa6 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkgraph
PORTVERSION= 0.6.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jedgar
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index f63d38368310..3fa47a115bb8 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwenview
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 24348ad762a6..f352d2d09cb2 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwenview
PORTVERSION= 1.4.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics kde
MASTER_SITES= SF
@@ -15,6 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An image viewer and browser for the KDE environment
LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
+ png15:${PORTSDIR}/graphics/png \
exiv2.10:${PORTSDIR}/graphics/exiv2
USE_BZIP2= yes
@@ -22,6 +23,7 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
+CFLAGS+=-I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS+=--enable-kipi
MAN1= gwenview.1
diff --git a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp
index a7c10d008337..443d390a083b 100644
--- a/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp
+++ b/graphics/gwenview/files/patch-src_gvcore_pngformattype.cpp
@@ -1,6 +1,14 @@
--- src/gvcore/pngformattype.cpp.orig 2007-09-15 15:46:13.000000000 +0200
-+++ src/gvcore/pngformattype.cpp 2010-03-30 10:12:59.000000000 +0200
-@@ -245,7 +245,7 @@
++++ src/gvcore/pngformattype.cpp 2012-05-09 12:32:26.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include "pngformattype.h"
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ namespace Gwenview {
+
+@@ -245,7 +246,7 @@
image.setColor( i, qRgba(c,c,c,0xff) );
}
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
@@ -9,7 +17,7 @@
if (g < ncols) {
image.setAlphaBuffer(TRUE);
image.setColor(g, image.color(g) & RGB_MASK);
-@@ -273,7 +273,7 @@
+@@ -273,7 +274,7 @@
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
@@ -18,3 +26,21 @@
)
);
i++;
+@@ -381,7 +382,7 @@
+ return -1;
+ }
+
+- if (setjmp((png_ptr)->jmpbuf)) {
++ if (setjmp(png_jmpbuf((png_ptr)))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ image = 0;
+ return -1;
+@@ -409,7 +410,7 @@
+
+ if ( !png_ptr ) return 0;
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ image = 0;
+ state = MovieStart;
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index bf8a18626406..c6c6430a9497 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gx
PORTVERSION= 0.4.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://perticone.homelinux.net/sergio/c++/gx/src/ CENKES
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index b3ab7b6f0814..b063c9e4be0f 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cairo
PORTVERSION= 0.12.2
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index 5d32bef2f7bb..17736f53d4e5 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= soegtk
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 7c9f5f14ffee..17cfb59597e9 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= svgcairo
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 0615a4215650..f18a41b60ed2 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hsetroot
PORTVERSION= 1.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://cdn.thegraveyard.org/releases/hsetroot/
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 50c570197a38..8a12f37d35b0 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hugin
PORTVERSION= 2011.4.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
@@ -15,7 +16,7 @@ COMMENT= A GUI for Panorama Tools, to stitch panoramic images
LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
IlmImf:${PORTSDIR}/graphics/OpenEXR \
exiv2.10:${PORTSDIR}/graphics/exiv2 \
pano13:${PORTSDIR}/graphics/libpano13 \
diff --git a/graphics/icoconvert/Makefile b/graphics/icoconvert/Makefile
index 22e060f0f08a..786ad2e6c754 100644
--- a/graphics/icoconvert/Makefile
+++ b/graphics/icoconvert/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icoconvert
PORTVERSION= 2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.mox.net/downloads/ \
http://www.xunix.org/~flz/distfiles/
diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile
index 188ab8627dec..48bcc3178cd9 100644
--- a/graphics/icon-slicer/Makefile
+++ b/graphics/icon-slicer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icon-slicer
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://www.freedesktop.org/software/icon-slicer/releases/
diff --git a/graphics/icontact/Makefile b/graphics/icontact/Makefile
index b2674c82a2f8..40eafd7271cb 100644
--- a/graphics/icontact/Makefile
+++ b/graphics/icontact/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icontact
PORTVERSION= 1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.panix.com/~mbh/icontact/
diff --git a/graphics/icoutils/Makefile b/graphics/icoutils/Makefile
index 0e9801c0ead0..ceb358e6542c 100644
--- a/graphics/icoutils/Makefile
+++ b/graphics/icoutils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icoutils
PORTVERSION= 0.29.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SAVANNAH
@@ -16,7 +17,7 @@ COMMENT= Convert/extract images in Microsoft Windows(R) icon/cursor files
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
USE_BZIP2= yes
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 9f7629238fcb..3ad546c9b8ee 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ida
PORTVERSION= 2.09
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.kraxel.org/releases/fbida/
DISTNAME= fbida-${PORTVERSION}
@@ -58,7 +59,7 @@ MAKE_ARGS+= HAVE_LIBPCD=no
.if defined(WITHOUT_PNG)
MAKE_ARGS+= HAVE_LIBPNG=no
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITH_SANE)
diff --git a/graphics/iiview/Makefile b/graphics/iiview/Makefile
index 7c4bb2fd2d14..19b1469b92b0 100644
--- a/graphics/iiview/Makefile
+++ b/graphics/iiview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= iiview
PORTVERSION= 0.28
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index e5fc402d22bf..0ba9b2192baf 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imageindex
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.edwinh.org/imageindex/release/ \
http://www.reynoldsnet.org/imageindex/release/
diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile
index 2cf9e56b2c78..d0563ce4d633 100644
--- a/graphics/imagesort/Makefile
+++ b/graphics/imagesort/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imagesort
PORTVERSION= 2.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/viewers/X
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible X utility for managing many image files
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib
USE_XORG= x11 xt
diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile
index 9093a8ffbd3f..f67235e6abaa 100644
--- a/graphics/imc/Makefile
+++ b/graphics/imc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= imc
PORTVERSION= 4.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://users.skynet.be/Peter.Verthez/projects/imc/
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index 8a77ba3d89b7..2d88f6d015e5 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imgSeek
PORTVERSION= 0.8.6
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile
index eb708faabff3..3f70a7731a87 100644
--- a/graphics/imgtops/Makefile
+++ b/graphics/imgtops/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imgtops
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 45f07869cc5e..45ae9074f4ae 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= imlib
PORTVERSION= 1.9.15
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A graphic library for enlightenment package
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
MAN1= imlib-config.1 imlib_config.1
diff --git a/graphics/imlib/files/patch-io-png.c b/graphics/imlib/files/patch-io-png.c
new file mode 100644
index 000000000000..c4f315a15f4d
--- /dev/null
+++ b/graphics/imlib/files/patch-io-png.c
@@ -0,0 +1,46 @@
+--- gdk_imlib/io-png.c.orig 2002-03-04 18:06:29.000000000 +0100
++++ gdk_imlib/io-png.c 2012-04-24 23:11:43.000000000 +0200
+@@ -5,6 +5,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h>
++#include <pngpriv.h>
+
+ unsigned char *
+ loader_png (FILE * f, int *w, int *h, int *t)
+@@ -40,7 +41,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+@@ -275,7 +276,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+@@ -440,7 +441,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+@@ -635,7 +636,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
diff --git a/graphics/imlib/files/patch-load.c b/graphics/imlib/files/patch-load.c
index a51987eb63ef..471406402710 100644
--- a/graphics/imlib/files/patch-load.c
+++ b/graphics/imlib/files/patch-load.c
@@ -1,5 +1,22 @@
--- Imlib/load.c.orig 2004-09-21 02:23:20.000000000 +0200
+++ Imlib/load.c 2010-03-28 16:23:13.000000000 +0200
+@@ -170,6 +176,7 @@
+ #endif /* HAVE_LIBJPEG */
+
+ #ifdef HAVE_LIBPNG
++#include <pngpriv.h>
+ unsigned char *
+ _LoadPNG(ImlibData * id, FILE * f, int *w, int *h, int *t)
+ {
+@@ -192,7 +198,7 @@
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return NULL;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
@@ -1619,7 +1619,7 @@
return 0;
fread(buf, 1, 8, f);
diff --git a/graphics/imlib/files/patch-save.c b/graphics/imlib/files/patch-save.c
new file mode 100644
index 000000000000..88a23c0426c8
--- /dev/null
+++ b/graphics/imlib/files/patch-save.c
@@ -0,0 +1,11 @@
+--- Imlib/save.c.orig 2004-09-21 02:22:59.000000000 +0200
++++ Imlib/save.c 2012-04-27 07:19:57.000000000 +0200
+@@ -342,7 +342,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
diff --git a/graphics/imlib/files/patch-utils.c b/graphics/imlib/files/patch-utils.c
new file mode 100644
index 000000000000..0d59d7879b1f
--- /dev/null
+++ b/graphics/imlib/files/patch-utils.c
@@ -0,0 +1,19 @@
+--- Imlib/utils.c.orig 2012-04-27 07:12:19.000000000 +0200
++++ Imlib/utils.c 2012-04-27 07:15:39.000000000 +0200
+@@ -1899,6 +1899,7 @@
+ };
+
+ #ifdef HAVE_LIBPNG
++#include "pngpriv.h"
+ static void
+ _png_io_read(png_structp png_ptr,
+ png_bytep data, png_uint_32 size)
+@@ -1982,7 +1983,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index da5667847e20..ac3b09d3cf3f 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imlib2
PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -65,7 +65,7 @@ PLIST_SUB+= JPEG="@comment "
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+= --without-png
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index ddb2dc99ef24..3ca86d7a8571 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -7,6 +7,7 @@
PORTNAME= imlib2_loaders
PORTVERSION= 1.4.5
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 115a8845ea13..0c604b28d3a6 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inkscape
PORTVERSION= 0.48.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= SF
MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
@@ -23,6 +23,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gtkspell.0:${PORTSDIR}/textproc/gtkspell \
lcms.1:${PORTSDIR}/graphics/lcms \
wpg-0.2:${PORTSDIR}/graphics/libwpg \
+ png15:${PORTSDIR}/graphics/png \
Magick++.5:${PORTSDIR}/graphics/ImageMagick
RUN_DEPENDS= ${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
@@ -63,7 +64,7 @@ CONFIGURE_ARGS+= --enable-poppler-cairo=no
post-patch:
@${REINPLACE_CMD} -e 's|ieefp.h|ieeefp.h|' \
${WRKSRC}/src/2geom/bezier-utils.cpp
- @${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng14 >= 1.2|g' \
+ @${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng15 >= 1.2|g' \
-e 's|-ldl||g' \
${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "*.h" -o -name "*.cpp" | ${XARGS} \
diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp
new file mode 100644
index 000000000000..e9e49d9930b6
--- /dev/null
+++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp
@@ -0,0 +1,11 @@
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig 2012-05-04 10:06:12.000000000 +0200
++++ src/extension/internal/pdfinput/svg-builder.cpp 2012-05-04 12:24:12.000000000 +0200
+@@ -1443,7 +1443,7 @@
+ return NULL;
+ }
+ // Set error handler
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return NULL;
+ }
diff --git a/graphics/inkscape/files/patch-src_helper_png-write.cpp b/graphics/inkscape/files/patch-src_helper_png-write.cpp
new file mode 100644
index 000000000000..078b4252c930
--- /dev/null
+++ b/graphics/inkscape/files/patch-src_helper_png-write.cpp
@@ -0,0 +1,11 @@
+--- src/helper/png-write.cpp.orig 2012-05-04 10:06:13.000000000 +0200
++++ src/helper/png-write.cpp 2012-05-04 12:02:19.000000000 +0200
+@@ -165,7 +165,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
diff --git a/graphics/inkscape/files/patch-src_sp-image.cpp b/graphics/inkscape/files/patch-src_sp-image.cpp
new file mode 100644
index 000000000000..6b1fed560818
--- /dev/null
+++ b/graphics/inkscape/files/patch-src_sp-image.cpp
@@ -0,0 +1,11 @@
+--- src/sp-image.cpp.orig 2011-07-08 20:25:09.468790000 +0200
++++ src/sp-image.cpp 2012-05-05 08:06:14.000000000 +0200
+@@ -388,7 +388,7 @@
+ {
+ char* name = 0;
+ int compression_type = 0;
+- char* profile = 0;
++ png_byte * profile = 0;
+ png_uint_32 proflen = 0;
+ if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 5dcfe6bb4a16..1b2712c1e544 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ipe
DISTVERSION= 7.1.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}7/${PORTNAME}/7.1.0
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 6f13115381a2..b830d8a3cd3e 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= iulib
PORTVERSION= 0.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
EXTRACT_SUFX= .tgz
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= A library of image understanding-related algorithms
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/jbig2dec/Makefile b/graphics/jbig2dec/Makefile
index e21364edbebc..6a7ca7b62dea 100644
--- a/graphics/jbig2dec/Makefile
+++ b/graphics/jbig2dec/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jbig2dec
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= SF \
http://ghostscript.com/~giles/jbig2/jbig2dec/
@@ -36,8 +37,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+=--with-libpng=${LOCALBASE}
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.endif
.if ${PORT_OPTIONS:MTESTS}
diff --git a/graphics/jbig2dec/files/patch-jbig2_image_png.c b/graphics/jbig2dec/files/patch-jbig2_image_png.c
new file mode 100644
index 000000000000..1aa509b0f27a
--- /dev/null
+++ b/graphics/jbig2dec/files/patch-jbig2_image_png.c
@@ -0,0 +1,10 @@
+--- jbig2_image_png.c.orig 2009-07-16 06:44:49.000000000 +0200
++++ jbig2_image_png.c 2012-04-24 21:54:55.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "jbig2.h"
+ #include "jbig2_priv.h"
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 9cfb85eab833..02e121885a9d 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -9,7 +9,7 @@
PORTNAME= k3d
PORTVERSION= 0.6.7.0
DISTVERSIONSUFFIX=-src
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION}
diff --git a/graphics/kalbum/Makefile b/graphics/kalbum/Makefile
index 7b2085d6bad4..46f42f64f5d3 100644
--- a/graphics/kalbum/Makefile
+++ b/graphics/kalbum/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kalbum
PORTVERSION= 0.8.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics kde
MASTER_SITES= http://www.paldandy.com/kalbum/data/${PORTNAME}-${PORTVERSION}/
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 04a2d32f8165..d708569b26bc 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kamera
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
index 8fd8edc27538..ce627d262ebd 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kamera
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 9878c92873f6..3678da70657b 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kbarcode
PORTVERSION= 2.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics kde
MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION}
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index fe9b3d4cce3a..3cbd59cda553 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kcolorchooser
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile
index f52292f22221..5a866d78bdd4 100644
--- a/graphics/kcoloredit/Makefile
+++ b/graphics/kcoloredit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kcoloredit
PORTVERSION= ${APP_VER}.${EXTRA_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/extragear
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index fc1e17287907..606cd98ae963 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile
index c93ad8f9f42b..c7ff0a56ca52 100644
--- a/graphics/kdegraphics4-mobipocket/Makefile
+++ b/graphics/kdegraphics4-mobipocket/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdegraphics-mobipocket
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index ef76a290a791..f4d3e2456216 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdegraphics-strigi-analyzer
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile
index 19dbcc04df25..cfa246a2174c 100644
--- a/graphics/kdegraphics4-svgpart/Makefile
+++ b/graphics/kdegraphics4-svgpart/Makefile
@@ -7,6 +7,7 @@
PORTNAME= svgpart
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile
index 2bdcb7b63991..bc61bd233d1a 100644
--- a/graphics/kdegraphics4-thumbnailers/Makefile
+++ b/graphics/kdegraphics4-thumbnailers/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdegraphics-thumbnailers
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
index 7003f791cfc0..c289c68dab5d 100644
--- a/graphics/kgraphviewer/Makefile
+++ b/graphics/kgraphviewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kgraphviewer
PORTVERSION= ${APP_VER}.${EXTRA_VER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/extragear
diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile
index 930f19c9a98e..d4e4f92b69a5 100644
--- a/graphics/kiconedit/Makefile
+++ b/graphics/kiconedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kiconedit
PORTVERSION= ${EXTRA_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/extragear
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index b12bf50a5235..8b17166c9279 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 1.9.0
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index c91539210e7b..8d2d4a66ad55 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 0.1.7
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
@@ -17,6 +17,7 @@ COMMENT= KDE Image Plugin Interface plugins
LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \
+ png15:${PORTSDIR}/graphics/png \
kdcraw.4:${PORTSDIR}/graphics/libkdcraw
OPTIONS= ACQUIREIMAGES "scanner/screenshot plugin" on \
diff --git a/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp b/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp
new file mode 100644
index 000000000000..537790ab0934
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-rawdecodingiface.cpp
@@ -0,0 +1,11 @@
+--- kipi-plugins/rawconverter/rawdecodingiface.cpp.orig 2008-12-13 12:20:05.000000000 +0100
++++ kipi-plugins/rawconverter/rawdecodingiface.cpp 2012-05-09 12:36:43.000000000 +0200
+@@ -299,7 +299,7 @@
+ if (!ICCColorProfile.isEmpty())
+ {
+ png_set_iCCP(png_ptr, info_ptr, "icc", PNG_COMPRESSION_TYPE_BASE,
+- ICCColorProfile.data(), ICCColorProfile.size());
++ (const png_byte *)ICCColorProfile.data(), ICCColorProfile.size());
+ }
+
+ QString libpngver(PNG_HEADER_VERSION_STRING);
diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile
index cb747e847798..2385355ebc5e 100644
--- a/graphics/kisomandel/Makefile
+++ b/graphics/kisomandel/Makefile
@@ -8,14 +8,14 @@
PORTNAME= kisomandel
PORTVERSION= 0.66
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A fractal rendering program with nice 3d-display in realtime
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
PLIST_FILES= bin/kisomandel
USE_BZIP2= yes
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index efb371c2d225..9bdc9e8e9fee 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klatexformula
PORTVERSION= 3.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 4e7037100995..905953325087 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kludge3d
PORTVERSION= 20040822
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/source/2004-08-22
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index 71b73c65ece7..ab347e50bd56 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kolourpaint
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile
index 9a27f519e695..7e0d5beb2e1a 100644
--- a/graphics/kooka/Makefile
+++ b/graphics/kooka/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kooka
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index fa510172b8a5..08f22e9522b5 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kphotoalbum
PORTVERSION= ${APP_VER}.${EXTRA_VER}
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/extragear
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 88da76124064..072b0b0061cd 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kphotoalbum
PORTVERSION= 3.1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics kde
MASTER_SITES= http://www.kphotoalbum.org/data/download/
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index a9bdd232eabf..d63ffb2209a7 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kpovmodeler
PORTVERSION= ${APP_VER}.${EXTRA_VER}
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${EXTRA_VER}/src/extragear
diff --git a/graphics/kradview/Makefile b/graphics/kradview/Makefile
index 2d1d8f2e0f23..aead5849646c 100644
--- a/graphics/kradview/Makefile
+++ b/graphics/kradview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kradview
PORTVERSION= 1.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics kde
MASTER_SITES= http://www.orcero.org/irbis/kradview/
EXTRACT_SUFX= .tgz
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index 81e67bb8060a..38b4ccfc17a5 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ksaneplugin
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index be9bc7c29367..538db09a5b86 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ksnapshot
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 6529755cf096..748a5c59a216 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kudu
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index f3a932e90434..b82555954b18 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kuickshow
PORTVERSION= ${APP_VER}.${EXTRA_VER}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/extragear
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
index 3e61a5f3bb24..bf4b897a7e5e 100644
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kuickshow
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile
index 51992a5aef6e..6018c832dc57 100644
--- a/graphics/landscape/Makefile
+++ b/graphics/landscape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= landscape
PORTVERSION= 0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics kde
MASTER_SITES= http://homepage.ntlworld.com/jon.belson/files/
diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile
index 6bb755677214..a8c75f4844f0 100644
--- a/graphics/lcdtest/Makefile
+++ b/graphics/lcdtest/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lcdtest
PORTVERSION= 1.18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.brouhaha.com/~eric/software/lcdtest/download/ \
http://www.predatorlabs.net/dl/
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 989eabe4133e..a02446d79827 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lensfun
PORTVERSION= 0.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= BERLIOS
@@ -16,7 +16,7 @@ COMMENT= Library for fixing lens geometry distortions
LICENSE= LGPL3
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/graphics/lensfun/files/patch-image.cpp b/graphics/lensfun/files/patch-image.cpp
new file mode 100644
index 000000000000..a5b111788379
--- /dev/null
+++ b/graphics/lensfun/files/patch-image.cpp
@@ -0,0 +1,37 @@
+--- libs/auxfun/image.cpp.orig 2008-05-02 08:56:04.000000000 +0200
++++ libs/auxfun/image.cpp 2012-05-04 12:31:16.000000000 +0200
+@@ -6,6 +6,7 @@
+ #include "image.h"
+ #include <zlib.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <math.h>
+@@ -94,7 +95,7 @@
+
+ png_init_io (png, file);
+
+- if (setjmp (png->jmpbuf))
++ if (setjmp (png_jmpbuf(png)))
+ // If we get here, we had a problem reading the file
+ goto nomem;
+
+@@ -157,7 +158,7 @@
+ row_pointers = new png_bytep [Height];
+
+ if (!row_pointers
+- || setjmp (png->jmpbuf)) // Set a new exception handler
++ || setjmp (png_jmpbuf(png))) // Set a new exception handler
+ {
+ delete [] row_pointers;
+ nomem:
+@@ -214,7 +215,7 @@
+ }
+
+ /* Catch processing errors */
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ /* If we get here, we had a problem writing the file */
+ goto error2;
+
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index 5362f3b7c71a..3c479b51dcae 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -7,6 +7,7 @@
PORTNAME= leptonica
PORTVERSION= 1.68
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
@@ -15,7 +16,7 @@ COMMENT= C library for efficient image processing and image analysis operations
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
webp.2:${PORTSDIR}/graphics/webp
diff --git a/graphics/leptonica/files/patch-pngio.c b/graphics/leptonica/files/patch-pngio.c
new file mode 100644
index 000000000000..70c02ed57047
--- /dev/null
+++ b/graphics/leptonica/files/patch-pngio.c
@@ -0,0 +1,10 @@
+--- src/pngio.c.orig 2011-02-01 06:41:12.000000000 +0100
++++ src/pngio.c 2012-05-04 12:33:51.000000000 +0200
+@@ -107,6 +107,7 @@
+ /* --------------------------------------------*/
+
+ #include "png.h"
++#include "zlib.h"
+
+ /* ----------------Set defaults for read/write options ----------------- */
+ /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index a13f188ae5c8..77e51cb09ab3 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libafterimage
PORTVERSION= 1.20
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/afterstep/libAfterImage/${PORTVERSION}
DISTNAME= libAfterImage-${PORTVERSION}
@@ -17,7 +18,7 @@ COMMENT= Generic imaging library originally designed for AfterStep
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/graphics/libafterimage/files/patch-export.c b/graphics/libafterimage/files/patch-export.c
new file mode 100644
index 000000000000..950da3b1b275
--- /dev/null
+++ b/graphics/libafterimage/files/patch-export.c
@@ -0,0 +1,11 @@
+--- export.c.orig 2011-01-15 06:52:22.000000000 +0100
++++ export.c 2012-05-04 12:57:15.000000000 +0200
+@@ -496,7 +496,7 @@
+ png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+ if ( png_ptr != NULL )
+ if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ info_ptr = NULL ;
diff --git a/graphics/libafterimage/files/patch-import.c b/graphics/libafterimage/files/patch-import.c
new file mode 100644
index 000000000000..3b2a5f7f8b47
--- /dev/null
+++ b/graphics/libafterimage/files/patch-import.c
@@ -0,0 +1,19 @@
+--- import.c.orig 2011-01-15 06:52:22.000000000 +0100
++++ import.c 2012-05-04 18:57:46.000000000 +0200
+@@ -40,6 +40,7 @@
+ # else
+ # include <png.h>
+ # endif
++# include <pngpriv.h>
+ #else
+ # include <setjmp.h>
+ # ifdef HAVE_JPEG
+@@ -1251,7 +1252,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if ( !setjmp (png_ptr->jmpbuf))
++ if ( !setjmp (png_jmpbuf(png_ptr)))
+ {
+ ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index c27c9abde7d5..d26f20ce9fbd 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libboard
DISTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index a652200502b4..3a48ca3d099e 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libcaca
DISTVERSION= 0.99.beta18
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 759677ebba2a..b6c6cfe97a09 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libchamplain
PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GNOME
diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile
index ddad2eb9acdc..c97ae7014100 100644
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libdmtx
PORTVERSION= 0.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 1e94691fc441..bf39f25e96ae 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libexif-gtk
PORTVERSION= 0.3.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/libexif/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile
index 4b6cf1b7c854..8df8ed5d1218 100644
--- a/graphics/libgfx/Makefile
+++ b/graphics/libgfx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgfx
DISTVERSION= 1.1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://mgarland.org/files/dist/
@@ -18,7 +18,7 @@ LICENSE= MIT
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gzstream.0:${PORTSDIR}/devel/gzstream \
jpeg.11:${PORTSDIR}/graphics/jpeg
@@ -26,6 +26,7 @@ BUILD_WRKSRC= ${WRKSRC}/src
USE_GL= glu
USE_GMAKE= yes
+USE_XORG= x11 xext xft xinerama
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gzstream --with-libtiff-lzw --with-x
ALL_TARGET= ${PORTNAME}.so
diff --git a/graphics/libgfx/files/patch-png.cxx b/graphics/libgfx/files/patch-png.cxx
new file mode 100644
index 000000000000..80b3f88d92c0
--- /dev/null
+++ b/graphics/libgfx/files/patch-png.cxx
@@ -0,0 +1,20 @@
+--- src/raster-png.cxx.orig 2004-09-27 06:45:31.000000000 +0200
++++ src/raster-png.cxx 2012-05-04 12:59:52.000000000 +0200
+@@ -42,7 +42,7 @@
+ // Because we didn't set up any error handlers, we need to be
+ // prepared to handle longjmps out of the library on error
+ // conditions.
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+@@ -132,7 +132,7 @@
+ return false;
+ }
+
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 35658ef9d531..14ad2b7544fd 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnomecanvas
PORTVERSION= 2.30.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 7b1defbcb373..ca69343793f7 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomecanvasmm
PORTVERSION= 2.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics gnome
MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index a9cd647a98ce..cf01f1720974 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnomecanvasmm
PORTVERSION= 2.26.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index 448258946339..ca0a07dc85fe 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libimg
PORTVERSION= 1.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES?= graphics tk
MASTER_SITES= SF/tkimg/tkimg/${PORTVERSION:R}
DISTNAME= img${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= img${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
COMMENT= A library of image format handlers for Tk4.1 and later
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index 09ee263f6a93..c12b7c9a05b0 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= libkdcraw
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 49a5de7e75e6..c6a76464ceac 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libkdcraw
PORTVERSION= 0.1.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics devel
MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 16fe829bd2ee..b2eac83d62d4 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libkexif
PORTVERSION= 0.2.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics devel
MASTER_SITES= SF/kipi/OldFiles
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index a53938a88458..fc53688247bd 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libkexiv2
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index ef9dbfd18bb6..59fbf349ffc1 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libkexiv2
PORTVERSION= 0.1.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics devel
MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index d8ec49021306..f1f05f4246d6 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= libkipi
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 88eb27e517b1..a14ecd2def1a 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libkipi
PORTVERSION= 0.1.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics kde devel
MASTER_SITES= SF/kipi/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 08c967340a17..160b396f3f56 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -6,6 +6,7 @@
PORTNAME= libksane
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index baaf76a3603b..45544309a9db 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopenraw
PORTVERSION= 0.0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://libopenraw.freedesktop.org/download/
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index b1dc587c3678..2d5b8cb8b79d 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -10,7 +10,7 @@
PORTNAME= libpano12
PORTVERSION= 2.8.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics java
MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -18,7 +18,7 @@ MAINTAINER= vd@FreeBSD.org
COMMENT= Panorama Tools to make panorama pictures
LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
USE_GNOME= gtk20 glib20 pango atk
@@ -28,6 +28,7 @@ USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
+ -I${LOCALBASE}/include/libpng15 \
-I${LOCALBASE}/include/pango-1.0 \
-I${LOCALBASE}/include/atk-1.0
CONFIGURE_ARGS= --with-png=${LOCALBASE} \
diff --git a/graphics/libpano12/files/patch-png.c b/graphics/libpano12/files/patch-png.c
new file mode 100644
index 000000000000..0bd2e46b40d9
--- /dev/null
+++ b/graphics/libpano12/files/patch-png.c
@@ -0,0 +1,27 @@
+--- png.c.orig 2006-08-20 23:04:06.000000000 +0200
++++ png.c 2012-05-04 13:03:57.000000000 +0200
+@@ -1,5 +1,6 @@
+ #include "filter.h"
+ #include "png.h"
++#include "pngpriv.h"
+
+
+
+@@ -56,7 +57,7 @@
+ }
+
+ /* set error handling */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file */
+ fclose(outfile);
+@@ -165,7 +166,7 @@
+ }
+
+ /* set error handling if you are using the setjmp/longjmp method */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 85c9f5410c9f..4314da5b5177 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libpano13
PORTVERSION= 2.9.18
+PORTREVISION= 1
CATEGORIES= graphics java
MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -14,7 +15,7 @@ MAINTAINER= vd@FreeBSD.org
COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
USE_GNOME= gtk20 glib20 pango atk
diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile
index 9cf63b72f997..620b58d1349c 100644
--- a/graphics/libpuzzle/Makefile
+++ b/graphics/libpuzzle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libpuzzle
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/
diff --git a/graphics/libqglviewer/Makefile b/graphics/libqglviewer/Makefile
index c4efdc27880f..e27f9a5ffe77 100644
--- a/graphics/libqglviewer/Makefile
+++ b/graphics/libqglviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libqglviewer
PORTVERSION= 2.2.4.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/src/
DISTNAME= libQGLViewer-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index 1426141eed7b..ab94a995cc71 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libqrencode
PORTVERSION= 3.3.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://fukuchi.org/works/qrencode/
DISTNAME= qrencode-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME= qrencode-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A C library for encoding data in a QR Code symbol
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index a39befe62f5e..d9819d6b688b 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= librsvg2
PORTVERSION= 2.34.1
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile
index 6af35dbf2c23..e2b4858b00df 100644
--- a/graphics/libsvg-cairo/Makefile
+++ b/graphics/libsvg-cairo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libsvg-cairo
PORTVERSION= 0.1.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile
index 2db8602620a4..3f3b16d350e8 100644
--- a/graphics/libsvg/Makefile
+++ b/graphics/libsvg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libsvg
PORTVERSION= 0.1.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A parser for SVG content in files or buffers
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_AUTOTOOLS= libtool
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index a73b65827d97..c5e2d2bcecbd 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libwmf
PORTVERSION= 0.2.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION}
@@ -16,7 +16,7 @@ COMMENT= Tools and library for converting Microsoft WMF (windows metafile)
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_AUTOTOOLS= libtool
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index 9cedf888696a..ccb3eda0d268 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libwpg
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile
index 667523eca4c4..b3e0bb491f5e 100644
--- a/graphics/libwpg01/Makefile
+++ b/graphics/libwpg01/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libwpg
PORTVERSION= 0.1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile
index a7c40f0e5adc..260183b6a51a 100644
--- a/graphics/libx3dtk/Makefile
+++ b/graphics/libx3dtk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libx3dtk
PORTVERSION= 1.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/
DISTNAME= X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E}
diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile
index b697f5d6cd2b..d988a2e6d9c2 100644
--- a/graphics/linux-cairo/Makefile
+++ b/graphics/linux-cairo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.0.2
DISTVERSIONSUFFIX= -2.gst.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics linux
MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
MASTER_SITE_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.deps
diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile
index d43f48f15b14..5843ba5da33c 100644
--- a/graphics/linux-f10-cairo/Makefile
+++ b/graphics/linux-f10-cairo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cairo
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
PKGNAMEPREFIX= linux-f10-
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index b87269fb2bd2..50b436204ac6 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.37
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
PKGNAMEPREFIX= linux-f10-
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index e802d4bd5bcb..95b4c6133b62 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
PKGNAMEPREFIX= linux-f10-
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index b4c770a3731c..98255877e7d9 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
DISTNAME= libpng-${PORTVERSION}-2
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 1ec4ad49b8be..2a99a209bcce 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png
PORTVERSION= 1.0.18
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
DISTNAME= libpng10-${PORTVERSION}-2
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index a6eeb0c422dd..a0a103c5c2d7 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lprof
PORTVERSION= 20080514
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|}
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index a0487e71f509..5009b65d01b9 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -7,7 +7,7 @@
PORTNAME= luminance
DISTVERSION= 2.0.1-1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION:S/-1//}/
DISTNAME= ${PORTNAME}-v${DISTVERSION}
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index be7eff9eaea2..47c73fd9f757 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -7,6 +7,7 @@
PORTNAME= luxrender
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://src.luxrender.net/lux/archive/ \
http://freebsd.nsu.ru/distfiles/luxrender/
@@ -22,7 +23,7 @@ BROKEN= does not build with boost-1.48.0
BUILD_DEPENDS= ${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
HG_NODEID= 9206b3ba7011
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index a5761f06b027..4c5f2986780d 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= makehuman
DISTVERSION= 0.9.1-rc1a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 0b9bea73eef2..6d13ec4f594d 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mapnik
PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= graphics geography
MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
@@ -19,7 +19,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg \
icuuc:${PORTSDIR}/devel/icu \
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index eee904d4d6c0..7e2e6bab3e29 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mapserver
PORTVERSION= 6.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics www geography
MASTER_SITES= http://download.osgeo.org/mapserver/
@@ -16,7 +16,7 @@ COMMENT= System for developing web-based GIS applications
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
proj.7:${PORTSDIR}/graphics/proj \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib
diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile
index 6d4a96b31088..0b89d7750e1c 100644
--- a/graphics/maverik/Makefile
+++ b/graphics/maverik/Makefile
@@ -31,7 +31,7 @@ MAKE_JOBS_UNSAFE= yes
.include <bsd.port.pre.mk>
.if defined(WITH_PNG)
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --PNGLIBS="-L${LOCALBASE}/lib -lpng" \
--PNGINCL="-I${LOCALBASE}/include"
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index efa41f528a10..a3e962e9729b 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -7,7 +7,7 @@
PORTNAME= megapov
PORTVERSION= 1.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://megapov.inetart.net/packages/unix/
@@ -15,7 +15,7 @@ MAINTAINER= maho@FreeBSD.org
COMMENT= Unofficial extensions of POV-Ray
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
@@ -26,9 +26,9 @@ GNU_CONFIGURE= yes
ALL_TARGET= # empty
CONFIGURE_ARGS+= COMPILED_BY="ports@FreeBSD.org"
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include
-CXXFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
.include <bsd.port.pre.mk>
diff --git a/graphics/megapov/files/patch-png_pov.cpp b/graphics/megapov/files/patch-png_pov.cpp
index 11ea26f73c34..e3d97aeaf664 100644
--- a/graphics/megapov/files/patch-png_pov.cpp
+++ b/graphics/megapov/files/patch-png_pov.cpp
@@ -1,6 +1,104 @@
---- source/png_pov.cpp.orig 2005-08-23 20:20:33.000000000 +0100
-+++ source/png_pov.cpp 2010-11-24 10:15:11.000000000 +0000
-@@ -1437,7 +1437,7 @@
+--- source/png_pov.cpp.orig 2005-08-23 21:20:33.000000000 +0200
++++ source/png_pov.cpp 2012-05-06 19:21:51.000000000 +0200
+@@ -54,6 +54,7 @@
+ #include "povray.h"
+ #include "optout.h"
+ #include "png.h"
++#include "pngpriv.h"
+ #include "png_pov.h"
+ #include "pov_util.h"
+ #include "povmsend.h"
+@@ -172,7 +173,7 @@
+ if (png_get_error_ptr(png_ptr))
+ PossibleError("libpng: %s",msg);
+
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+
+@@ -392,7 +393,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ // If we get here, we had a problem reading the file
+ png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -442,7 +443,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -538,7 +539,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+@@ -656,7 +657,7 @@
+ case APPEND_MODE:
+
+ #if defined(PNG_WRITE_FLUSH_SUPPORTED)
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+
+@@ -765,7 +766,7 @@
+
+ if (png_ptr != NULL)
+ {
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+
+@@ -1213,7 +1214,7 @@
+ }
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ delete out_file;
+@@ -1261,7 +1262,7 @@
+
+ register int col, j, step;
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file, which probably
+ * means that we have read all the available data, rather than a real
+@@ -1270,7 +1271,7 @@
+ return 0;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the new file
+ delete in_file;
+@@ -1386,7 +1387,7 @@
+ ((r_info_ptr = png_create_info_struct(r_png_ptr)) == NULL))
+ Error("Cannot allocate PNG data structures");
+
+- if(setjmp(r_png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(r_png_ptr)))
+ {
+ // If we get here, we had a problem reading the file
+ png_destroy_read_struct(&r_png_ptr, &r_info_ptr, (png_infopp)NULL);
+@@ -1437,7 +1438,7 @@
if(r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
@@ -9,7 +107,7 @@
}
Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1470,7 +1470,7 @@
+@@ -1470,7 +1471,7 @@
if(r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 8e04c2995a3a..8b9a7dadb4e3 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -6,7 +6,7 @@
PORTNAME= meshviewer
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/mview/mview/${PORTVERSION}
DISTNAME= mview-src-${PORTVERSION}
diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 40fd41a2878e..b90ec3315885 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= metapixel
PORTVERSION= 1.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \
http://mirror.roe.ch/dist/metapixel/
@@ -14,12 +14,12 @@ MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A photomosaic generator
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib
USE_GMAKE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I.
+CPPFLAGS+= -I${LOCALBASE}/include -I. -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
diff --git a/graphics/metapixel/files/patch-rwpng.c b/graphics/metapixel/files/patch-rwpng.c
new file mode 100644
index 000000000000..23e4803b9bd0
--- /dev/null
+++ b/graphics/metapixel/files/patch-rwpng.c
@@ -0,0 +1,64 @@
+--- rwimg/rwpng.c.orig 2006-12-10 18:59:54.000000000 +0100
++++ rwimg/rwpng.c 2012-05-04 13:02:08.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "rwpng.h"
+
+@@ -57,7 +58,7 @@
+ data->end_info = png_create_info_struct(data->png_ptr);
+ assert(data->end_info != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ png_init_io(data->png_ptr, data->file);
+@@ -84,7 +85,7 @@
+ int bps, spp;
+ unsigned char *row;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
+@@ -119,7 +120,7 @@
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (data->have_read)
+@@ -148,7 +149,7 @@
+ data->info_ptr = png_create_info_struct(data->png_ptr);
+ assert(data->info_ptr != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (pixel_stride == 4)
+@@ -182,7 +183,7 @@
+ png_data_t *data = (png_data_t*)_data;
+ int i;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ for (i = 0; i < num_lines; ++i)
+@@ -194,7 +195,7 @@
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ png_write_end(data->png_ptr, data->info_ptr);
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 9b2ed3d96b5e..c721dc6e8677 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mhgui
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GUI widget library for MakeHuman
LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index fa03d9c03f23..e27479b3f86d 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ming
PORTVERSION= 0.4.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Releases/
@@ -16,7 +16,7 @@ COMMENT= Flash 4/5 movie output library with many languages support
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= ja-ming-[0-9]*
diff --git a/graphics/mingplot/Makefile b/graphics/mingplot/Makefile
index 855b996dfab4..471a3d982a8e 100644
--- a/graphics/mingplot/Makefile
+++ b/graphics/mingplot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mingplot
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= graphics www
MASTER_SITES= http://0xcc.net/mingplot/
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index 4c2124372c2a..a892c5360113 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mirage
PORTVERSION= 0.9.5.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= BERLIOS/mirageiv
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index f1c0302864d0..ae212f10d8e2 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= morpheus
PORTVERSION= 0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics gnome
MASTER_SITES= http://www.winnicki.net/morpheus/meat/
diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile
index 08aefdcf6fb7..3ea9a8ca9285 100644
--- a/graphics/mscgen/Makefile
+++ b/graphics/mscgen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mscgen
PORTVERSION= 0.20
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.mcternan.me.uk/mscgen/software/ \
http://romain.blogreen.org/distfiles/
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index f1281c3821aa..49a29be102b9 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mtpaint
PORTVERSION= 3.40
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
@@ -17,7 +18,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/graphics/multivideo/Makefile b/graphics/multivideo/Makefile
index 2a3febcb8e1c..c1d24e8928f5 100644
--- a/graphics/multivideo/Makefile
+++ b/graphics/multivideo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= multivideo
PORTVERSION= 0.1.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= http://www.lis.inpg.fr/pages_perso/bonnaud/multivideo/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 84048497d66c..9a96085c89d4 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mupdf
PORTVERSION= 0.9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE \
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 0f744ab4c057..250eb1c6793c 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mypaint
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://download.gna.org/mypaint/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/nathive/Makefile b/graphics/nathive/Makefile
index 8f60f2b135b5..97e3ad7e986f 100644
--- a/graphics/nathive/Makefile
+++ b/graphics/nathive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nathive
PORTVERSION= 0.813
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.nathive.org/packages/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 8b642412b05c..9bff4e837de5 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netpbm
PORTVERSION= 10.35.84
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION}
EXTRACT_SUFX= .tgz
@@ -17,7 +17,7 @@ COMMENT= A toolkit for conversion of images between different formats
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jbig.1:${PORTSDIR}/graphics/jbigkit \
jasper.4:${PORTSDIR}/graphics/jasper \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/graphics/netpbm/files/patch-pamrgbatopng.c b/graphics/netpbm/files/patch-pamrgbatopng.c
new file mode 100644
index 000000000000..92e7590cf59b
--- /dev/null
+++ b/graphics/netpbm/files/patch-pamrgbatopng.c
@@ -0,0 +1,8 @@
+--- converter/other/pamrgbatopng.c.orig 2006-08-19 05:12:28.000000000 +0200
++++ converter/other/pamrgbatopng.c 2012-04-24 22:20:00.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include <png.h>
++#include <pngpriv.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <setjmp.h>
diff --git a/graphics/netpbm/files/patch-pngtopnm.c b/graphics/netpbm/files/patch-pngtopnm.c
index b5387857e1b2..8c4615530bbe 100644
--- a/graphics/netpbm/files/patch-pngtopnm.c
+++ b/graphics/netpbm/files/patch-pngtopnm.c
@@ -1,6 +1,14 @@
---- converter/other/pngtopnm.c.orig 2009-09-03 17:34:36.000000000 +0200
-+++ converter/other/pngtopnm.c 2010-05-21 11:24:05.000000000 +0200
-@@ -44,7 +44,7 @@
+--- converter/other/pngtopnm.c.orig 2011-11-25 01:15:46.000000000 +0100
++++ converter/other/pngtopnm.c 2012-04-24 22:15:14.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <math.h>
+ #include <float.h>
+ #include <png.h> /* includes zlib.h and setjmp.h */
++#include <pngpriv.h>
+ #define VERSION "2.37.4 (5 December 1999) +netpbm"
+
+ #include "pnm.h"
+@@ -44,7 +45,7 @@
#include "nstring.h"
#include "shhopt.h"
@@ -9,7 +17,7 @@
#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
#error You need either an older PNG library (older than 1.4)
#error newer Netpbm source code (at least 10.48)
-@@ -482,7 +482,7 @@
+@@ -489,7 +490,7 @@
bool retval;
if (info_ptr->valid & PNG_INFO_tRNS) {
@@ -18,7 +26,7 @@
/* There seems to be a problem here: you can't compare real
-@@ -575,8 +575,8 @@
+@@ -582,8 +583,8 @@
for (i = 0, foundGray = FALSE;
i < info_ptr->num_trans && !foundGray;
++i) {
@@ -29,7 +37,7 @@
foundGray = TRUE;
}
}
-@@ -647,7 +647,7 @@
+@@ -654,7 +655,7 @@
unsigned int i;
trans_mix = TRUE;
for (i = 0; i < info_ptr->num_trans; ++i)
@@ -38,7 +46,7 @@
trans_mix = FALSE;
break;
}
-@@ -885,7 +885,7 @@
+@@ -892,7 +893,7 @@
setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
((info_ptr->valid & PNG_INFO_tRNS) &&
(fgColor.r ==
@@ -47,7 +55,7 @@
totalgamma))) ?
0 : maxval);
}
-@@ -914,7 +914,7 @@
+@@ -921,7 +922,7 @@
setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
(info_ptr->valid & PNG_INFO_tRNS) &&
index < info_ptr->num_trans ?
diff --git a/graphics/netpbm/files/patch-pngtxt.c b/graphics/netpbm/files/patch-pngtxt.c
new file mode 100644
index 000000000000..b3ae8ad5a51f
--- /dev/null
+++ b/graphics/netpbm/files/patch-pngtxt.c
@@ -0,0 +1,10 @@
+--- converter/other/pngtxt.c.orig 2006-08-19 05:12:28.000000000 +0200
++++ converter/other/pngtxt.c 2012-04-24 22:12:39.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "nstring.h"
+ #include "pngtxt.h"
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 429f2ad63592..519996367535 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nip2
PORTVERSION= 7.26.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 5f7e02ca0e4f..33ea6a0bae80 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nvidia-texture-tools
DISTVERSION= 2.0.8-1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
@@ -14,7 +15,7 @@ MASTER_SITES= GOOGLE_CODE \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Texture Tools with support for DirectX 10 texture formats
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR
@@ -23,8 +24,8 @@ USE_CMAKE= yes
CMAKE_ARGS= -DNVTT_SHARED=TRUE
MAKE_JOBS_SAFE= yes
-CFLAGS+= -fPIC
-CXXFLAGS+= -fPIC
+CFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15
+CXXFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp
new file mode 100644
index 000000000000..b4e288d62c52
--- /dev/null
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp
@@ -0,0 +1,11 @@
+--- src/nvimage/ImageIO.cpp.orig 2010-05-14 19:59:28.000000000 +0200
++++ src/nvimage/ImageIO.cpp 2012-05-06 20:50:40.000000000 +0200
+@@ -599,6 +599,8 @@
+
+ #if defined(HAVE_PNG)
+
++#include "pngpriv.h"
++
+ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+ nvDebugCheck(png_ptr != NULL);
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 00dec9e1bbf9..35cfee7734f1 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -8,7 +8,7 @@
PORTNAME= images
PORTVERSION= 3.0.2
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ \
@@ -32,6 +32,7 @@ USE_OCAML_WASH= yes
OCAML_PKGDIRS= camlimages
USE_OCAML_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
@@ -48,7 +49,7 @@ OPTIONS= PNG "Enable PNG support" on \
.include <bsd.port.options.mk>
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-png
.else
CONFIGURE_ARGS+= --without-png
diff --git a/graphics/ocaml-images/files/patch-src_pngread.c b/graphics/ocaml-images/files/patch-src_pngread.c
new file mode 100644
index 000000000000..2e5a49bf9c4f
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_pngread.c
@@ -0,0 +1,38 @@
+--- src/pngread.c.orig 2009-10-26 13:42:03.000000000 +0100
++++ src/pngread.c 2012-05-05 07:08:53.000000000 +0200
+@@ -69,7 +69,7 @@
+ }
+
+ /* error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
+@@ -134,7 +134,7 @@
+ png_set_rows(png_ptr, info_ptr, row_pointers);
+
+ /* Later, we can return something */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
+@@ -243,7 +243,7 @@
+ }
+
+ /* error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
+@@ -302,7 +302,7 @@
+ png_set_rows(png_ptr, info_ptr, row_pointers);
+
+ /* Later, we can return something */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
diff --git a/graphics/ocaml-images/files/patch-src_pngwrite.c b/graphics/ocaml-images/files/patch-src_pngwrite.c
new file mode 100644
index 000000000000..dc6872e299d7
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_pngwrite.c
@@ -0,0 +1,20 @@
+--- src/pngwrite.c.orig 2009-10-26 13:42:03.000000000 +0100
++++ src/pngwrite.c 2012-05-06 13:01:28.000000000 +0200
+@@ -62,7 +62,7 @@
+ }
+
+ /* error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+@@ -171,7 +171,7 @@
+ }
+
+ /* error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
index 5f64189f6934..3e231822513b 100644
--- a/graphics/ocre/Makefile
+++ b/graphics/ocre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ocre
PORTVERSION= 0.041
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://lem.eui.upm.es/pub/ocre/
DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/}
diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index e47aba0b75be..f7c708e95a6d 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ocrfeeder
PORTVERSION= 0.7.7
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/ocrfeeder/${PORTVERSION:R}
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 2cf9bda77fc8..412c7065c21b 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -7,14 +7,14 @@
PORTNAME= ocropus
PORTVERSION= 0.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= The OCRopus(tm) open source document analysis and OCR system
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
iulib.0:${PORTSDIR}/graphics/iulib \
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index b06bc76932f7..04669db90368 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -7,6 +7,7 @@
PORTNAME= okular
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 793ae746e2b3..84875cd338a2 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opencsg
PORTVERSION= 1.3.1
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.opencsg.org/
DISTNAME= OpenCSG-${PORTVERSION}
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 565afcfb4ac1..36d3dd5f6fac 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= opencv
PORTVERSION= 2.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
DISTNAME= OpenCV-${DISTVERSION}a
@@ -111,7 +111,7 @@ CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=Off
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CMAKE_ARGS+= -DWITH_PNG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_PNG:BOOL=Off
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index ce13692eb87c..327b0f4b6ef8 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= opendx
PORTVERSION= 4.4.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics math
MASTER_SITES= http://www.sfr-fresh.com/unix/misc/
DISTNAME= dx-${PORTVERSION}
diff --git a/graphics/opengtl/Makefile b/graphics/opengtl/Makefile
index 5176f9f2d298..fd48418c1037 100644
--- a/graphics/opengtl/Makefile
+++ b/graphics/opengtl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= opengtl
PORTVERSION= 0.9.16
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://download.${PORTNAME}.org/
DISTNAME= OpenGTL-${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT= Graphics Transformation Languages
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= ${LOCALBASE}/lib/libLLVM-3.0.so:${PORTSDIR}/devel/llvm
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index e14e004c907b..9490d030cc30 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openimageio
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics multimedia
MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/
DISTNAME= Release-${PORTVERSION}
diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile
index 7a8731d0020a..69fe7afc18a4 100644
--- a/graphics/optar/Makefile
+++ b/graphics/optar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= optar
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://xps.crucible.gr/
DISTFILES= optar.tgz \
@@ -17,7 +17,7 @@ EXTRACT_ONLY= optar.tgz
MAINTAINER= antonakis@gmail.com
COMMENT= A tool for encoding data on paper
-BUILD_DEPENDS= ${LOCALBASE}/include/libpng/png.h:${PORTSDIR}/graphics/png
+BUILD_DEPENDS= ${LOCALBASE}/include/libpng15/png.h:${PORTSDIR}/graphics/png
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
USE_GMAKE= yes
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 64e28afd032b..246b88c8ecaa 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -28,9 +28,10 @@ PORTDOCS= caveat.txt history.txt manual.html manual.pdf manual.txt \
.include <bsd.port.options.mk>
.ifndef(WITH_BUNDLED_LIBPNG)
+BROKEN= does not build with libpng 1.5.x
CONFIGURE_ARGS+= --with-system-libpng
CFLAGS+= "-I${LOCALBASE}/include"
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.ifndef(WITH_BUNDLED_ZLIB)
diff --git a/graphics/orca/Makefile b/graphics/orca/Makefile
index 8ef452585520..4e8bf7bd9912 100644
--- a/graphics/orca/Makefile
+++ b/graphics/orca/Makefile
@@ -7,7 +7,7 @@
PORTNAME= orca
PORTVERSION= 0.27
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.orcaware.com/orca/pub/
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 1d1084c19112..b64f9307afa3 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osg
PORTVERSION= 3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
@@ -18,7 +18,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ OpenGL scene graph library for real-time rendering
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
CONFLICTS= osg-[0-9]*
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 8f3db2235dce..a44119a21373 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osg
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \
http://mirror.amdmi3.ru/distfiles/
@@ -17,7 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ OpenGL scene graph library for real-time rendering
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
CONFLICTS= osg-devel-[0-9]*
diff --git a/graphics/p5-Acme-Steganography-Image-Png/Makefile b/graphics/p5-Acme-Steganography-Image-Png/Makefile
index 78acfc9db059..ff7c4280f6f4 100644
--- a/graphics/p5-Acme-Steganography-Image-Png/Makefile
+++ b/graphics/p5-Acme-Steganography-Image-Png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Acme-Steganography-Image-Png
PORTVERSION= 0.06
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-CAD-Drawing-Template/Makefile b/graphics/p5-CAD-Drawing-Template/Makefile
index b229d8da1735..b3a3c19ff06b 100644
--- a/graphics/p5-CAD-Drawing-Template/Makefile
+++ b/graphics/p5-CAD-Drawing-Template/Makefile
@@ -7,7 +7,7 @@
PORTNAME= CAD-Drawing-Template
PORTVERSION= 0.01
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index 56fb3c9aed12..f6c6a568a2b7 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -7,7 +7,7 @@
PORTNAME= CAD-Drawing
PORTVERSION= 0.26
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index 8159a96e448f..0964cfab9c9b 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= Cairo
PORTVERSION= 1.090
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION} \
CPAN
diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile
index 021dbc98a49e..f8c5e7ee0b8d 100644
--- a/graphics/p5-Chart-Clicker/Makefile
+++ b/graphics/p5-Chart-Clicker/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Chart-Clicker
PORTVERSION= 2.81
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:GPHAT
diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile
index 62f1bea94fd4..3765595ed56f 100644
--- a/graphics/p5-Chart-Graph/Makefile
+++ b/graphics/p5-Chart-Graph/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Chart-Graph
PORTVERSION= 3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index 4ad94b623a7c..ba84b7b03e0e 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Chart-PNGgraph
PORTVERSION= 1.21
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index b7da48f77532..f7bb37fa02bc 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Chart
PORTVERSION= 2.4.5
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:CHARTGRP
diff --git a/graphics/p5-GD-Arrow/Makefile b/graphics/p5-GD-Arrow/Makefile
index 1565109648db..edba2b14695e 100644
--- a/graphics/p5-GD-Arrow/Makefile
+++ b/graphics/p5-GD-Arrow/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GD-Arrow
PORTVERSION= 0.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD-Barcode/Makefile b/graphics/p5-GD-Barcode/Makefile
index 630869b5212e..b7114bb22b0f 100644
--- a/graphics/p5-GD-Barcode/Makefile
+++ b/graphics/p5-GD-Barcode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-Barcode
PORTVERSION= 1.15
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD-Graph-histogram/Makefile b/graphics/p5-GD-Graph-histogram/Makefile
index 75c5430ac246..5c2842bcc87a 100644
--- a/graphics/p5-GD-Graph-histogram/Makefile
+++ b/graphics/p5-GD-Graph-histogram/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-Graph-histogram
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:WHIZDOG
diff --git a/graphics/p5-GD-Graph-ohlc/Makefile b/graphics/p5-GD-Graph-ohlc/Makefile
index b1cf23e3b144..08bd6c843275 100644
--- a/graphics/p5-GD-Graph-ohlc/Makefile
+++ b/graphics/p5-GD-Graph-ohlc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-Graph-ohlc
PORTVERSION= 0.9605
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JETTERO
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index e05c19f2cec8..0e72400a73ed 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GD-Graph
PORTVERSION= 1.44.01
DISTVERSION= ${PORTVERSION:C/\.(..)$/_\1/}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:BWARFIELD
diff --git a/graphics/p5-GD-Graph3d/Makefile b/graphics/p5-GD-Graph3d/Makefile
index 0103144c86b8..f948ebc7978f 100644
--- a/graphics/p5-GD-Graph3d/Makefile
+++ b/graphics/p5-GD-Graph3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-Graph3d
PORTVERSION= 0.63
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD-SVG/Makefile b/graphics/p5-GD-SVG/Makefile
index 04bb3335ea11..b000b6ac083c 100644
--- a/graphics/p5-GD-SVG/Makefile
+++ b/graphics/p5-GD-SVG/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GD-SVG
PORTVERSION= 0.33
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index 8810838455ba..eea18c37e0d5 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-TextUtil
PORTVERSION= 0.86
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD-Thumbnail/Makefile b/graphics/p5-GD-Thumbnail/Makefile
index c54adfdbf11b..7eebbaadcd50 100644
--- a/graphics/p5-GD-Thumbnail/Makefile
+++ b/graphics/p5-GD-Thumbnail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GD-Thumbnail
PORTVERSION= 1.35
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 9dd61a0e800b..da82eb449606 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GD
PORTVERSION= 2.46
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Graph-SocialMap/Makefile b/graphics/p5-Graph-SocialMap/Makefile
index a7a37ffd8d4b..8bac5608abd4 100644
--- a/graphics/p5-Graph-SocialMap/Makefile
+++ b/graphics/p5-Graph-SocialMap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Graph-SocialMap
PORTVERSION= 0.12
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Graph-Writer-GraphViz/Makefile b/graphics/p5-Graph-Writer-GraphViz/Makefile
index c24b9b5c3e9e..8c68110ce46a 100644
--- a/graphics/p5-Graph-Writer-GraphViz/Makefile
+++ b/graphics/p5-Graph-Writer-GraphViz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Graph-Writer-GraphViz
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GraphViz-Data-Structure/Makefile b/graphics/p5-GraphViz-Data-Structure/Makefile
index 4884ebaf95a4..8eda891d0c34 100644
--- a/graphics/p5-GraphViz-Data-Structure/Makefile
+++ b/graphics/p5-GraphViz-Data-Structure/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GraphViz-Data-Structure
PORTVERSION= 0.17
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GraphViz-Traverse/Makefile b/graphics/p5-GraphViz-Traverse/Makefile
index ab04904340f9..4c28feb6e732 100644
--- a/graphics/p5-GraphViz-Traverse/Makefile
+++ b/graphics/p5-GraphViz-Traverse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GraphViz-Traverse
PORTVERSION= 0.02
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index c4b1fa965726..b1bfedcf872a 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GraphViz
PORTVERSION= 2.10
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index 20b0c144dbef..ad21e1a1daf0 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GraphViz2
PORTVERSION= 2.02
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RSAVAGE
diff --git a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
index cc9895d17ba9..eca85a75680b 100644
--- a/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
+++ b/graphics/p5-Graphics-Primitive-Driver-Cairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Graphics-Primitive-Driver-Cairo
PORTVERSION= 0.44
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index 4626237fbc8c..285a35a24216 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image-Compare
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile
index 5c2b5a76f27c..4fa223c3c0af 100644
--- a/graphics/p5-Image-Heatmap/Makefile
+++ b/graphics/p5-Image-Heatmap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image-Heatmap
PORTVERSION= 0.565
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 8484fcec4e28..eed0e7e2502e 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Image-Imlib2
PORTVERSION= 2.03
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index ce170c881c30..e5897aaea198 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Image-Magick-Iterator
PORTVERSION= 0.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= Image
diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile
index dbfa2ce8fe5d..fbdf1391fefe 100644
--- a/graphics/p5-Image-Scale/Makefile
+++ b/graphics/p5-Image-Scale/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image-Scale
PORTVERSION= 0.08
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -17,7 +18,7 @@ COMMENT= Perl module for fast, high-quality fixed-point image resizing
LICENSE= GPLv2
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib
TEST_DEPENDS= p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
diff --git a/graphics/p5-Imager-AverageGray/Makefile b/graphics/p5-Imager-AverageGray/Makefile
index fa403513c457..8c360e550207 100644
--- a/graphics/p5-Imager-AverageGray/Makefile
+++ b/graphics/p5-Imager-AverageGray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Imager-AverageGray
PORTVERSION= 0.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Imager-Graph/Makefile b/graphics/p5-Imager-Graph/Makefile
index 1857bfd15a2a..faad2c8e322a 100644
--- a/graphics/p5-Imager-Graph/Makefile
+++ b/graphics/p5-Imager-Graph/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Imager-Graph
PORTVERSION= 0.09
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Imager-Plot/Makefile b/graphics/p5-Imager-Plot/Makefile
index c49c5cf849ad..d0229f9e39ec 100644
--- a/graphics/p5-Imager-Plot/Makefile
+++ b/graphics/p5-Imager-Plot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Imager-Plot
PORTVERSION= 0.09
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Imager-QRCode/Makefile b/graphics/p5-Imager-QRCode/Makefile
index 79796883a0ed..266227330ed3 100644
--- a/graphics/p5-Imager-QRCode/Makefile
+++ b/graphics/p5-Imager-QRCode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Imager-QRCode
PORTVERSION= 0.03.3
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index f2776b77fa06..012525958ea8 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Imager
PORTVERSION= 0.90
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -20,7 +21,7 @@ LICENSE_COMB= dual
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
gif.5:${PORTSDIR}/graphics/giflib \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
t1:${PORTSDIR}/devel/t1lib \
tiff:${PORTSDIR}/graphics/tiff
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index b6a090c8f9e8..aea995d93307 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Imlib2
PORTVERSION= 1.0.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics perl5
MASTER_SITES= http://www.muhri.net/
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 57305a955f67..a138882cbf29 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -7,7 +7,7 @@
PORTNAME= PGPLOT
PORTVERSION= 2.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:KGB
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 1827a2dad930..ba9914273e33 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SpringGraph
PORTVERSION= 0.05
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= GraphViz/TEEJAY
diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile
index 94b756521630..37164c623a21 100644
--- a/graphics/p5-Tk-JPEG-Lite/Makefile
+++ b/graphics/p5-Tk-JPEG-Lite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-JPEG-Lite
PORTVERSION= 2.01403
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index b7da48f77532..f7bb37fa02bc 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Chart
PORTVERSION= 2.4.5
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:CHARTGRP
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index ba3843025e3c..0b08bb75531f 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ming
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics perl5
PKGNAMEPREFIX= p5-
diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile
index c26c71e329d0..b4cce8bce568 100644
--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= panoglview
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 265c325645e2..96da913ce9c0 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -8,7 +8,7 @@
PORTNAME= passepartout
PORTVERSION= 0.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile
index f2afd5f4d2ac..c9ce08a85079 100644
--- a/graphics/pdf2svg/Makefile
+++ b/graphics/pdf2svg/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pdf2svg
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.cityinthesky.co.uk/_media/opensource/
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 6e1b0e09a8f6..a1a995037dfc 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image_Canvas
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= graphics www pear
MAINTAINER= numisemis@yahoo.com
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 82b98bd33864..5278d5e3b232 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pencil
PORTVERSION= 0.4.4b
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
DISTNAME= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
@@ -18,7 +18,7 @@ COMMENT= Pencil - a traditional 2D animation software
LICENSE= GPLv2
LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2 \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
iconv:${PORTSDIR}/converters/libiconv \
diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile
index d8504c2380d7..dd8e4e349f67 100644
--- a/graphics/peps/Makefile
+++ b/graphics/peps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peps
PORTVERSION= 2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://peps.redprince.net/peps/ \
ftp://ftp.peps.redprince.net/unix/peps/
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index c237bd1bc69c..1532f2df4448 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pgplot
PORTVERSION= 5.2.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/
DISTNAME= ${PORTNAME}${PORTVERSION:R}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:R}
MAINTAINER= bf@FreeBSD.org
COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
MAKE_JOBS_UNSAFE= yes
diff --git a/graphics/pho/Makefile b/graphics/pho/Makefile
index 0524cef3f77a..f4a6b03a9d0d 100644
--- a/graphics/pho/Makefile
+++ b/graphics/pho/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pho
DISTVERSION= 0.9.7-pre7
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://shallowsky.com/software/pho/
diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile
index 2c68f3f03c3f..143d048ef35c 100644
--- a/graphics/php5-swfed/Makefile
+++ b/graphics/php5-swfed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= swfed
PORTVERSION= 0.57
+PORTREVISION= 1
CATEGORIES= graphics www
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= ${PORTNAME}/55622
@@ -19,7 +20,7 @@ LICENSE= PHP301
BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
DEFAULT_PHP_VER= 5
IGNORE_WITH_PHP= 4
diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile
index 4cebb2c37439..c29e7677ccd8 100644
--- a/graphics/picpuz/Makefile
+++ b/graphics/picpuz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= picpuz
PORTVERSION= 2.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics games
MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/
diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile
index 0b15d95ce455..95d44b6e3912 100644
--- a/graphics/picturebook/Makefile
+++ b/graphics/picturebook/Makefile
@@ -7,7 +7,7 @@
PORTNAME= picturebook
PORTVERSION= 20010422
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://samba.org/picturebook/
DISTNAME= capture
diff --git a/graphics/picviz/Makefile b/graphics/picviz/Makefile
index cf78f0fcf011..8ed735961321 100644
--- a/graphics/picviz/Makefile
+++ b/graphics/picviz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= picviz
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics security
MASTER_SITES= http://www.wallinfire.net/picviz/attachment/wiki/ReleasesDownload/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}?format=raw
diff --git a/graphics/pinpoint/Makefile b/graphics/pinpoint/Makefile
index 1a02558c5cfa..d246f0a1a473 100644
--- a/graphics/pinpoint/Makefile
+++ b/graphics/pinpoint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pinpoint
DISTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GNOME
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index 520264efcd23..fdefbcd5983b 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pixelize
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://lashwhip.com/pub/ \
http://www.c-s.li/ports/ \
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 566513aa9bad..c9ad77571d81 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pixie
PORTVERSION= 2.2.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
DISTNAME= Pixie-src-${PORTVERSION}
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index fca4f488b6a4..403c7f4189a9 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= plotutils
PORTVERSION= 2.6
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= GNU
@@ -15,7 +15,7 @@ MASTER_SITES= GNU
MAINTAINER= stephen@FreeBSD.org
COMMENT= A plotting library and toolkit
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_MOTIF= yes
USE_AUTOTOOLS= libtool
@@ -25,6 +25,7 @@ USE_LDCONFIG= yes
MAN1= ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
INFO= libxmi plotutils
+#CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/plotutils/files/patch-libplot-z_write.c b/graphics/plotutils/files/patch-libplot-z_write.c
new file mode 100644
index 000000000000..787771bab997
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot-z_write.c
@@ -0,0 +1,29 @@
+--- libplot/z_write.c.orig 2008-07-16 02:54:10.000000000 +0200
++++ libplot/z_write.c 2012-04-27 19:12:55.000000000 +0200
+@@ -164,7 +164,7 @@
+ }
+
+ /* cleanup after libpng errors (error handler does a longjmp) */
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+ return -1;
+@@ -444,7 +444,7 @@
+ #endif
+ }
+
+- longjmp (png_ptr->jmpbuf, 1);
++ longjmp (png_jmpbuf(png_ptr), 1);
+ }
+
+ static void
+@@ -515,7 +515,7 @@
+ #endif
+ }
+
+- longjmp (png_ptr->jmpbuf, 1);
++ longjmp (png_jmpbuf(png_ptr), 1);
+ }
+
+ static void
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 02145532f074..4ef14f656bf2 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.4.11
+PORTVERSION= 1.5.10
CATEGORIES= graphics
-MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}14/${PORTVERSION}
+MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION}
DISTNAME= lib${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -18,50 +18,63 @@ COMMENT= Library for manipulating PNG images
MAKE_JOBS_SAFE= yes
USE_XZ= yes
+GNU_CONFIGURE= yes
+USE_CMAKE= yes
USE_LDCONFIG= yes
-MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd
-ALL_TARGET= all libpng-config test
-MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f
SHLIB_VER= 6
-MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
-PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
+CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man
MAN3= libpng.3 libpngpf.3
MAN5= png.5
-MANCOMPRESSED= maybe
OPTIONS= APNG "Animated PNG support" On
-APNGDISTNAME= ${DISTNAME}-apng.patch
-
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_APNG) || make(makesum) || defined(FETCH_ALL)
-MASTER_SITES+= SF/apng/libpng/libpng14:apng
-DISTFILES+= ${APNGDISTNAME}.gz:apng
+MASTER_SITES+= SF/lib${PORTNAME}-apng/libpng15/${PORTVERSION}:apng
+DISTFILES+= ${DISTNAME}-apng.patch.gz:apng
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
.endif
.if !defined(WITHOUT_APNG)
-EXTRA_PATCHES= ${WRKSRC}/${APNGDISTNAME}
+EXTRA_PATCHES= ${WRKSRC}/${DISTNAME}-apng.patch
.endif
post-extract:
.if !defined(WITHOUT_APNG)
@${LN} -sf ${WRKSRC} ${WRKSRC}/
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${APNGDISTNAME}.gz ${WRKSRC}/
- ${GZIP_CMD} -d ${WRKSRC}/${APNGDISTNAME}.gz
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}-apng.patch.gz ${WRKSRC}/
+ ${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz
.endif
+post-patch:
+ ${REINPLACE_CMD} \
+ -e 's|RELEASE}.0|RELEASE}|' \
+ -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \
+ ${WRKSRC}/CMakeLists.txt
+
+post-build:
+ @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \
+ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+
pre-su-install:
@${MKDIR} ${PREFIX}/include/libpng
@${MKDIR} ${PREFIX}/libdata/pkgconfig
post-install:
- ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/scripts/libpng.pc.in \
- > ${WRKSRC}/scripts/libpng.pc
- ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc \
- ${PREFIX}/libdata/pkgconfig/libpng14.pc
- ${LN} -sf libpng14.pc ${PREFIX}/libdata/pkgconfig/libpng.pc
+ ${INSTALL_DATA} ${WRKSRC}/pngdebug.h ${WRKSRC}/pnginfo.h \
+ ${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \
+ ${PREFIX}/include/libpng15/
+ ${RMDIR} ${PREFIX}/include/libpng
+ ${RM} ${PREFIX}/libdata/pkgconfig/libpng.pc
+ ${LN} -sf libpng15.pc ${PREFIX}/libdata/pkgconfig/libpng.pc
+ ${RM} ${PREFIX}/lib/libpng15.so.15
+ ${MV} ${PREFIX}/lib/libpng15.so.15.10 ${PREFIX}/lib/libpng15.so.15
.include <bsd.port.post.mk>
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 1ea447a092b1..f6630fe54659 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libpng-1.4.11.tar.xz) = 4200ca1c758ffda2a85af573bf057bbe00f209d6d1b8e2d7d75ace38115e5eb1
-SIZE (libpng-1.4.11.tar.xz) = 548088
-SHA256 (libpng-1.4.11-apng.patch.gz) = 4e697de6d5fd87231aaee5055f17c3de1fd61c19757f5506f3e6239277fced91
-SIZE (libpng-1.4.11-apng.patch.gz) = 9199
+SHA256 (libpng-1.5.10.tar.xz) = dd49c39710a6ef8a550923ba17d3496b08ce769e47122d9150df4763bf49605d
+SIZE (libpng-1.5.10.tar.xz) = 702752
+SHA256 (libpng-1.5.10-apng.patch.gz) = 0464b2df97853c426f35f97d12800b4dcb5760fc4c787fc4987ae0fb870a997f
+SIZE (libpng-1.5.10-apng.patch.gz) = 10127
diff --git a/graphics/png/files/patch-libpng.pc.in b/graphics/png/files/patch-libpng.pc.in
deleted file mode 100644
index 372f46391835..000000000000
--- a/graphics/png/files/patch-libpng.pc.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- scripts/libpng.pc.in.orig 2009-12-03 02:46:02.000000000 +0100
-+++ scripts/libpng.pc.in 2010-01-12 13:49:36.000000000 +0100
-@@ -1,10 +1,10 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@/libpng14
-+prefix=@PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include/libpng
-
- Name: libpng
- Description: Loads and saves PNG files
- Version: 1.4.11
--Libs: -L${libdir} -lpng14
-+Libs: -L${libdir} -lpng -lz -lm
- Cflags: -I${includedir}
diff --git a/graphics/png/files/patch-makefile.freebsd b/graphics/png/files/patch-makefile.freebsd
index d81023af2185..e35f35b313ba 100644
--- a/graphics/png/files/patch-makefile.freebsd
+++ b/graphics/png/files/patch-makefile.freebsd
@@ -1,5 +1,5 @@
---- scripts/makefile.freebsd.orig 2010-01-03 06:05:38.000000000 +0100
-+++ scripts/makefile.freebsd 2010-01-18 13:25:13.000000000 +0100
+--- scripts/makefile.freebsd.orig 2011-01-06 14:02:38.000000000 +0100
++++ scripts/makefile.freebsd 2011-01-07 11:16:17.000000000 +0100
@@ -11,17 +11,17 @@
LIB= png
SHLIB_MAJOR= ${SHLIB_VER}
@@ -14,7 +14,7 @@
-LIBDIR= /lib
+#DESTDIR= ${PREFIX}
+LIBDIR= ${PREFIX}/lib
- INCS= png.h pngconf.h pngpriv.h
+ INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-INCSDIR= /include/libpng
+INCSDIR= ${PREFIX}/include/libpng
INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk
@@ -22,9 +22,9 @@
-MANDIR= /man/man
+MANDIR= ${PREFIX}/man/man
SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
- libpng/pngconf.h ${INCSDIR}/../pngconf.h
- LDADD+= -lm -lz
-@@ -45,4 +45,22 @@
+ libpng/pngconf.h ${INCSDIR}/../pngconf.h \
+ libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
+@@ -50,4 +50,22 @@
writelock:
chmod a-w *.[ch35] $(DOCS) scripts/*
@@ -44,6 +44,6 @@
+beforeinstall: libpng-config
+ ${BSD_INSTALL_SCRIPT} \
+ libpng-config ${PREFIX}/bin
-+ ln -sf libpng-config ${PREFIX}/bin/libpng14-config
++ ln -sf libpng-config ${PREFIX}/bin/libpng15-config
+
.include <bsd.lib.mk>
diff --git a/graphics/png/files/patch-pngrutil.c b/graphics/png/files/patch-pngrutil.c
deleted file mode 100644
index 677cbfd3919b..000000000000
--- a/graphics/png/files/patch-pngrutil.c
+++ /dev/null
@@ -1,20 +0,0 @@
----pngrutil.c.orig 2012/02/10 19:43:42 121491
-+++ pngrutil.c 2012/02/10 19:45:46 121492
-@@ -363,8 +363,15 @@
- {
- /* Success (maybe) - really uncompress the chunk. */
- png_size_t new_size = 0;
-- png_charp text = png_malloc_warn(png_ptr,
-- prefix_size + expanded_size + 1);
-+ png_charp text = NULL;
-+ /* Need to check for both truncation (64-bit platforms) and integer
-+ * overflow.
-+ */
-+ if (prefix_size + expanded_size > prefix_size &&
-+ prefix_size + expanded_size < 0xffffffffU)
-+ {
-+ text = png_malloc_warn(png_ptr, prefix_size + expanded_size + 1);
-+ }
-
- if (text != NULL)
- {
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index 8dcab4dfa031..9bc30bd4dc93 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -1,17 +1,23 @@
-@unexec rm -f %D/bin/libpng14-config
bin/libpng-config
-@exec ln -sf %f %D/bin/libpng14-config
-include/libpng/png.h
-@exec ln -sf libpng/%f %D/include/%f
-@unexec rm -f %D/include/%f
-include/libpng/pngconf.h
-@exec ln -sf libpng/%f %D/include/%f
-@unexec rm -f %D/include/%f
-include/libpng/pngpriv.h
+bin/libpng15-config
+include/libpng15/png.h
+include/libpng15/pngconf.h
+include/libpng15/pngdebug.h
+include/libpng15/pnginfo.h
+include/libpng15/pnglibconf.h
+include/libpng15/pngpriv.h
+include/libpng15/pngstruct.h
+include/png.h
+include/pngconf.h
+include/pnglibconf.h
lib/libpng.a
lib/libpng.so
-lib/libpng.so.%%SHLIB_VER%%
-libdata/pkgconfig/libpng14.pc
-@exec ln -sf %f %D/libdata/pkgconfig/libpng.pc
-@unexec rm -f %D/libdata/pkgconfig/libpng.pc
-@dirrm include/libpng
+libdata/pkgconfig/libpng15.pc
+libdata/pkgconfig/libpng.pc
+lib/libpng/libpng15-release.cmake
+lib/libpng/libpng15.cmake
+lib/libpng15.a
+lib/libpng15.so
+lib/libpng15.so.15
+@dirrm lib/libpng
+@dirrm include/libpng15
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 6765d8849fc2..86960fce7a6e 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png2html
PORTVERSION= 1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://www.geoffholden.com/content/projects/png2html/
@@ -17,7 +17,7 @@ COMMENT= Takes a PNG image and transforms it into HTML
LICENSE= GPLv2 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
gd.4:${PORTSDIR}/graphics/gd
PLIST_FILES= bin/png2html
diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile
index ede02d0c20ce..b0787bb26e66 100644
--- a/graphics/png2ico/Makefile
+++ b/graphics/png2ico/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png2ico
PORTVERSION= 2002.12.08
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.winterdrache.de/freeware/png2ico/data/
DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./-/g}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./-/g}
MAINTAINER= klammer@webonaut.com
COMMENT= Converts PNG files to Windows icon resource files
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
MAN1= png2ico.1
PLIST_FILES= bin/png2ico
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index bf78fa8288ab..81f19aae2cce 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pngcrush
PORTVERSION= 1.7.28
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/pmt/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-nolib
@@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-nolib
MAINTAINER= jsa@FreeBSD.org
COMMENT= An optimizer for PNG files
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_XZ= yes
USE_GMAKE= yes
diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile
index 57e05cd768a5..7fd70f505e47 100644
--- a/graphics/pngnq/Makefile
+++ b/graphics/pngnq/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pngnq
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
@@ -15,7 +16,7 @@ COMMENT= A tool for quantizing PNG images in RGBA format
LICENSE= BSD
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
diff --git a/graphics/pngnq/files/patch-rwpng.c b/graphics/pngnq/files/patch-rwpng.c
new file mode 100644
index 000000000000..563f04f9fb14
--- /dev/null
+++ b/graphics/pngnq/files/patch-rwpng.c
@@ -0,0 +1,10 @@
+--- src/rwpng.c.orig 2010-05-11 00:42:56.000000000 +0200
++++ src/rwpng.c 2012-04-25 19:10:41.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+
+ #include "png.h" /* libpng header; includes zlib.h */
++#include "zlib.h"
+ #include "rwpng.h" /* typedefs, common macros, public prototypes */
+
+ /* future versions of libpng will provide this macro: */
diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile
index 54dd47dc88d0..ccb6b6c3f00c 100644
--- a/graphics/pngquant/Makefile
+++ b/graphics/pngquant/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pngquant
PORTVERSION= 1.7.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -src
CATEGORIES= graphics
MASTER_SITES= http://pngquant.org/
@@ -17,7 +18,7 @@ COMMENT= Converts 32-bit RGBA PNGs into 8-bit RGBA-palette PNGs
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS= OPTIMIZED_CFLAGS "Additional optimization" off \
OPENMP "Enable OpenMP support" off \
diff --git a/graphics/pngrewrite/Makefile b/graphics/pngrewrite/Makefile
index b448675d33ba..8a81f183c872 100644
--- a/graphics/pngrewrite/Makefile
+++ b/graphics/pngrewrite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pngrewrite
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://entropymine.com/jason/pngrewrite/ \
http://mirror.roe.ch/dist/pngrewrite/
@@ -14,7 +15,7 @@ MASTER_SITES= http://entropymine.com/jason/pngrewrite/ \
MAINTAINER= bapt@FreeBSD.org
COMMENT= A PNG palette optimizer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index 4ca373f71034..9db6905ca1e6 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -8,20 +8,20 @@
PORTNAME= pngwriter
PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ library for creating PNG images
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_GNOME= pkgconfig
-CXXFLAGS+= `pkg-config --cflags freetype2 libpng14` -I${LOCALBASE}/include
+CXXFLAGS+= `pkg-config --cflags freetype2 libpng15` -I${LOCALBASE}/include
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/graphics/pngwriter/files/patch-pngwriter.cc b/graphics/pngwriter/files/patch-pngwriter.cc
index 8ea130fba529..135ab18302c3 100644
--- a/graphics/pngwriter/files/patch-pngwriter.cc
+++ b/graphics/pngwriter/files/patch-pngwriter.cc
@@ -1,5 +1,31 @@
--- src/pngwriter.cc.orig 2009-02-10 22:45:16.000000000 +0100
-+++ src/pngwriter.cc 2010-03-29 15:55:32.000000000 +0200
++++ src/pngwriter.cc 2012-05-07 20:50:38.000000000 +0200
+@@ -988,19 +988,19 @@
+ time(&gmt);
+ png_convert_from_time_t(&mod_time, gmt);
+ png_set_tIME(png_ptr, info_ptr, &mod_time);
+- text_ptr[0].key = "Title";
++ text_ptr[0].key = (char*)"Title";
+ text_ptr[0].text = texttitle_;
+ text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+- text_ptr[1].key = "Author";
++ text_ptr[1].key = (char*)"Author";
+ text_ptr[1].text = textauthor_;
+ text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+- text_ptr[2].key = "Description";
++ text_ptr[2].key = (char*)"Description";
+ text_ptr[2].text = textdescription_;
+ text_ptr[2].compression = PNG_TEXT_COMPRESSION_NONE;
+- text_ptr[3].key = "Creation Time";
+- text_ptr[3].text = png_convert_to_rfc1123(png_ptr, &mod_time);
++ text_ptr[3].key = (char*)"Creation Time";
++ text_ptr[3].text = (char *)png_convert_to_rfc1123(png_ptr, &mod_time);
+ text_ptr[3].compression = PNG_TEXT_COMPRESSION_NONE;
+- text_ptr[4].key = "Software";
++ text_ptr[4].key = (char*)"Software";
+ text_ptr[4].text = textsoftware_;
+ text_ptr[4].compression = PNG_TEXT_COMPRESSION_NONE;
+ png_set_text(png_ptr, info_ptr, text_ptr, 5);
@@ -1204,8 +1204,8 @@
FILE *fp;
png_structp png_ptr;
@@ -20,3 +46,12 @@
transformation_ = 1;
}
+@@ -1530,7 +1530,7 @@
+ fclose(fp);
+ return 0;
+ }
+- if (setjmp((*png_ptr)->jmpbuf)) /*(setjmp(png_jmpbuf(*png_ptr)) )*//////////////////////////////////////
++ if (setjmp( png_jmpbuf((*png_ptr))))
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ std::cerr << " PNGwriter::read_png_info - ERROR **: This file may be a corrupted PNG file. (setjmp(*png_ptr)->jmpbf) failed)." << std::endl;
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index f602733c3e46..f1999cdb0853 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= podofo
PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics print
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
@@ -50,7 +50,7 @@ CMAKE_ARGS+= -DWANT_TIFF:BOOL=TRUE
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CMAKE_ARGS+= -DWANT_PNG:BOOL=TRUE
.endif
diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile
index c46088d8b9f4..0118fa24b6f0 100644
--- a/graphics/poppler-glib/Makefile
+++ b/graphics/poppler-glib/Makefile
@@ -6,7 +6,7 @@
# $MCom$
#
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -glib
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index d045b363ca64..9f2274b9a69d 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -qt4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index 263fca70ea32..fafe6bcf1415 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -utils
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 227283129c63..f72bb073e9d9 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -8,7 +8,7 @@
PORTNAME= poppler
PORTVERSION= 0.18.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index eec21308517f..bdadf926e4ae 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pornview
PORTVERSION= 0.2.0.p.1
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
@@ -15,8 +15,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= PornView is an image viewer/manager
-LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
-LIB_DEPENDS+= xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil
+LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
+ png15:${PORTSDIR}/graphics/png \
+ xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil
USE_XORG= x11 xi xext xinerama
USE_GNOME= gtk20
diff --git a/graphics/pornview/files/patch-pixbuf_utils.c b/graphics/pornview/files/patch-pixbuf_utils.c
new file mode 100644
index 000000000000..605265e93a68
--- /dev/null
+++ b/graphics/pornview/files/patch-pixbuf_utils.c
@@ -0,0 +1,19 @@
+--- src/support/pixbuf_utils.c.orig 2002-12-13 13:29:28.000000000 +0100
++++ src/support/pixbuf_utils.c 2012-05-09 12:38:26.000000000 +0200
+@@ -18,6 +18,7 @@
+ #endif
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <gtk/gtk.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+
+@@ -60,7 +61,7 @@
+ return FALSE;
+ }
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct (&png_ptr, &info_ptr);
+ fclose (handle);
diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile
index 218de4d37f68..d75ec18c7588 100644
--- a/graphics/potracegui/Makefile
+++ b/graphics/potracegui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= potracegui
PORTVERSION= 1.3.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics kde
MASTER_SITES= SF
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index e5df5ca1a88e..f09b32c40e44 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
PORTVERSION= 3.1g
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -19,7 +19,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= bkoenig@alpha-tierchen.de
COMMENT= Persistence of Vision Ray Tracer
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS= X11 "X Window support" On
diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab
index 1acc44a9241f..39187f94ab5f 100644
--- a/graphics/povray31/files/patch-ab
+++ b/graphics/povray31/files/patch-ab
@@ -1,5 +1,5 @@
---- source/unix/makefile.orig Mon Nov 22 09:12:37 1999
-+++ source/unix/makefile Sat Dec 2 03:42:45 2006
+--- source/unix/makefile.orig 1999-11-22 02:12:37.000000000 +0100
++++ source/unix/makefile 2012-05-06 19:41:21.000000000 +0200
@@ -53,7 +53,7 @@
#CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
@@ -33,8 +33,9 @@
# Use -Llibdir -lXXX if you want to use shared libraries (if they are
# available). It doesn't matter if you only have libXXX.a libraries.
-PNGDIR = $(SRCDIR)/libpng
+-LIBPNGINC = -I$(PNGDIR)
+PNGDIR = $(PREFIX)/include
- LIBPNGINC = -I$(PNGDIR)
++LIBPNGINC = -I$(PNGDIR) -I${LOCALBASE}/include/libpng15
#LIBPNGLIB = $(PNGDIR)/libpng.a
-LIBPNGLIB = -L$(PNGDIR) -lpng
+LIBPNGLIB = -L$(PREFIX)/lib -lpng
diff --git a/graphics/povray31/files/patch-png_pov.c b/graphics/povray31/files/patch-png_pov.c
index 0bc4b332b20a..c830f27e02c4 100644
--- a/graphics/povray31/files/patch-png_pov.c
+++ b/graphics/povray31/files/patch-png_pov.c
@@ -1,6 +1,104 @@
--- source/png_pov.c.orig 1999-05-01 15:01:24.000000000 +0200
-+++ source/png_pov.c 2010-03-29 11:17:58.000000000 +0200
-@@ -1445,7 +1445,7 @@
++++ source/png_pov.c 2012-05-05 07:28:33.000000000 +0200
+@@ -53,6 +53,7 @@
+ #include "optout.h"
+ #include "png.h"
+ #include "png_pov.h"
++#include "pngpriv.h"
+
+
+
+@@ -227,7 +228,7 @@
+ if (png_get_error_ptr(png_ptr))
+ Error_Line("libpng: %s\n",msg);
+
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+
+@@ -356,7 +357,7 @@
+ Error("Error allocating PNG data structures");
+ }
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file */
+ Status_Info("\n");
+@@ -397,7 +398,7 @@
+ Error("Error allocating PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+ Status_Info("\n");
+@@ -509,7 +510,7 @@
+ Error("Error allocating PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+ if (handle->buffer != NULL)
+@@ -628,7 +629,7 @@
+ case APPEND_MODE:
+
+ #if defined(PNG_WRITE_FLUSH_SUPPORTED)
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+
+@@ -943,7 +944,7 @@
+ }
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+ fclose(handle->file);
+@@ -996,7 +997,7 @@
+ {
+ register int col, j, step;
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file, which probably
+ * means that we have read all the available data, rather than a real
+@@ -1006,7 +1007,7 @@
+ return(0);
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the new file */
+ Status_Info("\n");
+@@ -1139,7 +1140,7 @@
+ {
+ if (png_ptr != NULL)
+ {
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem writing the file */
+
+@@ -1391,7 +1392,7 @@
+ return; /* -hdf99- */
+ }
+
+- if (setjmp(r_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(r_png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file */
+
+@@ -1445,7 +1446,7 @@
if (r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
@@ -9,7 +107,7 @@
}
Image->data.map_lines = (unsigned char **)
-@@ -1479,7 +1479,7 @@
+@@ -1479,7 +1480,7 @@
if (r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 2fab13fe4fab..5d7c66378e30 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
PORTVERSION= 3.6.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -21,7 +21,7 @@ COMMENT= Persistence of Vision Ray Tracer
.if defined(WITH_ICC)
BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
.endif
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg
@@ -54,6 +54,8 @@ CFLAGS= -O3 -tpp7 -axN -Vaxlib
CXXFLAGS= -O3 -tpp7 -axN -Vaxlib
.endif
+CFLAGS+= -I${LOCALBASE}/include/libpng15
+CXXFLAGS+= -I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \
CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \
diff --git a/graphics/povray36/files/patch-png_pov.cpp b/graphics/povray36/files/patch-png_pov.cpp
index 01225b66021e..de3b006562ba 100644
--- a/graphics/povray36/files/patch-png_pov.cpp
+++ b/graphics/povray36/files/patch-png_pov.cpp
@@ -1,6 +1,104 @@
--- source/png_pov.cpp.orig 2004-08-03 01:11:37.000000000 +0200
-+++ source/png_pov.cpp 2010-03-29 14:06:26.000000000 +0200
-@@ -1428,7 +1428,7 @@
++++ source/png_pov.cpp 2012-05-05 07:35:49.000000000 +0200
+@@ -53,6 +53,7 @@
+ #include "pov_util.h"
+ #include "povmsend.h"
+ #include "colour.h"
++#include "pngpriv.h"
+
+ USING_POV_NAMESPACE
+
+@@ -167,7 +168,7 @@
+ if (png_get_error_ptr(png_ptr))
+ PossibleError("libpng: %s",msg);
+
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+
+@@ -387,7 +388,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ // If we get here, we had a problem reading the file
+ png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -433,7 +434,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ png_destroy_read_struct(&o_png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -529,7 +530,7 @@
+ Error("Cannot allocate PNG data structures");
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+@@ -647,7 +648,7 @@
+ case APPEND_MODE:
+
+ #if defined(PNG_WRITE_FLUSH_SUPPORTED)
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+
+@@ -756,7 +757,7 @@
+
+ if (png_ptr != NULL)
+ {
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+
+@@ -1204,7 +1205,7 @@
+ }
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the file
+ delete out_file;
+@@ -1252,7 +1253,7 @@
+
+ register int col, j, step;
+
+- if (setjmp(o_png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(o_png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file, which probably
+ * means that we have read all the available data, rather than a real
+@@ -1261,7 +1262,7 @@
+ return 0;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // If we get here, we had a problem writing the new file
+ delete in_file;
+@@ -1377,7 +1378,7 @@
+ ((r_info_ptr = png_create_info_struct(r_png_ptr)) == NULL))
+ Error("Cannot allocate PNG data structures");
+
+- if(setjmp(r_png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(r_png_ptr)))
+ {
+ // If we get here, we had a problem reading the file
+ png_destroy_read_struct(&r_png_ptr, &r_info_ptr, (png_infopp)NULL);
+@@ -1428,7 +1429,7 @@
if(r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
@@ -9,7 +107,7 @@
}
Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1461,7 +1461,7 @@
+@@ -1461,7 +1462,7 @@
if(r_info_ptr->valid & PNG_INFO_tRNS)
{
for (index = 0; index < r_info_ptr->num_trans; index++)
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 585be201723b..789734a846ad 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -7,7 +7,7 @@
PORTNAME= povray
DISTVERSION= 3.7.0.RC3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.povray.org/beta/source/
DIST_SUBDIR= ${UNIQUENAME}
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-io-restrictions
.if defined(WITH_STATIC)
BUILD_DEPENDS+= png>=1.4:${PORTSDIR}/graphics/png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
LIBS+= -lpng
.endif
.else
diff --git a/graphics/ppminfo/Makefile b/graphics/ppminfo/Makefile
index b87a9f5ae90e..2a6dc017e5d5 100644
--- a/graphics/ppminfo/Makefile
+++ b/graphics/ppminfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ppminfo
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.vanheusden.com/ppminfo/ CENKES
EXTRACT_SUFX= .tgz
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index d574ed59797f..51152339ff85 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pqiv
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/
EXTRACT_SUFX= .tbz
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 4c483fb58d7b..deb1ad52820f 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -6,6 +6,7 @@
PORTNAME= prison
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index fadda619914c..7e8092e24402 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pstoedit
PORTVERSION= 3.60
+PORTREVISION= 1
CATEGORIES= graphics print
MASTER_SITES= SF
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index a3f281537128..0ced4e9057b9 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pstoepsi
PORTVERSION= 20020711
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/tools/pstoepsi/
DISTFILES= pstoepsi README.this-site
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index bfbd39d0f0ad..d974cab5269e 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pvmpov
PORTVERSION= 3.1g.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics parallel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.1g2.tgz
DISTNAME= ${PORTNAME}-3.1g2
@@ -18,6 +18,7 @@ COMMENT= Distributed rendering package for Persistence of Vision Ray Tracer
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/povray31:configure \
aimk:${PORTSDIR}/net/pvm
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= povray31:${PORTSDIR}/graphics/povray31 \
pvmd:${PORTSDIR}/net/pvm
diff --git a/graphics/pvmpov/files/patch-ab b/graphics/pvmpov/files/patch-ab
index bc9572eda285..74c3af68658a 100644
--- a/graphics/pvmpov/files/patch-ab
+++ b/graphics/pvmpov/files/patch-ab
@@ -7,7 +7,7 @@
-PNGDIR = $(SRCDIR)/libpng
-LIBPNGINC = -I$(PNGDIR)
+PNGDIR =
-+LIBPNGINC = -I%LOCALBASE%/include
++LIBPNGINC = -I%LOCALBASE%/include/libpng15
#LIBPNGLIB = $(PNGDIR)/libpng.a
#LIBPNGINC = -I/usr/X11R6/include
-LIBPNGLIB = -L$(PNGDIR) -lpng
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index 1172ab730cce..ec6422480795 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -8,6 +8,7 @@
PORTNAME= PyX
PORTVERSION= 0.11.1
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-amanith/Makefile b/graphics/py-amanith/Makefile
index 2f7dbf1fa4e7..9411090506d5 100644
--- a/graphics/py-amanith/Makefile
+++ b/graphics/py-amanith/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanith
PORTVERSION= 0.3.35
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics python
MASTER_SITES= http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 95ea87c16036..0ee609cd7323 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.8.10
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile
index 24b4875ab5d4..7b3384ffc0d0 100644
--- a/graphics/py-chart/Makefile
+++ b/graphics/py-chart/Makefile
@@ -8,7 +8,7 @@
PORTNAME= chart
PORTVERSION= 1.39
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics python
MASTER_SITES= http://download.gna.org/pychart/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
index a5c215ea772b..1f071ea7172f 100644
--- a/graphics/py-clutter-gtk/Makefile
+++ b/graphics/py-clutter-gtk/Makefile
@@ -8,6 +8,7 @@
PORTNAME= clutter
PORTVERSION= 0.10.0
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gtk/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 99fdd874aa9b..f0bd606b8eee 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= clutter
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics python
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index b9db35e79bed..a2fc58d5cb4f 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gd
PORTVERSION= 0.56
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics python
MASTER_SITES= http://newcenturycomputers.net/projects/download.cgi/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index a1758fd1eef3..8c42c82c43db 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 0068bdf2c777..6c35468be66e 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= goocanvas
PORTVERSION= 0.14.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/py${PORTNAME}/${PORTVERSION:C/..$//}
diff --git a/graphics/py-graph-dot/Makefile b/graphics/py-graph-dot/Makefile
index 7727e6171feb..73bd36930712 100644
--- a/graphics/py-graph-dot/Makefile
+++ b/graphics/py-graph-dot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graph-dot
PORTVERSION= 1.7.0
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index b8dd179b9439..c27ec9b179db 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -6,6 +6,7 @@
PORTNAME= graphviz
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= CHEESESHOP \
http://networkx.lanl.gov/download/pygraphviz/
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index e529ea326c98..bc9f2fce3ddf 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ming
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index c36fd3d8fb5a..4d9110826828 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paint
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,14 +16,15 @@ DISTNAME= pypaint-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple and flexible painting adaptor to libart for Python
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_FREETYPE= yes
USE_GNOME= libartlgpl2
NO_WRKSUBDIR= yes
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype1
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 \
+ -I${LOCALBASE}/include/freetype1
LDFLAGS+= -L${LOCALBASE}/lib
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/graphics/py-paint/files/patch-image.c b/graphics/py-paint/files/patch-image.c
new file mode 100644
index 000000000000..4b3f9065e4c0
--- /dev/null
+++ b/graphics/py-paint/files/patch-image.c
@@ -0,0 +1,20 @@
+--- image.c.orig 2004-02-16 10:57:56.000000000 +0100
++++ image.c 2012-05-05 07:40:54.000000000 +0200
+@@ -129,7 +129,7 @@
+ set_error(PyExc_RuntimeError, "could not create info struct");
+ return NULL;
+ }
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ set_error(PyExc_RuntimeError, "error building image");
+@@ -233,7 +233,7 @@
+ set_error(PyExc_RuntimeError, "could not create info struct");
+ goto error;
+ }
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ set_error(PyExc_RuntimeError, "error building image");
+ goto error;
+ }
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 8993479cd6fe..ffd620595cac 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= poppler
PORTVERSION= 0.10.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics python
MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \
http://launchpadlibrarian.net/30270080/ \
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index c3a82e7d20bb..5a004f060c03 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pycha
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile
index be9dda0d81f8..0346f4693b7b 100644
--- a/graphics/py-pydot/Makefile
+++ b/graphics/py-pydot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pydot
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 0026fb0caa67..7d474dece6f1 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -6,6 +6,7 @@
PORTNAME= svg
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index 23af99d7e2ad..1172bc6e84c7 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -7,7 +7,7 @@
PORTNAME= visual
PORTVERSION= 4.b26
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics python
MASTER_SITES= SF/${PORTNAME}python/${PORTNAME}-module/VPython%204.beta26
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/q-graph/Makefile b/graphics/q-graph/Makefile
index 95a82c72f3f3..b3332bc6404e 100644
--- a/graphics/q-graph/Makefile
+++ b/graphics/q-graph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= graph
PORTVERSION= 1.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/q-lang/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= q-
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 16db714ba1b4..0bfa80ab4e8f 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qcomicbook
PORTVERSION= 0.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://qcomicbook.linux-projects.net/releases/
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 675eb279d911..4f1043aef45d 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qgis
PORTVERSION= 1.7.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics geography
MASTER_SITES= http://qgis.org/downloads/ \
http://download.osgeo.org/qgis/src/
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 6969a0eda8aa..b28ccc494678 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qiv
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://spiegl.de/qiv/download/ \
http://www.predatorlabs.net/dl/
diff --git a/graphics/qiviewer/Makefile b/graphics/qiviewer/Makefile
index c8409ede74b6..886312ccd4ce 100644
--- a/graphics/qiviewer/Makefile
+++ b/graphics/qiviewer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qiviewer
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index 80425033f1f8..84a81b5cfc63 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qslim
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://mgarland.org/files/dist/ \
CENKES
@@ -18,7 +18,7 @@ COMMENT= SlimKit Surface Modeling Tools
LICENSE= GPLv2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gfx.0:${PORTSDIR}/graphics/libgfx \
forms.2:${PORTSDIR}/x11-toolkits/xforms
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index a672a857a744..2f4ae9d4b69b 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -8,6 +8,7 @@
PORTNAME= iconengines
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= graphics
PKGNAMEPREFIX= qt4-
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 4a68fd945a07..4cf5f7d808e9 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -8,6 +8,7 @@
PORTNAME= imageformats
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= graphics
PKGNAMEPREFIX= qt4-
@@ -16,7 +17,7 @@ COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
mng:${PORTSDIR}/graphics/libmng \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
USE_QT_VER= 4
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 76818fe56b22..b42356577d5d 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pixeltool
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= graphics
PKGNAMEPREFIX= qt4-
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index af73d7b8b3fe..43402033d8eb 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -8,6 +8,7 @@
PORTNAME= svg
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= graphics
PKGNAMEPREFIX= qt4-
diff --git a/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index e609d24a2676..ae963962a36b 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= qtgtl
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://download.opengtl.org/
DISTNAME= libQtGTL-${PORTVERSION}
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 73737b173683..dc15974e2efd 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quat
PORTVERSION= 1.20
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/
PKGNAMESUFFIX= -gui
diff --git a/graphics/radius-engine/Makefile b/graphics/radius-engine/Makefile
index 2163fc6fae1c..a4e4e412daf1 100644
--- a/graphics/radius-engine/Makefile
+++ b/graphics/radius-engine/Makefile
@@ -16,7 +16,7 @@ COMMENT= Lua script-based 2D engine built on top of OpenGL and SDL
LICENSE= MIT
LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
physfs.1:${PORTSDIR}/devel/physfs
GNU_CONFIGURE= yes
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 292ee4e82d0c..f0fcc3ec5402 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -7,6 +7,7 @@
PORTNAME= raster3d
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= graphics biology
MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/
DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 4bceac6585a4..6fa2a0b2520c 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rawstudio
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://rawstudio.org/files/release/
@@ -17,6 +17,7 @@ COMMENT= Open-source program to read and manipulate RAW photo images
LICENSE= GPLv2
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+ png15:${PORTSDIR}/graphics/png \
lcms.1:${PORTSDIR}/graphics/lcms \
exiv2.10:${PORTSDIR}/graphics/exiv2 \
dbus-1.3:${PORTSDIR}/devel/dbus \
diff --git a/graphics/rawstudio/files/patch-exiv2-colorspace.cpp b/graphics/rawstudio/files/patch-exiv2-colorspace.cpp
new file mode 100644
index 000000000000..ff3002ace1e1
--- /dev/null
+++ b/graphics/rawstudio/files/patch-exiv2-colorspace.cpp
@@ -0,0 +1,19 @@
+--- plugins/load-gdk/exiv2-colorspace.cpp.orig 2011-02-23 23:35:18.000000000 +0100
++++ plugins/load-gdk/exiv2-colorspace.cpp 2012-05-12 12:15:07.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "exiv2-colorspace.h"
+ #include <math.h>
+ #include <png.h>
++#include <pngpriv.h>
+ #include <jpeglib.h>
+
+ #ifndef EXIV2_TEST_VERSION
+@@ -129,7 +130,7 @@
+ {
+ png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+ (png_charpp) &icc_profile_title, &compression_type,
+- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++ (png_byte**) (&icc_profile), (png_uint_32*) &icc_profile_size);
+ if (retval != 0)
+ {
+ RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
diff --git a/graphics/rawstudio/files/patch-output-pngfile.c b/graphics/rawstudio/files/patch-output-pngfile.c
new file mode 100644
index 000000000000..267a284c53e9
--- /dev/null
+++ b/graphics/rawstudio/files/patch-output-pngfile.c
@@ -0,0 +1,10 @@
+--- plugins/output-pngfile/output-pngfile.c.orig 2011-03-26 02:52:29.000000000 +0100
++++ plugins/output-pngfile/output-pngfile.c 2012-05-12 14:23:21.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 165525828a74..800d65cd95b3 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rawtherapee
PORTVERSION= 4.0.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
@@ -19,7 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
iptcdata.3:${PORTSDIR}/graphics/libiptcdata \
jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms2.2:${PORTSDIR}/graphics/lcms2 \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
sigc-2.0:${PORTSDIR}/devel/libsigc++20
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 817ede2bcb39..72d8ae78d4ea 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rayshade
PORTVERSION= 4.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://ccl.net/cca/software/SOURCES/C/rayshade/ \
http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 9e8e86176107..978345a3b3ef 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
PORTNAME= reallyslick
PORTVERSION= 0.9.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION}
DISTNAME= rss-glx_${PORTVERSION}
diff --git a/graphics/repng2jpeg/Makefile b/graphics/repng2jpeg/Makefile
index e6b8922179d0..ff35542eaf52 100644
--- a/graphics/repng2jpeg/Makefile
+++ b/graphics/repng2jpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= repng2jpeg
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://sugachan.dip.jp/obsolete/arch/
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index 177b47655d74..0b5cdba439ec 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rgbpaint
PORTVERSION= 0.8.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= SF/mtpaint/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 226b53b03c97..4462b2818e37 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ristretto
PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= graphics xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile
index f85b4dfc1001..6a06efc2bf37 100644
--- a/graphics/ruby-cairo/Makefile
+++ b/graphics/ruby-cairo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.10.2
+PORTREVISION= 1
CATEGORIES= graphics ruby
MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 5a252e48addb..03135d76b3ed 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gd
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= graphics ruby
MASTER_SITES= http://www.daifukuya.com/archive/kagemai/lib/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index fc48cc97c941..a378d645b611 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gdk_pixbuf2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= graphics ruby gnome
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index f52cea60803d..2c81e5550f06 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imlib2
PORTVERSION= 0.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics ruby
MASTER_SITES= http://www.pablotron.org/download/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile
index 955a10c2e8c7..f2192601345b 100644
--- a/graphics/ruby-ming/Makefile
+++ b/graphics/ruby-ming/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ming
PORTVERSION= 0.4.3.${RUBY_MING_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= graphics ruby
MASTER_SITES= RF
MASTER_SITE_SUBDIR= mingruby
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 14e067f25424..71e3288b4569 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rmagick
PORTVERSION= 2.13.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics ruby
MASTER_SITES= RF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index a62c053ee3b9..007e46828e48 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= rsvg2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= graphics ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 0496bfc209b1..b714ee1d93a2 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tgif
PORTVERSION= 20010408
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics ruby
MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/graphics/rubygem-chunky_png/Makefile b/graphics/rubygem-chunky_png/Makefile
index ae2efbc7d65a..454068f99ab4 100644
--- a/graphics/rubygem-chunky_png/Makefile
+++ b/graphics/rubygem-chunky_png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= chunky_png
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= graphics rubygems
MASTER_SITES= RG
diff --git a/graphics/rubygem-png/Makefile b/graphics/rubygem-png/Makefile
index 0e32ff5adec6..a47b4837bac8 100644
--- a/graphics/rubygem-png/Makefile
+++ b/graphics/rubygem-png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= graphics rubygems
MASTER_SITES= RG
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 5dc8fe0c6bd0..0654c04ecde2 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sam2p
PORTVERSION= 0.49
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile
index d0366d750ba4..9644d24f5088 100644
--- a/graphics/sane-epkowa/Makefile
+++ b/graphics/sane-epkowa/Makefile
@@ -43,7 +43,7 @@
PORTNAME= epkowa
PORTVERSION= 2.11.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://lx1.avasys.jp/iscan/${PORTVERSION}/
DISTNAME= iscan_${PORTVERSION}-1
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 283e99dfacce..3a8b124a67e6 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sane-frontends
PORTVERSION= 1.0.14
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://alioth.debian.org/frs/download.php/1140/ \
ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile
index c47d9cd92939..58e59e544f33 100644
--- a/graphics/scale2x/Makefile
+++ b/graphics/scale2x/Makefile
@@ -7,22 +7,22 @@
PORTNAME= scale2x
PORTVERSION= 2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Real-time graphics effect able to increase the size of small bitmaps
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
MAN1= scalex.1 scalerx.1
PLIST_FILES= bin/scalex bin/scalerx
-CPPFLAGS+= `libpng14-config --I_opts`
-LDFLAGS+= `libpng14-config --L_opts`
+CPPFLAGS+= `libpng15-config --I_opts`
+LDFLAGS+= `libpng15-config --L_opts`
post-patch:
${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 420ac553d33b..8813609e4adf 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scantailor
PORTVERSION= 0.9.10
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
@@ -18,7 +19,7 @@ LICENSE= GPLv3
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
jbig.1:${PORTSDIR}/graphics/jbigkit \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
USE_CMAKE= yes
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index 943a94603a22..32c88bdf8cdc 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scr2png
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nik
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index b0bf7df74028..c4d687f14800 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scrot
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 2c8a7b54afee..9f7d68df864b 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.12
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
DISTNAME= SDL_image-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org
COMMENT= A simple library to load images of various formats as SDL surfaces
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_AUTOTOOLS= libtool
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index 963b0452abfd..74bdbb477c95 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= seam-carving-gui
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index 1f6d5e990a3e..c9014754b752 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= separate
PORTVERSION= 0.5.8
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SFJP
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 8808bfe20595..4f73120e78c1 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sharpconstruct
PORTVERSION= 0.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/sharp3d/SharpConstruct/${PORTVERSION}
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index e4dd85d5158b..93d85d408e09 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shotwell
PORTVERSION= 0.11.6
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/
diff --git a/graphics/show/Makefile b/graphics/show/Makefile
index 9a7a64eb58a8..053ba7072d03 100644
--- a/graphics/show/Makefile
+++ b/graphics/show/Makefile
@@ -7,7 +7,7 @@
PORTNAME= show
PORTVERSION= 2.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://www.ibiblio.org/propaganda/ \
http://www.freebsdbrasil.com.br/~jmelo/
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A fast, flexible, extensible and bloat-free image viewer for X11
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib \
Imlib.5:${PORTSDIR}/graphics/imlib
diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
index a7c33e4b6cbb..5fb4f9e9a188 100644
--- a/graphics/showimage/Makefile
+++ b/graphics/showimage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= showimage
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTNAME= 143977-${PORTNAME}-${PORTVERSION}
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 519a6404b058..f606d021d17b 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= showimg
PORTVERSION= 0.9.5
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.jalix.org/projects/${PORTNAME}/download/${PORTVERSION}/ \
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 8307ea4c11e5..6f3b1405bc30 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= simage
PORTVERSION= 1.7.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/
@@ -18,7 +19,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
jasper.4:${PORTSDIR}/graphics/jasper \
jpeg.11:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GNOME= gnomehack
USE_AUTOTOOLS= libtool
diff --git a/graphics/simage/files/patch-simage_png.c b/graphics/simage/files/patch-simage_png.c
new file mode 100644
index 000000000000..b0dc15caad22
--- /dev/null
+++ b/graphics/simage/files/patch-simage_png.c
@@ -0,0 +1,11 @@
+--- src/simage_png.c.orig 2010-02-26 16:47:31.000000000 +0100
++++ src/simage_png.c 2012-05-05 07:44:14.000000000 +0200
+@@ -323,7 +323,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr);
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index fa97051b7410..9e02170f6af9 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simpleviewer
PORTVERSION= 1.7.1553.8560
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OpenGL%20edition
DISTNAME= sviewgl-src-${PORTVERSION}
@@ -18,13 +18,14 @@ COMMENT= Small and simple OpenGL image viewer with transparency support
LICENSE= GPLv2
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib
USE_BZIP2= yes
USE_EFL= imlib2
USE_GL= glut
WRKSRC= ${WRKDIR}/sviewgl-src
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_ARGS= CC=${CXX}
PLIST_FILES= bin/sviewgl
@@ -32,7 +33,7 @@ PLIST_FILES= bin/sviewgl
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's,-O2,${CFLAGS}, ; s,/usr,${LOCALBASE},g ; \
+ @${REINPLACE_CMD} -e 's,-O2,${CFLAGS}, ; s,/usr/include,${LOCALBASE}/include,g ; \
s,=-s,=-L${LOCALBASE}/lib,' ${WRKSRC}/Makefile
.if ${OSVERSION} < 800501
@${REINPLACE_CMD} -e 's,const struct dirent,struct dirent,' \
diff --git a/graphics/simpleviewer/files/patch-formatpng.cpp b/graphics/simpleviewer/files/patch-formatpng.cpp
new file mode 100644
index 000000000000..b910eb4ffbf7
--- /dev/null
+++ b/graphics/simpleviewer/files/patch-formatpng.cpp
@@ -0,0 +1,10 @@
+--- src/formats/formatpng.cpp.orig 2010-08-29 16:33:33.000000000 +0200
++++ src/formats/formatpng.cpp 2012-05-05 07:46:22.000000000 +0200
+@@ -7,6 +7,7 @@
+
+ #include "formatpng.h"
+ #include <png.h>
++#include <pngpriv.h>
+ #include <string.h>
+ #include <iostream>
+
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index bb2aa7de6bb6..1cb8838ef996 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skanlite
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= SF/sanewidget/Skanlite/
DIST_SUBDIR= KDE/extragear
diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile
index 3b193d2cbc74..87fdc7cfdbf2 100644
--- a/graphics/sng/Makefile
+++ b/graphics/sng/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sng
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
@@ -16,9 +17,10 @@ COMMENT= Compiler/decompiler for Scriptable Network Graphics
BUILD_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
RUN_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \
--with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt
@@ -26,7 +28,7 @@ CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \
MAN1= sng.1
PLIST_FILES= bin/sng bin/sng_regress
-pre-patch:
+no-pre-patch:
@${REINPLACE_CMD} -e 's|-static||g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e '33,34s|^static ||' ${WRKSRC}/sngd.c
diff --git a/graphics/sng/files/patch-sngc.c b/graphics/sng/files/patch-sngc.c
new file mode 100644
index 000000000000..14992c786307
--- /dev/null
+++ b/graphics/sng/files/patch-sngc.c
@@ -0,0 +1,10 @@
+--- sngc.c.orig 2010-11-05 18:29:14.000000000 +0100
++++ sngc.c 2012-05-04 07:33:36.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #define PNG_INTERNAL
+ #include "png.h"
++#include "pngpriv.h"
+
+ #include "sng.h"
+
diff --git a/graphics/sng/files/patch-sngd.c b/graphics/sng/files/patch-sngd.c
index d6259018e75d..559068050313 100644
--- a/graphics/sng/files/patch-sngd.c
+++ b/graphics/sng/files/patch-sngd.c
@@ -1,6 +1,25 @@
---- sngd.c.orig 2003-11-15 20:25:10.000000000 +0100
-+++ sngd.c 2010-03-29 16:10:17.000000000 +0200
-@@ -793,17 +793,17 @@
+--- sngd.c.orig 2012-05-04 08:20:04.000000000 +0200
++++ sngd.c 2012-05-04 08:42:54.000000000 +0200
+@@ -10,6 +10,7 @@
+ #define PNG_INTERNAL
+ #include "config.h" /* for RGBTXT */
+ #include "png.h"
++#include "pngpriv.h"
+ #include "sng.h"
+
+ png_structp png_ptr;
+@@ -726,8 +727,8 @@
+ }
+ #ifdef PNG_FLOATING_POINT_SUPPORTED
+ #ifndef MNG_INTERFACE
+- fprintf(fpout, " width: %g\n", info_ptr->scal_pixel_width);
+- fprintf(fpout, " height: %g\n", info_ptr->scal_pixel_height);
++ fprintf(fpout, " width: %s\n", info_ptr->scal_s_width);
++ fprintf(fpout, " height: %s\n", info_ptr->scal_s_height);
+ #else
+ fprintf(fpout, " width: %g\n", info_ptr->scal.pixel_width);
+ fprintf(fpout, " height: %g\n", info_ptr->scal.pixel_height);
+@@ -794,17 +795,17 @@
fprintf(fpout, "tRNS {\n");
switch (info_ptr->color_type) {
case PNG_COLOR_TYPE_GRAY:
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 67564cff3f0d..9d6905bbe3be 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -7,14 +7,15 @@
PORTNAME= sodipodi
PORTVERSION= 0.34
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics gnome
MASTER_SITES= SF
MAINTAINER= gnome@FreeBSD.org
COMMENT= A small vector based drawing program with GNOME libraries
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ png15:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
diff --git a/graphics/sodipodi/files/patch-src_helper_png-write.c b/graphics/sodipodi/files/patch-src_helper_png-write.c
new file mode 100644
index 000000000000..35452d0e8a13
--- /dev/null
+++ b/graphics/sodipodi/files/patch-src_helper_png-write.c
@@ -0,0 +1,29 @@
+--- src/helper/png-write.c.orig 2004-02-09 20:01:16.000000000 +0100
++++ src/helper/png-write.c 2012-05-09 12:54:09.000000000 +0200
+@@ -111,7 +111,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+@@ -282,7 +282,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose (fp);
+ unlink (filename);
+@@ -370,7 +370,7 @@
+
+ h = MIN (height - r, 64);
+ n = get_rows ((const unsigned char **) row_pointers, r, h, data);
+- if (!n) longjmp (png_ptr->jmpbuf, 1);
++ if (!n) longjmp (png_jmpbuf(png_ptr), 1);
+ png_write_rows (png_ptr, row_pointers, n);
+ r += n;
+ }
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index 1b362169f35f..73edb2db5660 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= structuresynth
PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Structure%20Synth/Version%201.5%20%28Hinxton%29
DISTNAME= StructureSynth-Source-v${PORTVERSION}
diff --git a/graphics/svg2pdf/Makefile b/graphics/svg2pdf/Makefile
index ba311381c6bd..7d50f0a5cd89 100644
--- a/graphics/svg2pdf/Makefile
+++ b/graphics/svg2pdf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= svg2pdf
PORTVERSION= 0.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
diff --git a/graphics/svg2png/Makefile b/graphics/svg2png/Makefile
index 64627b8f5cc9..a7e95a63b18e 100644
--- a/graphics/svg2png/Makefile
+++ b/graphics/svg2png/Makefile
@@ -8,7 +8,7 @@
PORTNAME= svg2png
PORTVERSION= 0.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
diff --git a/graphics/svgviewer/Makefile b/graphics/svgviewer/Makefile
index 6326e9bca2a1..59367f862d8f 100644
--- a/graphics/svgviewer/Makefile
+++ b/graphics/svgviewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= svgviewer
PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnustep
MASTER_SITES= http://gnu.ethz.ch/debian/svgviewer/
DISTNAME= SVGViewer-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT= SVG Viewer for GNUstep
LIB_DEPENDS+= svg.1:${PORTSDIR}/graphics/libsvg
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 24dc668cba27..754c82b8b081 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,7 +8,7 @@
PORTNAME= swfdec
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index e1a0fd71ef2c..b7ba59941843 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -7,13 +7,14 @@
PORTNAME= swfmill
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://swfmill.org/releases/
MAINTAINER= skv@FreeBSD.org
COMMENT= xml2swf and swf2xml processor with import functionalities
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
USE_AUTOTOOLS= libtool
@@ -25,6 +26,6 @@ CONFIGURE_ENV+= PKG_CONFIG=${LOCALBASE}/bin/pkg-config
USE_LDCONFIG= YES
post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/graphics/swfmill/files/patch-readpng.c b/graphics/swfmill/files/patch-readpng.c
index ba18494b46ea..53c3d44c9172 100644
--- a/graphics/swfmill/files/patch-readpng.c
+++ b/graphics/swfmill/files/patch-readpng.c
@@ -1,6 +1,14 @@
---- src/swft/readpng.c.orig 2006-07-20 15:57:17.000000000 +0200
-+++ src/swft/readpng.c 2010-03-29 16:19:53.000000000 +0200
-@@ -69,7 +69,7 @@
+--- src/swft/readpng.c.orig 2009-11-30 01:18:53.000000000 +0100
++++ src/swft/readpng.c 2012-05-05 07:48:08.000000000 +0200
+@@ -51,6 +51,7 @@
+ #include <stdlib.h>
+
+ #include "png.h" /* libpng header; includes zlib.h */
++#include "zlib.h"
+ #include "readpng.h" /* typedefs, common macros, public prototypes */
+
+ /* future versions of libpng will provide this macro: */
+@@ -87,7 +88,7 @@
* have used slightly more general png_sig_cmp() function instead */
fread(sig, 1, 8, infile);
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 97b12405efca..75e1b5f71b61 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= synfigstudio
DISTVERSION= 0.63.05
+PORTREVISION= 1
CATEGORIES= graphics multimedia
MASTER_SITES= SF/synfig/${PORTNAME}/${PORTVERSION}
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 840bb92eb985..246b533ea608 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -7,6 +7,7 @@
PORTNAME= telak
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://julien.danjou.info/telak/ \
CRITICAL
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index a2b1dcfb3053..353110ea6499 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tesseract
PORTVERSION= 3.01
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
.if !defined(NOPORTDATA) || make(makesum)
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 2bf788bdd406..46c9cde181e8 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tgif
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/ \
http://groups.yahoo.com/group/tgif4-announce/files/ \
diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile
index b724eac4dccc..ffdbb8153474 100644
--- a/graphics/tif22pnm/Makefile
+++ b/graphics/tif22pnm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tif22pnm
PORTVERSION= 0.12
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://pts.szit.bme.hu/ \
GOOGLE_CODE
@@ -16,7 +16,7 @@ MASTER_SITES= http://pts.szit.bme.hu/ \
MAINTAINER= martymac@FreeBSD.org
COMMENT= Converts TIFF- sampled images to PNM image
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
@@ -36,8 +36,8 @@ do-build:
cd ${WRKSRC} \
&& ${CC} ${CFLAGS} -DNDEBUG -I${LOCALBASE}/include \
${TIF22PNM_SRCS} -o tif22pnm -L${LOCALBASE}/lib -ltiff \
- && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng14 --cflags` \
- ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng14 --libs`
+ && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng15 --cflags` \
+ ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng15 --libs`
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/png22pnm ${PREFIX}/bin
diff --git a/graphics/tif22pnm/files/patch-png22pnm.c b/graphics/tif22pnm/files/patch-png22pnm.c
index dc9378f22e29..45212e6231ec 100644
--- a/graphics/tif22pnm/files/patch-png22pnm.c
+++ b/graphics/tif22pnm/files/patch-png22pnm.c
@@ -1,6 +1,14 @@
--- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100
-+++ png22pnm.c 2010-03-29 08:27:57.000000000 +0200
-@@ -783,7 +783,7 @@
++++ png22pnm.c 2012-05-04 07:36:40.000000000 +0200
+@@ -40,6 +40,7 @@
+
+ #include <math.h>
+ #include <png.h> /* includes zlib.h and setjmp.h */
++#include <pngpriv.h>
+ #if 0
+ #define VERSION "p2.37.4 (5 December 1999) +netpbm"
+ #else
+@@ -783,7 +784,7 @@
(info_ptr->valid & PNG_INFO_tRNS)) {
trans_mix = TRUE;
for (i = 0 ; i < info_ptr->num_trans ; i++)
@@ -9,7 +17,7 @@
trans_mix = FALSE;
break;
}
-@@ -932,7 +932,7 @@
+@@ -932,7 +933,7 @@
pnm_type = PBM_TYPE;
if (info_ptr->valid & PNG_INFO_tRNS) {
for (i = 0 ; i < info_ptr->num_trans ; i++) {
@@ -18,7 +26,7 @@
pnm_type = PGM_TYPE;
break;
}
-@@ -1009,7 +1009,7 @@
+@@ -1009,7 +1010,7 @@
case PNG_COLOR_TYPE_GRAY:
store_pixel (pnm_pixel, c, c, c,
((info_ptr->valid & PNG_INFO_tRNS) &&
@@ -27,7 +35,7 @@
0 : maxval);
break;
-@@ -1023,7 +1023,7 @@
+@@ -1023,7 +1024,7 @@
info_ptr->palette[c].green, info_ptr->palette[c].blue,
(info_ptr->valid & PNG_INFO_tRNS) &&
c<info_ptr->num_trans ?
@@ -36,7 +44,7 @@
break;
case PNG_COLOR_TYPE_RGB:
-@@ -1031,9 +1031,9 @@
+@@ -1031,9 +1032,9 @@
c3 = get_png_val (png_pixel);
store_pixel (pnm_pixel, c, c2, c3,
((info_ptr->valid & PNG_INFO_tRNS) &&
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index 56913aec679b..1a7d1099b4fc 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tiff2png
PORTVERSION= 0.91
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF/png-mng/${PORTNAME}/${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT= Converts TIFF images to PNG format
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
MAKEFILE= Makefile.unx
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/tiff2png/files/patch-tiff2png.c b/graphics/tiff2png/files/patch-tiff2png.c
new file mode 100644
index 000000000000..ba385e7a7f01
--- /dev/null
+++ b/graphics/tiff2png/files/patch-tiff2png.c
@@ -0,0 +1,10 @@
+--- tiff2png.c.orig 2002-09-13 01:00:00.000000000 +0200
++++ tiff2png.c 2012-04-27 07:10:32.000000000 +0200
+@@ -87,6 +87,7 @@
+ # include "tiffcomp.h" /* not installed by default */
+ #endif
+ #include "png.h"
++#include "zlib.h"
+
+ #ifdef _MSC_VER /* works for MSVC 5.0; need finer tuning? */
+ # define strcasecmp _stricmp
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 838ae9e39f33..306c32e6df2d 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -8,7 +8,7 @@
PORTNAME= truevision
PORTVERSION= 0.5.5.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 6e9131a46a69..e83233fa75b3 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tulip
PORTVERSION= 3.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
diff --git a/graphics/tumble/Makefile b/graphics/tumble/Makefile
index 613e2505b6ae..d769f4667063 100644
--- a/graphics/tumble/Makefile
+++ b/graphics/tumble/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tumble
PORTVERSION= 0.33
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics print
MASTER_SITES= http://tumble.brouhaha.com/download/ \
http://www.predatorlabs.net/dl/
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 440c2931e323..1a939436a726 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ufraw
PORTVERSION= 0.18
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -18,7 +18,7 @@ LICENSE= GPLv2
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
lcms.1:${PORTSDIR}/graphics/lcms
GNU_CONFIGURE= yes
diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile
index 0227b45ed587..4bee8d7f294c 100644
--- a/graphics/uniconvw/Makefile
+++ b/graphics/uniconvw/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uniconvw
PORTVERSION= 1.1.5
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= GOOGLE_CODE \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index a602fabaf6a4..2939588f6a89 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= urt
PORTVERSION= 3.1b1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/
DISTNAME= urt
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 822bf4c9e876..25b4f0b61777 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= view3ds
PORTVERSION= 1.0.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 9aa8c3360d2f..7667d459e02f 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -11,7 +11,7 @@
PORTNAME= vigra
PORTVERSION= 1.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -48,7 +48,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
.endif
.if !defined(WITHOUT_VIGRA_PNG)
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if !defined(WITHOUT_VIGRA_FFTW)
diff --git a/graphics/vigra/files/patch-png.cxx b/graphics/vigra/files/patch-png.cxx
new file mode 100644
index 000000000000..d6fd4f212143
--- /dev/null
+++ b/graphics/vigra/files/patch-png.cxx
@@ -0,0 +1,20 @@
+--- src/impex/png.cxx.orig 2010-12-03 18:40:34.000000000 +0100
++++ src/impex/png.cxx 2012-05-05 07:53:39.000000000 +0200
+@@ -320,7 +320,7 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
+- char * profilePtr;
++ png_byte * profilePtr;
+ png_uint_32 profileLen;
+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+@@ -592,7 +592,7 @@
+ // set icc profile
+ if (iccProfile.size() > 0) {
+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
+- (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
++ (const png_byte *)iccProfile.begin(), (png_uint_32)iccProfile.size());
+ }
+ #endif
+
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 3e549c669a85..7b130b998bbf 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vips
PORTVERSION= 7.26.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
@@ -25,7 +25,7 @@ LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \
GraphicsMagick:${PORTSDIR}/graphics/GraphicsMagick \
IlmImf:${PORTSDIR}/graphics/OpenEXR \
orc-0:${PORTSDIR}/devel/orc \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
matio:${PORTSDIR}/math/matio \
lcms:${PORTSDIR}/graphics/lcms
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index b91dacfbe347..9460c1ce7a3b 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -7,7 +7,7 @@
PORTNAME= visionworkbench
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/
DISTNAME= VisionWorkbench-${PORTVERSION}
@@ -31,7 +31,7 @@ USE_LDCONFIG= yes
USE_PYTHON= 2.4+
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs
LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc
new file mode 100644
index 000000000000..962b7bdbb2a0
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc
@@ -0,0 +1,10 @@
+--- src/vw/FileIO/DiskImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/DiskImageResourcePNG.cc 2012-05-05 08:28:48.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <vw/Image/Manipulation.h>
+
+ #include <png.h>
++#include <zlib.h>
+ #include <vector>
+ #include <fstream>
+
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc
new file mode 100644
index 000000000000..786775f4ddeb
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc
@@ -0,0 +1,11 @@
+--- src/vw/FileIO/MemoryImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/MemoryImageResourcePNG.cc 2012-05-06 11:29:59.000000000 +0200
+@@ -11,6 +11,8 @@
+
+ namespace vw {
+
++typedef void * voidp;
++
+ class SrcMemoryImageResourcePNG::Data : public fileio::detail::PngIODecompress {
+ boost::shared_array<const uint8> m_data;
+ const uint8 * m_cur;
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc
new file mode 100644
index 000000000000..ebef892f48f0
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc
@@ -0,0 +1,10 @@
+--- src/vw/FileIO/PngIO.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/PngIO.cc 2012-05-06 13:36:44.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <vw/Core/Exception.h>
+ #include <vw/Core/Log.h>
+ #include <vw/Core/Settings.h>
++#include <zlib.h>
+
+ static void png_error_handler(png_structp /*png_ptr*/, png_const_charp error_msg)
+ {
diff --git a/graphics/visprint/Makefile b/graphics/visprint/Makefile
index fc19aa983cd6..12b2782008a4 100644
--- a/graphics/visprint/Makefile
+++ b/graphics/visprint/Makefile
@@ -7,14 +7,14 @@
PORTNAME= visprint
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.tastyrabbit.net/visprint/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates fractal fingerprint images based on any data
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lpng
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 5393ba3fd0cb..6c73f8940f31 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vp
PORTVERSION= 1.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://bzflag.bz/~erik/files/
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index 1761752dde92..4930d35955bd 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webp
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GOOGLE_CODE
DISTNAME= lib${PORTNAME}-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= Google WebP image format conversion tool
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 3efb7316caae..2d628f89a09a 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -9,7 +9,7 @@
PORTNAME= white_dune
PORTVERSION= ${DISTVERSION:S/pl/./}
DISTVERSION= 0.30pl5
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES
@@ -18,7 +18,7 @@ MAINTAINER= devel@stasyan.com
COMMENT= Graphical VRML97 Editor and animation tool
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/graphics/white_dune/files/patch-src-pngLoad.c b/graphics/white_dune/files/patch-src-pngLoad.c
new file mode 100644
index 000000000000..a95df605f2ad
--- /dev/null
+++ b/graphics/white_dune/files/patch-src-pngLoad.c
@@ -0,0 +1,11 @@
+--- src/pngLoad.c.orig 2010-12-09 08:36:57.000000000 +0100
++++ src/pngLoad.c 2012-05-05 08:32:20.000000000 +0200
+@@ -139,7 +139,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* If we get here, we had a problem reading the file */
+ return 0;
diff --git a/graphics/wings-devel/Makefile b/graphics/wings-devel/Makefile
index 9ad36ee257a0..3ab806557c06 100644
--- a/graphics/wings-devel/Makefile
+++ b/graphics/wings-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wings
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
DIST_SUBDIR= erlang
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index bab4adff5f19..f98047c3fadd 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wings
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
DIST_SUBDIR= erlang
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 75a877c1ab20..d951883dffe5 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmGrabImage
PORTVERSION= 0.72
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics windowmaker
MASTER_SITES= http://dockapps.org/files/12/19/
EXTRACT_SUFX= .tgz
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index b7886fdc3f16..6ebc0d0b588a 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wxsvg
PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 5c2171e525e4..19f2907c331c 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xaos
PORTVERSION= 3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics math
MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= A real-time fractal browser for X11 and ASCII terminals
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_XORG= x11 xext
GNU_CONFIGURE= yes
@@ -24,7 +24,7 @@ OPTIONS= PTHREAD "Enable SMP support (experimental)" off \
GTK2 "GTK+ User Interface (experimental)" off \
NLS "Native Language Support" on
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-aa-driver=no --with-dga-driver=no \
--with-ggi-driver=no --with-svga-driver=no \
diff --git a/graphics/xaos/files/patch-png.c b/graphics/xaos/files/patch-png.c
new file mode 100644
index 000000000000..17ec32ea93ab
--- /dev/null
+++ b/graphics/xaos/files/patch-png.c
@@ -0,0 +1,20 @@
+--- src/util/png.c.orig 2009-07-18 01:50:39.000000000 +0200
++++ src/util/png.c 2012-05-05 08:36:16.000000000 +0200
+@@ -3,6 +3,8 @@
+ #include <aconfig.h>
+ #ifdef USE_PNG
+ #include <png.h>
++#include <zlib.h>
++#include <pngpriv.h>
+ #endif
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -59,7 +61,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return "No memory to create png info structure";
+ }
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(file);
+ return strerror(errno);
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 57a987ecafc1..e731e805cbe4 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xd3d
PORTVERSION= 8.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics math
MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/
diff --git a/graphics/xenomorph/Makefile b/graphics/xenomorph/Makefile
index bf42609414ac..43e3bec49f69 100644
--- a/graphics/xenomorph/Makefile
+++ b/graphics/xenomorph/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xenomorph
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://xenomorph.sourceforge.net/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 5615522eca9d..03214088983e 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xface.el
PORTVERSION= 1.3.6.24
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics elisp
MASTER_SITES= http://www.jpl.org/ftp/pub/elisp/ \
ftp://ftp.jpl.org/pub/elisp/
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 4a17204319e0..66a621db827b 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfig
PORTVERSION= 3.2.5.a5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/
DISTNAME= ${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full
@@ -16,7 +16,7 @@ MAINTAINER= lesi@FreeBSD.org
COMMENT= A drawing program for X11 (Alpha version)
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
@@ -27,6 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:S,.a,-alpha,}
LATEST_LINK= xfig-devel
USE_IMAKE= yes
USE_XORG= ice sm x11 xaw xext xi xmu xpm xt
+USE_GETETEXT= yes
MAN1= xfig.1
MAKE_ENV+= DOCSDIR=${DOCSDIR}
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index d1a6d73aaca9..b31b62624463 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfig
PORTVERSION= 3.2.5b
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/mcj/mcj_dist_src/3.0/
DISTNAME= ${PORTNAME}.${PORTVERSION}.full
@@ -15,7 +16,7 @@ MAINTAINER= mjl@luckie.org.nz
COMMENT= A drawing program for X11
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
@@ -49,6 +50,10 @@ PLIST_SUB+= JPORTDOCS="@comment "
PLIST_SUB= JPORTDOCS=""
.endif
+.if !defined(WITHOUT_I18N)
+USE_GETETEXT= yes
+.endif
+
post-extract:
@cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
@cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 032cf44fabd5..d0c26c6543ab 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfpovray
PORTVERSION= 1.3.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
${MASTER_SITE_SUNSITE}
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 112c655b6791..6a77a5a9e9ae 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xli
PORTVERSION= 1.17.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
@@ -17,7 +17,7 @@ MAINTAINER= lichray@gmail.com
COMMENT= Utilities to display images in X11
CONFLICTS_INSTALL= xloadimage-*
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_XORG= xi
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index b8f76ddc3ac9..a5ea0c7513b7 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmedcon
PORTVERSION= 0.11.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/XMedCon-Source/${PORTVERSION}
@@ -100,7 +101,7 @@ CONFIGURE_ARGS+= --disable-ljpg
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
post-patch:
diff --git a/graphics/xmms-vumeter/Makefile b/graphics/xmms-vumeter/Makefile
index bacc47a6cf8d..e52c8ce0f97c 100644
--- a/graphics/xmms-vumeter/Makefile
+++ b/graphics/xmms-vumeter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vumeter
PORTVERSION= 0.9.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}plugin/Plugin%20for%20XMMS
PKGNAMEPREFIX= xmms-
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index c475113cf09b..a4a78ec94715 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xournal
PORTVERSION= 0.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index d92872ac208d..3e2a6807d5bb 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -7,13 +7,14 @@
PORTNAME= xpaint
PORTVERSION= 2.9.9
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= A simple paint program
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
openjpeg:${PORTSDIR}/graphics/openjpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 7c40ba61b299..25d5256ef00b 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xsane
PORTVERSION= 0.998
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -16,7 +17,7 @@ MAINTAINER= domi@nonsensss.de
COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy)
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
sane.1:${PORTSDIR}/graphics/sane-backends
diff --git a/graphics/xsane/files/patch-xsane-save.c b/graphics/xsane/files/patch-xsane-save.c
new file mode 100644
index 000000000000..3113c7308ea3
--- /dev/null
+++ b/graphics/xsane/files/patch-xsane-save.c
@@ -0,0 +1,20 @@
+--- src/xsane-save.c.orig 2010-11-16 22:06:00.000000000 +0100
++++ src/xsane-save.c 2012-05-04 07:37:59.000000000 +0200
+@@ -4910,7 +4910,7 @@
+ return -1; /* error */
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+ xsane_back_gtk_error(buf, TRUE);
+@@ -5100,7 +5100,7 @@
+ return -1; /* error */
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+ xsane_back_gtk_error(buf, TRUE);
diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile
index 11429167c4a2..bec89a205c2d 100644
--- a/graphics/xsvg/Makefile
+++ b/graphics/xsvg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xsvg
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 0df550fe7016..e4f23ce506e3 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xv
PORTVERSION= 3.10a
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES+= graphics
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/:base \
SF/png-mng/XV%20jumbo%20patches/20070520
@@ -24,7 +24,7 @@ COMMENT?= An X11 program that displays images of various formats
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jasper.4:${PORTSDIR}/graphics/jasper
USE_IMAKE= yes
@@ -34,6 +34,7 @@ MAN1= bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
.endif
XVDIST= ${DISTDIR}/${DIST_SUBDIR}
+CFLAGS+= -I${LOCALBASE}/include/libpng15
pre-patch:
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt
diff --git a/graphics/xv/files/patch-xvpng.c b/graphics/xv/files/patch-xvpng.c
new file mode 100644
index 000000000000..f7df0484feda
--- /dev/null
+++ b/graphics/xv/files/patch-xvpng.c
@@ -0,0 +1,38 @@
+--- xvpng.c.orig 2007-05-14 02:53:28.000000000 +0200
++++ xvpng.c 2012-04-27 07:51:56.000000000 +0200
+@@ -32,6 +32,8 @@
+ #ifdef HAVE_PNG
+
+ #include "png.h"
++#include "zlib.h"
++#include "pngpriv.h"
+
+ /*** Stuff for PNG Dialog box ***/
+ #define PWIDE 318
+@@ -458,7 +460,7 @@
+ FatalError(software);
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return -1;
+ }
+@@ -921,7 +923,7 @@
+ FatalError("malloc failure in LoadPNG");
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ fclose(fp);
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ if (!read_anything) {
+@@ -1143,7 +1145,7 @@
+ {
+ SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message);
+
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index ebcb2c9f6b1f..b341ff994fa0 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xzgv
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index 94f80f8a8bcd..46d1405a7bd3 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yagf
PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://symmetrica.net/cuneiform-linux/
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index ba55333274fb..02cea53a3f5e 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zathura
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics print
MASTER_SITES= http://pwmt.org/projects/zathura/download/
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index ca2468b7d87d..c221c3c16a1c 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zbar
PORTVERSION= 0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index 3d932c76a92e..de4a32000361 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zgv
PORTVERSION= 5.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/viewers/svga
@@ -18,7 +18,7 @@ COMMENT= Graphics viewer for SVGAlib
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
vga.1:${PORTSDIR}/graphics/svgalib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
diff --git a/graphics/zgv/files/patch-readpng.c b/graphics/zgv/files/patch-readpng.c
new file mode 100644
index 000000000000..e1983a329799
--- /dev/null
+++ b/graphics/zgv/files/patch-readpng.c
@@ -0,0 +1,20 @@
+--- src/readpng.c.orig 2004-10-31 16:00:23.000000000 +0100
++++ src/readpng.c 2012-05-06 16:05:53.000000000 +0200
+@@ -63,7 +63,7 @@
+ use_errmsg=1;
+
+ /* cleanup is done after jump back, so just do that now... */
+-longjmp(png_ptr->jmpbuf,1);
++longjmp( png_jmpbuf(png_ptr),1);
+ }
+
+
+@@ -132,7 +132,7 @@
+ return(_PICERR_NOMEM);
+ }
+
+-if(setjmp(png_ptr->jmpbuf))
++if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* if we get here, there was an error. */
+ /* don't use local variables here, they may have been blasted */
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index 63e7058bdc92..e4746f1f4bfc 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zimg
PORTVERSION= 5.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
index 855a2adf6fa3..f366002fc0ad 100644
--- a/graphics/zint/Makefile
+++ b/graphics/zint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zint
PORTVERSION= 2.4.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
@@ -15,7 +16,7 @@ COMMENT= Zint Barcode Generator
LICENSE= GPLv3
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_CMAKE= yes
USE_LDCONFIG= yes
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 21384074e10e..b5ae191d02af 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zphoto
PORTVERSION= 1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index cd65b808705b..86a296dfa3b2 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= hebrew kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 68e1ab2acd48..d8a5a74d42bb 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES?= hebrew kde
MAINTAINER= kde@FreeBSD.org
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index 3a90588b94b7..12fadb90e097 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= hungarian kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 16ab248127f1..3770e65745a9 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= hungarian kde
MAINTAINER= kde@FreeBSD.org
diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile
index eadebf272afb..0b2fdb3c5683 100644
--- a/irc/cwirc/Makefile
+++ b/irc/cwirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cwirc
PORTVERSION= 2.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc comms hamradio
MASTER_SITES= http://users.skynet.be/ppc/cwirc/download/ \
http://www.db.net/downloads/ \
diff --git a/irc/eggcreator/Makefile b/irc/eggcreator/Makefile
index 508ddf521f94..cdb8657058fc 100644
--- a/irc/eggcreator/Makefile
+++ b/irc/eggcreator/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eggcreator
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= irc
MASTER_SITES= http://www.oook.cz/bsd/distfiles/ \
LOCAL/beech
diff --git a/irc/irchat-pj-emacs21/Makefile b/irc/irchat-pj-emacs21/Makefile
index 76ecb97b0f3c..068803297e86 100644
--- a/irc/irchat-pj-emacs21/Makefile
+++ b/irc/irchat-pj-emacs21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= irchat-pj
PORTVERSION= 2.5.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= irc elisp
MASTER_SITES= http://his.luky.org/ftp/mirrors/irchat-pj/2.5/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index c31698657b75..e7f4b1321e12 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kmyirc
PORTVERSION= 0.2.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= irc kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-alpha/${PORTVERSION}
diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index 6be5c4959b2d..9c863db75dc6 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= konversation
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${DISTVERSION}/src
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index fe72510960c4..a01895857832 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -7,7 +7,7 @@
PORTNAME= konversation
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc kde
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index c4d5be305bb0..07ca3c9fcd65 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kvirc
PORTVERSION= 4.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc kde
MASTER_SITES= ftp://ftp.kvirc.de/pub/kvirc/%SUBDIR%/ \
http://kvirc.gmake.de/pub/kvirc/%SUBDIR%/ \
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index 2a4ad6939153..c610563c838e 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kwirc
PORTVERSION= 0.1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= irc kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_sexybaby_
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index ef3ae74263ea..6264f39839fb 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lostirc
PORTVERSION= 0.4.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= irc
MASTER_SITES= SF
diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile
index 0989f9bef80d..bb47cac35b16 100644
--- a/irc/minbif/Makefile
+++ b/irc/minbif/Makefile
@@ -7,7 +7,7 @@
PORTNAME= minbif
PORTVERSION= 1.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= irc net-im
MASTER_SITES= http://symlink.me/attachments/download/50/
diff --git a/irc/pure-emacs21/Makefile b/irc/pure-emacs21/Makefile
index 9752b08d2a60..063411f7deb7 100644
--- a/irc/pure-emacs21/Makefile
+++ b/irc/pure-emacs21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pure
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= irc elisp
MASTER_SITES= http://his.luky.org/ftp/mirrors/irchat-pj/2.5/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index b476a898fb2a..c1e59b11ac08 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quassel
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://www.quassel-irc.org/pub/
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 4fa69ab9a6ca..c21e1aa2899c 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -6,6 +6,7 @@
PORTNAME= riece
PORTVERSION= 8.0.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= irc elisp
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
diff --git a/irc/slirc/Makefile b/irc/slirc/Makefile
index 1a8959b60735..e3d9a6dd9b17 100644
--- a/irc/slirc/Makefile
+++ b/irc/slirc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slirc
PORTVERSION= 0.12
-PORTREVISION= 3
+PORTREVISION= 4
# Assign with += for slave ports
CATEGORIES+= irc
MASTER_SITES= http://members.core.com/~stabro/
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 852d5542d40f..c119ab8a40af 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fish
DISTVERSION= 0.98
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc security
MASTER_SITES= http://fish.secure.la/xchat/
PKGNAMEPREFIX= xchat-
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index fc0ee8507e92..0050604e0895 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xchat
PORTVERSION= 0.26.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= irc gnome ipv6
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/xchat-gnome/${PORTVERSION:R}
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index ef018ebb198e..f5c7547bbe4d 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mircryption
DISTVERSION= 0.3.3
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= irc security
MASTER_SITES= http://mircryption.sourceforge.net/Downloads/
diff --git a/irc/xchat-ruby/Makefile b/irc/xchat-ruby/Makefile
index d9f5cafeb0a5..0133ce469288 100644
--- a/irc/xchat-ruby/Makefile
+++ b/irc/xchat-ruby/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ruby
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc ruby
MASTER_SITES= SF/xchat-${PORTNAME}/xchat-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= xchat-
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index c0b42118db40..bcd24fd6a91c 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -8,6 +8,7 @@
PORTNAME= xchat
PORTVERSION= 2.8.8
+PORTREVISION= 1
CATEGORIES= irc gnome ipv6
MASTER_SITES= SF/${PORTNAME}/ \
http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 3c736011c6e3..3aa79cd1c09e 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aterm
PORTVERSION= 0.4.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES+= japanese x11
MASTER_SITES= SF
@@ -22,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A color vt102 terminal emulator with transparency support
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_AUTOTOOLS= autoconf:env
USE_XORG= xpm xmu
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 3a1c65f6feed..04e8711f2f91 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ddskk
PORTVERSION= 14.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese elisp
MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ \
ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 4a7adfc018b5..196331a5b756 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvipsk
PORTVERSION= 5.95b
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
${MASTER_SITE_LOCAL:S,%SUBDIR%,hrs/teTeX,:S,$,:udvipspatch,}
@@ -31,7 +31,7 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
mktexlsr:${PORTSDIR}/print/teTeX-base \
${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 862d90cd85b9..ab2a19351e57 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ebview
PORTVERSION= 0.3.6
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= japanese
MASTER_SITES= SF
PKGNAMESUFFIX= -gtk2
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 779d28b90737..c6d05920975a 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ebview
PORTVERSION= 0.2.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= japanese
MASTER_SITES= SF
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 5d49d5b99f3e..dc2fc769938a 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emcws
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -25,6 +25,8 @@ PATCHFILES+= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
MAINTAINER= nakaji@jp.freebsd.org
COMMENT= Emacs + Canna + Wnn + Sj3
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_EMACS= yes
EMACS_PORT_NAME= emacs21
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 2c8e3c3d7b08..8d1e9946fa10 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -8,7 +8,7 @@
PORTNAME= groff
PORTVERSION= 1.18.1
DISTVERSIONSUFFIX= .1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
${MASTER_SITE_DEBIAN:S,$,:debian,}
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 538a9b1e8096..6e212305c1f1 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gxditview
PORTVERSION= 1.18.1
DISTVERSIONSUFFIX= .1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/g/groff
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 95b5a451f848..f1785fefb6ac 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-anthy
PORTVERSION= 1.2.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= japanese
PROJECTHOST= ibus
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 2e62893aeedb..8ca294409e3d 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-skk
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://cloud.github.com/downloads/ueno/ibus-skk/
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 1e692796d7d9..2a45623f15a3 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
PORTNAME= im-ja
PORTVERSION= 1.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese x11-toolkits
MASTER_SITES= http://im-ja.sourceforge.net/
diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index 30732577b93a..e1dc0a7479b4 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jadetex
PORTVERSION= 3.13
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese print
MASTER_SITES= SF
PKGNAMESUFFIX= -ptex
@@ -17,7 +17,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= A pTeX backend for Jade, for typesetting SGML documents
BUILD_DEPENDS= ptex:${PORTSDIR}/japanese/ptex
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ptex:${PORTSDIR}/japanese/ptex
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 6288791fc4c9..b6ea41a715be 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jd
PORTVERSION= 2.8.2
+PORTREVISION= 1
CATEGORIES= japanese www
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= jd4linux/52863
diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile
index 7ddafbef61b1..d411302ef2ec 100644
--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kanjipad
PORTVERSION= 2.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese x11
MASTER_SITES= http://fishsoup.net/software/kanjipad/
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 6772c4b78138..5a176ff888a7 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kasumi
PORTVERSION= 2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ${PORTNAME}/41436
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index b75f2fd0e433..2c7a8473f6eb 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= japanese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index bec84611c796..34537dc15ecc 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese kde
MAINTAINER= kde@FreeBSD.org
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index ea2420bc5f68..6ed06386c579 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kiten
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index a418c7e74090..22402f8f79e4 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex2html
PORTVERSION= ${VERSION}j${JP_VERSION}
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/${PORTNAME}
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 4787ae97e096..8af30981337d 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libtomoe-gtk
PORTVERSION= 0.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese
MASTER_SITES= SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION}
DISTNAME= tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index dc285478007c..a27c286dea47 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lookup
PORTVERSION= 1.4.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= japanese elisp
MASTER_SITES= http://openlab.ring.gr.jp/edict/lookup/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 2a40bb28ac77..4f1848827e83 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= man-doc
PORTVERSION= 5.4.20050911
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese
.if !defined(WITH_CVS)
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 33aa43084c0a..be961df12f18 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -7,7 +7,7 @@
PORTNAME= man
PORTVERSION= 1.1j
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese
MASTER_SITES= ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
${MASTER_SITE_PORTS_JP}
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 9c1428d8922c..5d1fe073d6de 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= migemo
PORTVERSION= 0.40
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= japanese elisp
MASTER_SITES= http://0xcc.net/migemo/ \
diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile
index d591baff108c..859dead19e44 100644
--- a/japanese/ming/Makefile
+++ b/japanese/ming/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ming
PORTVERSION= 0.1.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese graphics
MASTER_SITES= http://dist.bsdlab.org/
#MASTER_SITES= http://blue.ribbon.to/~harpy/ming/jaming/
@@ -16,7 +16,7 @@ DISTNAME= jaming-${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= LGPL'ed Flash 4/5 movie output library with Japanese languages support
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib
CONFLICTS= ming-*
diff --git a/japanese/ming/files/patch-util_png2dbl.c b/japanese/ming/files/patch-util_png2dbl.c
new file mode 100644
index 000000000000..8782dda505ba
--- /dev/null
+++ b/japanese/ming/files/patch-util_png2dbl.c
@@ -0,0 +1,11 @@
+--- ../util/png2dbl.c.orig 2002-06-24 14:21:54.000000000 +0200
++++ ../util/png2dbl.c 2012-05-06 06:30:46.000000000 +0200
+@@ -80,7 +80,7 @@
+ error("Couldn't create end_info\n");
+ }
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
+ error("Mystery error (longjmp called)\n");
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index f98ca8f01d68..d81598340205 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mozc
PORTVERSION= 1.5.1090.102
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX?= ja-
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 8f13895945bf..2613937fc487 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= navi2ch
PORTVERSION= 1.8.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= japanese www elisp
MASTER_SITES= SF
diff --git a/japanese/netype/Makefile b/japanese/netype/Makefile
index d86c8bc8b86a..48cb913f840c 100644
--- a/japanese/netype/Makefile
+++ b/japanese/netype/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netype
PORTVERSION= 0.1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/
DISTNAME= ${PORTNAME}-0.1.0
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 0ae59c31b7a1..0969a35f9e37 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ochusha
PORTVERSION= 0.5.8.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ochusha/16560
diff --git a/japanese/platex-japanese/Makefile b/japanese/platex-japanese/Makefile
index b7d92085b92a..78b21e010ce4 100644
--- a/japanese/platex-japanese/Makefile
+++ b/japanese/platex-japanese/Makefile
@@ -7,7 +7,7 @@
PORTNAME= japanese
PORTVERSION= 1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= language/japanese
diff --git a/japanese/platex-otf/Makefile b/japanese/platex-otf/Makefile
index e80a8ca09212..41b698436a9b 100644
--- a/japanese/platex-otf/Makefile
+++ b/japanese/platex-otf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= platex-otf
PORTVERSION= 1.2.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hrs
diff --git a/japanese/platex209/Makefile b/japanese/platex209/Makefile
index 74be9cbacc2c..c936c759813e 100644
--- a/japanese/platex209/Makefile
+++ b/japanese/platex209/Makefile
@@ -7,7 +7,7 @@
PORTNAME= platex209
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
DISTNAME= ${PORTNAME}
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 967ab4f29b77..b35b50589c11 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ptex
PORTVERSION= 3.1.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -28,7 +28,7 @@ BUILD_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
mktexlsr:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
@@ -120,7 +120,7 @@ pre-configure:
--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
- --with-pnglib-include=${LIBPNG_PREFIX}/include \
+ --with-pnglib-include=${LIBPNG_PREFIX}/include/libpng15 \
--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
--with-t1lib-include=${LIBT1_PREFIX}/include \
--without-xdvik --without-oxdvik \
diff --git a/japanese/ptex/files/patch-texk-pdftexdir-writepng.c b/japanese/ptex/files/patch-texk-pdftexdir-writepng.c
new file mode 100644
index 000000000000..1bc4ab625be7
--- /dev/null
+++ b/japanese/ptex/files/patch-texk-pdftexdir-writepng.c
@@ -0,0 +1,19 @@
+--- texk/web2c/pdftexdir/writepng.c.orig 2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writepng.c 2012-04-27 09:06:18.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+
+ static const char perforce_id[] =
+ "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/writepng.c#5 $";
+@@ -34,7 +35,7 @@
+ pdftex_fail("libpng: png_create_read_struct() failed");
+ if ((png_info(img) = png_create_info_struct(png_ptr(img))) == NULL)
+ pdftex_fail("libpng: png_create_info_struct() failed");
+- if (setjmp(png_ptr(img)->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr(img))))
+ pdftex_fail("libpng: internal error");
+ png_init_io(png_ptr(img), png_file);
+ png_read_info(png_ptr(img), png_info(img));
diff --git a/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c b/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c
new file mode 100644
index 000000000000..fa3b43fdc83e
--- /dev/null
+++ b/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c
@@ -0,0 +1,10 @@
+--- texk/web2c/pdftexdir/writeimg.c.orig 2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writeimg.c 2012-04-27 09:30:39.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+ #include <kpathsea/c-auto.h>
+ #include <kpathsea/c-memstr.h>
+
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 8c77887f7d4b..910ba00c328e 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-anthy
PORTVERSION= 1.2.7
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=scim-imengine/37309
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 91d6e608b496..16ce41586294 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-canna
PORTVERSION= 1.0.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/18849
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 9283246734b2..1986a936b56d 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-honoka-plugin-romkan
PORTVERSION= 0.9.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-plugin-romkan-${PORTVERSION}
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index a844646650e3..0701701e7064 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-honoka-plugin-wnn
PORTVERSION= 0.9.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-plugin-wnn-${PORTVERSION}
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 99393e2d1460..ea8c4b34db29 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-honoka
PORTVERSION= 0.9.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese
MASTER_SITES= http://nop.net-p.org/files/honoka/
DISTNAME= honoka-${PORTVERSION}
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index b31abae9c4cd..2ee23f213fe4 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-prime
PORTVERSION= 0.3.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/17192
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 434fd3133f51..2807df1b6cc2 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-skk
PORTVERSION= 0.5.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= scim-imengine/18121
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 49de49a67043..ab5f7277b972 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-tables
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index f4c6d3502c7f..0c980dc11812 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-tomoe
PORTVERSION= 0.6.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index be2aab1983c2..68b9c791937e 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-uim
PORTVERSION= 0.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \
http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index 6bcd005fda19..addca6a23d70 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -6,7 +6,7 @@
PORTNAME= teTeX
PORTVERSION= 1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese print
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/japanese/texfamily-vfn2a/Makefile b/japanese/texfamily-vfn2a/Makefile
index f3f954f22b36..44bde6789b24 100644
--- a/japanese/texfamily-vfn2a/Makefile
+++ b/japanese/texfamily-vfn2a/Makefile
@@ -6,7 +6,7 @@
PORTNAME= texfamily-vfn2a
PORTVERSION= 1.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/
DISTNAME= vftool-${PORTVERSION}
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 8e5770a9fe98..2884368abe5b 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -6,7 +6,7 @@
PORTNAME= texfamily
PORTVERSION= 1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
${MASTER_SITE_LOCAL}
@@ -32,7 +32,7 @@ BUILD_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
mktexlsr:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index f74c76a79985..8735a01e876e 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texinfo
PORTVERSION= 4.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 11e3c49cf61e..8eb4de0f6a38 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uim-tomoe-gtk
PORTVERSION= 0.6.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= japanese
MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile
index dc7d92843fd0..dfa6b888b465 100644
--- a/japanese/xdtp/Makefile
+++ b/japanese/xdtp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdtp
PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese
MASTER_SITES+= http://www.ongs.co.jp/projects/xdtp/
DISTNAME= xdtp-${PORTVERSION}
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 5c3c1c82ce0c..4dfcd5ebfdcd 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdvik
PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= japanese print
MASTER_SITES= SF/xdvi/OldFiles
PKGNAMESUFFIX= -tetex
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 225fc1d4dbe6..57a79b5ebdf6 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xjtext
PORTVERSION= 1.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= japanese
MASTER_SITES= http://plaza.harmonix.ne.jp/~onizuka/
DISTNAME= XJTEXT-${PORTVERSION}
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 4249c03415a9..e4b0236b0c90 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yc.el
PORTVERSION= 5.2.1
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= japanese elisp
MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index db6e0bb7715f..2d2f7bd301ad 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -6,7 +6,7 @@
PORTNAME= cacao
PORTVERSION= 0.98
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= java devel
MASTER_SITES= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 698d1699dc2b..ddfd0cf6c64b 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -8,7 +8,7 @@
PORTNAME= classpath
PORTVERSION= 0.97.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_GNU} \
${MASTER_SITE_SAVANNAH}
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index 951c7256c57f..dd1f238cd93d 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eclipse-devel
PORTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 8799ebc1375e..8663338e84b0 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= findbugs
DISTVERSION= 1.3.2.20080222
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= java devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20eclipse%20plugin/1.3.2
PKGNAMEPREFIX= eclipse-
diff --git a/java/eclipse-langpack/Makefile b/java/eclipse-langpack/Makefile
index 679df26e3ba0..7f3207ae7e3b 100644
--- a/java/eclipse-langpack/Makefile
+++ b/java/eclipse-langpack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eclipse
PORTVERSION= 3.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR= L-${PORTVERSION}_Language_Packs-200609210945
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 0e17655ed50a..65dbbb123310 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eclipse
PORTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index a6b260159566..0d798e8635f5 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icedtea-web
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java www
MASTER_SITES= http://icedtea.classpath.org/download/source/
diff --git a/java/jamvm/Makefile b/java/jamvm/Makefile
index 020c5ffc2db0..8643d75ded99 100644
--- a/java/jamvm/Makefile
+++ b/java/jamvm/Makefile
@@ -6,7 +6,7 @@
PORTNAME= jamvm
PORTVERSION= 1.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 17e8457fb471..9370d8aa8d37 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jc
PORTVERSION= 1.4.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= java
MASTER_SITES= SF/${PORTNAME}vm/JC%20source%20distribution/Release%20${PORTVERSION}
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index d3c716b7aabe..88af86e7ae3b 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jmp
PORTVERSION= 0.51
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= java devel
MASTER_SITES= http://www.khelekore.org/jmp/ \
http://www.klop.ws/~ronald/software-mirrors/
diff --git a/java/phpeclipse/Makefile b/java/phpeclipse/Makefile
index 51d1bd5421ee..4a01e5b368c4 100644
--- a/java/phpeclipse/Makefile
+++ b/java/phpeclipse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phpeclipse
PORTVERSION= 1.2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= java editors devel
MASTER_SITES= SF/${PORTNAME}/a%29%20Eclipse%203.3.x/PHPEclipse-${PORTVERSION}
DISTNAME= PHPEclipse-${PLIST_VER}-src
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 5ff3cecacaf2..91f8771db4dd 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sablevm-classpath
PORTVERSION= 1.13
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= java
MASTER_SITES= SF/sablevm/sablevm/${PORTVERSION}
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index e5fd80523678..f5d85305a6b7 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sablevm
PORTVERSION= 1.13
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= java devel
MASTER_SITES= SF
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index f2af6dd6aafc..de73a322df5c 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ami
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= korean x11
MASTER_SITES= http://kldp.net/frs/download.php/942/ \
http://www.kr.freebsd.org/~hwang/ami/:hjdic \
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 3809972e7521..9d1ed967bd80 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.8.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= korean x11
MASTER_SITES= ftp://ftp.holywar.net/pub/FreeBSD/ \
ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 9325c9a2636e..4b2415e387ba 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkcomm
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= korean comms
MASTER_SITES= http://kldp.net/frs/download.php/480/
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index 2118ff58e026..408808b7008c 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ibus-hangul
PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index 92c807c9e126..b6f2725379d0 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -7,6 +7,7 @@
PORTNAME= imhangul
PORTVERSION= 2.1.0
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index a9f4d2540b2c..8c0da8bbf42e 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= korean kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index 27006894402d..e526d9260e02 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= korean kde
MAINTAINER= kde@FreeBSD.org
diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile
index 915b2259465d..aaef04cf2312 100644
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ko.TeX
PORTVERSION= 0.1.1.20080329
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= korean print
MASTER_SITES= http://ftp.ktug.or.kr/KTUG/ko.TeX/current/
DISTNAME= ko.tex-macro-20080329
diff --git a/korean/man-doc/Makefile b/korean/man-doc/Makefile
index a3ce49553bdf..0480640ebfce 100644
--- a/korean/man-doc/Makefile
+++ b/korean/man-doc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= man
PORTVERSION= 021120
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= korean
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.freebsd.org/~perky/distfiles/
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index ca25713c6b9b..8dea3eae579c 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nabi
PORTVERSION= 0.99.11
+PORTREVISION= 1
CATEGORIES= korean gnome
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index d1beacd6f8cb..991bfb3a19bf 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-hangul
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile
index 32df7c8f7b8d..76ab65fb181c 100644
--- a/korean/scim-tables/Makefile
+++ b/korean/scim-tables/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-tables
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= korean
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index cad95185a566..3c5f323964ee 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -7,6 +7,7 @@
PORTNAME= algol68g
PORTVERSION= 2.3.5
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://jmvdveer.home.xs4all.nl/
EXTRACT_SUFX= .tgz
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index 835ebdcb221d..6121d8b8e20e 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -6,6 +6,7 @@
PORTNAME= basic256
PORTVERSION= 0.9.6.66
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kidbasic/basic256
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 2af3dfc89794..3b6ce5c7c832 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bigloo
PORTVERSION= 3.7a.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang scheme
MASTER_SITES= ftp://ftp-sop.inria.fr/indes/fp/Bigloo/
DISTNAME= ${PORTNAME}${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 301f8674e328..3ad3486ebfbe 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clisp
PORTVERSION= 2.49
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang lisp
MASTER_SITES= GNU/${PORTNAME}/release/${PORTVERSION}
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index ec0a4beb8af4..f85a10593c89 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -7,6 +7,7 @@
PORTNAME= units
PORTVERSION= 2.6.0
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= # none
PKGNAMEPREFIX= fpc-
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 0edb973ce61b..3a369a8d6a9b 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -173,7 +173,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
.if ${PKGNAMESUFFIX} == "-libpng"
. if defined(WITH_LIBPNG)
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
. endif
.endif
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 289ba94d6f0d..d39cd091f89b 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fsharp
PORTVERSION= 1.9.6.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= http://download.microsoft.com/download/F/7/4/F74A3170-261C-4E8F-B1A8-2E352C61A89B/
DISTNAME= fsharp
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index ef12f62339e1..f0b982267393 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gambas
PORTVERSION= 1.0.19
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= lang
MASTER_SITES= SF
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index ca7409f999c9..f0f98c9d93bf 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gjs
PORTVERSION= 0.7.7
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index a7ed03cb5b4c..9bd059329104 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -7,6 +7,7 @@
PORTNAME= harbour
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}-project/source/${PORTVERSION}
diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile
index 4b42b93c6124..1ef4228ca458 100644
--- a/lang/klogoturtle/Makefile
+++ b/lang/klogoturtle/Makefile
@@ -6,7 +6,7 @@
PORTNAME= klogoturtle
PORTVERSION= 0.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= lang kde
MASTER_SITES= http://klogoturtle.sourceforge.net/
diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile
index 328b985cba48..2ae47cb682c1 100644
--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kroc
PORTVERSION= 1.5.r6372
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= http://ftp.i-scream.org/pub/kroc/ \
ftp://ftp.i-scream.org/pub/kroc/
@@ -17,7 +17,7 @@ MAINTAINER= tdb@FreeBSD.org
COMMENT= The Kent Retargettable occam-pi Compiler
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
ONLY_FOR_ARCHS= i386
diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
index b2d9a618ae59..6f9bcc2915a8 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kturtle
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= lang kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile
index 7c2956b618ab..df8184ac7eac 100644
--- a/lang/lafontaine/Makefile
+++ b/lang/lafontaine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lafontaine
PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= lang
MASTER_SITES= http://www.nongnu.org/lafontaine/archives/
DISTNAME= ${PORTNAME}_0.4-1
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 3b2732e8aae4..5e7aa2466d59 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -6,7 +6,7 @@
PORTNAME= lush
PORTVERSION= 1.2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang
MASTER_SITES= SF
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index e65b2ca3ced7..83d0f7a04ae7 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mdk
PORTVERSION= 1.2.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNU:S/%SUBDIR%/${PORTNAME}\/v${PORTVERSION}/} \
SF
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index d3a556d856c5..e57b00e64ee4 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -12,7 +12,7 @@
PORTNAME= mlton
PORTVERSION= 20070826
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= lang
MASTER_SITES= http://mlton.org/pages/Download/attachments/ \
http://mlton.org/pages/Experimental/attachments/ \
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 7e8a08718e81..f482d0fd70a0 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nbc
PORTVERSION= 1.2.1.r4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= SF
MASTER_SITE_SUBDIR= bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/}
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 49b049b5fcfb..b1110225af49 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -7,7 +7,7 @@
PORTNAME= neko
PORTVERSION= 1.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang
MASTER_SITES= http://nekovm.org/_media/
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index 557481368414..25665eb905d2 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ofc
PORTVERSION= 0.8.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang
MASTER_SITES= http://ofc.dvoudheusden.net/download/
@@ -15,7 +15,7 @@ MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Objective-C Foundation Classes library
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2
@@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= GDBM "Add gdbm support" off \
@@ -41,7 +41,15 @@ LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 900000
-BROKEN= does not compile on FreeBSD 9.X
+# needs libobjc
+GCCSUFFIX=42
+CC= gcc${GCCSUFFIX}
+CXX= g++${GCCSUFFIX}
+OFC_GCC_PORT?= lang/gcc${GCCSUFFIX}
+TARGLIB!= (cd ${PORTSDIR}/${OFC_GCC_PORT} && make -V TARGLIB)
+LDFLAGS+= -L${TARGLIB}
+BUILD_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
+RUN_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
.endif
.include <bsd.port.post.mk>
diff --git a/lang/ofc/files/patch-DPNGImage.m b/lang/ofc/files/patch-DPNGImage.m
new file mode 100644
index 000000000000..87a3171f4380
--- /dev/null
+++ b/lang/ofc/files/patch-DPNGImage.m
@@ -0,0 +1,46 @@
+--- ofc/DPNGImage.m.orig 2008-08-20 19:16:29.000000000 +0200
++++ ofc/DPNGImage.m 2012-05-09 13:07:56.000000000 +0200
+@@ -30,6 +30,7 @@
+
+ #ifdef HAVE_DPNGIMAGE
+ #include "png.h"
++#include "pngpriv.h"
+ #endif
+
+
+@@ -346,7 +347,7 @@
+
+ if (ok)
+ {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+ ok = NO;
+@@ -485,7 +486,7 @@
+
+ if (ok)
+ {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+ ok = NO;
+@@ -553,7 +554,7 @@
+
+ pixels = _width;
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+ pixels = 0;
+@@ -599,7 +600,7 @@
+
+ png_structp png = (png_structp) _png;
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+ ok = NO;
diff --git a/lang/opa/Makefile b/lang/opa/Makefile
index 3b35e5b9b80a..5e089b114807 100644
--- a/lang/opa/Makefile
+++ b/lang/opa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opa
PORTVERSION= 0.9.2.${GITVER}
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://download.opalang.org/tar-gz/
DISTNAME= ${PORTNAME}_v${GITVER}
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 3a43ea4bfb2d..4dc46b543d81 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phantomjs
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 8f3007eb3912..461b407798f0 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -84,7 +84,7 @@ USE_OPENSSL= yes
.if ${PHP_MODNAME} == "gd"
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
. if !defined(WITHOUT_X11)
USE_XORG= xpm
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 010dd9806492..7d632a20e4b6 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -94,7 +94,7 @@ USE_OPENSSL= yes
.if ${PHP_MODNAME} == "gd"
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
. if !defined(WITHOUT_X11)
USE_XORG= xpm
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 072d7c11010c..6158dde43e88 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pike76
PORTVERSION= 7.6.112
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= lang
MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 104486e317f1..14ae7804608d 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
PORTNAME= q
PORTVERSION= 7.11
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}-lang/${PORTNAME}/${PORTVERSION}
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index d4e2816940f2..b0b17050c017 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -7,7 +7,7 @@
PORTNAME= racket
PORTVERSION= 5.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang scheme
MASTER_SITES= http://download.racket-lang.org/installers/${PORTVERSION}/${PORTNAME}/ \
http://www.eecs.northwestern.edu/racket/${PORTVERSION}/${PORTNAME}/ \
@@ -48,7 +48,7 @@ USE_GNOME= pango
LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi \
cairo.2:${PORTSDIR}/graphics/cairo \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
.if defined(WITH_RACKET_PLACES)
CONFIGURE_ARGS+= --enable-places
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 59f6b3b0f846..3b947eba91e7 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -10,6 +10,7 @@
PORTNAME= sbcl
PORTVERSION= 1.0.57
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang lisp
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 90bd2ffcdb6e..d6ceca50a8e3 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smalltalk
PORTVERSION= 3.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index b59b709da3eb..c871dcee428f 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sml-mode
PORTVERSION= 3.9.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang elisp
MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
${MASTER_SITE_LOCAL}
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 890bfb61fa7a..840d5c0c514d 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squeak
PORTVERSION= 4.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
##################################################
MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 56a9eb822dcc..9f004d41b29c 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= steptalk
PORTVERSION= 0.10.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= libs
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 0cfc7d4ad412..60aafd60b3b2 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tuareg-mode
PORTVERSION= 1.45.6
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= lang elisp
MASTER_SITES= http://www-rocq.inria.fr/~acohen/tuareg/mode/
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index 5ee81aa3d5ad..eb864a89daf6 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twelf
PORTVERSION= 1.5R1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang
MASTER_SITES= http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/
DISTNAME= twelf-1-5R1
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 4ca0b6653955..3f8b74d41083 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -8,7 +8,7 @@
PORTNAME= balsa
PORTVERSION= 2.4.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail gnome
MASTER_SITES= http://pawsa.fedorapeople.org/balsa/
DISTNAME= balsa-${PORTVERSION}
diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index 88808c471c9c..d610aa92e1e3 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= c-sig
PORTVERSION= 3.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= mail elisp
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= tota/${PORTNAME}
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 30f080817370..13c3b0345bd6 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= address_keeper
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index 7ee16a2a2088..0dbcfc90ddee 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= archiver
PORTVERSION= 0.6.11
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 81801d100d3d..5e04eb911223 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -7,6 +7,7 @@
PORTNAME= att_remover
PORTVERSION= 1.0.13
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 3c37041a72bd..f74eef20ceae 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -7,6 +7,7 @@
PORTNAME= attach_warner
PORTVERSION= 0.2.23
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 52bfd9822c0f..f8ac983f4c43 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bsfilter
PORTVERSION= 1.0.7
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index fbd36f43ff97..b0c78cc0afa4 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cachesaver
PORTVERSION= 0.10.9
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index f4b8a073bacf..0db07d4bfe0a 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clamd
PORTVERSION= 3.5.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 0433a40ddd46..8b335d90c4be 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fancy
PORTVERSION= 0.9.15
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index d7423b14e434..1533a34339da 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fetchinfo
PORTVERSION= 0.4.24
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index 2bb48b0e6858..0d9fd8b44d84 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdata
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index eaa494019dca..2d11de019d46 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkhtml2_viewer
PORTVERSION= 0.32
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 9d5a676cafac..ba33c94a6d43 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mailmbox
PORTVERSION= 1.14.6
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 022b1674cb06..75c2c9cb64bb 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= newmail
PORTVERSION= 0.0.15
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 01c485c35060..37a0c92035fe 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -7,6 +7,7 @@
PORTNAME= notification
PORTVERSION= 0.29
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 8530856b3b33..ff830a463b80 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= perl
PORTVERSION= 0.9.19
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 49f6a35ba765..43ca5bbb6516 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -7,6 +7,7 @@
PORTNAME= python
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index a3670a5538ec..718e808bdc2f 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rssyl
PORTVERSION= 0.32
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index cb3c3ad2971c..af4e499534f6 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -7,6 +7,7 @@
PORTNAME= spamreport
PORTVERSION= 0.3.15
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index bfe208860fcd..f33f35692632 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -7,7 +7,7 @@
PORTNAME= synce
PORTVERSION= 0.7.5
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index cc31c9f9b2b9..ebf0cfd49b42 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tnef
PORTVERSION= 0.3.12
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index f2c2236a86a0..290d0e7ea5ed 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vcalendar
PORTVERSION= 2.0.12
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ \
${MASTER_SITE_LOCAL}
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index ca03a4d27c50..7aadbe20d925 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,6 +7,7 @@
PORTNAME= claws-mail
PORTVERSION= 3.8.0
+PORTREVISION= 1
CATEGORIES= mail news ipv6
MASTER_SITES= SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
@@ -21,7 +22,7 @@ LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
freetype:${PORTSDIR}/print/freetype2 \
gcrypt:${PORTSDIR}/security/libgcrypt \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gnutls.47:${PORTSDIR}/security/gnutls \
execinfo:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index 0fa6c4b11ffd..0cd6b2d4686d 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clawsker
PORTVERSION= 0.7.7
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/tools/
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index 27a7d25c9c42..023cae7429f4 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= contact
PORTVERSION= 0.17
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail gnome
MASTER_SITES= http://www.burtonini.com/computing/
PKGNAMESUFFIX= -lookup-applet
diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index f7e6579edc78..9fbc019dc145 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -7,6 +7,7 @@
PORTNAME= davmail
PORTVERSION= 3.9.8
+PORTREVISION= 1
CATEGORIES= mail java
MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 972aa79600bd..bde991997c33 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emh
PORTVERSION= 1.14.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= mail elisp
MASTER_SITES= ftp://ring.aist.go.jp/pub/elisp/semi/semi-1.14-for-flim-1.14/ \
http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/semi/semi-1.14-for-flim-1.14/
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 74c51155689a..75273b7b9e05 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-exchange
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 6f13681987c5..298b0d209d4f 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -8,6 +8,7 @@
PORTNAME= evolution-mapi
PORTVERSION= 0.32.2
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b1e69749aae4..dfd99422defa 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 808bbbe19302..7e9a6dc469f1 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -9,7 +9,7 @@
PORTNAME= exmh
PORTVERSION= 2.7.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES+= mail tk
MASTER_SITES= ${MASTER_SITE_TCLTK} \
SF
diff --git a/mail/firetray/Makefile b/mail/firetray/Makefile
index 13780f11055c..1cb0ad8932c8 100644
--- a/mail/firetray/Makefile
+++ b/mail/firetray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= firetray
DISTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
diff --git a/mail/gkrellmmailwatch/Makefile b/mail/gkrellmmailwatch/Makefile
index abb6de9e81e7..3a28645c4498 100644
--- a/mail/gkrellmmailwatch/Makefile
+++ b/mail/gkrellmmailwatch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmmailwatch
PORTVERSION= 0.7.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= mailwatch-${PORTVERSION}
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index 771aa41b4e5f..3ec85b1e3f82 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gkrellmmailwatch
PORTVERSION= 2.4.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= gkrellm-mailwatch-${PORTVERSION}
diff --git a/mail/gmail-notify/Makefile b/mail/gmail-notify/Makefile
index 94d7868623a1..90d577063db4 100644
--- a/mail/gmail-notify/Makefile
+++ b/mail/gmail-notify/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmail-notify
PORTVERSION= 1.6.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/mail/gmime24-sharp/Makefile b/mail/gmime24-sharp/Makefile
index 4d6f931dd9b3..483b5540d7cb 100644
--- a/mail/gmime24-sharp/Makefile
+++ b/mail/gmime24-sharp/Makefile
@@ -6,7 +6,7 @@
# $Id: Makefile,v 1.17 2006/10/26 18:37:29 tmclau02 Exp $
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
PKGNAMESUFFIX= -24-sharp
diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
index fafe71278a6b..07e0ca0afb37 100644
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-gmail-notifier
PORTVERSION= 0.10.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail deskutils
MASTER_SITES= GOOGLE_CODE
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 310363ac92f5..0181e3682524 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnubiff
PORTVERSION= 2.2.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 8d20f506ba48..3dca0fbc4313 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kbiff
PORTVERSION= 4.0
+PORTREVISION= 1
CATEGORIES= mail kde
MASTER_SITES= SF
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index 3d0f0a974742..eacbd49997ef 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kcheckgmail
PORTVERSION= 0.5.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail kde
MASTER_SITES= http://www.yuanjue.net/download/
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index ee7eaa16ccee..206bc1cd39b5 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kshowmail
PORTVERSION= 4.1
+PORTREVISION= 1
CATEGORIES= mail kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20for%20KDE4/${PORTVERSION}
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index 5b6dc34bc4a5..b75f5ea641de 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mahogany
PORTVERSION= 0.67
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/Mahogany/${PORTVERSION}
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 68c74b4db88f..07d1dcfc7945 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mail-notification
DISTVERSION= 5.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= mailnotify
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 818dd0910ff9..6603ecf30737 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mailcrypt
PORTVERSION= 3.5.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/mailtray/Makefile b/mail/mailtray/Makefile
index c0dc275d5f0b..6ac85ca5cac2 100644
--- a/mail/mailtray/Makefile
+++ b/mail/mailtray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mailtray
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= mail python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index d5da6fff774e..0b7bdb5f938c 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mboxcheck-applet
PORTVERSION= 0.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail
MASTER_SITES= http://perso.orange.fr/seb128/fichiers/
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index dbcdf2684aa6..b06cd2f92f38 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= metamail
PORTVERSION= 2.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \
ftp://ftp.research.telcordia.com/pub/nsb/
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index d4a8d223daeb..324ed0ef42e3 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mew
PORTVERSION= 6.5
+PORTREVISION= 1
CATEGORIES= mail elisp
MASTER_SITES= http://www.mew.org/Release/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index 2b2da828f810..fd8981ac04d3 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mew
PORTVERSION= ${MEW_VER}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail elisp
MASTER_SITES= http://www.mew.org/Release/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index d25786f56e5b..4f8cb1b1e25d 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mew
PORTVERSION= ${MEW_VER}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail elisp
MASTER_SITES= http://www.mew.org/Release/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index 13eb1db9a935..cd814670eaad 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mmc
PORTVERSION= 0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail gnome
MASTER_SITES= SF
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index c48e7a047f2e..738265db0b4c 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= FuzzyOcr
DISTVERSION= 3.6.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail perl5
MASTER_SITES= http://users.own-hero.net/~decoder/${PORTNAME:L}/
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-FuzzyOcr/Makefile b/mail/p5-FuzzyOcr/Makefile
index a2a61fd4c391..983942ea0c0e 100644
--- a/mail/p5-FuzzyOcr/Makefile
+++ b/mail/p5-FuzzyOcr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= FuzzyOcr
DISTVERSION= 2.3b
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= mail perl5
MASTER_SITES= http://users.own-hero.net/~decoder/${PORTNAME:L}/
diff --git a/mail/p5-Mail-Graph/Makefile b/mail/p5-Mail-Graph/Makefile
index 917834917f54..a3142f41543a 100644
--- a/mail/p5-Mail-Graph/Makefile
+++ b/mail/p5-Mail-Graph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Mail-Graph
PORTVERSION= 0.14
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/qgmailnotifier/Makefile b/mail/qgmailnotifier/Makefile
index 88c943bea1e6..a69d3f21a3a7 100644
--- a/mail/qgmailnotifier/Makefile
+++ b/mail/qgmailnotifier/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qgmailnotifier
PORTVERSION= 2008.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://www.codef00.com/projects/
EXTRACT_SUFX= .tgz
diff --git a/mail/qmailmrtg7/Makefile b/mail/qmailmrtg7/Makefile
index 19373ebc256b..9866b4c82e1f 100644
--- a/mail/qmailmrtg7/Makefile
+++ b/mail/qmailmrtg7/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qmailmrtg7
PORTVERSION= 4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail net-mgmt
MASTER_SITES= http://www.inter7.com/qmailmrtg7/
diff --git a/mail/qmrtg/Makefile b/mail/qmrtg/Makefile
index be1dca31be18..e74c6a715487 100644
--- a/mail/qmrtg/Makefile
+++ b/mail/qmrtg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qmrtg
PORTVERSION= 2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail net-mgmt
MASTER_SITES= http://dev.publicshout.org/qmrtg/download/
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index 6559d33673a5..5d140b9494d1 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quickml
PORTVERSION= 0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail
MASTER_SITES= http://0xcc.net/quickml/
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 56d95f7ab336..93642b4b4dbb 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -14,7 +14,7 @@
PORTNAME= spamprobe
PORTVERSION= 1.4d
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= SF
@@ -56,7 +56,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.endif
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 6518b0be0b89..cd4a0eedcad1 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sylpheed
PORTVERSION= 3.1.4
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \
CRITICAL
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index c19b8bf8aa5a..2fd03186bb17 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -8,7 +8,7 @@
PORTNAME= thunderbird-dictionaries
PORTVERSION= 20060220
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZDEV}
MASTER_SITE_SUBDIR= dictionaries
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 13d37d24766a..f59c1f44cfdf 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thunderbird
DISTVERSION= 10.0.4
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 5f8eca56dd27..caad57924315 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thunderbird
DISTVERSION= 12.0.1
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 16ecfb0fdbb0..283494a7d8fe 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vm
PORTVERSION= 8.1.2
+PORTREVISION= 1
CATEGORIES= mail elisp
MASTER_SITES= https://launchpad.net/${PORTNAME}/8.1.x/${PORTVERSION}/+download/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index df2d1c038926..f167de40a034 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wanderlust
PORTVERSION= 2.15.9.b.${SNAPDATE}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail elisp
MASTER_SITES= http://www.jpl.org/elips/wl/snapshots/ \
${MASTER_SITE_LOCAL}
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index b92b0440795f..44455dac96f8 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wanderlust
PORTVERSION= 2.14.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index 8f2434b6acc7..2c120a29f805 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= x-face-e21
PORTVERSION= 20070306
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail elisp
MASTER_SITES= http://www.jpl.org/elips/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile
index 85b68f95b65c..3b196535e40e 100644
--- a/mail/xcite/Makefile
+++ b/mail/xcite/Makefile
@@ -7,8 +7,8 @@
PORTNAME= xcite
PORTVERSION= 1.60
-#PORTREVISION= 0
-PORTREVISION= 4
+PORTREVISION= 1
+PORTREVISION= 5
CATEGORIES= mail elisp
MASTER_SITES= http://www.gentei.org/~yuuji/software/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index b81bcec0970a..05fc57ff23d1 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.1.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= mail xfce
MASTER_SITES= http://spuriousinterrupt.org/files/mailwatch/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 36111a23f6ba..e518bda271d8 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= PDL
PORTVERSION= 2.4.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math perl5
MASTER_SITES= CPAN/${PORTNAME}:cpan \
SF/pdl/PDL/${PORTVERSION}:sf
diff --git a/math/R/Makefile b/math/R/Makefile
index 783d372ce6a7..a8fc70849dd7 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -8,6 +8,7 @@
PORTNAME?= R
PORTVERSION= 2.15.0
+PORTREVISION= 1
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@@ -178,7 +179,7 @@ PLIST_SUB+= PANGOCAIRO=""
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-libpng
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-libpng
.endif
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index de3de436ff39..568aff55db28 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -6,7 +6,7 @@
PORTNAME= abakus
PORTVERSION= 0.91
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= math kde
MASTER_SITES= http://purinchu.net/abakus/ \
http://www.athame.co.uk/mirror/
diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index 5e2fe5a349be..cc4fd5263c54 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alt-ergo
PORTVERSION= 0.94
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://alt-ergo.lri.fr/http/ LOCAL/bf
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 3b1d509e6d2f..feabe6852c7a 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asymptote
PORTVERSION= 2.15
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
SF/${PORTNAME}/${PORTNAME}/old/${PORTVERSION}
diff --git a/math/bargraph/Makefile b/math/bargraph/Makefile
index 43c5c9b3f672..c55c5725f34f 100644
--- a/math/bargraph/Makefile
+++ b/math/bargraph/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bargraph
PORTVERSION= 4.7
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://bargraphgen.googlecode.com/files/
DISTNAME= bargraphgen-${PORTVERSION}
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 0e18309f6bde..9ae11ad5fc63 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -8,7 +8,7 @@
PORTNAME= biggles
PORTVERSION= 1.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF
DISTNAME= python2-${PORTNAME}-${PORTVERSION}
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index b508ce520fe9..28935d5c10ce 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -8,7 +8,7 @@
PORTNAME= blitz++
PORTVERSION= 0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MASTER_SITES= SF/blitz/blitz/Blitz%2B%2B%20${PORTVERSION}
DISTNAME= blitz-${PORTVERSION}
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 3f3bc4eace06..ec855c3863c4 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -6,7 +6,7 @@
PORTNAME= calcoo
PORTVERSION= 1.3.18
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 3392a72c5770..e27ba78dc33b 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cantor
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 0b62f00affe8..7994d728e1dd 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= convertall
PORTVERSION= 0.5.1b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= BERLIOS
DISTFILES= ${PORTNAME}-${PORTVERSION:S/b//}${EXTRACT_SUFX} \
diff --git a/math/coq/Makefile b/math/coq/Makefile
index f95ebd3f83ae..03ce68ca9707 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -7,6 +7,7 @@
PORTNAME= coq
PORTVERSION= 8.3.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math
MASTER_SITES= http://coq.inria.fr/distrib/V${COQVERSION}/files/ \
diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index 8131a2b797ef..b3789bbf201c 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= digitizer
PORTVERSION= 4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math graphics
MASTER_SITES= SF/${PORTNAME}/Engauge%20Digitizer/${PORTNAME}-${PORTVERSION}
DISTNAME= digit-src-${PORTVERSION:S/./_/}
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 3895ba2ba53f..a3f05ebe89aa 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drgeo
PORTVERSION= 1.1.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= math
MASTER_SITES= SF/ofset/${PORTNAME}/${PORTVERSION}
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 62b651a7643b..8161aa1b5d2f 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -6,6 +6,7 @@
PORTNAME= dynare
PORTVERSION= 4.2.5
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www.dynare.org/download/dynare-4.2/source/${DISTNAME}.tar.gz/at_download/file
diff --git a/math/emacs-calc/Makefile b/math/emacs-calc/Makefile
index a42506511444..010930b7bcdb 100644
--- a/math/emacs-calc/Makefile
+++ b/math/emacs-calc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= calc
PORTVERSION= 2.02f
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 0f400a2f3486..f28f2e68cf46 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ess
DISTVERSION= 12.04-2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/
EXTRACT_SUFX= .tgz
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 9ed0f4aff1ba..059ddb80847b 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eukleides
PORTVERSION= 1.5.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= http://www.eukleides.org/files/
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 888e3a2b2820..6525caefa324 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fityk
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF \
SF/xylib:xylib
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 32ad006dadda..b314b24d8747 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= FreeMat
PORTVERSION= 4.0
DISTVERSIONSUFFIX= -Source
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math science
MASTER_SITES= SF
MASTER_SITE_SUBDIR= freemat/FreeMat4
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 2c46cc4b867d..d32a1d56d005 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -6,7 +6,7 @@
PORTNAME= fung-calc
PORTVERSION= 1.3.2b
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= math kde
MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 06a9b36f5ec4..f20de42a6e85 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galculator
PORTVERSION= 1.3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 75b9bcafbe96..7d5483c0ab7b 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gambit
PORTVERSION= 0.2010.09.01
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index d89083ead85f..d5c2c098a634 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gcalctool
PORTVERSION= 5.32.2
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
diff --git a/math/gdcalc/Makefile b/math/gdcalc/Makefile
index ef32aadad745..f3e22380d402 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdcalc
PORTVERSION= 2.15
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math
MASTER_SITES= http://bhepple.freeshell.org/dcalc/unix/
diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile
index c771cf1b0c96..152249d86fcb 100644
--- a/math/ggobi/Makefile
+++ b/math/ggobi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ggobi
PORTVERSION= 2.1.9
+PORTREVISION= 1
CATEGORIES= math graphics
MASTER_SITES= http://www.ggobi.org/downloads/
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index f41b6b57a1b2..7d6939a93d10 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= giacxcas
PORTVERSION= 0.9.5
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp-fourier.ujf-grenoble.fr/linux/xcas/freebsd/ \
http://people.math.jussieu.fr/~han/xcas/sources/
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 6912ddc1a02d..c05c6a2ed86d 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -9,6 +9,7 @@
PORTNAME= gnumeric
PORTVERSION= 1.10.17
+PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 58562a6b6235..e11fe45a0691 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuplot371+
PORTVERSION= 1.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math japanese graphics
MASTER_SITES= SF/gnuplot/gnuplot/3.7.1 \
http://www.yama-ga.com/gnuplot/:patch \
@@ -20,7 +20,7 @@ EXTRACT_ONLY= gnuplot-3.7.1.tar.gz
MAINTAINER= nakaji@jp.freebsd.org
COMMENT= A command-driven interactive function plotting program
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
VFlib2.24:${PORTSDIR}/japanese/vflib
USE_XORG= x11
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 74ae3e333e15..ca84a564e3e8 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuplot
PORTVERSION= 4.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= SF
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 27bba392a14a..737a7995bd21 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grace
PORTVERSION= 5.1.22
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math print
#
MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
@@ -22,7 +22,7 @@ COMMENT= A powerful plotting tool (successor of xmgr)
LIB_DEPENDS= t1:${PORTSDIR}/devel/t1lib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
fftw.2:${PORTSDIR}/math/fftw \
pdf.6:${PORTSDIR}/print/pdflib \
diff --git a/math/grace/files/patch-src-rstdrv.c b/math/grace/files/patch-src-rstdrv.c
new file mode 100644
index 000000000000..c48c18824399
--- /dev/null
+++ b/math/grace/files/patch-src-rstdrv.c
@@ -0,0 +1,19 @@
+--- src/rstdrv.c.orig 2004-07-03 22:47:46.000000000 +0200
++++ src/rstdrv.c 2012-04-27 20:54:10.000000000 +0200
+@@ -54,6 +54,7 @@
+
+ #ifdef HAVE_LIBPNG
+ # include <png.h>
++# include <zlib.h>
+ #endif
+
+ #ifndef NONE_GUI
+@@ -885,7 +886,7 @@
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return;
+ }
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index 80c363e7d095..dd2d81053e37 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -8,7 +8,7 @@
PORTNAME= graphthing
PORTVERSION= 1.3.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math
MASTER_SITES= http://graph.seul.org/
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 3583551a8d43..86beff0e5375 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gretl
PORTVERSION= 1.9.8
+PORTREVISION= 1
CATEGORIES= math finance
MASTER_SITES= SF
diff --git a/math/gri/Makefile b/math/gri/Makefile
index d44860c15a88..645d3c16dfcc 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gri
PORTVERSION= 2.12.18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index f1c9199d58ef..20a71f76075c 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guppi
PORTVERSION= 0.40.3
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= math gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/Guppi/0.40
diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile
index bec38f8f6e35..93a112a907d6 100644
--- a/math/k3dsurf/Makefile
+++ b/math/k3dsurf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3dsurf
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_Linux/${PORTVERSION}
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index a8fa41a26bde..1018e7d0f4ba 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kalgebra
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
index a157dd61974a..01b2923b6cfe 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kbruch
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/kig/Makefile b/math/kig/Makefile
index 097196cd91fb..e7d67abb3827 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kig
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
index b009c53d5190..2abb766a83dd 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kmplot
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 20bf60cc0a61..5ee5fca496e4 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koctave
PORTVERSION= 0.70
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math kde
MASTER_SITES= SF
diff --git a/math/kseg/Makefile b/math/kseg/Makefile
index 73dc2e20d9da..83686ff322a6 100644
--- a/math/kseg/Makefile
+++ b/math/kseg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kseg
PORTVERSION= 0.403
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= math graphics
MASTER_SITES= http://www.mit.edu/~ibaran/
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 0d38cde9aa4b..10f353b14ae2 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= LabPlot
PORTVERSION= 1.6.0.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= math kde
MASTER_SITES= SF
diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile
index 0e725b59a0bf..98c0888b208b 100644
--- a/math/lybniz/Makefile
+++ b/math/lybniz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lybniz
PORTVERSION= 1.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}2/${PORTNAME}/${PORTVERSION}
diff --git a/math/matrices/Makefile b/math/matrices/Makefile
index 914fb0e53a1d..f9aaf22bf238 100644
--- a/math/matrices/Makefile
+++ b/math/matrices/Makefile
@@ -7,7 +7,7 @@
PORTNAME= matrices
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math
MASTER_SITES= http://mplus.dk/${PORTNAME}/
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index ad470343cc5a..900a097d2c2c 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -7,7 +7,7 @@
PORTNAME= maxima
PORTVERSION= 5.27.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math lisp tk
MASTER_SITES= SF/maxima/Maxima-source/${PORTVERSION}-source
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index b669505adf74..b365ba121ee3 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mbasecalc
PORTVERSION= 1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MASTER_SITES= http://www.muquit.com/muquit/software/mbasecalc/
DISTNAME= ${PORTNAME}
diff --git a/math/naturalmath/Makefile b/math/naturalmath/Makefile
index f6a5bf81e94a..4d32d31b9a96 100644
--- a/math/naturalmath/Makefile
+++ b/math/naturalmath/Makefile
@@ -7,7 +7,7 @@
PORTNAME= naturalmath
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math
MASTER_SITES= http://www.math.missouri.edu/~stephen/naturalmath/
diff --git a/math/ocaml-ocamlgraph/Makefile b/math/ocaml-ocamlgraph/Makefile
index 20679dcfdab7..ca7e57064c5b 100644
--- a/math/ocaml-ocamlgraph/Makefile
+++ b/math/ocaml-ocamlgraph/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ocamlgraph
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ocamlgraph.lri.fr/download/
PKGNAMEPREFIX= ocaml-
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index 48f88fc87b5f..f5f39de0857a 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-actuarial
PORTVERSION= 1.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-ad/Makefile b/math/octave-forge-ad/Makefile
index a0229b1a9154..ac3e92a1e379 100644
--- a/math/octave-forge-ad/Makefile
+++ b/math/octave-forge-ad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-ad
PORTVERSION= 1.0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index 7b5b976428f5..d09e52c3ee26 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-audio
PORTVERSION= 1.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index 1d7cdef8187b..e179279d86e2 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-base
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= #none
DISTFILES= #none
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index d5c3fa750146..2138c449477c 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-bim
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index da768b8038fc..4ea56ace6e9b 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-bioinfo
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index 38ca39d2c04a..3d7ffcdadd48 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-civil-engineering
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-combinatorics/Makefile b/math/octave-forge-combinatorics/Makefile
index 16c31e0fbcb2..e9b06037f9d9 100644
--- a/math/octave-forge-combinatorics/Makefile
+++ b/math/octave-forge-combinatorics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-combinatorics
PORTVERSION= 1.0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index 36cf06345686..254686fa3a34 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-communications
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index 02706020d3e1..4c8fbc245c4f 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-control
PORTVERSION= 2.3.50
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index 98409a69c824..22765e222236 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-data-smoothing
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 9c65d011f761..7e379ad430b6 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-dataframe
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index 9c994e169805..caea15e526f2 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-dicom
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index fd4740ef8904..5793fc612b8c 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-econometrics
PORTVERSION= 1.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-engine/Makefile b/math/octave-forge-engine/Makefile
index a07a6978cb99..14dc4876a5c2 100644
--- a/math/octave-forge-engine/Makefile
+++ b/math/octave-forge-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-engine
PORTVERSION= 1.0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 8b855939e2db..d2b94f01740e 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-fenv
PORTVERSION= 0.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index bfb3e304f1e3..fec492bb38e6 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-financial
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 919863c9fb96..56c2dabcece3 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-fits
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
index 1abac0996efa..8ce43b96d08d 100644
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-fl-core
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index d5efb5af300b..86051a4bbbb3 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-fpl
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index f918aa31abe5..426df56b00cc 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-fuzzy-logic-toolkit
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index fed9d73fb399..1b03d16cd1b2 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-ga
PORTVERSION= 0.10.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 0f7c4e89c85a..8ba48f89757e 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-general
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index 7145892e1050..1dee4ba5ad6d 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-generate_html
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 4bc098e7fcf9..7e5a2c9aec7c 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-geometry
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index bd2d1ce32e87..a5ff611086ac 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-gnuplot
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 2e662ebf0452..ade0c40defee 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-gsl
PORTVERSION= 1.0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index 2ca56df7c8ab..d4f16dc54fdc 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-ident
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 0668c860c0ff..d1d334092ae2 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-image
PORTVERSION= 1.0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index 2f42dbca5043..8428824b3c57 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-informationtheory
PORTVERSION= 0.1.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index ec9ae3e03915..9eadc4c7537e 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-integration
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index ea94be3f2f27..fc4235b61d9b 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-io
PORTVERSION= 1.0.18
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 2a2c7c8527e2..162f96713bf4 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-irsa
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index a093caa37fa0..b690d5cd5a38 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-mapping
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index b07d0bae4b68..2ab3011b4e50 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-mechanics
PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index 355e6dfc961e..1ef4721712e4 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-miscellaneous
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index c14fa0fb7942..9f3d538154aa 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-missing-functions
PORTVERSION= 1.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index 8f78deb703c3..c0367d5b460e 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-msh
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index 37ae544d84fd..77619811723b 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-multicore
PORTVERSION= 0.2.15
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index 7cbd1aa60269..073dccc7d380 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-nan
PORTVERSION= 2.5.5
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 1fde28b73f5a..a06ec1e39820 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-nlwing2
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 4d86cf6d736c..34d9279b96e1 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-nnet
PORTVERSION= 0.1.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index a4a2bfedd44b..0fe5e0969d70 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-nurbs
PORTVERSION= 1.3.6
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile
index dd47f7ff45c2..9a5516adbf9f 100644
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-ocs
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index 95a15968dbd3..3e448fb58d72 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-oct2mat
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile
index 991eb7cbd4c7..143155c7834c 100644
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-octcdf
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index 8133ee029c78..f6938616cada 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-octclip
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-octgpr/Makefile b/math/octave-forge-octgpr/Makefile
index 3af51b0afca2..b8328347dac8 100644
--- a/math/octave-forge-octgpr/Makefile
+++ b/math/octave-forge-octgpr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-octgpr
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 1447da926336..93104470479a 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-octproj
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index ee901d393371..17a3caa14f19 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-odebvp
PORTVERSION= 1.0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-odepkg/Makefile b/math/octave-forge-odepkg/Makefile
index e2907da1e8ea..2d7e95461831 100644
--- a/math/octave-forge-odepkg/Makefile
+++ b/math/octave-forge-odepkg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-odepkg
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 4f9a7e5c8315..08020aa06393 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-optim
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index b406aecc303d..c6aad2cd81c4 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-optiminterp
PORTVERSION= 0.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-outliers/Makefile b/math/octave-forge-outliers/Makefile
index ee3ab60bd58f..560c3c5acd48 100644
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-outliers
PORTVERSION= 0.13.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index 3af0589ceb53..dce1b0bb87e6 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-parallel
PORTVERSION= 2.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-pdb/Makefile b/math/octave-forge-pdb/Makefile
index 4c9f0bb8f58f..05fe1a50c524 100644
--- a/math/octave-forge-pdb/Makefile
+++ b/math/octave-forge-pdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-pdb
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-physicalconstants/Makefile b/math/octave-forge-physicalconstants/Makefile
index 91dc0507c07e..41ff2c0b1fc0 100644
--- a/math/octave-forge-physicalconstants/Makefile
+++ b/math/octave-forge-physicalconstants/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-physicalconstants
PORTVERSION= 0.1.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index 9374c1a3d5d6..c6ec77198a55 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-plot
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-pt_br/Makefile b/math/octave-forge-pt_br/Makefile
index cb9c7c5ca7ab..72d944f4e45e 100644
--- a/math/octave-forge-pt_br/Makefile
+++ b/math/octave-forge-pt_br/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-pt_br
PORTVERSION= 1.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index ddc488ce41d7..63b14888a8aa 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-quaternion
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index 9c71cd1fe15b..1d3b8480e05e 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-queueing
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index c4217affb437..0d1192f61e67 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-secs1d
PORTVERSION= 0.0.9
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-secs2d/Makefile b/math/octave-forge-secs2d/Makefile
index cad9ebe33374..ff4eea68da77 100644
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-secs2d
PORTVERSION= 0.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index 5a74edf426b6..da9aeada9702 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-secs3d
PORTVERSION= 0.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index 09791aa42417..2dd509f5661e 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-signal
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-simp/Makefile b/math/octave-forge-simp/Makefile
index 6d510f2391bc..f1f48adcccab 100644
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-simp
PORTVERSION= 1.1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index 891d95ea4c79..ade066c46ef2 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-sockets
PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index f68cc665322e..5e4caa9c4787 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-specfun
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-special-matrix/Makefile b/math/octave-forge-special-matrix/Makefile
index b8a425b25a5f..1eed6753f032 100644
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-special-matrix
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-spline-gcvspl/Makefile b/math/octave-forge-spline-gcvspl/Makefile
index c0e0894d95d9..0f7cc8e30620 100644
--- a/math/octave-forge-spline-gcvspl/Makefile
+++ b/math/octave-forge-spline-gcvspl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-spline-gcvspl
PORTVERSION= 1.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index db309831edbd..498753dd26f4 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-splines
PORTVERSION= 1.0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index 607264293f6b..3107cf5162a4 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-statistics
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index 208bd61147df..d605f51f6325 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-strings
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index 8dd73515efae..f0155d8969f3 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-struct
PORTVERSION= 1.0.10
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-symband/Makefile b/math/octave-forge-symband/Makefile
index 140633268235..fa1097b33986 100644
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-symband
PORTVERSION= 1.0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index c3f06c248dda..22e5d12c2a84 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-symbolic
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-tcl-octave/Makefile b/math/octave-forge-tcl-octave/Makefile
index 6cf89457cb97..69e0c37afca2 100644
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-tcl-octave
PORTVERSION= 0.1.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index 1222b6195f44..a5355c5c4fd0 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge-tsa
PORTVERSION= 4.2.4
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index 93d86f03083f..d9f14f243cbe 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-video
PORTVERSION= 1.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-xraylib/Makefile b/math/octave-forge-xraylib/Makefile
index a8bb1e5391b0..a13abb103e84 100644
--- a/math/octave-forge-xraylib/Makefile
+++ b/math/octave-forge-xraylib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-xraylib
PORTVERSION= 1.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index a79a78cf9cd5..57a00623d319 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= octave-forge-zenity
PORTVERSION= 0.5.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 2177cbf59980..6675f0ad0573 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave-forge
PORTVERSION= 20120418
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= #none
DISTFILES= #none
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 6d15f45bda37..3358483b647e 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= octave
PORTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.gnu.org/gnu/octave/ \
ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index fa8677ce2ade..084307052ea2 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Statistics-R
PORTVERSION= 0.27
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FANGLY
diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile
index 079eb3db9809..232eb595af60 100644
--- a/math/pgcalc/Makefile
+++ b/math/pgcalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pgcalc2
DISTVERSION= 2.2-10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math kde
MASTER_SITES= http://www.pgcalc.net/
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 1a5fa9defe31..c711fdde304b 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ploticus
PORTVERSION= 2.40
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF
DISTNAME= pl${PORTVERSION:S/.//}src
@@ -19,7 +19,7 @@ COMMENT?= Generates plots and graphs from data
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg \
ming.5:${PORTSDIR}/graphics/ming \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 8c048bff9b93..90b51b7cde87 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -7,6 +7,7 @@
PORTNAME= proofgeneral
PORTVERSION= 4.1
+PORTREVISION= 1
CATEGORIES= math elisp
MASTER_SITES= http://proofgeneral.inf.ed.ac.uk/releases/
PKGNAMESUFFIX= -${EMACS_NAME}
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 492661ec09b0..0966e33dfdf4 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pspp
PORTVERSION= 0.6.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= math
MASTER_SITES= GNU
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 1a33dc0125be..0523d96bbbf8 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -8,7 +8,7 @@
PORTNAME= basemap
PORTVERSION= 0.9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math python
MASTER_SITES= SF/matplotlib/matplotlib-toolkits/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index e3ed912b5be6..3b24f047155e 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuplot
PORTVERSION= 1.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= SF/${PORTNAME}-py/Gnuplot-py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-graphtool/Makefile b/math/py-graphtool/Makefile
index 2faf8ff618cc..13f3d2c7daca 100644
--- a/math/py-graphtool/Makefile
+++ b/math/py-graphtool/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graphtool
PORTVERSION= 2.2.12
+PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= http://downloads.skewed.de/graph-tool/
DISTNAME= graph-tool-${PORTVERSION}
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 1de4c9624142..7c71f3f0a82a 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= matplotlib
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
@@ -102,8 +102,6 @@ post-extract:
# bsd.tcl.mk doesn't set TK_VER, so we use TCL_VER instead
post-patch:
- ${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \
- ${WRKSRC}/src/_png.cpp
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-e 's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g' \
-e 's|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g' \
diff --git a/math/py-matplotlib/files/patch-_png.cpp b/math/py-matplotlib/files/patch-_png.cpp
new file mode 100644
index 000000000000..cfa0202a92c0
--- /dev/null
+++ b/math/py-matplotlib/files/patch-_png.cpp
@@ -0,0 +1,23 @@
+--- src/_png.cpp.orig 2010-10-12 18:14:42.000000000 +0200
++++ src/_png.cpp 2012-05-06 06:33:48.000000000 +0200
+@@ -20,6 +20,7 @@
+ # include "Python.h"
+
+ # include <png.h>
++# include <pngpriv.h>
+ #endif
+
+ // TODO: Un CXX-ify this module
+@@ -459,10 +460,10 @@
+
+ //free the png memory
+ png_read_end(png_ptr, info_ptr);
+-#ifndef png_infopp_NULL
++#ifndef NULL
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ #else
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ #endif
+ if (close_file)
+ {
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 872b0330e5ba..3443a4e466c2 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qalculate
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-gtk/${PORTNAME}-gtk-${PORTVERSION}
DISTNAME= ${PORTNAME}-gtk-${PORTVERSION}
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 83f16238049c..31a1b0d135e4 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtiplot
DISTVERSION= 0.9.8.9
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
PKGNAMESUFFIX= -doc
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index a4ad3a7e2be1..ec32ab95b52b 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtiplot
DISTVERSION= 0.9.8.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math science
MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
@@ -15,7 +15,8 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= An Origin clone for data analysis and scientific plotting
BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl \
+ png15:${PORTSDIR}/graphics/png
# use bundled modified libraries
# qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
# qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c b/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c
new file mode 100644
index 000000000000..3473b168685c
--- /dev/null
+++ b/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c
@@ -0,0 +1,10 @@
+--- 3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c.orig 2011-08-23 11:57:54.000000000 +0200
++++ 3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c 2012-05-09 13:20:35.000000000 +0200
+@@ -48,6 +48,7 @@
+
+ #if defined(GL2PS_HAVE_LIBPNG)
+ #include <png.h>
++#include <zlib.h>
+ #endif
+
+ /*********************************************************************
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 92eb75f92bc6..61e13b2f99cf 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtoctave
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://forja.rediris.es/frs/download.php/1760/
diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 31c907668961..3339208fac8d 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qwtplot3d
PORTVERSION= 0.2.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF
PKGNAMESUFFIX= -qt4
diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
index 30ac227f3167..1a59e1f13a82 100644
--- a/math/qwtplot3d/Makefile
+++ b/math/qwtplot3d/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qwtplot3d
PORTVERSION= 0.2.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index d8f276b94078..cb87c3cc0e88 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rocs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 27f13091e423..7081fbb5b240 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpy
PORTVERSION= 1.0.3
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= math
MASTER_SITES= SF
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index a36a869eadab..d9ccfff45ba8 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpy2
PORTVERSION= 2.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= CHEESESHOP \
SF
diff --git a/math/saga/Makefile b/math/saga/Makefile
index aba540ee43ee..67305cab816b 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= saga
PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/sage/Makefile b/math/sage/Makefile
index a591d80a7e94..7bfd2f40b4e7 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sage
PORTVERSION= 5.0
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \
http://mirrors.xmission.com/sage/src/ \
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index 813f807aa102..a27203b9ed9a 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sivp
DISTVERSION= 1.0.0.r286
+PORTREVISION= 1
CATEGORIES= math graphics multimedia
MASTER_SITES= LOCAL/makc
PKGNAMEPREFIX= scilab-toolbox-
diff --git a/math/sedumi/Makefile b/math/sedumi/Makefile
index ccee5638a0cb..4a61c31fef43 100644
--- a/math/sedumi/Makefile
+++ b/math/sedumi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sedumi
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/sedumi|}
# http://sedumi.mcmaster.ca/
diff --git a/math/slgrace/Makefile b/math/slgrace/Makefile
index 087be1170eb8..5920449c4527 100644
--- a/math/slgrace/Makefile
+++ b/math/slgrace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slgrace
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v${SLANG_VER}/modules/grace/ \
ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${SLANG_VER}/modules/grace/ \
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index ef5b56ff2322..25b88713db19 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= speedcrunch
DISTVERSION= 0.10.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/math/ump/Makefile b/math/ump/Makefile
index f4294e6b20fc..a8ca210c283f 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ump
PORTVERSION= 0.8.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math
MASTER_SITES= SF/u-m-p/u-m-p/${PORTVERSION}
diff --git a/math/vtk-python/Makefile b/math/vtk-python/Makefile
index eb75b0d432d3..86997e055668 100644
--- a/math/vtk-python/Makefile
+++ b/math/vtk-python/Makefile
@@ -11,6 +11,7 @@ PKGNAMESUFFIX= -python
COMMENT= The Visualization Toolkit Python libs
LIB_DEPENDS= vtkCommon.${LIBVER}:${PORTSDIR}/math/vtk \
+ png15:${PORTSDIR}/graphics/png \
tcl84:${PORTSDIR}/lang/tcl84 \
tk84:${PORTSDIR}/x11-toolkits/tk84
@@ -39,7 +40,7 @@ CMAKE_DEFS= -DVTK_WRAP_PYTHON:BOOL=ON \
-DJPEG_LIBRARY:PATH=${LOCALBASE}/lib/libjpeg.so \
-DJPEG_INCLUDE_DIR:PATH=${LOCALBASE}/include \
-DPNG_LIBRARY:PATH=${LOCALBASE}/lib/libpng.so \
- -DPNG_INCLUDE_DIR:PATH=${LOCALBASE}/include \
+ -DPNG_INCLUDE_DIR:PATH=${LOCALBASE}/include/libpng15 \
-DTIFF_LIBRARY:PATH=${LOCALBASE}/lib/libtiff.so \
-DTIFF_INCLUDE_DIR:PATH=${LOCALBASE}/include \
-DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDE_DIR} \
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index 22207bffadfd..0bebaafe2569 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -15,7 +15,7 @@
PORTNAME= vtk
PORTVERSION= 4.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math graphics
MASTER_SITES= http://ovt.irfu.se/vtk/files/
DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz
@@ -49,7 +49,7 @@ BUILD_DEPENDS+= ${CMAKE}:${PORTSDIR}/devel/cmake
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
.if defined(WITH_TESTING) && (!defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-java")
@@ -132,8 +132,6 @@ do-configure:
patch-common:
@${FIND} ${VTKSRCDIR} -name "*.cxx" | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc.h|stdlib.h|g'
- @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${VTKSRCDIR}/IO/vtkPNGReader.cxx
@${REINPLACE_CMD} -E 's|lib/vtk\)|lib\)|g' \
${VTKSRCDIR}/vtkGenerateVTKConfig.cmake
.if defined(WRAP)
diff --git a/math/vtk/files/patch-vtkPNGReader.cxx b/math/vtk/files/patch-vtkPNGReader.cxx
new file mode 100644
index 000000000000..4ad23950beb5
--- /dev/null
+++ b/math/vtk/files/patch-vtkPNGReader.cxx
@@ -0,0 +1,20 @@
+--- IO/vtkPNGReader.cxx.orig 2012-05-06 13:44:56.000000000 +0200
++++ IO/vtkPNGReader.cxx 2012-05-06 13:46:04.000000000 +0200
+@@ -101,7 +101,7 @@
+ // minimum of a byte per pixel
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ // add alpha if any alpha found
+@@ -200,7 +200,7 @@
+ // minimum of a byte per pixel
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ // add alpha if any alpha found
diff --git a/math/vtk/files/patch-vtkPNGWriter.cxx b/math/vtk/files/patch-vtkPNGWriter.cxx
new file mode 100644
index 000000000000..70dc6030ffeb
--- /dev/null
+++ b/math/vtk/files/patch-vtkPNGWriter.cxx
@@ -0,0 +1,20 @@
+--- IO/vtkPNGWriter.cxx.orig 2003-12-30 21:51:31.000000000 +0100
++++ IO/vtkPNGWriter.cxx 2012-05-05 09:43:24.000000000 +0200
+@@ -147,7 +147,7 @@
+ void vtkPNGWriteErrorFunction(png_structp png_ptr,
+ png_const_charp vtkNotUsed(error_msg))
+ {
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ }
+
+@@ -223,7 +223,7 @@
+ png_init_io(png_ptr, this->TempFP);
+ png_set_error_fn(png_ptr, png_ptr,
+ vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction);
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(this->TempFP);
+ this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError);
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 0dbc6eed41a8..ebc647e759d2 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vtk
PORTVERSION= 5.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ \
http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
@@ -18,7 +18,7 @@ COMMENT= The Visualization Toolkit
LIB_DEPENDS= expat.[5-6]:${PORTSDIR}/textproc/expat2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
LATEST_LINK= vtk5
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 56b961769ee8..bcee6cf2a5bb 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxMaxima
PORTVERSION= 11.08.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index aa144038aaf1..3a3bdc0141bc 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xgfe
PORTVERSION= 2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= graphics/gnuplot/contrib
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index 07c655de0c76..2aa38da4b201 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alevt
PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://www.goron.de/~froese/alevt/
@@ -23,7 +23,7 @@ MAN1= alevt.1x alevt-date.1 alevt-cap.1
.include <bsd.port.pre.mk>
.if defined(WITH_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
MAKE_ARGS+= -DWITH_PNG
.endif
diff --git a/misc/alevt/files/patch-exp-gfx.c b/misc/alevt/files/patch-exp-gfx.c
new file mode 100644
index 000000000000..5b042ea3dd74
--- /dev/null
+++ b/misc/alevt/files/patch-exp-gfx.c
@@ -0,0 +1,10 @@
+--- exp-gfx.c.orig 2007-12-03 03:56:06.000000000 +0100
++++ exp-gfx.c 2012-05-05 08:55:49.000000000 +0200
+@@ -6,6 +6,7 @@
+
+ #include "lang.h"
+ #include "export.h"
++#include "zlib.h"
+
+ #include "font.h"
+ #define WW (W*CW) /* pixel width of window */
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 6a341da0d8e0..664eecde60dd 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bibletime
PORTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile
index 01ddc69e821a..413cfcca6a1e 100644
--- a/misc/bigboard/Makefile
+++ b/misc/bigboard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bigboard
PORTVERSION= 0.5.38
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc gnome
MASTER_SITES= GNOME
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index 66dfc9466c65..8f7e26d7546b 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cdcollect
PORTVERSION= 0.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}_source
diff --git a/misc/color-theme.el/Makefile b/misc/color-theme.el/Makefile
index 5d08860abb1d..ca6b058f616b 100644
--- a/misc/color-theme.el/Makefile
+++ b/misc/color-theme.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= color-theme.el
PORTVERSION= 6.6.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc elisp
MASTER_SITES= http://download.gna.org/color-theme/
PKGNAMESUFFIX= -${EMACS_NAME}
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 6c07070a3f4a..3ffd39379ecb 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dahdi-kmod
PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc kld
MASTER_SITES= ${MASTER_SITE_LOCAL}\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index 15726b36b7cd..735a4dae05bb 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dahdi
PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL}\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 3e2d17504e52..5ad3481609b7 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hercules
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= SF/${PORTNAME}/development%20branch/${PORTVERSION}
PKGNAMEPREFIX= diary-
diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile
index 5d9679541ceb..a1f554ee9c96 100644
--- a/misc/explosions/Makefile
+++ b/misc/explosions/Makefile
@@ -7,7 +7,7 @@
PORTNAME= explosions
PORTVERSION= 0.2005.07.31
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/explosions/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//}
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 5f840a0bda47..a887643feb00 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -29,6 +29,7 @@
PORTNAME= freebsd-doc
PORTVERSION= 20120506
+PORTREVISION= 1
CATEGORIES= misc docs
MASTER_SITES= LOCAL/blackend
PKGNAMEPREFIX?= en-
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 9f5cb2dda3f1..c2be46b4ce6c 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freeguide
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= misc java
MASTER_SITES= SF/${PORTNAME}-tv/${PORTNAME}-source/${PORTVERSION}
diff --git a/misc/gcstar/Makefile b/misc/gcstar/Makefile
index 64eeb5d0c57b..87689da2b957 100644
--- a/misc/gcstar/Makefile
+++ b/misc/gcstar/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gcstar
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://download.gna.org/gcstar/ \
http://djdomics.free.fr/distfiles/
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 7f41dbee9da6..53ab2aa5d78a 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm-gamma
PORTVERSION= 2.03
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= misc
MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/gamma/dist/
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index df964a385ed9..f9e31c4daf3b 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm-helium
PORTVERSION= 2.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= misc
MASTER_SITES= http://makovick.googlepages.com/
EXTRACT_SUFX= .tgz
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index 694abd5afc91..4345cad72833 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm-xkb
PORTVERSION= 1.05
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= misc x11
MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/xkb/dist/
diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile
index c68629b817a4..c1ffef3c81df 100644
--- a/misc/gkrellmbgchg2/Makefile
+++ b/misc/gkrellmbgchg2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gkrellmbgchg2
PORTVERSION= 0.1.11
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.bender-suhl.de/stefan/comp/sources/
diff --git a/misc/gkrellmfmonitor/Makefile b/misc/gkrellmfmonitor/Makefile
index 8699a0894807..8c79f700570f 100644
--- a/misc/gkrellmfmonitor/Makefile
+++ b/misc/gkrellmfmonitor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gkrellmfmonitor
PORTVERSION= 0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= # none
DISTNAME= fmonitor-${PORTVERSION}
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index 5a7e71aaec04..16fbd52f293a 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmlaunch
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= SF
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 0c885029391d..94deb501702c 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmlaunch
PORTVERSION= 0.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= SF
PKGNAMESUFFIX= 2
diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile
index 4d29edb75ee9..0341b2a29511 100644
--- a/misc/gkrellshoot/Makefile
+++ b/misc/gkrellshoot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellshoot
PORTVERSION= 0.3.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc
MASTER_SITES= SF
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index e312950579ae..ce2236a9601c 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellshoot
PORTVERSION= 0.4.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= SF/${PORTNAME}/GkrellM2.0%20Port/${PORTVERSION}
PKGNAMESUFFIX= 2
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index 954ea9b2899f..e0d1f4eba13c 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellweather
PORTVERSION= 2.0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc geography
MASTER_SITES= http://makovick.googlepages.com/
EXTRACT_SUFX= .tgz
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index 76887ac0a579..eddf19f4b606 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkx86info2
PORTVERSION= 0.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= http://anchois.free.fr/ \
http://depot.fsck.ch/mirror/distfiles/
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index edce4e7ed480..14af01530cbd 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-icon-theme-extras
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 3933a9d68f45..75e679b02600 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-icon-theme
PORTVERSION= 2.31.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 35ec178e1325..9d290ec51235 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-osd
PORTVERSION= 0.20.0
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://launchpadlibrarian.net/63944370/
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index 1a7697999a6e..223a0d038576 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gonvert
PORTVERSION= 0.2.25
+PORTREVISION= 1
CATEGORIES= misc python gnome
MASTER_SITES= http://www.unihedron.com/projects/gonvert/downloads/
diff --git a/misc/gopod/Makefile b/misc/gopod/Makefile
index 087cb7737971..3e4003c4cc17 100644
--- a/misc/gopod/Makefile
+++ b/misc/gopod/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gopod
PORTVERSION= 1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://gopod.free-go.net/gopod/ \
CRITICAL
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 643fa41c549f..f04bef8fb3fd 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gregexp
PORTVERSION= 0.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc
MASTER_SITES= http://dentrassi.de/download/gregexp/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 836d4a43c79e..933814c9a2e9 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtktalog
PORTVERSION= 1.0.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/misc/gwenview-i18n/Makefile b/misc/gwenview-i18n/Makefile
index f8bde97e2636..23ddeeaf567c 100644
--- a/misc/gwenview-i18n/Makefile
+++ b/misc/gwenview-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gwenview-i18n
PORTVERSION= 1.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc kde
MASTER_SITES= SF/gwenview/gwenview/${PORTVERSION}
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index c14b2bf225db..8203730a1150 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -6,7 +6,7 @@
PORTNAME= hotkeys
PORTVERSION= 0.5.7.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc
MASTER_SITES= http://ypwong.org/hotkeys/${PORTVERSION}/
DISTNAME= hotkeys_${PORTVERSION}
diff --git a/misc/k3b-i18n/Makefile b/misc/k3b-i18n/Makefile
index 22f71a947ab8..c5013b47d227 100644
--- a/misc/k3b-i18n/Makefile
+++ b/misc/k3b-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b-i18n
PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= SF/k3b/${PORTNAME}/${PORTVERSION}
diff --git a/misc/katalog/Makefile b/misc/katalog/Makefile
index e22d7494756e..82ccfe64f022 100644
--- a/misc/katalog/Makefile
+++ b/misc/katalog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= katalog
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc kde
MASTER_SITES= http://salvaste.altervista.org/files/
diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index 4971247f6be7..5003263c9460 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kbfx
PORTVERSION= 0.4.9.3.1
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= misc kde
MASTER_SITES= SF/${PORTNAME}/Source%20Packages/${PORTNAME}-${PORTVERSION}
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index ff8febea2353..a9ac6e477a3a 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index e61227bd3d28..cf401103d40b 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-be/Makefile b/misc/kde3-i18n-be/Makefile
index 9b04573b46e7..ef11b9dff8b6 100644
--- a/misc/kde3-i18n-be/Makefile
+++ b/misc/kde3-i18n-be/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 1abb2eec3bc4..67b117990aea 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bn/Makefile b/misc/kde3-i18n-bn/Makefile
index 448972afb810..de9753bd3d07 100644
--- a/misc/kde3-i18n-bn/Makefile
+++ b/misc/kde3-i18n-bn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-br/Makefile b/misc/kde3-i18n-br/Makefile
index 33b1ebd548d3..a4fcf2fcdf93 100644
--- a/misc/kde3-i18n-br/Makefile
+++ b/misc/kde3-i18n-br/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index f6feb039e64a..f840b56483b6 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index cb0727f17568..a8aaca376f76 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 0789404d9550..1bc3d5d091f0 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-csb/Makefile b/misc/kde3-i18n-csb/Makefile
index 6b250d94c033..5e55e77d9b38 100644
--- a/misc/kde3-i18n-csb/Makefile
+++ b/misc/kde3-i18n-csb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-cy/Makefile b/misc/kde3-i18n-cy/Makefile
index b29c42c91007..1c0a3a80f6cf 100644
--- a/misc/kde3-i18n-cy/Makefile
+++ b/misc/kde3-i18n-cy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 0f3fbe5eb6c0..44019153eedb 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 119a0f6db9c9..69338a9d43a0 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 2db52273652d..e78a15bc100b 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 50fd615981d0..30978d7f5483 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index d0241038a9a9..57759602a192 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde spanish
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index de8d938c82a1..89c1b46094f1 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-eu/Makefile b/misc/kde3-i18n-eu/Makefile
index 9a4d3a382338..dfca6fa23e16 100644
--- a/misc/kde3-i18n-eu/Makefile
+++ b/misc/kde3-i18n-eu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fa/Makefile b/misc/kde3-i18n-fa/Makefile
index 5d736c65523f..38342d7ffc7a 100644
--- a/misc/kde3-i18n-fa/Makefile
+++ b/misc/kde3-i18n-fa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 94281671f4c1..ff7d28cef437 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-fy/Makefile b/misc/kde3-i18n-fy/Makefile
index 4b49633294bf..335e2f145f75 100644
--- a/misc/kde3-i18n-fy/Makefile
+++ b/misc/kde3-i18n-fy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ga/Makefile b/misc/kde3-i18n-ga/Makefile
index 4eed734af2da..9d86d8b1bf79 100644
--- a/misc/kde3-i18n-ga/Makefile
+++ b/misc/kde3-i18n-ga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-gl/Makefile b/misc/kde3-i18n-gl/Makefile
index 748b345c5054..0f32a55b065e 100644
--- a/misc/kde3-i18n-gl/Makefile
+++ b/misc/kde3-i18n-gl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-hi/Makefile b/misc/kde3-i18n-hi/Makefile
index 43c1e3f56e6d..7f53eb5b154e 100644
--- a/misc/kde3-i18n-hi/Makefile
+++ b/misc/kde3-i18n-hi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index b299ecbe6452..9238b6376141 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 466d408828a2..23f5b940a25c 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 6d7cc3dd71af..12f6bb924ab6 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-kk/Makefile b/misc/kde3-i18n-kk/Makefile
index 80072a88ef87..82ec69883289 100644
--- a/misc/kde3-i18n-kk/Makefile
+++ b/misc/kde3-i18n-kk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-km/Makefile b/misc/kde3-i18n-km/Makefile
index eaaaa1296e11..ce62b532d646 100644
--- a/misc/kde3-i18n-km/Makefile
+++ b/misc/kde3-i18n-km/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 864b26e7b706..1fd1e6e56e09 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index 93a0ffd2e537..457b1f19c787 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-mk/Makefile b/misc/kde3-i18n-mk/Makefile
index e0d33bc73415..f59773d8e27e 100644
--- a/misc/kde3-i18n-mk/Makefile
+++ b/misc/kde3-i18n-mk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-mn/Makefile b/misc/kde3-i18n-mn/Makefile
index c8d962060d97..0378cf716000 100644
--- a/misc/kde3-i18n-mn/Makefile
+++ b/misc/kde3-i18n-mn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ms/Makefile b/misc/kde3-i18n-ms/Makefile
index 4c498513c5d9..5f6b339e7ec3 100644
--- a/misc/kde3-i18n-ms/Makefile
+++ b/misc/kde3-i18n-ms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index db1dba523007..289cbc541e28 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nds/Makefile b/misc/kde3-i18n-nds/Makefile
index 9ad17bf7f08d..31e2b7b5ff11 100644
--- a/misc/kde3-i18n-nds/Makefile
+++ b/misc/kde3-i18n-nds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 96538bcefdfb..e05ee4bc8f5c 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 6e81bdac7b58..91d6ba386d7a 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-pa/Makefile b/misc/kde3-i18n-pa/Makefile
index c97bc3388b17..5041c147663d 100644
--- a/misc/kde3-i18n-pa/Makefile
+++ b/misc/kde3-i18n-pa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 4065cd3ee684..76c000dafa60 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-rw/Makefile b/misc/kde3-i18n-rw/Makefile
index 23063566df27..ebafc9133aad 100644
--- a/misc/kde3-i18n-rw/Makefile
+++ b/misc/kde3-i18n-rw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-se/Makefile b/misc/kde3-i18n-se/Makefile
index 2db650bff87d..f44ff71f15c7 100644
--- a/misc/kde3-i18n-se/Makefile
+++ b/misc/kde3-i18n-se/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index d761f87ba52d..4f990853be81 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 9055d1c625dc..25626782a5bc 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 6cb1c71dc4ee..c4c8ba279b30 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sr_Latn/Makefile b/misc/kde3-i18n-sr_Latn/Makefile
index c2bda6d99dd1..f921bfebc2b7 100644
--- a/misc/kde3-i18n-sr_Latn/Makefile
+++ b/misc/kde3-i18n-sr_Latn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ss/Makefile b/misc/kde3-i18n-ss/Makefile
index 01adf86d9611..985e2a62cb8d 100644
--- a/misc/kde3-i18n-ss/Makefile
+++ b/misc/kde3-i18n-ss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index d6f086162dae..689d81d9dd75 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 0c900ef40500..cf35c29085df 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-te/Makefile b/misc/kde3-i18n-te/Makefile
index e6e021a6b106..0b42631830d6 100644
--- a/misc/kde3-i18n-te/Makefile
+++ b/misc/kde3-i18n-te/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-tg/Makefile b/misc/kde3-i18n-tg/Makefile
index 2b5af9ac5749..46c8962f084d 100644
--- a/misc/kde3-i18n-tg/Makefile
+++ b/misc/kde3-i18n-tg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 06fc601e475a..0549fce9682a 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 950867014a61..7d6fd2596f43 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-uz/Makefile b/misc/kde3-i18n-uz/Makefile
index fc593bfc758e..d6c11bd02145 100644
--- a/misc/kde3-i18n-uz/Makefile
+++ b/misc/kde3-i18n-uz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index e2c6cade7645..6992c938a8cd 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kde-i18n
# PORTVERSION= ${KDE_VERSION}
PORTVERSION= 3.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-wa/Makefile b/misc/kde3-i18n-wa/Makefile
index 3b3da02497c7..f48813bf1b41 100644
--- a/misc/kde3-i18n-wa/Makefile
+++ b/misc/kde3-i18n-wa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index fd74b7a35881..65891743e502 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kde-i18n
# PORTVERSION= ${KDE_VERSION}
PORTVERSION= 3.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 26cead242414..090a7758c44d 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kde-i18n
# PORTVERSION= ${KDE_VERSION}
PORTVERSION= 3.1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= Attic/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index a327961a54f4..15d1cf89dfac 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-bs/Makefile b/misc/kde4-l10n-bs/Makefile
index c59ac0cea0b6..4bcd66b06de6 100644
--- a/misc/kde4-l10n-bs/Makefile
+++ b/misc/kde4-l10n-bs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 794e6a78a4a9..c20050441bfa 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ca_valencia/Makefile b/misc/kde4-l10n-ca_valencia/Makefile
index 1459c1bb454b..8bfef92861ff 100644
--- a/misc/kde4-l10n-ca_valencia/Makefile
+++ b/misc/kde4-l10n-ca_valencia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index deb631164a38..7a0ce72f3120 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index d47084c775d2..c21ac954e5ce 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES?= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index f4f9fdc4b1ee..3b32ccbd73bb 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index fe3ae78a599a..810787c483cc 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 7e3072767eff..3cd999b983c0 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index f3a736145098..357a509d1c15 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index d4d5644eb33b..23e220aa32ab 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-eu/Makefile b/misc/kde4-l10n-eu/Makefile
index e53a2a8b0ba8..e52c81700437 100644
--- a/misc/kde4-l10n-eu/Makefile
+++ b/misc/kde4-l10n-eu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 1d48c18d5365..4cdd594f6cb7 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ga/Makefile b/misc/kde4-l10n-ga/Makefile
index dd1f4201dc82..3c7f9fbdfed0 100644
--- a/misc/kde4-l10n-ga/Makefile
+++ b/misc/kde4-l10n-ga/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-gl/Makefile b/misc/kde4-l10n-gl/Makefile
index bf13acf4841c..9d92b4f13874 100644
--- a/misc/kde4-l10n-gl/Makefile
+++ b/misc/kde4-l10n-gl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-hr/Makefile b/misc/kde4-l10n-hr/Makefile
index cc48c6e2a14f..b2da85603533 100644
--- a/misc/kde4-l10n-hr/Makefile
+++ b/misc/kde4-l10n-hr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ia/Makefile b/misc/kde4-l10n-ia/Makefile
index 34e995217f35..cbf5c4b08a0d 100644
--- a/misc/kde4-l10n-ia/Makefile
+++ b/misc/kde4-l10n-ia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-id/Makefile b/misc/kde4-l10n-id/Makefile
index bb6adca983bd..7c66bb38fbaa 100644
--- a/misc/kde4-l10n-id/Makefile
+++ b/misc/kde4-l10n-id/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 5b31dd9cd593..2724e3733ce8 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index c7efdd82450d..7f9c9906cc22 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-kk/Makefile b/misc/kde4-l10n-kk/Makefile
index ebd551b2b458..b6c1d6716ce0 100644
--- a/misc/kde4-l10n-kk/Makefile
+++ b/misc/kde4-l10n-kk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-km/Makefile b/misc/kde4-l10n-km/Makefile
index bc0a2697fbd0..1a9247115232 100644
--- a/misc/kde4-l10n-km/Makefile
+++ b/misc/kde4-l10n-km/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 5c48841652dc..265ef2036c46 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index 8d0718b39fbc..1ded88e9b8a8 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index c8df80df2b9a..9ea0d10c37f2 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-nds/Makefile b/misc/kde4-l10n-nds/Makefile
index 0ba749f05e04..54d514d71545 100644
--- a/misc/kde4-l10n-nds/Makefile
+++ b/misc/kde4-l10n-nds/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 7920e18d3214..47a5f93f7349 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index f5ec9f224c58..d896ebdb292a 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-pa/Makefile b/misc/kde4-l10n-pa/Makefile
index e156dc9dd379..b4d387861c18 100644
--- a/misc/kde4-l10n-pa/Makefile
+++ b/misc/kde4-l10n-pa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 8128cda3f12b..4af750d0ade1 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-si/Makefile b/misc/kde4-l10n-si/Makefile
index a829eb6bbfce..998c8e296734 100644
--- a/misc/kde4-l10n-si/Makefile
+++ b/misc/kde4-l10n-si/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 1620bfd2d7c5..be461414e289 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index e245c97dd855..ecfcdb87fb76 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 591dbb724940..1f3e592f29c6 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 344f866dc5b2..750b4dffa0e5 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-tg/Makefile b/misc/kde4-l10n-tg/Makefile
index 8490d75fd844..05e08d4ce274 100644
--- a/misc/kde4-l10n-tg/Makefile
+++ b/misc/kde4-l10n-tg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 9f6411aa41e8..afaca0328973 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 198bc5936bc0..fef133765feb 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-ug/Makefile b/misc/kde4-l10n-ug/Makefile
index 58a66d5a1a41..fbb26be51a5b 100644
--- a/misc/kde4-l10n-ug/Makefile
+++ b/misc/kde4-l10n-ug/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kde4-l10n-wa/Makefile b/misc/kde4-l10n-wa/Makefile
index fbc3ccc3edae..4135c3f58560 100644
--- a/misc/kde4-l10n-wa/Makefile
+++ b/misc/kde4-l10n-wa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kdeaddons3/Makefile.split b/misc/kdeaddons3/Makefile.split
index 2d594e1230df..d97ee5e599d4 100644
--- a/misc/kdeaddons3/Makefile.split
+++ b/misc/kdeaddons3/Makefile.split
@@ -6,43 +6,43 @@ KDE_SPLIT_DIST= kdeaddons
ATLANTIKDESIGNER_PORTNAME= ${KDE_SPLIT_DIST}-atlantikdesigner
ATLANTIKDESIGNER_PORTVERSION= ${KDE_VERSION}
-ATLANTIKDESIGNER_PORTREVISION= 3
+ATLANTIKDESIGNER_PORTREVISION= 4
ATLANTIKDESIGNER_PORTEPOCH= 0
ATLANTIKDESIGNER_PKGNAME= ${ATLANTIKDESIGNER_PORTNAME}-${ATLANTIKDESIGNER_PORTVERSION}
KADDRESSBOOKPLUG_PORTNAME= ${KDE_SPLIT_DIST}-kaddressbook-plugins
KADDRESSBOOKPLUG_PORTVERSION= ${KDE_VERSION}
-KADDRESSBOOKPLUG_PORTREVISION= 5
+KADDRESSBOOKPLUG_PORTREVISION= 6
KADDRESSBOOKPLUG_PORTEPOCH= 0
KADDRESSBOOKPLUG_PKGNAME= ${KADDRESSBOOKPLUG_PORTNAME}-${KADDRESSBOOKPLUG_PORTVERSION}
KATEPLUGINS_PORTNAME= ${KDE_SPLIT_DIST}-kate-plugins
KATEPLUGINS_PORTVERSION= ${KDE_VERSION}
-KATEPLUGINS_PORTREVISION= 5
+KATEPLUGINS_PORTREVISION= 6
KATEPLUGINS_PORTEPOCH= 0
KATEPLUGINS_PKGNAME= ${KATEPLUGINS_PORTNAME}-${KATEPLUGINS_PORTVERSION}
KFILEPLUGINS_PORTNAME= ${KDE_SPLIT_DIST}-kfile-plugins
KFILEPLUGINS_PORTVERSION= ${KDE_VERSION}
-KFILEPLUGINS_PORTREVISION= 5
+KFILEPLUGINS_PORTREVISION= 6
KFILEPLUGINS_PORTEPOCH= 0
KFILEPLUGINS_PKGNAME= ${KFILEPLUGINS_PORTNAME}-${KFILEPLUGINS_PORTVERSION}
KICKERAPPLETS_PORTNAME= ${KDE_SPLIT_DIST}-kicker-applets
KICKERAPPLETS_PORTVERSION= ${KDE_VERSION}
-KICKERAPPLETS_PORTREVISION= 5
+KICKERAPPLETS_PORTREVISION= 6
KICKERAPPLETS_PORTEPOCH= 0
KICKERAPPLETS_PKGNAME= ${KICKERAPPLETS_PORTNAME}-${KICKERAPPLETS_PORTVERSION}
KNEWSTICKERAPP_PORTNAME= ${KDE_SPLIT_DIST}-knewsticker-scripts
KNEWSTICKERAPP_PORTVERSION= ${KDE_VERSION}
-KNEWSTICKERAPP_PORTREVISION= 3
+KNEWSTICKERAPP_PORTREVISION= 4
KNEWSTICKERAPP_PORTEPOCH= 0
KNEWSTICKERAPP_PKGNAME= ${KNEWSTICKERAPP_PORTNAME}-${KNEWSTICKERAPP_PORTVERSION}
KONQPLUGINS_PORTNAME= ${KDE_SPLIT_DIST}-konq-plugins
KONQPLUGINS_PORTVERSION= ${KDE_VERSION}
-KONQPLUGINS_PORTREVISION= 5
+KONQPLUGINS_PORTREVISION= 6
KONQPLUGINS_PORTEPOCH= 0
KONQPLUGINS_PKGNAME= ${KONQPLUGINS_PORTNAME}-${KONQPLUGINS_PORTVERSION}
@@ -54,13 +54,13 @@ KSIG_PKGNAME= ${KSIG_PORTNAME}-${KSIG_PORTVERSION}
NOATUNPLUG_PORTNAME= ${KDE_SPLIT_DIST}-noatun-plugins
NOATUNPLUG_PORTVERSION= ${KDE_VERSION}
-NOATUNPLUG_PORTREVISION= 3
+NOATUNPLUG_PORTREVISION= 4
NOATUNPLUG_PORTEPOCH= 0
NOATUNPLUG_PKGNAME= ${NOATUNPLUG_PORTNAME}-${NOATUNPLUG_PORTVERSION}
RENAMEDLGPLUG_PORTNAME= ${KDE_SPLIT_DIST}-renamedlg-plugins
RENAMEDLGPLUG_PORTVERSION= ${KDE_VERSION}
-RENAMEDLGPLUG_PORTREVISION= 3
+RENAMEDLGPLUG_PORTREVISION= 4
RENAMEDLGPLUG_PORTEPOCH= 0
RENAMEDLGPLUG_PKGNAME= ${RENAMEDLGPLUG_PORTNAME}-${RENAMEDLGPLUG_PORTVERSION}
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index cfb8a4b0a62f..c4e428b4adb3 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdeedu
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 7fcaed51b817..ca4149b2ecea 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdeutils
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 558d68f38f1a..28dbd15e919e 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kgeography
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index ffb285f68391..7a90c1a54d55 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -7,6 +7,7 @@
PORTNAME= klettres
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index f7ca5c7a4db6..3224bc627309 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krecipes
DISTVERSION= 2.0-beta2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index b6d14adb487f..243e4d7b9b47 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krecipes
PORTVERSION= 0.9.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc kde
MASTER_SITES= SF
diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile
index 14b23d7f604c..f6a10934efa4 100644
--- a/misc/ksig/Makefile
+++ b/misc/ksig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ${KSIG_PORTNAME}
PORTVERSION= ${KSIG_PORTVERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 3666e6c661af..f7538c5e849f 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ktouch
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 2e82c95fb43a..8f09ed948be0 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kwatch
PORTVERSION= 2.3.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= misc kde
MASTER_SITES= http://www.m-j-s.net/pub/kde/
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 5d64ad67777b..608f189580cf 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kwordquiz
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index 24d03867252e..17232435a130 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= latex-mk
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc print
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index c81229d9c3fe..3db2f0391257 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libkdeedu
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 24a91120d46f..ab50cdef598a 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lingoteach
PORTVERSION= 0.3.9
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= misc
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz
diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile
index bf01af058017..aa62a671b383 100644
--- a/misc/lxde-common/Makefile
+++ b/misc/lxde-common/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lxde-common
PORTVERSION= 0.5.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= SF/lxde/${PORTNAME}%20%28default%20config%29/LXDE%20Common%20${PORTVERSION}
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index d6cf246981b9..036c341c06e3 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -7,14 +7,14 @@
PORTNAME= magicpoint
PORTVERSION= 1.13a
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES?= misc
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= An X11-based presentation tool
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
mng:${PORTSDIR}/graphics/libmng
RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --disable-imlib
post-patch:
${REINPLACE_CMD} -e 's|-lungif|-lgif|' \
-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/configure ${WRKSRC}/image/png.c
+ ${WRKSRC}/configure
post-configure:
cd ${WRKSRC}/contrib/xmindpath && \
diff --git a/misc/magicpoint/files/patch-png.c b/misc/magicpoint/files/patch-png.c
new file mode 100644
index 000000000000..59d7537f2734
--- /dev/null
+++ b/misc/magicpoint/files/patch-png.c
@@ -0,0 +1,20 @@
+--- image/png.c.orig 2001-04-11 10:37:00.000000000 +0200
++++ image/png.c 2012-05-05 08:48:02.000000000 +0200
+@@ -86,7 +86,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
+ return NULL;
+@@ -134,7 +134,7 @@
+ }
+
+ if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8){
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)){
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 52a3481c9392..1a217ef9c388 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mc
PORTVERSION= 4.8.1.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= misc shells
MASTER_SITES= http://www.midnight-commander.org/downloads/ \
${MASTER_SITE_SUNSITE}
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index 5df1950829ef..09e622c6e130 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= metalink
PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= SF/${PORTNAME}s/Metalink%20Editor/${PORTVERSION}
PKGNAMESUFFIX?= -editor
diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index 6a1f3fa1b2dc..035e568c8362 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metromap
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://metromap.antex.ru/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index f63b7f9b6eb9..d3073c0f0643 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= misterproper
PORTVERSION= 0.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= misc gnome
MASTER_SITES= SF
#ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index b18f988ae1f4..f223fe2c2f63 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -7,6 +7,7 @@
PORTNAME= parley
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index e7a21ef2e7b8..2f48c0e7a8e4 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -6,6 +6,7 @@
PORTNAME= pdmenu
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/misc/pspresent/Makefile b/misc/pspresent/Makefile
index 140074f08a2b..c528801db0bd 100644
--- a/misc/pspresent/Makefile
+++ b/misc/pspresent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pspresent
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://www.cse.unsw.edu.au/~matthewc/pspresent/
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index f782c7dc85d8..c7ef129d5d35 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osd
PORTVERSION= 0.2.14
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc python
MASTER_SITES= http://ichi2.net/pyosd/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/pypanda/Makefile b/misc/pypanda/Makefile
index dc25205c857a..0c4bd9432431 100644
--- a/misc/pypanda/Makefile
+++ b/misc/pypanda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pypanda
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc
MASTER_SITES= # none
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index fbaaedbea414..9218ca27c85b 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qbrew
PORTVERSION= 0.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc
MASTER_SITES= http://www.usermode.org/code/
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index 7add3a5b4af9..92a7b628b742 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= l10n
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= misc
PKGNAMEPREFIX= qt4-
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index ef9d1ab2bff5..5fe0393106cf 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtconfig
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= misc
PKGNAMEPREFIX= qt4-
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e2f724045a86..c9a2c13119de 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qtdemo
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= misc
PKGNAMEPREFIX= qt4-
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 6cdce6b2436e..5ded2b35aee4 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -8,6 +8,7 @@
PORTNAME= quick-lounge-applet
PORTVERSION= 2.14.1
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/rabbit/Makefile b/misc/rabbit/Makefile
index 0e8e5359887e..b7f25ed741f0 100644
--- a/misc/rabbit/Makefile
+++ b/misc/rabbit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rabbit
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= misc ruby
MASTER_SITES= http://rabbit-shockers.org/download/ \
LOCAL
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 99e696b927e2..084114735d57 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tellico
PORTVERSION= 2.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc kde
MASTER_SITES= http://tellico-project.org/files/
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 16dd88b21514..a23500d3a49d 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -8,6 +8,7 @@
PORTNAME= terraform
PORTVERSION= 0.9.5
+PORTREVISION= 1
DISTVERSIONPREFIX= src-
CATEGORIES= misc gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/misc/toilet/Makefile b/misc/toilet/Makefile
index cabb849c39af..0f31ca0bff4e 100644
--- a/misc/toilet/Makefile
+++ b/misc/toilet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= toilet
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/toilet/
diff --git a/misc/typetrainer/Makefile b/misc/typetrainer/Makefile
index 14470bdd166b..2a4059d45806 100644
--- a/misc/typetrainer/Makefile
+++ b/misc/typetrainer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= typetrainer
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= misc python
MASTER_SITES= CHEESESHOP
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 374758782083..68677be186ea 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uf-view
PORTVERSION= 2.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc
MASTER_SITES= http://www.hadess.net/files/software/uf-view/
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index e012c4b233a5..8e5615ec8aaa 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmcalendar
PORTVERSION= 0.5.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc windowmaker
MASTER_SITES= SF
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 81ac047c46c0..d450d17dbcd9 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -6,7 +6,7 @@
PORTNAME= wmweather+
PORTVERSION= 2.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc windowmaker geography
MASTER_SITES= SF/wmweatherplus/wmweather%2B/
DISTNAME= wmweather%2B-${PORTVERSION}
@@ -18,7 +18,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
pcre:${PORTSDIR}/devel/pcre \
tiff:${PORTSDIR}/graphics/tiff \
Hermes:${PORTSDIR}/graphics/Hermes \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
gif.5:${PORTSDIR}/graphics/giflib
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 194c8338cfcb..5ea5a89972b9 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-appfinder
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-artwork/Makefile b/misc/xfce4-artwork/Makefile
index 488944fb9a3f..85ee82658810 100644
--- a/misc/xfce4-artwork/Makefile
+++ b/misc/xfce4-artwork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-artwork
PORTVERSION= 0.0.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index d3034208d182..590a0aa5acbf 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-weather-plugin
PORTVERSION= 0.7.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc xfce geography
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index c4b30b50497f..bebea6bb2cf9 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-wm-themes
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/art/xfwm4-themes/${PORTVERSION:R}
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 4ce6d54275a1..effdb0869145 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xiphos
PORTVERSION= 3.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= SF/gnomesword/Xiphos/${PORTVERSION}
diff --git a/misc/xmonad-log-applet/Makefile b/misc/xmonad-log-applet/Makefile
index 656f6131ab73..ae399c4aa190 100644
--- a/misc/xmonad-log-applet/Makefile
+++ b/misc/xmonad-log-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmonad-log-applet
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://cloud.github.com/downloads/alexkay/${PORTNAME}/
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 6b34e693ae84..dd5e7c2c540c 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xosd
PORTVERSION= 2.2.14
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= SF
MASTER_SITE_SUBDIR= libxosd/libxosd/${PORTNAME}-${PORTVERSION}
diff --git a/misc/xsw/Makefile b/misc/xsw/Makefile
index 1d2a4f3d45b8..2e2e78533c73 100644
--- a/misc/xsw/Makefile
+++ b/misc/xsw/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xsw
PORTVERSION= 0.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= GOOGLE_CODE
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index df05969ef5c7..fa62d8cb2ec5 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 2ManDVD
PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia kde
MASTER_SITES= http://download.tuxfamily.org/2mandvd/
diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index 04c7e42b0eff..f0a1b3b59cc5 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abby
PORTVERSION= 0.4.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia net
MASTER_SITES= GOOGLE_CODE
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index b165d3669729..829f592197fe 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= acidrip
PORTVERSION= 0.14
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Your%20two-wheeled%20knife
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 6dd9a855f97a..d669e4dceb75 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -9,6 +9,7 @@
PORTNAME= aegisub
PORTVERSION= 2.1.9
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://ftp.aegisub.org/pub/releases/ \
http://ftp2.aegisub.org/pub/releases/ \
diff --git a/multimedia/arista/Makefile b/multimedia/arista/Makefile
index f2fda478f77f..f74eeea1175b 100644
--- a/multimedia/arista/Makefile
+++ b/multimedia/arista/Makefile
@@ -7,7 +7,7 @@
PORTNAME= arista
PORTVERSION= 0.9.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://programmer-art.org/media/releases/arista-transcoder/ \
http://launchpadlibrarian.net/28489828/
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 351f7507280c..bd1acd533f89 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -8,7 +8,7 @@
PORTNAME= audacious-plugins
PORTVERSION= 3.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 30f862405b03..2c591623e6a6 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -7,6 +7,7 @@
PORTNAME= audacious
PORTVERSION= 3.2.2
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile
index a4faa8a90d55..e9a24bf5f586 100644
--- a/multimedia/audiopreview/Makefile
+++ b/multimedia/audiopreview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= audiopreview
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://audiopreview.codealpha.net/files/
diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index 5a12dee47726..95dcc277f33a 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avbin
PORTVERSION= 7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://mirror.amdmi3.ru/distfiles/
diff --git a/multimedia/avidemux2-plugins/Makefile b/multimedia/avidemux2-plugins/Makefile
index f94fecd30e26..b3d94c8afc73 100644
--- a/multimedia/avidemux2-plugins/Makefile
+++ b/multimedia/avidemux2-plugins/Makefile
@@ -7,6 +7,7 @@
PORTNAME= avidemux2
PORTVERSION= ${AVIDEMUX2_VERSION}
+PORTREVISION= 5
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 41410d87c157..bcaefce86600 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -2,7 +2,7 @@
#
AVIDEMUX2_VERSION= 2.5.6
-PORTREVISION= 1
+PORTREVISION= 2
MASTER_SITES= BERLIOS \
SF/avidemux/avidemux/${PORTVERSION}
DISTNAME= avidemux_${PORTVERSION}
@@ -10,7 +10,7 @@ DISTNAME= avidemux_${PORTVERSION}
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
a52.0:${PORTSDIR}/audio/liba52 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
dca.0:${PORTSDIR}/multimedia/libdca \
execinfo.1:${PORTSDIR}/devel/libexecinfo
diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile
index 044df88a9cd5..69fd9dcbd669 100644
--- a/multimedia/bangarang/Makefile
+++ b/multimedia/bangarang/Makefile
@@ -6,6 +6,7 @@
PORTNAME= bangarang
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index c5fbef9af8ba..a65d98e9f09d 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beep-media-player
PORTVERSION= 0.9.7.1
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6
MASTER_SITES= SF/beepmp/bmp/${PORTVERSION}
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index a3807ac0d8b5..b86727e29fb7 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bino
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://download.savannah.nongnu.org/releases/bino/ http://levsha.me/ports/distfiles/
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index d5b4f1dcfebf..925ac9d05c0e 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-extra-plugins
PORTVERSION= 0.2.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= multimedia audio
MASTER_SITES= http://wrzask.pl/files/
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 71907ecc2546..8cc395facd59 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bombono
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/1.2
DISTNAME= ${PORTNAME}-dvd-${PORTVERSION}
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index f49d2f63ca91..9925dcbf1b6f 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= camserv
PORTVERSION= 0.5.1
-PORTREVISION= 15
+PORTREVISION= 16
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 56c506443749..8a135eafa181 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cheese
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/clipgrab/Makefile b/multimedia/clipgrab/Makefile
index 86dfa9c99c16..ff4ef074f783 100644
--- a/multimedia/clipgrab/Makefile
+++ b/multimedia/clipgrab/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clipgrab
PORTVERSION= 3.1.0.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://clipgrab.de/download/ \
http://vanbittern.org/
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 805eaef53225..10b90b31e6dd 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clive
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
#PORTEPOCH= 0
CATEGORIES= multimedia
MASTER_SITES= http://download.gna.org/clive/1.0.x/ \
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 3b915db3c849..df2996f307b0 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clutter-gst
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index f59ebd5609c3..37dd601804a7 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dv2jpg
PORTVERSION= 1.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 03e94555d6ee..29bfc641ac24 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvbcut
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://www.mr511.de/dvbcut/
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 7172b1005dd7..53fe3cf5c095 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvdauthor
PORTVERSION= 0.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -46,7 +46,7 @@ CFLAGS+= -DICONV_CONV=yes
.if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS+= MagickWand.5:${PORTSDIR}/graphics/ImageMagick
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
pre-everything::
diff --git a/multimedia/dvdauthor/files/patch-spuunmux.c b/multimedia/dvdauthor/files/patch-spuunmux.c
new file mode 100644
index 000000000000..0ef3496b4962
--- /dev/null
+++ b/multimedia/dvdauthor/files/patch-spuunmux.c
@@ -0,0 +1,19 @@
+--- src/spuunmux.c.orig 2010-05-10 09:27:55.000000000 +0200
++++ src/spuunmux.c 2012-04-27 10:44:31.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include <netinet/in.h>
+
+ #include <png.h>
++#include <zlib.h>
+
+ #include "rgb.h"
+ #include "common.h"
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return -1;
+ } /*if*/
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
diff --git a/multimedia/dvdauthorwizard/Makefile b/multimedia/dvdauthorwizard/Makefile
index 0c3181ceabe3..e240371a9909 100644
--- a/multimedia/dvdauthorwizard/Makefile
+++ b/multimedia/dvdauthorwizard/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvdauthorwizard
PORTVERSION= 1.4.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia kde
MASTER_SITES= SF
DISTNAME= DVDAuthorWizard-${PORTVERSION}
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 27119ff96fd1..cadd5122b3ca 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvdrip
PORTVERSION= 0.98.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= CPAN \
http://www.exit1.org/dvdrip/dist/
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 95c1aa049ee1..6b3a6df04e26 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvdstyler
DISTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 27313d5cc32a..777ad09100fd 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -8,7 +8,7 @@
PORTNAME= emotion
PORTVERSION= 0.2.0.56361
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 11371c4616fb..d5fd96014345 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffmpeg
DISTVERSION= 2012-04-25
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mm/ffmpeg
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2f53ee189efd..bb476a8a0858 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.7.12
-PORTREVISION?= 1
+PORTREVISION?= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 80e037d01bbb..30bc100a352a 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ffmpeg2theora
PORTVERSION= 0.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 9d4345f3ebfa..73ed7273e313 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -6,14 +6,14 @@
PORTNAME= ffmpegthumbnailer
PORTVERSION= 2.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia graphics
MASTER_SITES= GOOGLE_CODE
MAINTAINER= dierk@blaxxtarz.de
COMMENT= Lightweight video thumbnailer that can be used by file managers
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
swscale:${PORTSDIR}/multimedia/ffmpeg \
jpeg.11:${PORTSDIR}/graphics/jpeg
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index f8c45e84a56a..403e4f8142dc 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freevo
PORTVERSION= 1.9.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index f44ad79427bd..c186c5d58331 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gaupol
PORTVERSION= 0.19.2
+PORTREVISION= 1
CATEGORIES= multimedia python
MASTER_SITES= http://download.gna.org/gaupol/0.19/ \
http://www.c-s.li/ports/
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index d1ee2157ddc8..e8f7bd573134 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gavl
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= A library for handling uncompressed video and audio data
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
samplerate.1:${PORTSDIR}/audio/libsamplerate
LICENSE= GPLv3
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index d517c804b6c4..a41977bc8a59 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdvrecv
PORTVERSION= 1.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index ee664bcc13a6..f20df3785533 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmencoder
PORTVERSION= 0.1.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 2c78d4c33eae..d66a7faa1067 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
@@ -108,7 +108,7 @@ CONFIGURE_ARGS+=--disable-samba
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+=--disable-libpng
.endif
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 5cc67718d833..3ecda24979f2 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmerlin
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -115,7 +115,7 @@ PLIST_SUB+= JPEG="@comment "
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+=--disable-libpng
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index 1d3ccfa264a4..abda4146a9d3 100644
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmimms
DISTVERSION= 0.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 4b9a9b277e3f..d9433ecadf62 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-mplayer
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 9082522403ff..6c238be7b327 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-subtitles
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 6a9a21f3995c..52e3c9921645 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpac
PORTVERSION= 0.4.5
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
@@ -77,8 +77,9 @@ CONFIGURE_ARGS+= --use-jpeg=no
.endif
.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --use-png=local
+CFLAGS+= -I${LOCALBASE}/include/libpng15
.else
CONFIGURE_ARGS+= --use-png=no
.endif
diff --git a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c
index 43a34f264345..1d8a614bb5e4 100644
--- a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c
+++ b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c
@@ -1,6 +1,32 @@
---- src/media_tools/img.c.orig 2010-03-31 10:03:24.806360005 +0000
-+++ src/media_tools/img.c 2010-03-31 10:05:39.430477556 +0000
-@@ -551,7 +551,7 @@
+--- src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100
++++ src/media_tools/img.c 2012-04-24 23:00:42.000000000 +0200
+@@ -33,6 +33,7 @@
+
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+ #include <png.h>
++#include <pngpriv.h>
+
+ #endif /*GPAC_HAS_PNG*/
+
+@@ -399,7 +400,7 @@
+ }
+ static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ {
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ GF_EXPORT
+@@ -424,7 +425,7 @@
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ return GF_IO_ERR;
+ }
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ return GF_IO_ERR;
+@@ -551,7 +552,7 @@
/* Allocate/initialize the image information data. REQUIRED */
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
diff --git a/multimedia/gpac-mp4box/Makefile b/multimedia/gpac-mp4box/Makefile
index f2c30e143573..243a47e5b4e4 100644
--- a/multimedia/gpac-mp4box/Makefile
+++ b/multimedia/gpac-mp4box/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mp4box
DISTVERSION= 0.4.5
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF/gpac/GPAC/GPAC%20${PORTVERSION}
PKGNAMEPREFIX= gpac-
diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index ff297309f604..0e366af38f94 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gpodder
PORTVERSION= 3.1.2
+PORTREVISION= 1
CATEGORIES= multimedia python
MASTER_SITES= http://gpodder.org/src/
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 0f0bbb1b555f..bfc7eee51499 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -6,7 +6,7 @@
PORTNAME= grpplaylist
PORTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= multimedia kde
MASTER_SITES= SF
DISTNAME= groupplaylist-${PORTVERSION}
diff --git a/multimedia/gst123/Makefile b/multimedia/gst123/Makefile
index 73d9bcfe7b38..25d81820251b 100644
--- a/multimedia/gst123/Makefile
+++ b/multimedia/gst123/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gst123
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://space.twc.de/~stefan/gst123/
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index 4906fdcff606..350d888e2eb0 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gstreamer-plugins-core
PORTVERSION= 0.10
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index 990c5c8190ca..3333a6d274ba 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
COMMENT= Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index 2d075f8c1d24..dcb316cba5c9 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
#
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 55b45e1a3d66..c17317b424d7 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -157,7 +157,7 @@ post-patch:
s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
- -e 's|libpng12.pc|libpng14.pc|g' \
+ -e 's|libpng12.pc|libpng15.pc|g' \
-e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 5a090bd8ba2a..80907686ad6b 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -368,7 +368,7 @@ gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
gst_libmms_DIST= bad
# libpng and the snapshot plugin
-gst_libpng_LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+gst_libpng_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
gst_libpng_GST_PLUGIN_DIR= ext/libpng
gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
${GST_LIB_DIR}/libgstpng.la
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index d315b0443b5e..871e053a78d1 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.10.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-${PORTNAME}/
PKGNAMESUFFIX= -qt4
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 92a535f5c53c..e242b1e97ad7 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gstreamermm
PORTVERSION= 0.10.10.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= GNOME
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 122ec9bb44c7..aa635dcfddaf 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GSubEdit
PORTVERSION= 0.4.p1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= multimedia gnome
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0.4pre1
DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/}
diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile
index d6fecc3fed6d..277190760fad 100644
--- a/multimedia/gtk-recordmydesktop/Makefile
+++ b/multimedia/gtk-recordmydesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-recordmydesktop
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia deskutils
MASTER_SITES= SF/recordmydesktop/gtk-recordMyDesktop/${PORTVERSION}
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index baab2aaf21dd..32df5514f662 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxine
PORTVERSION= 0.5.907
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index f6acb257acb0..23dac7505041 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gxmms
PORTVERSION= 0.2.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile
index b3e9fd64a5b3..b84dea29adfe 100644
--- a/multimedia/imagination/Makefile
+++ b/multimedia/imagination/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imagination
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 72931c4257e0..4d5995f7bbee 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= iriverter
PORTVERSION= 0.16
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia java
MASTER_SITES= SF
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index 176006572c52..238723694a7e 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= k9copy
PORTVERSION= 2.3.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 1d5ecb3f51f3..2410eb97042a 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -6,6 +6,7 @@
PORTNAME= k9copy
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= SF
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 52081bbb0e8a..e1b5be48a295 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kaffeine-mozilla
PORTVERSION= 0.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= multimedia
MASTER_SITES= SF/kaffeine/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 9462b8d8f6dc..a9d26e2e757b 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kaffeine
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia kde
MASTER_SITES= SF
MASTER_SITE_SUBDIR= kaffeine/current
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index bce281e93d59..ca10c8dc88ad 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdemultimedia
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 50bf62a26260..2d9a481e32bb 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdemultimedia
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index d7429783edb7..674b63cd4c1b 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kdenlive
PORTVERSION= 0.8.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia kde
MASTER_SITES= SF
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 82e2aff82dfb..34e63e0a56d1 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kino
PORTVERSION= 1.3.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 452b5078cc96..737a11d58575 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kissdx
PORTVERSION= 0.13.10a
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia net
MASTER_SITES= http://paragi.dk/kiss/
diff --git a/multimedia/kmenc15/Makefile b/multimedia/kmenc15/Makefile
index b23181e2a0fc..e10510720599 100644
--- a/multimedia/kmenc15/Makefile
+++ b/multimedia/kmenc15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmenc15
PORTVERSION= 0.04
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia kde
MASTER_SITES= SF
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 9fc5275dc842..fb992303c9e0 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmplayer
PORTVERSION= 0.11.2b
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= multimedia audio kde
MASTER_SITES= http://kmplayer.kde.org/pkgs/
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 65dd9f8beb95..c0006cd6cb38 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmplayer
PORTVERSION= 0.10.0c
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 2
CATEGORIES= multimedia audio kde
MASTER_SITES= http://freebsd.ricin.com/ports/distfiles/ \
diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile
index 11e06d837483..35f0d1eadc3a 100644
--- a/multimedia/konverter/Makefile
+++ b/multimedia/konverter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= konverter
DISTVERSION= 0.92-beta1
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= multimedia kde
MASTER_SITES= http://www.tr0ll.net/kraus.tk/projects/konverter/sources/
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index d0754198b9ad..69f7ee2af9fd 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kplayer
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia kde
MASTER_SITES= SF
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index 605a81f3e7af..97a5bc8bc9e2 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kplayer
PORTVERSION= 0.6.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia kde
MASTER_SITES= SF
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index 18abbaa7e2be..83a69c928f7e 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= KSubeditor
PORTVERSION= 0.2
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= multimedia kde
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION}
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 9bba0bd27314..840d28277ae6 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libkate
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -17,7 +18,7 @@ LICENSE= BSD
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile
index 003e5ba5ee2e..3c82ad974b3e 100644
--- a/multimedia/libquicktime-lame/Makefile
+++ b/multimedia/libquicktime-lame/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libquicktime
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
PKGNAMESUFFIX= -lame
-PORTREVISION= 1
+PORTREVISION= 2
MAINTAINER= mm@FreeBSD.org
COMMENT= LAME plugin for libquicktime
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 3ff2287b466b..ea606ecda85c 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -108,7 +108,7 @@ CONFIGURE_ARGS+= --without-libjpeg
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
CONFIGURE_ARGS+= --with-libpng
.else
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 4cc1720d31cc..0888d928f35d 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xine
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= multimedia ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX= lib
@@ -19,7 +20,7 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
vorbis.4:${PORTSDIR}/audio/libvorbis \
speex.1:${PORTSDIR}/audio/speex \
mng.1:${PORTSDIR}/graphics/libmng \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
dvdread.4:${PORTSDIR}/multimedia/libdvdread \
freetype.9:${PORTSDIR}/print/freetype2 \
fame-0.9.1:${PORTSDIR}/multimedia/libfame \
diff --git a/multimedia/linux-huludesktop/Makefile b/multimedia/linux-huludesktop/Makefile
index 03daf23b340d..027448890252 100644
--- a/multimedia/linux-huludesktop/Makefile
+++ b/multimedia/linux-huludesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= huludesktop
PORTVERSION= 0.9.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= multimedia linux
MASTER_SITES= http://download.hulu.com/
PKGNAMEPREFIX= linux-
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index f9a1f60ecdaa..f80cd52256e1 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linux-realplayer
DISTVERSION= 10.0.9.809-20070726
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia audio linux
MASTER_SITES= https://helixcommunity.org/download.php/2479/:player \
http://ftp.nluug.nl/ftp/pub/os/Linux/distr/pardusrepo/sources/:playeralt \
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index bfbaba6a2e11..26e508bec339 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lives
PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://salsaman.home.xs4all.nl/lives/current/
DISTNAME= LiVES-${PORTVERSION}
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 9bb74eab39ce..e24524af0ded 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lxdvdrip
PORTVERSION= 1.62
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/lxdvdrip/
EXTRACT_SUFX= .tgz
diff --git a/multimedia/m2tstoavi/Makefile b/multimedia/m2tstoavi/Makefile
index cc1cdef4fc3b..897c0329d30c 100644
--- a/multimedia/m2tstoavi/Makefile
+++ b/multimedia/m2tstoavi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= m2tstoavi
PORTVERSION= 2009121901
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://www.olmosconsulting.com/ http://meatwad.mouf.net/~steve/
DISTNAME= m2ts
diff --git a/multimedia/mandvd/Makefile b/multimedia/mandvd/Makefile
index c3b0eace43a5..0b3e91bdd099 100644
--- a/multimedia/mandvd/Makefile
+++ b/multimedia/mandvd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mandvd
DISTVERSION= 2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= multimedia kde
MASTER_SITES= http://csgib36.ifrance.com/FTP/
DISTNAME= ManDVD
diff --git a/multimedia/mediadownloader/Makefile b/multimedia/mediadownloader/Makefile
index 99be09b6af6d..e4ea1a56323c 100644
--- a/multimedia/mediadownloader/Makefile
+++ b/multimedia/mediadownloader/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mediadownloader
PORTVERSION= 1.5.2
+PORTREVISION= 1
CATEGORIES= multimedia www
MASTER_SITES= SF/googleimagedown/project/${PORTVERSION}/
DISTNAME= ${PORTNAME}_${PORTVERSION}-src
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 48ec8b8b62dd..e2f6521d8e41 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Convenient video file and movie encoder
RESTRICTED= Port has restricted dependencies
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index 616ab32dc634..bc6a174af4d5 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -7,6 +7,7 @@
PORTNAME= minitube
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= multimedia www
MASTER_SITES= http://flavio.tordini.org/files/minitube/
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 3b8fae02c619..11aec8da022c 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= miro
PORTVERSION= 5.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
http://ftp.osuosl.org/pub/pculture.org/miro/src/
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 71f4cd7a7534..70bc94f6de5c 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mjpegtools
PORTVERSION= 2.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index dd259d0e253e..db31851c8c72 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mkvtoolnix
PORTVERSION= 5.0.1
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 2cc30c5a1b58..22a4be50a6f2 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mlt
PORTVERSION= 0.7.8
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 08ffe1bac2e5..a2efa78f1942 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -7,7 +7,7 @@
PORTNAME= motion
PORTVERSION= 3.2.11.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION}
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index a193180a9d20..51d9c52f12cc 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index f95b98972c23..bfa9d758af57 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= High performance media player supporting many formats
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 191ca85ee332..10c2c4462dd9 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -18,7 +18,7 @@ MAINTAINER?= thomas.e.zander@googlemail.com
LICENSE= GPLv2
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 769010803fd0..eb90ae4c1ab8 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mplayerxp
PORTVERSION= 0.7.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia audio
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-threaded branch of the well known mplayer media player
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
vcdinfo.2:${PORTSDIR}/multimedia/vcdimager
RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c
new file mode 100644
index 000000000000..c79e3dfd515c
--- /dev/null
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c
@@ -0,0 +1,19 @@
+--- mplayerxp/libvo/screenshot.c.orig 2006-11-30 07:28:10.000000000 +0100
++++ mplayerxp/libvo/screenshot.c 2012-05-06 20:04:09.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <libpng/png.h>
+ #else
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ #endif
+
+@@ -67,7 +68,7 @@
+ return png;
+ }
+
+- if (setjmp(png.png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png.png_ptr))) {
+ MSG_V("PNG Internal error!\n");
+ png_destroy_write_struct(&png.png_ptr, &png.info_ptr);
+ fclose(png.fp);
diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index d82b006be8e4..2d92a977342d 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mythtv-frontend
PORTVERSION= 0.25
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \
http://ftp.osuosl.org/pub/mythtv/old_releases/ \
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index b883bfb0b734..647d7bc24799 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mythtv
PORTVERSION= 0.25
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \
http://ftp.osuosl.org/pub/mythtv/old_releases/ \
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index e3d73c91ffea..340138ead62b 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -5,7 +5,7 @@
PORTNAME= oggvideotools
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= SF
MASTER_SITE_SUBDIR= oggvideotools/oggvideotools/${DISTNAME}
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 09a28c411284..59039203f9fa 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogmrip
PORTVERSION= 0.13.7
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}
@@ -21,7 +21,7 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \
mplayer:${PORTSDIR}/multimedia/mplayer \
gsed:${PORTSDIR}/textproc/gsed
LIB_DEPENDS= enca.5:${PORTSDIR}/converters/enca \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
dvdread.4:${PORTSDIR}/multimedia/libdvdread
RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \
diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile
index a24d0158bf61..cd7ccfbc16f5 100644
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openmovieeditor
PORTVERSION= 0.0.20090105
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index 836a3c59e901..754a94b420a9 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -8,6 +8,7 @@
PORTNAME= openshot
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://launchpad.net/openshot/${PORTVERSION:C/\.[0-9]+$//}/${PORTVERSION}/+download/
diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile
index d8fa78bf0f21..ce53a6d47f0a 100644
--- a/multimedia/p5-FFmpeg-Command/Makefile
+++ b/multimedia/p5-FFmpeg-Command/Makefile
@@ -7,6 +7,7 @@
PORTNAME= FFmpeg-Command
PORTVERSION= 0.18
+PORTREVISION= 1
CATEGORIES= multimedia perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MIZZY
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index a8ed9fcddcd9..0b87a5ebb44e 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -6,6 +6,7 @@
PORTNAME= phonon
PORTVERSION= 4.6.0
+PORTREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 387166656aa7..27955fa86e87 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phonon
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 641f11ff8661..8c0921d84ba9 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -6,7 +6,7 @@
PORTNAME= phonon
PORTVERSION= 4.4.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 3ad49c557f44..788748a32b63 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -6,6 +6,7 @@
PORTNAME= phonon
PORTVERSION= 4.6.0
+PORTREVISION= 1
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index 6729324631ac..c7ee3910891f 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -8,7 +8,7 @@
PORTNAME= photofilmstrip
PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia python
MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index dc09fe8528d3..1d836de6bcec 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pitivi
PORTVERSION= 0.13.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= GNOME
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index a294b09b4217..119da07a6edf 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.10.22
+PORTREVISION= 1
CATEGORIES= multimedia python gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index b80fd606b5d9..89ba52701815 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kaa-base
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia python
MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 8791d64192d5..eff9d6cfcc8b 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kaa-imlib2
PORTVERSION= 0.2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia python
MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 15f47489618d..a3a644c78e39 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kaa-metadata
PORTVERSION= 0.7.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia python
MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-mlt/Makefile b/multimedia/py-mlt/Makefile
index ce376c7eed94..9c6acc46a97a 100644
--- a/multimedia/py-mlt/Makefile
+++ b/multimedia/py-mlt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mlt
PORTVERSION= 0.7.8
+PORTREVISION= 1
CATEGORIES= multimedia python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 3fad7d0e3e0a..7de622718ba7 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= OpenLP
PORTVERSION= 1.9.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia python
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile
index 28493133b173..3de6f4d52cda 100644
--- a/multimedia/py-pybmp/Makefile
+++ b/multimedia/py-pybmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyBMP
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia python
MASTER_SITES= http://nivi.interfree.it/distfiles/${PORTNAME}/ \
LOCAL/nivit/${PORTNAME}/
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index 7f0e5fa62c15..b023e1c9ba91 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= multimedia
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 295e10318566..823d41b05a47 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phonon
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile
index b996d9a25d24..dbf6a32ba0d6 100644
--- a/multimedia/qdvdauthor/Makefile
+++ b/multimedia/qdvdauthor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qdvdauthor
PORTVERSION= 1.1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 9ade63170e5a..09f9f9f02543 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qmmp
PORTVERSION= 0.5.5
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://qmmp.ylsoftware.com/files/ \
${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile
index 5d77b8b4051f..c1da479f7e12 100644
--- a/multimedia/qt4-multimedia/Makefile
+++ b/multimedia/qt4-multimedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= multimedia
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= multimedia
PKGNAMEPREFIX= qt4-
diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile
index a484a98e27dc..f3221e18b353 100644
--- a/multimedia/qt4-phonon-gst/Makefile
+++ b/multimedia/qt4-phonon-gst/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phonon
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= multimedia
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -gst
diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile
index 32870c3de6de..c598de46b44f 100644
--- a/multimedia/qt4-phonon/Makefile
+++ b/multimedia/qt4-phonon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phonon
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= multimedia
PKGNAMEPREFIX= qt4-
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index d557057db4e3..07d219317e1e 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -6,7 +6,7 @@
PORTNAME= quark
PORTVERSION= 3.24
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia gnome
MASTER_SITES= http://hsgg.github.com/quark/
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 92b63b26aee7..5afac7be4c23 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quodlibet
PORTVERSION= 2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia audio python gnome
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile
index c8345f5d9ed9..66bb0e72152a 100644
--- a/multimedia/rox-videothumbnail/Makefile
+++ b/multimedia/rox-videothumbnail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rox-videothumbnail
PORTVERSION= 0.1.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://www.kerofin.demon.co.uk/rox/
DISTNAME= VideoThumbnail-${PORTVERSION}
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 329a264225e2..b65b14154d4b 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sabbu
PORTVERSION= 0.3.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
diff --git a/multimedia/smile/Makefile b/multimedia/smile/Makefile
index 64776689db71..57a0320daf03 100644
--- a/multimedia/smile/Makefile
+++ b/multimedia/smile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smile
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia kde
MASTER_SITES= http://download.tuxfamily.org/smiletool/
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 4a75ce8221a8..6d24f6100e3c 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smplayer
DISTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= multimedia audio kde
MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION}
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 52a4310f87db..225bfb9fbc32 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.5.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia kde
MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index aca9646101bb..5bc3e98f9e4f 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 4e430a18d72b..b777565353c2 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subtitleeditor
PORTVERSION= 0.39.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/ \
CRITICAL
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index d1f4d6186b04..b775d55656fa 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= subtitleripper
DISTVERSION= 0.3-4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3-4
EXTRACT_SUFX= .tgz
@@ -16,7 +16,7 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Convert DVD subtitles into text format (subrip srt) or VobSub format
LIB_DEPENDS= netpbm:${PORTSDIR}/graphics/netpbm \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= gocr:${PORTSDIR}/graphics/gocr \
xv:${PORTSDIR}/graphics/xv \
transcode:${PORTSDIR}/multimedia/transcode
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index 5d310df581e6..bdca88a95368 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -8,6 +8,7 @@
PORTNAME= swfdec-gnome
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 513ac1c247c5..12e00fe833ac 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -8,6 +8,7 @@
PORTNAME= totem-pl-parser
PORTVERSION= 2.32.3
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 4c37904d379e..7ad7a8f47733 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -8,7 +8,7 @@
PORTNAME= totem
PORTVERSION= 2.32.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index e76e12694535..afc061442521 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index 9241bd321387..f09933a84dbd 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transkode
PORTVERSION= 0.7
-PORTREVISION= 14
+PORTREVISION= 15
PORTEPOCH= 1
CATEGORIES= multimedia audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile
index eeb912f9bd1a..86a17259d5e8 100644
--- a/multimedia/umplayer/Makefile
+++ b/multimedia/umplayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= umplayer
DISTVERSION= 0.97
+PORTREVISION= 1
CATEGORIES= multimedia audio kde
MASTER_SITES= LOCAL/wen
diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile
index 74fe8ba25d0f..14b85cb8f270 100644
--- a/multimedia/vdr-plugin-markad/Makefile
+++ b/multimedia/vdr-plugin-markad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdr-plugin-markad
PORTVERSION= 0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= http://projects.vdr-developer.org/attachments/download/578/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile
index 364b398a9ae6..b54a1a7f2996 100644
--- a/multimedia/vdr-plugin-osdpip/Makefile
+++ b/multimedia/vdr-plugin-osdpip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdr-plugin-osdpip
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://projects.vdr-developer.org/attachments/download/880/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile
index 523da6dca425..f1984bf73d6f 100644
--- a/multimedia/vdr-plugin-softdevice/Makefile
+++ b/multimedia/vdr-plugin-softdevice/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdr-plugin-softdevice
PORTVERSION= 0.5.0p20100414
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= multimedia
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= nox/
diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile
index aab8e0b54648..2c8affa33fae 100644
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdr-plugin-upnp
PORTVERSION= 0.0.2a2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia
MASTER_SITES= http://projects.vdr-developer.org/attachments/download/177/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index b0e12c1819b5..a345c8b6bfef 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vdr-plugin-xineliboutput
PORTVERSION= 1.0.90s20120511
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF:release \
LOCAL:snapshot
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5943e4a48ed7..bc12c8257af1 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vlc
DISTVERSION= 1.1.13
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -501,7 +501,7 @@ CONFIGURE_ARGS+=--disable-mozilla
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+=--disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+=--enable-png
.endif
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 2e4d396bca2c..ce625d7c87e8 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index cfe9e60fbec0..c31639ae72e0 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,7 +6,7 @@
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 7c2e4a347e89..8a791af32bd3 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xawtv
PORTVERSION= 3.95
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= http://dl.bytesex.org/releases/xawtv/
@@ -18,7 +18,7 @@ BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \
${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
RUN_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \
${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
OPTIONS= AA "Enable AA support" on \
diff --git a/multimedia/xbmc-addon-xvdr/Makefile b/multimedia/xbmc-addon-xvdr/Makefile
index ef90b9619881..aeca4918f7ee 100644
--- a/multimedia/xbmc-addon-xvdr/Makefile
+++ b/multimedia/xbmc-addon-xvdr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xbmc-addon-xvdr
PORTVERSION= 0.9.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= LOCAL/nox
DISTNAME= pipelka-${PORTNAME}-xvdr-${PORTVERSION}-0-g${GITHASH}
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile
index 3078b85c75e2..22407a2b6e5f 100644
--- a/multimedia/xbmc-pvr/Makefile
+++ b/multimedia/xbmc-pvr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xbmc
PORTVERSION= 70
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= LOCAL/nox
PKGNAMESUFFIX= -pvr-ppa-odk
@@ -47,7 +47,7 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \
mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
ogg.7:${PORTSDIR}/audio/libogg \
pcre.1:${PORTSDIR}/devel/pcre \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
diff --git a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp
new file mode 100644
index 000000000000..227ee6e097e7
--- /dev/null
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp
@@ -0,0 +1,74 @@
+--- lib/cximage-6.0/CxImage/ximapng.cpp.orig 2012-03-16 00:33:05.000000000 +0100
++++ lib/cximage-6.0/CxImage/ximapng.cpp 2012-04-28 06:40:43.000000000 +0200
+@@ -15,7 +15,7 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ strcpy(info.szLastError,message);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +62,7 @@
+ /* Set error handling if you are using the setjmp/longjmp method (this is
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier. */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ delete [] row_pointers;
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -80,7 +80,7 @@
+ head.biWidth = info_ptr->width;
+ head.biHeight= info_ptr->height;
+ info.dwType = CXIMAGE_FORMAT_PNG;
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /* calculate new number of channels */
+@@ -101,7 +101,7 @@
+ break;
+ default:
+ strcpy(info.szLastError,"unknown PNG color type");
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ //find the right pixel depth used for cximage
+@@ -111,7 +111,7 @@
+ if (channels >= 3) pixel_depth=24;
+
+ if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /* get metrics */
+@@ -207,7 +207,7 @@
+ }
+
+ // <vho> - handle cancel
+- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+
+ // row_bytes is the width x number of channels x (bit-depth / 8)
+ row_pointers = new BYTE[info_ptr->rowbytes + 8];
+@@ -230,7 +230,7 @@
+ do {
+
+ // <vho> - handle cancel
+- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+
+ #if CXIMAGE_SUPPORT_ALPHA // <vho>
+ if (AlphaIsValid()) {
+@@ -361,7 +361,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ /* If we get here, we had a problem reading the file */
+ if (info_ptr->palette) free(info_ptr->palette);
+ png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
diff --git a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h
new file mode 100644
index 000000000000..136d212061ad
--- /dev/null
+++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h
@@ -0,0 +1,19 @@
+--- lib/cximage-6.0/CxImage/ximapng.h.orig 2012-03-16 00:33:05.000000000 +0100
++++ lib/cximage-6.0/CxImage/ximapng.h 2012-04-28 06:17:43.000000000 +0200
+@@ -25,6 +25,7 @@
+ #ifdef _LINUX
+ #undef _DLL
+ #include <png.h>
++#include <pngpriv.h>
+ #else
+ #include "../png/png.h"
+ #endif
+@@ -70,7 +71,7 @@
+ static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ {
+ strncpy((char*)png_ptr->error_ptr,error_msg,255);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ };
+
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 358f921cf4cb..8cd05f8c28c8 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xbmc
PORTVERSION= 11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://mirrors.xbmc.org/releases/source/
@@ -46,7 +46,7 @@ LIB_DEPENDS= ass.5:${PORTSDIR}/multimedia/libass \
ogg.7:${PORTSDIR}/audio/libogg \
pcre.1:${PORTSDIR}/devel/pcre \
plist.1:${PORTSDIR}/devel/libplist \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 0f59574ca536..f774ef9c5334 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-media
PORTVERSION= 0.9.2
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= multimedia xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/
DISTNAME= xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 716da7351320..60a33e1a4594 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -7,7 +7,7 @@
PORTNAME= parole
PORTVERSION= 0.2.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia xfce
MASTER_SITES= XFCE/src/apps/parole/0.2/
DIST_SUBDIR= xfce4
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 1ded005e59c4..f985e7cef004 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index dc1600e8d377..055b9a07e5c5 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 0.99.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
DISTNAME= ${PORTNAME}-ui-${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT= An X11 multimedia player
BUILD_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
# Please update libxine PLUGINSDIR as well (see below)
LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
USE_XZ= yes
diff --git a/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c b/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c
new file mode 100644
index 000000000000..c0636a391d3f
--- /dev/null
+++ b/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c
@@ -0,0 +1,10 @@
+--- src/xitk/Imlib-light/load.c.orig 2010-03-01 18:02:05.000000000 +0100
++++ src/xitk/Imlib-light/load.c 2012-05-06 06:38:35.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include "Imlib.h"
+ #include "Imlib_private.h"
+ #include <setjmp.h>
++#include <pngpriv.h>
+
+ #ifndef INT_MAX
+ #define INT_MAX ((int)((unsigned int)(1 << (8 * sizeof(int) - 1)) - 1))
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index 0a6f4269206c..82e204beaa26 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine_artsplugin
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index db31b7aad6f4..f838f84d5be9 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms
PORTVERSION= 1.2.11
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES+= multimedia audio ipv6
MASTER_SITES= http://www.xmms.org/files/1.2.x/ \
LOCAL/beech
diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile
index 534dc06f4956..878cfb045d40 100644
--- a/multimedia/y4mscaler/Makefile
+++ b/multimedia/y4mscaler/Makefile
@@ -7,7 +7,7 @@
PORTNAME= y4mscaler
PORTVERSION= 9.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= http://www.mir.com/DMG/Software/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/net-im/amsn/Makefile b/net-im/amsn/Makefile
index d957ff3b386c..2dc13c7b39d8 100644
--- a/net-im/amsn/Makefile
+++ b/net-im/amsn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= amsn
PORTVERSION= 0.98.9
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -17,7 +18,7 @@ COMMENT= Alvano\'s MSN Messenger
LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
gstfarsight-0.10.0:${PORTSDIR}/net-im/farsight2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \
snack>=2.2.10_4:${PORTSDIR}/audio/snack
@@ -43,6 +44,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR}
+CXXFLAGS+= -I${LOCALBASE}/include/libpng15
CONFIGURE_ENV+= CFLAGS+="-I${LOCALBASE}/include" \
LDFLAGS+="-L${LOCALBASE}/lib"
diff --git a/net-im/amsn/files/patch-ximapng.cpp b/net-im/amsn/files/patch-ximapng.cpp
new file mode 100644
index 000000000000..623f9ee17a9d
--- /dev/null
+++ b/net-im/amsn/files/patch-ximapng.cpp
@@ -0,0 +1,74 @@
+--- utils/TkCximage/src/CxImage/ximapng.cpp.orig 2010-01-29 10:09:27.000000000 +0100
++++ utils/TkCximage/src/CxImage/ximapng.cpp 2012-05-05 13:25:32.000000000 +0200
+@@ -15,7 +15,7 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ strcpy(info.szLastError,message);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +62,7 @@
+ /* Set error handling if you are using the setjmp/longjmp method (this is
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier. */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ delete [] row_pointers;
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -80,7 +80,7 @@
+ head.biWidth = info_ptr->width;
+ head.biHeight= info_ptr->height;
+ info.dwType = CXIMAGE_FORMAT_PNG;
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /* calculate new number of channels */
+@@ -101,7 +101,7 @@
+ break;
+ default:
+ strcpy(info.szLastError,"unknown PNG color type");
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ //find the right pixel depth used for cximage
+@@ -111,7 +111,7 @@
+ if (channels >= 3) pixel_depth=24;
+
+ if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /* get metrics */
+@@ -207,7 +207,7 @@
+ }
+
+ // <vho> - handle cancel
+- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+
+ // row_bytes is the width x number of channels x (bit-depth / 8)
+ row_pointers = new BYTE[info_ptr->rowbytes + 8];
+@@ -230,7 +230,7 @@
+ do {
+
+ // <vho> - handle cancel
+- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+
+ #if CXIMAGE_SUPPORT_ALPHA // <vho>
+ if (AlphaIsValid()) {
+@@ -362,7 +362,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ /* If we get here, we had a problem reading the file */
+ if (info_ptr->palette) free(info_ptr->palette);
+ png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
diff --git a/net-im/amsn/files/patch-ximapng.h b/net-im/amsn/files/patch-ximapng.h
new file mode 100644
index 000000000000..2e1080f1d7a8
--- /dev/null
+++ b/net-im/amsn/files/patch-ximapng.h
@@ -0,0 +1,19 @@
+--- utils/TkCximage/src/CxImage/ximapng.h.orig 2012-05-05 13:24:02.000000000 +0200
++++ utils/TkCximage/src/CxImage/ximapng.h 2012-05-07 06:43:30.000000000 +0200
+@@ -23,6 +23,7 @@
+
+ extern "C" {
+ #include <png.h>
++#include <pngpriv.h>
+ }
+
+ class CxImagePNG: public CxImage
+@@ -65,7 +66,7 @@
+ static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ {
+ strncpy((char*)png_ptr->error_ptr,error_msg,255);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ };
+
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index d229a562ec8d..161e56915cb8 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ayttm
PORTVERSION= 0.5.0.111
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= SF/ayttm/ayttm/${PORTVERSION:R}-${PORTVERSION:E}/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/net-im/decibel/Makefile b/net-im/decibel/Makefile
index beb1f3105863..3ec03e3bbca2 100644
--- a/net-im/decibel/Makefile
+++ b/net-im/decibel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= decibel
PORTVERSION= 0.5.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net-im
MASTER_SITES= http://decibel.kde.org/fileadmin/downloads/decibel/releases/
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index d8cf14b17c8d..1b69a0b1e197 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emesene
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im python
#MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MASTER_SITES= ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 64d5163fc04e..ddf9c981d350 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= empathy
PORTVERSION= 2.32.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index da277fd6c202..c4a8e31dacf6 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eva
PORTVERSION= 0.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net-im kde
MASTER_SITES= SF/${PORTNAME}q/${PORTNAME}-0.4/Eva%20${PORTVERSION}
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index d064f51605c6..135a1ede1794 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= farsight2
PORTVERSION= 0.0.22
+PORTREVISION= 1
CATEGORIES= net-im devel
MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/
diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 154d7ad65d9f..a57297883bfb 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= finch
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= marcus@FreeBSD.org
COMMENT= Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index b154c9326acd..d7eb4cde319d 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gajim
PORTVERSION= 20101030
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.bamus.cz/distfiles/
PKGNAMESUFFIX= -devel
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index afecb029aefa..5b652d845843 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gajim
PORTVERSION= 0.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://www.gajim.org/downloads/0.15/
diff --git a/net-im/gyach/Makefile b/net-im/gyach/Makefile
index 2520e76676b9..7294b1b19c0b 100644
--- a/net-im/gyach/Makefile
+++ b/net-im/gyach/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gyach
PORTVERSION= 0.9.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im
MASTER_SITES= http://www4.infi.net/~cpinkham/gyach/code/
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index cd489758d01f..8c6339905b9a 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -6,7 +6,7 @@
PORTNAME= jabber.el
PORTVERSION= 0.8.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im elisp
MASTER_SITES= SF/emacs-jabber/emacs-jabber/${PORTVERSION}
DISTNAME= emacs-jabber-${PORTVERSION}
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 274224fbc838..ce17f169e454 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmerlin
PORTVERSION= 1.4.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index d2598ee6c23f..5fb45a246bc2 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmess
PORTVERSION= 2.0.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im kde
MASTER_SITES= SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 331396d86f02..e6975f73b5a9 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmess
PORTVERSION= 1.5.p.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im kde
MASTER_SITES= SF/${PORTNAME}/Older%20versions/1.5pre1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
diff --git a/net-im/komclean/Makefile b/net-im/komclean/Makefile
index f6939877995d..ded01297d2ce 100644
--- a/net-im/komclean/Makefile
+++ b/net-im/komclean/Makefile
@@ -7,6 +7,7 @@
PORTNAME= komclean
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME:S/kom/KOM/}-${PORTVERSION}
diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile
index 83c05040b07b..1bbffeffa2f1 100644
--- a/net-im/konverse/Makefile
+++ b/net-im/konverse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= konverse
PORTVERSION= 0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net-im kde
MASTER_SITES= SF
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index 53aadba1bf73..d93f1bc1304c 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kopete
PORTVERSION= 0.12.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= net-im kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/3.5.10/src
diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index 66ae50bb5c2d..4e55af1cd67f 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -9,7 +9,7 @@
PORTNAME= kpopup
PORTVERSION= 0.9.8.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im kde
MASTER_SITES= http://www.henschelsoft.de/kpopup/ \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 19a9443d4b89..42ee624aa973 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= libpurple
PORTVERSION= 2.10.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index e1aab0511a86..c969e8d3a8b7 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -8,6 +8,7 @@
PORTNAME= osd
PORTVERSION= ${OSD_LICQ_VER}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-im
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 2a4dbccf336c..3a8673335457 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qt4-gui
PORTVERSION= ${QT_LICQ_VER}
+PORTREVISION= 1
CATEGORIES= net-im
PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile
index 3329f2c4dc21..069aa9267262 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mbpurple
PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/net-im/openfetion/Makefile b/net-im/openfetion/Makefile
index c7993f332aa5..820e69671812 100644
--- a/net-im/openfetion/Makefile
+++ b/net-im/openfetion/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openfetion
PORTVERSION= 2.0.7
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= GOOGLE_CODE
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 8f3bc44baac4..9543ff1377a3 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= papyon
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/pidgin-audacious-remote/Makefile b/net-im/pidgin-audacious-remote/Makefile
index 97bd5cfd0c05..fb5d79888865 100644
--- a/net-im/pidgin-audacious-remote/Makefile
+++ b/net-im/pidgin-audacious-remote/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-audacious-remote
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://pidginaudacious.sourceforge.net/files/ \
ftp://ftp.lissyara.su/users/gx_ua/distfiles/
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index dccb1bec9e11..ec523eebb8f5 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-birthday-reminder
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MASTER_SITES= http://launchpadlibrarian.net/56075754/
diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile
index 9c696224e986..1137a67f3182 100644
--- a/net-im/pidgin-bs/Makefile
+++ b/net-im/pidgin-bs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-bs
PORTVERSION= 1.3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= SF/${PORTNAME}/bot-sentry/${PORTVERSION}
DISTNAME= bot-sentry-${PORTVERSION}
diff --git a/net-im/pidgin-facebookchat/Makefile b/net-im/pidgin-facebookchat/Makefile
index 9dae38f4763e..b156dfd62234 100644
--- a/net-im/pidgin-facebookchat/Makefile
+++ b/net-im/pidgin-facebookchat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-facebookchat
PORTVERSION= 1.69
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PROJECTHOST}-source-${PORTVERSION}
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index 67cc78f62877..1e706338e496 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fetion
PORTVERSION= 0.98.5.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MASTER_SITES= http://www.logvinov.ru/files/dist/fetion/ \
LOCAL/avl
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 429f2270fef3..fe2814ab1d77 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-guifications
PORTVERSION= 2.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://downloads.guifications.org/plugins/Guifications2/
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index 436dc893d0ab..c2e04257c5a2 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-hotkeys
PORTVERSION= 0.2.4
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net-im
MASTER_SITES= SF
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 88f400421bec..5e5d38e89751 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= SF/pidgin-${PORTNAME}/pidgin-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= pidgin-
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 36d1ee566388..1602608edef7 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libnotify
PORTVERSION= 0.14
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net-im
MASTER_SITES= SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= pidgin-
diff --git a/net-im/pidgin-manualsize/Makefile b/net-im/pidgin-manualsize/Makefile
index 1ecd66c9edc7..da7d87a370f3 100644
--- a/net-im/pidgin-manualsize/Makefile
+++ b/net-im/pidgin-manualsize/Makefile
@@ -7,7 +7,7 @@
PORTNAME= manualsize
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= http://issv.org.ru/oss/ \
http://wickedmachine.net/~jsa/FreeBSD/distfiles/
diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index c5ddb1c53147..ce9f00ac2e62 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= msn-pecan
PORTVERSION= 0.1.0.r1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= pidgin-
diff --git a/net-im/pidgin-osd/Makefile b/net-im/pidgin-osd/Makefile
index 9e70d0cc6740..a9313e8260c8 100644
--- a/net-im/pidgin-osd/Makefile
+++ b/net-im/pidgin-osd/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pidgin-osd
PORTVERSION= 0.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= https://babelize.org/download/pidgin-osd/
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index dc01f0799a99..52f306e5faa9 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgimpd
PORTVERSION= 1.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im audio
MASTER_SITES= http://ayeon.org/projects/pidgimpd/
PKGNAMEPREFIX= pidgin-
diff --git a/net-im/pidgin-privacy-please/Makefile b/net-im/pidgin-privacy-please/Makefile
index 48a046e7881c..2be848ed2fbe 100644
--- a/net-im/pidgin-privacy-please/Makefile
+++ b/net-im/pidgin-privacy-please/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-privacy-please
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= GOOGLE_CODE
diff --git a/net-im/pidgin-rhythmbox/Makefile b/net-im/pidgin-rhythmbox/Makefile
index 75016783df66..f51526f067b5 100644
--- a/net-im/pidgin-rhythmbox/Makefile
+++ b/net-im/pidgin-rhythmbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pidgin-rhythmbox
PORTVERSION= 2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im audio
MASTER_SITES= http://jon.oberheide.org/pidgin-rhythmbox/downloads/
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index 0011a7078024..e19113968700 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pidgin-sipe
PORTVERSION= 1.13.1
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= SF/sipe/sipe/${DISTNAME}
diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile
index 8976ef9a20fa..c90aebc68073 100644
--- a/net-im/pidgin-skype/Makefile
+++ b/net-im/pidgin-skype/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pidgin-skype
PORTVERSION= 0.0.0.628
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= LOCAL/mandree
DISTFILES= pidgin-skype-svn-r${PORTVERSION:E}.tar.xz
diff --git a/net-im/pidgin-twitter/Makefile b/net-im/pidgin-twitter/Makefile
index d954670341ea..405b1465502c 100644
--- a/net-im/pidgin-twitter/Makefile
+++ b/net-im/pidgin-twitter/Makefile
@@ -6,6 +6,7 @@
PORTNAME= pidgin-twitter
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.honeyplanet.jp/
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index e51dc0834c09..a1bc1f20e830 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= pidgin
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= marcus@FreeBSD.org
COMMENT= Pidgin multi-protocol messaging client (GTK+ UI)
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 6cd64010dc21..f7c0ec691e20 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= psi
PORTVERSION= 0.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION}
diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile
index 53cf3045e7b2..58508e20b1db 100644
--- a/net-im/psimedia/Makefile
+++ b/net-im/psimedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= psimedia
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= net-im audio multimedia
MASTER_SITES= http://delta.affinix.com/download/psimedia/
diff --git a/net-im/pymsn/Makefile b/net-im/pymsn/Makefile
index 8fa76a56f951..2fca3dda1a1d 100644
--- a/net-im/pymsn/Makefile
+++ b/net-im/pymsn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pymsn
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/qutim-plugin-icq/Makefile b/net-im/qutim-plugin-icq/Makefile
index c538fa9f2838..c948ed8b23bc 100644
--- a/net-im/qutim-plugin-icq/Makefile
+++ b/net-im/qutim-plugin-icq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icq
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net-im
MASTER_SITES= http://qutim.org/download/ \
diff --git a/net-im/qutim-plugin-jabber/Makefile b/net-im/qutim-plugin-jabber/Makefile
index 1fbe1e910ac5..eaf5e4991eea 100644
--- a/net-im/qutim-plugin-jabber/Makefile
+++ b/net-im/qutim-plugin-jabber/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jabber
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net-im
MASTER_SITES= http://qutim.org/download/ \
diff --git a/net-im/qutim/Makefile b/net-im/qutim/Makefile
index 9b7182d46560..2752212e04fb 100644
--- a/net-im/qutim/Makefile
+++ b/net-im/qutim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qutim
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net-im
MASTER_SITES= http://dl.kibab.com/distfiles/qutim/ \
diff --git a/net-im/qwit-devel/Makefile b/net-im/qwit-devel/Makefile
index 38753955c592..f8db069d762c 100644
--- a/net-im/qwit-devel/Makefile
+++ b/net-im/qwit-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qwit
DISTVERSION= r215
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= GOOGLE_CODE
DISTNAME= qwit-ng-${PORTVERSION}-src
diff --git a/net-im/qwit/Makefile b/net-im/qwit/Makefile
index fc3cdfd895a6..33bc294f05f5 100644
--- a/net-im/qwit/Makefile
+++ b/net-im/qwit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qwit
DISTVERSION= r154
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= qwit-${PORTVERSION}-src
diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index 6176010d3cf7..4b0ae2e594f9 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qxmpp
PORTVERSION= 0.3.91
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= GOOGLE_CODE
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index 672640b8faa3..629157541a83 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ramblercontacts
PORTVERSION= 0.3.2.1030
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://developers.rambler.ru/upload/contacts/
DISTNAME= ${PORTNAME}_v${PORTVERSION}_beta_src
diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index 3c40b91e88e1..aea2c15c28f0 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= sim-im-devel
PORTVERSION= 0.9.5.2236
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= http://sim-im.lehis.ru/dist/ \
http://www.sim-im.lehis.ru/dist/
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index ad4d97232852..65bdfe35fb9b 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -6,7 +6,7 @@
PORTNAME= sim-im
PORTVERSION= 0.9.4.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
http://sim-im.lehis.ru/dist/ \
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index f014c4f9a07d..1c4f268ce5aa 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -8,7 +8,7 @@
PORTNAME= telepathy-butterfly
PORTVERSION= 0.5.15
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 589f7e10c539..4293350dd27d 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -7,6 +7,7 @@
PORTNAME= telepathy-farsight
PORTVERSION= 0.0.15
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index b72ef3394ef3..3db35fa9993f 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -7,7 +7,7 @@
PORTNAME= haze
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-haze/
PKGNAMEPREFIX= telepathy-
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index bbbaa6747f1a..6386e5f4451e 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -7,6 +7,7 @@
PORTNAME= telepathy-mission-control
PORTVERSION= 5.6.1
+PORTREVISION= 1
CATEGORIES= net-im devel
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 17e501a5c265..0b92953ebdde 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= telepathy-qt4
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME:C/4//}/
DISTNAME= ${PORTNAME:C/4//}-${PORTVERSION}
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index 507e63eba75f..86ba325a612b 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -7,6 +7,7 @@
PORTNAME= turpial
PORTVERSION= 1.6.7.1
+PORTREVISION= 1
CATEGORIES= net-im python
MASTER_SITES= http://turpial.org.ve/files/sources/%SUBDIR%/
MASTER_SITE_SUBDIR= stable
diff --git a/net-im/vacuum-im/Makefile b/net-im/vacuum-im/Makefile
index b85e1ca41fd2..d22fdb064c10 100644
--- a/net-im/vacuum-im/Makefile
+++ b/net-im/vacuum-im/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vacuum
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -im
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index 6319783b10f1..1003be78a04b 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vqcc-gtk
PORTVERSION= 0.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES?= net-im
MASTER_SITES= SF
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index 0348eeda7655..f013bc3050a9 100644
--- a/net-im/xfce4-messenger-plugin/Makefile
+++ b/net-im/xfce4-messenger-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-messenger-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= net-im xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
diff --git a/net-mgmt/argus-monitor/Makefile b/net-mgmt/argus-monitor/Makefile
index 478436ada764..9a74f07de190 100644
--- a/net-mgmt/argus-monitor/Makefile
+++ b/net-mgmt/argus-monitor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= argus-monitor
PORTVERSION= 20100109
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://www.tcp4me.com/code/argus-archive/
DISTNAME= argus-dev-${PORTVERSION}
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 5e35d380a1c8..f1851388e2b3 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bandwidthd
PORTVERSION= 2.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 6806d9e56456..d315931560d2 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= collectd
PORTVERSION= 4.10.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 1787b2740eb0..7f220939eb3c 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= collectd
PORTVERSION= 5.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 0b314d3cfecd..bc76928950da 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= etherape
PORTVERSION= 0.9.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt gnome
MASTER_SITES= SF
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 8590b2c88dfc..21bafd4bfd2c 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ettercap
PORTVERSION= 0.7.4.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}-Lazarus \
diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index a1b5b06e7e2c..d4ec2367cb5c 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -6,7 +6,7 @@
PORTNAME= flowviewer
PORTVERSION= 3.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://ensight.eos.nasa.gov/FlowViewer/
DISTNAME= FlowViewer_${DISTVERSION}
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index e3948b3f5c79..f183967d90ff 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icinga
PORTVERSION= 1.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= SF
diff --git a/net-mgmt/lanmap/Makefile b/net-mgmt/lanmap/Makefile
index f952054a0b4e..c1216bf980dc 100644
--- a/net-mgmt/lanmap/Makefile
+++ b/net-mgmt/lanmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lanmap
DISTVERSION= 2006-03-07-rev81
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-mgmt
MASTER_SITES= http://www.parseerror.com/lanmap/rev/
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index 673bc578d267..bbc7a3bd2409 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mbrowse
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 5b3928ac8f25..40d76fe31285 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrtg-ping-probe
PORTVERSION= 2.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 01fc40a37ce6..54a8b58cf98f 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrtg
PORTVERSION= 2.17.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net-mgmt ipv6
MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
diff --git a/net-mgmt/nagiosagent/Makefile b/net-mgmt/nagiosagent/Makefile
index 0966bbe42db8..00c3d36f45a2 100644
--- a/net-mgmt/nagiosagent/Makefile
+++ b/net-mgmt/nagiosagent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= NagiosAgent
PORTVERSION= 1.2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.netpatch.ru/projects/nagiosagent/ \
http://www.netpatch.ru/projects/nagiosagent/old/
diff --git a/net-mgmt/nagiosgrapher/Makefile b/net-mgmt/nagiosgrapher/Makefile
index 3eab0569b058..58166a74907a 100644
--- a/net-mgmt/nagiosgrapher/Makefile
+++ b/net-mgmt/nagiosgrapher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nagiosgrapher
PORTVERSION= 1.7.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosGrapher-${PORTVERSION}/ \
https://www.nagiosforge.org/gf/download/frsrelease/135/285/
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index f0c9ad3219d5..3bd7f247a28c 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nagstamon
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= net-mgmt python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} \
CRITICAL/.
diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 3e41e2df2d61..d7c4599bced6 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ndoutils
PORTVERSION= 1.4b8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt
MASTER_SITES= SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/nettop/Makefile b/net-mgmt/nettop/Makefile
index c83f53a8c81b..e85496f916d6 100644
--- a/net-mgmt/nettop/Makefile
+++ b/net-mgmt/nettop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nettop
PORTVERSION= 0.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://srparish.net/scripts/
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 6e133942a882..d00e4c74ba31 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nfdump-devel
PORTVERSION= 20070808
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-mgmt
MASTER_SITES= SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
DISTNAME= nfdump-snapshot-${PORTVERSION}
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 68480f9fa15b..bd0c5d0b3bd2 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nfdump
PORTVERSION= 1.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 8005a9fce357..892beced488d 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nsca
PORTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF/nagios/nsca-2.x/nsca-${PORTVERSION}
diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index 1e0d0f1f4133..f972fecc7b22 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= FusionInventory-Agent
PORTVERSION= 2.1.13
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FUSINV
diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile
index 96c78885c899..aadd29a9bee0 100644
--- a/net-mgmt/qkismet/Makefile
+++ b/net-mgmt/qkismet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qkismet
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/qKismet/${PORTVERSION}
diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index e335ec18dafe..858b40d4d8e4 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rrdbot
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://thewalter.net/stef/software/rrdbot/
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index dd01752659c8..c9d252590a70 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smokeping
PORTVERSION= 2.6.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt www
MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \
http://smokeping.cs.pu.edu.tw/pub/
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index 04952c696d76..8c10a9ef9419 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= spectools
PORTVERSION= 201004.r1
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.kismetwireless.net/code/ \
${MASTER_SITE_LOCAL}
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 62473f48a9f9..2ffcd3b3147f 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tork
PORTVERSION= 0.30
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt security
MASTER_SITES= SF/${PORTNAME}/TorK%20Source%20Tarball/TorK-${PORTVERSION}
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 55bd3ef35a86..9383182eb200 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= torrus
PORTVERSION= 2.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= SF
diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile
index 18f84283bee8..8c5512fa2d6b 100644
--- a/net-mgmt/vidalia/Makefile
+++ b/net-mgmt/vidalia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vidalia
PORTVERSION= 0.2.18
+PORTREVISION= 1
CATEGORIES= net-mgmt security
MASTER_SITES= https://archive.torproject.org/tor-package-archive/vidalia/ \
https://www.torproject.org/dist/vidalia/ \
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index 76ead149c053..8def7f61f45a 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= virt-viewer
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/
diff --git a/net-mgmt/wifimgr/Makefile b/net-mgmt/wifimgr/Makefile
index 15d4455bdf94..a172d7ec3c0c 100644
--- a/net-mgmt/wifimgr/Makefile
+++ b/net-mgmt/wifimgr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wifimgr
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= net-mgmt sysutils
MASTER_SITES= http://opal.com/freebsd/ports/net-mgmt/wifimgr/ \
CRITICAL
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 4de565b832b8..f4fe5c8b2154 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xymon
PORTVERSION= 4.3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= System for monitoring servers and networks
BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
pcre:${PORTSDIR}/devel/pcre
RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
diff --git a/net-mgmt/yabm/Makefile b/net-mgmt/yabm/Makefile
index 23706f8bcd12..c560c5f757fc 100644
--- a/net-mgmt/yabm/Makefile
+++ b/net-mgmt/yabm/Makefile
@@ -7,14 +7,14 @@
PORTNAME= yabm
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.shapeshifter.se/code/yabm/release/
MAINTAINER= fli@shapeshifter.se
COMMENT= Yet Another Bandwidth Meter, somewhat resembles the Linux bwbar
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_RC_SUBR= yes
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=/etc/rc.subr
diff --git a/net-mgmt/yabm/files/patch-Makefile b/net-mgmt/yabm/files/patch-Makefile
new file mode 100644
index 000000000000..680280badd03
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-Makefile
@@ -0,0 +1,49 @@
+--- src/mylibpng/Makefile.orig 2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/Makefile 2012-05-06 18:42:26.000000000 +0200
+@@ -1,9 +1,10 @@
+ include ../../Makefile.inc
+
+-CFLAGS += -I${PREFIX}/include
++CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+ OBJS = mylibpng.o font.o
+
+ all:: ${OBJS}
++ @touch done
+
+ clean::
+ @-rm ${OBJS}
+--- src/Makefile.orig 2005-04-21 18:44:48.000000000 +0200
++++ src/Makefile 2012-05-06 18:44:54.000000000 +0200
+@@ -3,9 +3,10 @@
+ DIRS = mylibpng
+ OBJS = yabm.o bw.o
+
+-all:: ${DIRS} ${OBJS}
++all:: ${DIRS}/done ${OBJS}
++ @touch done
+
+-mylibpng: force_look
++mylibpng/done:
+ @cd mylibpng; ${MAKE}
+
+ force_look:
+--- Makefile.orig 2005-04-21 18:44:48.000000000 +0200
++++ Makefile 2012-05-06 18:44:32.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ LINK = -lkvm -L${PREFIX}/lib -lpng
+
+-all:: ${DIRS} yabm
++all:: ${DIRS}/done yabm
+
+ install::
+ ${INSTALL} -o root -m 0755 ${BIN} ${PREFIX}/bin/${BIN}
+@@ -18,7 +18,7 @@
+ ${MYLIBPNG_OBJS} \
+ ${OBJS} ${LINK}
+
+-src: force_look
++src/done: force_look
+ @cd src; ${MAKE}
+
+ force_look:
diff --git a/net-mgmt/yabm/files/patch-mylibpng.c b/net-mgmt/yabm/files/patch-mylibpng.c
new file mode 100644
index 000000000000..aff8beab5321
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-mylibpng.c
@@ -0,0 +1,10 @@
+--- src/mylibpng/mylibpng.c.orig 2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/mylibpng.c 2012-05-06 06:45:47.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "mylibpng.h"
+
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 7d82684d61bf..1f92e9c5f609 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amule
PORTVERSION= 10771
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= http://amule.sourceforge.net/tarballs/
PKGNAMESUFFIX= -devel
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 0be477c7e460..abc33c5c1535 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amule
PORTVERSION= 2.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION}
DISTNAME= aMule-${PORTVERSION}
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index 5312419475e4..38251ce0b0bf 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= azureus2
PORTVERSION= 2.5.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p java
MASTER_SITES= SF/azureus/x_obsolete/azureus-${PORTVERSION}
DISTNAME= azureus_${PORTVERSION}_source
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index cc970c8a92b4..58215c26b047 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bitcoin
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= net-p2p finance
MASTER_SITES= https://nodeload.github.com/${PORTNAME}/${PORTNAME}/tarball/ \
http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/net-p2p/bittyrant/Makefile b/net-p2p/bittyrant/Makefile
index f73075afe0f5..814e9cc872af 100644
--- a/net-p2p/bittyrant/Makefile
+++ b/net-p2p/bittyrant/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bittyrant
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-p2p java
MASTER_SITES= http://bittyrant.cs.washington.edu/dist_010807/
DISTNAME= BitTyrant-src
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 20fc171dd04a..eb54e15b2f8d 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= deluge
PORTVERSION= 1.3.5
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-p2p python
MASTER_SITES= http://download.deluge-torrent.org/source/
diff --git a/net-p2p/eiskaltdcpp-data/Makefile b/net-p2p/eiskaltdcpp-data/Makefile
index c8fc1b1b5fb2..6f482d79f4c0 100644
--- a/net-p2p/eiskaltdcpp-data/Makefile
+++ b/net-p2p/eiskaltdcpp-data/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eiskaltdcpp-data
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= GOOGLE_CODE
DISTNAME= eiskaltdcpp-${DISTVERSION}
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index 3c472873af5e..0086a49b8bc6 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eiskaltdcpp-gtk
PORTVERSION= 2.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= GOOGLE_CODE
DISTNAME= eiskaltdcpp-${DISTVERSION}
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index aa3f785aa134..ef7d0a15ca89 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eiskaltdcpp-qt
PORTVERSION= 2.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= GOOGLE_CODE
DISTNAME= eiskaltdcpp-${DISTVERSION}
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index 305f59260d7f..f30a01e04fd4 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gkremldk
PORTVERSION= 0.9.8
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= http://www.tof2k.com/gkremldk/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f310389a6ca6..f7e43c5c11e0 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnunet
DISTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p ipv6 security
MASTER_SITES= GNU
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 599dd8b26ccc..3bff4548710d 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -44,7 +44,7 @@
PORTNAME= gtk-gnutella
PORTVERSION= 0.96.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p ipv6
MASTER_SITES= SF
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index bb29af35bf77..67c4c0b4e3a4 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhx
PORTVERSION= 0.9.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-p2p
MASTER_SITES= SF
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index b68f156b5951..fe41968492eb 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtorrentviewer
PORTVERSION= 0.2b
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
DISTNAME= GTorrentViewer-${PORTVERSION}
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 51ff585a36c6..8ea5fadd978c 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmldonkey
PORTVERSION= 0.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/apps/KDE3.x/network
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 07a702f20387..c6f94e690062 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ktorrent
DISTVERSION= 4.2.0
+PORTREVISION= 1
CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.org/downloads/${DISTVERSION}/
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index bd70fcc38362..f27d30cf5343 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ktorrent
PORTVERSION= 2.2.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.org/downloads/${PORTVERSION}/
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index f8917c99c73e..9713b97440d1 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libktorrent
DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.org/downloads/${DISTVERSION:S,^1,4,}/
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 1ac9ad75fb68..0fe7213e3570 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= linuxdcpp
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= http://launchpadlibrarian.net/69733951/
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 295e9e7fcb98..7e8fd3a0a1fa 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mldonkey
PORTVERSION= 3.1.1
+PORTREVISION= 1
CATEGORIES+= net-p2p
MASTER_SITES= SF
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 487714f2d86c..ff6a3bbcb927 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -6,7 +6,7 @@
PORTNAME= museekplus
PORTVERSION= 0.1.13
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/museek-plus/museek-plus/${PORTVERSION}
DISTNAME= museek+-${PORTVERSION}
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index 9e6003451f78..2b8ef1134848 100644
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@@ -7,7 +7,7 @@
PORTNAME= BitTornado
PORTVERSION= 0.3.18
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES?= net-p2p python ipv6
MASTER_SITES= http://download.bittornado.com/download/ \
diff --git a/net-p2p/qbittorrent-29/Makefile b/net-p2p/qbittorrent-29/Makefile
index 2be6164bbdab..8d520507935c 100644
--- a/net-p2p/qbittorrent-29/Makefile
+++ b/net-p2p/qbittorrent-29/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qbittorrent
PORTVERSION= 2.9.9
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net-p2p ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
diff --git a/net-p2p/qtella/Makefile b/net-p2p/qtella/Makefile
index bb46dc5695f5..1ba874a23e6f 100644
--- a/net-p2p/qtella/Makefile
+++ b/net-p2p/qtella/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtella
PORTVERSION= 0.7.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}
diff --git a/net-p2p/qtorrent/Makefile b/net-p2p/qtorrent/Makefile
index 5f342e474c88..7c92a8d04a23 100644
--- a/net-p2p/qtorrent/Makefile
+++ b/net-p2p/qtorrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtorrent
PORTVERSION= 0.9.6.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net-p2p python
MASTER_SITES= http://cdn.thegraveyard.org/releases/qtorrent/
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 48a9bd425728..4e94ced2ba70 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -7,7 +7,7 @@
PORTNAME= retroshare
PORTVERSION= 0.5.3a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index afa476dd013d..48e25e351b40 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sharktorrent
PORTVERSION= 0.1.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-beta-src
diff --git a/net-p2p/solidcoin/Makefile b/net-p2p/solidcoin/Makefile
index ba5f026e3e37..a6d2a215c4a8 100644
--- a/net-p2p/solidcoin/Makefile
+++ b/net-p2p/solidcoin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= solidcoin
PORTVERSION= 2.041
+PORTREVISION= 1
CATEGORIES= net-p2p finance
MASTER_SITES= http://solidcoin.info/downloads/ \
http://dl.dropbox.com/u/47582909/
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index fcf253ae96c4..f722f6c93fc7 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transmission
PORTVERSION= 2.51
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net-p2p
#MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ \
MASTER_SITES= http://transmission.cachefly.net/
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index 2085a49f03b6..439bcb6f8daa 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -qt4
MAINTAINER= crees@FreeBSD.org
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index 485978c83fbf..fff116b3168e 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transmission-remote-gui
PORTVERSION= 3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= transgui-${PORTVERSION}-src
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 832b274ea5f9..f6da0d6eef65 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tribler
PORTVERSION= 5.5.24
+PORTREVISION= 1
CATEGORIES= net-p2p
#MASTER_SITES= http://dl.tribler.org/
MASTER_SITES= GENTOO/distfiles \
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 750b6c7d1308..c0520567eddc 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -9,7 +9,7 @@
PORTNAME= valknut
PORTVERSION= 0.4.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= SF/wxdcgui/${PORTNAME}-qt4/${PORTVERSION}
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 53e32141edd7..c8dc6efb23ba 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vuze
PORTVERSION= 4.7.0.0
+PORTREVISION= 1
CATEGORIES= net-p2p java
# Moved to x-obsolete, could do with an update
MASTER_SITES= SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g}
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index a40869cb264e..e73d54910a0a 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -7,7 +7,7 @@
PORTNAME= appkonference
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
index 0fce7e51804f..92a33e283919 100644
--- a/net/asterisk-oh323/Makefile
+++ b/net/asterisk-oh323/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-oh323
PORTVERSION= 0.7.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://www.b2bua.org/chrome/site/
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 3616468ae31b..0181b380cbb5 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.12.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 0680fd375638..6d9a3680c7fb 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 10.4.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
index 4df9fdc3e057..41fea6e8e2a6 100644
--- a/net/asterisk14-addons/Makefile
+++ b/net/asterisk14-addons/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk14
PORTVERSION= 1.4.13
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index f114ec384262..d7b7262f7e59 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.4.42
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile
index 0a9ffdfb1e2c..24a4ce4be608 100644
--- a/net/asterisk16-addons/Makefile
+++ b/net/asterisk16-addons/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk16
PORTVERSION= 1.6.2.4
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 8655b434fad8..370d1ec9296e 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.6.2.24
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index 555a05e6f3a1..84335c305091 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
PKGNAMESUFFIX= -gtk
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index 1066da236cd1..7f6ce24d2986 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
PKGNAMESUFFIX= -qt3
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 062a9f7014ae..08f6bd605bbc 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -8,7 +8,7 @@
PORTNAME= blam
PORTVERSION= 1.8.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.cmartin.tk/${PORTNAME}/ \
http://romain.blogreen.org/distfiles/
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 27b70a1b77ac..c4e712ebf2c0 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= boinc-client
PORTVERSION= 7.0.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
diff --git a/net/boinc_curses/Makefile b/net/boinc_curses/Makefile
index 395c9e99508d..4a78f48c528e 100644
--- a/net/boinc_curses/Makefile
+++ b/net/boinc_curses/Makefile
@@ -7,6 +7,7 @@
PORTNAME= boinc_curses
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.oook.cz/bsd/boinc_curses/
diff --git a/net/cphone/Makefile b/net/cphone/Makefile
index 10a1ada25238..2a903ce028ed 100644
--- a/net/cphone/Makefile
+++ b/net/cphone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cphone
DISTVERSION= 0.3.2.cvs.20060407
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net
MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index fe984373c513..d749b729d88a 100644
--- a/net/desktop-data-model/Makefile
+++ b/net/desktop-data-model/Makefile
@@ -7,7 +7,7 @@
PORTNAME= desktop-data-model
PORTVERSION= 1.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index f39130e5f247..0238452df23a 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= diradmin
PORTVERSION= 1.5.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MASTER_SITES= http://diradmin.open-it.org/releases/ \
http://diradmin.open-it.org/releases/old/
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 73938f39b652..a386a1a4a112 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.11
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index a71b8f838ecb..056276a01011 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga3
PORTVERSION= 3.2.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
DISTNAME= ekiga-${PORTVERSION}
diff --git a/net/freenx/Makefile b/net/freenx/Makefile
index 692ecb9d41ab..fcd0d0eac78b 100644
--- a/net/freenx/Makefile
+++ b/net/freenx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freenx
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= BERLIOS
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index cd9f5bf9d091..3b89bde77a8d 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freerdp
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= net comms ipv6
MASTER_SITES= SF/${PORTNAME}/0.8
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 50e3d875b176..ff3fbc8ec232 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= g2ipmsg
PORTVERSION= 0.9.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net gnome
MASTER_SITES= http://www.ipmsg.org/archive/ \
${MASTER_SITE_LOCAL} \
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index f0d2a26c62ad..f5bb05e14fda 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gatekeeper
#PORTVERSION= 2.2.8
DISTVERSION= 2.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/openh323gk/Sources/${PORTVERSION}
DISTNAME= gnugk-${DISTVERSION}
diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index b0a7c22ed6e3..361255d2f221 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gkrellmqst
PORTVERSION= 0.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net games
MASTER_SITES= http://tadpol.org/projects/archives/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile
index b76af62b2847..52cb8f782437 100644
--- a/net/gkrellmwireless2/Makefile
+++ b/net/gkrellmwireless2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmwireless
PORTVERSION= 2.0.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index b3d1e8ee3f63..4ea6ef4beb20 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-mud
PORTVERSION= 0.11.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 1a67a2f3b5e1..eb9a796c9f5d 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-netstatus
PORTVERSION= 2.28.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index de00c1619a4f..bb5b8ca86ed1 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-nettool
PORTVERSION= 2.32.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index 42ae46eadd72..14ef1cb118ad 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-vnc
PORTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net gnome
MASTER_SITES= http://www.brettnacher.org/users/dominik/FreeBSD/
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 4eca54b94f2b..ae38341c497c 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gq
PORTVERSION= 1.3.4
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index 7b7c2c2c6a87..66827cf7fffc 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grdesktop
PORTVERSION= 0.23
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 23046106e6e1..d2b360997e12 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -7,6 +7,7 @@
PORTNAME= grsync
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.opbyte.it/release/ \
LOCAL/martymac
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 236359c8dabd..cad372ab840f 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gspoof
PORTVERSION= 3.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index fe8d8c263e20..b4415c5e2381 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gssdp
PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sites/all/files/sources/
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 76f503999f29..b7af9a3c6065 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-vnc
PORTVERSION= 0.3.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index 3bc1913394a0..1e6318f6d769 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gupnp-av
PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sites/all/files/sources/
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index eb15382e8286..12d9784c63d4 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gupnp-igd
PORTVERSION= 0.1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sites/all/files/sources/
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index 831653da1cc4..c06549c470b5 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gupnp-ui
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sites/all/files/sources/
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 7ab0813de95c..35d9c11596c8 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gupnp
PORTVERSION= 0.13.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sites/all/files/sources/
diff --git a/net/heybuddy/Makefile b/net/heybuddy/Makefile
index c73fc6309220..223bc178e0ff 100644
--- a/net/heybuddy/Makefile
+++ b/net/heybuddy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= heybuddy
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://launchpad.net/${PORTNAME}/0.2/${PORTVERSION}/+download/ \
http://freebsd.grindcore.ch/distfiles/
diff --git a/net/hupnp/Makefile b/net/hupnp/Makefile
index 3c4ce8dac1b4..4f9951541c65 100644
--- a/net/hupnp/Makefile
+++ b/net/hupnp/Makefile
@@ -6,6 +6,7 @@
PORTNAME= hupnp
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= net devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
DISTNAME= herqq-${PORTVERSION}
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 703660677170..1bc128a92008 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdenetwork
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= net kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 97056b3d5cd3..a522142bf610 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdenetwork
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 945c65078b30..7f168db2e10e 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kiax
PORTVERSION= 0.8.51
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src_bin.tar.gz/${PORTVERSION}%20%28Ariana%29
DISTNAME= kiax-${PORTVERSION}-src
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 24139c296650..66f1a65ebb1a 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kio-upnp-ms
DISTVERSION= 1.0.0.git20110808
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel
#MASTER_SITES= ${MASTER_SITE_KDE}
#MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 0d638677b855..181954dc315a 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -6,7 +6,7 @@
PORTNAME= knemo
PORTVERSION= 0.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net kde
MASTER_SITES= http://kde-apps.org/CONTENT/content-files/
DISTNAME= 12956-${PORTNAME}-${PORTVERSION}
diff --git a/net/knemo/Makefile b/net/knemo/Makefile
index 3d6740aa9722..9f435f4d4918 100644
--- a/net/knemo/Makefile
+++ b/net/knemo/Makefile
@@ -6,7 +6,7 @@
PORTNAME= knemo
PORTVERSION= 0.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net kde
MASTER_SITES= http://www.eris23.de/knemo/
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 7727c59b0626..14b6e8f9a056 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kphone
PORTVERSION= 4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= http://www.wirlab.net/kphone/
diff --git a/net/krdesktop/Makefile b/net/krdesktop/Makefile
index 6bda0fb9389c..109e43524345 100644
--- a/net/krdesktop/Makefile
+++ b/net/krdesktop/Makefile
@@ -6,7 +6,7 @@
PORTNAME= krdesktop
PORTVERSION= 1.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net kde
MASTER_SITES= http://www.fruitsalad.org/people/mdouhan/krdesktop/
DISTNAME= ${PORTNAME:S/kr/KR/}-${PORTVERSION}
diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile
index ca18a3e88636..bdd54692bec1 100644
--- a/net/kwooty/Makefile
+++ b/net/kwooty/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kwooty
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net kde
MASTER_SITES= SF/${PORTNAME}
diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile
index e0a8c53b69ec..14ea981c3610 100644
--- a/net/lanbrowsing/Makefile
+++ b/net/lanbrowsing/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lanbrowsing
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 6eccc52d1247..e4199d19ae05 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnetwork
PORTVERSION= 0.0.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index dc41f8af8d8f..867bc56c9f8b 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgweather
PORTVERSION= 2.30.3
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libproxy-gnome/Makefile b/net/libproxy-gnome/Makefile
index baaf76b46ced..3f8896b8ece5 100644
--- a/net/libproxy-gnome/Makefile
+++ b/net/libproxy-gnome/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net devel
PKGNAMESUFFIX= -gnome
diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
index 40f92c4e668b..3458c2394650 100644
--- a/net/libproxy-kde/Makefile
+++ b/net/libproxy-kde/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/net/libproxy-kde/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel
PKGNAMESUFFIX= -kde
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
index 15366949c4a4..87572da161da 100644
--- a/net/libproxy-mozjs/Makefile
+++ b/net/libproxy-mozjs/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/net/libproxy-mozjs/Makefile,v 1.5 2011/01/12 13:10:53 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net www
PKGNAMESUFFIX= -mozjs
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index dd9eea7f0b7d..2051f2d535dc 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/net/libproxy-webkit/Makefile,v 1.13 2011/03/06 23:12:41 kwm Exp $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net www
PKGNAMESUFFIX= -webkit
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 7478905ab3bc..41efe9c87bc6 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.8.5
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index 660920bdba03..22a3cdae7f82 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= link-monitor-applet
PORTVERSION= 2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= link-monitor
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index fe6fcd5a6bba..faabc101a1f5 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
LINPHONE_GUI= yes
diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 6106d65dee7c..d5ee7993c8db 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linux-nx-client
PORTVERSION= 3.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/Linux/
DISTNAME= nxclient-${PORTVERSION}-5.i386
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index de3934f89ab5..aba0b0e524a8 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mediatomb
PORTVERSION= 0.12.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net multimedia
MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION}
diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile
index a7ddfe1fa39b..dbe6a26309dd 100644
--- a/net/minidlna/Makefile
+++ b/net/minidlna/Makefile
@@ -7,6 +7,7 @@
PORTNAME= minidlna
PORTVERSION= 1.0.24
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net multimedia www
MASTER_SITES= SF
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index dac26cde5c2e..9b2d65d8f850 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mtr
PORTVERSION= 0.82
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
http://launchpadlibrarian.net/82181604/ \
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 1e0027cfbb04..1ec9bfc1c9f7 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -8,6 +8,7 @@
PORTNAME= netmap
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NetMap%20${PORTVERSION}
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 445d15fe3cf1..73a0ae39a57b 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netspeed_applet
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://launchpadlibrarian.net/49741506/
diff --git a/net/nos-ttb/Makefile b/net/nos-ttb/Makefile
index e2ecaf56d805..f5f9b2196a10 100644
--- a/net/nos-ttb/Makefile
+++ b/net/nos-ttb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nos-ttb
PORTVERSION= 0.9.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.djcbsoftware.nl/code/ttb/
DISTNAME= ttb-${PORTVERSION}
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 5344da489a10..6c7d4037a6a2 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ntop
PORTVERSION= 4.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
#MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Stable
diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile
index d2ff1d995272..69520fa9fbf5 100644
--- a/net/nxproxy/Makefile
+++ b/net/nxproxy/Makefile
@@ -6,7 +6,7 @@
PORTNAME= nxproxy
DISTVERSION= 3.4.0-2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://x2go.obviously-nice.de/deb/pool-lenny/nxproxy/:nxproxy \
http://x2go.obviously-nice.de/deb/pool-lenny/nxcomp/:nxcomp
@@ -16,7 +16,7 @@ DISTFILES= nxcomp-${DISTVERSION:S/2/1/}.tar.gz:nxcomp\
MAINTAINER= arved@FreeBSD.org
COMMENT= An x2go helper program
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
LICENSE= GPLv2
@@ -25,6 +25,8 @@ CONFLICTS= nxserver-[0-9]*
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf
USE_XORG= ice x11 sm
+CXXFLAGS+= -I${LOCALBASE}/include/libpng15
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
PLIST_FILES= bin/nxproxy bin/setsid
.include <bsd.port.pre.mk>
diff --git a/net/nxproxy/files/patch-nxcomp-Pgn.cpp b/net/nxproxy/files/patch-nxcomp-Pgn.cpp
new file mode 100644
index 000000000000..b59a4619a092
--- /dev/null
+++ b/net/nxproxy/files/patch-nxcomp-Pgn.cpp
@@ -0,0 +1,10 @@
+--- ../nxcomp-3.4.0-1/Pgn.cpp.orig 2007-06-04 15:02:24.000000000 +0200
++++ ../nxcomp-3.4.0-1/Pgn.cpp 2012-05-06 06:43:28.000000000 +0200
+@@ -29,6 +29,7 @@
+
+ #include "Unpack.h"
+ #include "Pgn.h"
++#include "pngpriv.h"
+
+ #define PANIC
+ #define WARNING
diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile
index ce85f14e7fa4..a62883dd23e4 100644
--- a/net/nxserver/Makefile
+++ b/net/nxserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nxserver
PORTVERSION= 2.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/sources/
DISTFILES= nx-X11-${PORTVERSION}-3.tar.gz \
@@ -27,7 +27,7 @@ COMMENT= Low-bandwidth X network server
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
# freetype version included does not compile on 64bit
ONLY_FOR_ARCHS= i386
@@ -60,6 +60,8 @@ post-patch:
${WRKSRC}/nxviewer/nxviewer/Imakefile
@${REINPLACE_CMD} -e "s|objformat=.*|objformat=elf|" \
${WRKSRC}/nxesd/configure
+ ${REINPLACE_CMD} -e 's|^CXXINCLUDES =.*|CXXINCLUDES = -I${LOCALBASE}/include/libpng15|' \
+ ${WRKSRC}/nxcomp/Makefile.in
do-configure:
.if defined(TEMPLATES) && exists(${TEMPLATES}/config.guess) && exists(${TEMPLATES}/config.sub)
diff --git a/net/nxserver/files/patch-nxcomp-Pgn.cpp b/net/nxserver/files/patch-nxcomp-Pgn.cpp
new file mode 100644
index 000000000000..02aecb1f30ea
--- /dev/null
+++ b/net/nxserver/files/patch-nxcomp-Pgn.cpp
@@ -0,0 +1,10 @@
+--- nxcomp/Pgn.cpp.orig 2006-06-27 11:25:12.000000000 +0200
++++ nxcomp/Pgn.cpp 2012-05-07 05:27:20.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "Unpack.h"
+ #include "Pgn.h"
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index b9f4e940477d..4c34e9a0d616 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ohphone
PORTVERSION= 1.4.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
diff --git a/net/online-desktop/Makefile b/net/online-desktop/Makefile
index 088719d2cbde..790effefc838 100644
--- a/net/online-desktop/Makefile
+++ b/net/online-desktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= online-desktop
PORTVERSION= 0.3.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/opal/Makefile b/net/opal/Makefile
index b833890b259a..3828d3c67ba3 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opal
PORTVERSION= 2.2.11
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index cf7051271ca4..20ae1092e77e 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opal3
PORTVERSION= 3.6.6
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S|3||g}/${PORTVERSION:R}
diff --git a/net/openam/Makefile b/net/openam/Makefile
index cc585140b28b..91e30a4e30a7 100644
--- a/net/openam/Makefile
+++ b/net/openam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openam
PORTVERSION= 1.1.18
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.voxgratia.org/releases/
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 7add8bff782a..3f63f12071fb 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.19.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index 75e94f08852d..9ed6727f3765 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openmcu
PORTVERSION= 2.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= SF/openh323/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 93bc53227d2b..3bedac459839 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opennx
PORTVERSION= 0.16.0.709
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index 422747e9fdab..478918751d3f 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Net-FS-Flickr
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-Net-VNC/Makefile b/net/p5-Net-VNC/Makefile
index 097b332e5f63..399adb70e07f 100644
--- a/net/p5-Net-VNC/Makefile
+++ b/net/p5-Net-VNC/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Net-VNC
PORTVERSION= 0.40
+PORTREVISION= 1
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/pcbsd-netmanager/Makefile b/net/pcbsd-netmanager/Makefile
index 6dd396d14f76..5d5cad413c9c 100644
--- a/net/pcbsd-netmanager/Makefile
+++ b/net/pcbsd-netmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pcbsd-netmanager
PORTVERSION= 8.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net kde
MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \
http://www.pcbsd.org/~kris/software/
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index aa7ab3590268..c91824c4998e 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pppload
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/network/serial/ppp
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 7b9f32aa60d2..74e04d3e3856 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
#
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= # empty
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index bb9a47442331..54bf09b2303a 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -6,6 +6,7 @@
PORTNAME= network
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index 7513a3e8c664..99d97e2454df 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= remmina
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= SF/${PORTNAME}/0.8
PKGNAMESUFFIX= -applet
diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile
index c4a1a7234995..32d9f3ddece6 100644
--- a/net/remmina-plugin-vnc/Makefile
+++ b/net/remmina-plugin-vnc/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 1
PKGNAMESUFFIX= -vnc
COMMENT= Remmina plugin for VNC protocol
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 211fd8cdf79e..8984523ed573 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -7,7 +7,7 @@
PORTNAME= remmina
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= SF/${PORTNAME}/0.9
diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index 138948aaf62e..88aa64a5cdbf 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rsplib
PORTVERSION= 2.7.13
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.tdr.wiwi.uni-due.de/fileadmin/fileupload/I-TDR/ReliableServer/Downloads/
diff --git a/net/rude/Makefile b/net/rude/Makefile
index ad919dcd76e1..9cfa47398e9c 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rude
PORTVERSION= 0.70
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index ec647a0e2e33..399246a5d4de 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= service-discovery-applet
PORTVERSION= 0.4.3
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net dns gnome
MASTER_SITES= http://0pointer.de/~sebest/
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index e6c8cc545294..e35db20fa57b 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smb4k-kde4
PORTVERSION= 0.10.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= smb4k
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index 7bea8a85bfd5..6bf8b9c6c9ab 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smb4k
PORTVERSION= 0.9.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= smb4k
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index c7e7633a669c..4d0f24e61f18 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tramp
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= net elisp
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index c82696ed78b2..f34cccbdf4ad 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tsclient
PORTVERSION= 0.150
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net gnome
MASTER_SITES= SF
diff --git a/net/tucan/Makefile b/net/tucan/Makefile
index fe7e5484f1c2..eb8c682b764d 100644
--- a/net/tucan/Makefile
+++ b/net/tucan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tucan
PORTVERSION= 0.3.10
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://forja.rediris.es/frs/download.php/2051/ \
http://build-tucan-doc.googlecode.com/files/
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index c8c048c1c629..bad543c73001 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twinkle
PORTVERSION= 1.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= http://www.xs4all.nl/~mfnboer/twinkle/download/
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 99fe516205c2..2648e2a7c287 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twitux
PORTVERSION= 0.69
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 2ef84c06b35b..92a300014e3d 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unison
PORTVERSION= 2.45.4
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= -devel
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 32585686146c..1427500aab00 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unison
PORTVERSION= 2.40.63
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 01251a1957ab..f36fc4477e50 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unison
PORTVERSION= 2.32.52
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 232
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 5cd9562bb118..73630f3f2018 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vinagre
PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 1c5d00877124..d39338403698 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vino
PORTVERSION= 2.32.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 89820233d788..0a08965ba3c5 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vnstat
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://humdi.net/vnstat/ \
http://mirror.mcx2.org/
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 94dced990fc2..66c34b8e3977 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= wireshark
PORTVERSION= 1.6.8
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/ \
http://ftp.uni-kl.de/pub/wireshark/src/ \
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 030cd8b264ce..c444e7dd0ffa 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wpa_gui
PORTVERSION= 0.5.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://hostap.epitest.fi/releases/
DISTNAME= wpa_supplicant-${PORTVERSION}
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index ec7c6eae2611..76b6029d439a 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -6,7 +6,7 @@
PORTNAME= x2goclient
DISTVERSION= 3.01-5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/pre-git/
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 1cd3b1a1d4bd..73bb036dc688 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grn
PORTVERSION= 0.0.28
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= news gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/pre-${PORTVERSION}
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index b36a8eb6bc65..575b67d63304 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klibido
PORTVERSION= 0.2.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= news
MASTER_SITES= SF
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 4e6c1d6f7fe3..b26be5a1b675 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knews
PORTVERSION= 1.0b.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=dinoex
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= A threaded nntp newsreader for X
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
compface:${PORTSDIR}/mail/faces
RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter
diff --git a/news/knews/files/patch-Imakefile b/news/knews/files/patch-Imakefile
new file mode 100644
index 000000000000..926c9ba08eaa
--- /dev/null
+++ b/news/knews/files/patch-Imakefile
@@ -0,0 +1,12 @@
+--- src/Imakefile.orig 1998-11-21 16:31:37.000000000 +0100
++++ src/Imakefile 2012-05-06 18:07:58.000000000 +0200
+@@ -35,7 +35,8 @@
+ COMPFACE_LIB =
+ #endif
+
+-INCLUDES = -I../Widgets $(REGEXP_INCLUDES) $(KNEWS_INCLUDES)
++INCLUDES = -I../Widgets $(REGEXP_INCLUDES) $(KNEWS_INCLUDES) -I${LOCALBASE}/include/libpng15
++
+
+ LOCAL_LIBRARIES = \
+ -L../Widgets -lWidgets $(REGEXP_LIB) $(JPEG_LIB) $(PNG_LIB) \
diff --git a/news/knews/files/patch-png.c b/news/knews/files/patch-png.c
index 999e7c7e5007..22eed8a7c1c3 100644
--- a/news/knews/files/patch-png.c
+++ b/news/knews/files/patch-png.c
@@ -1,6 +1,14 @@
--- src/png.c.orig 1998-11-21 15:55:13.000000000 +0100
-+++ src/png.c 2010-09-15 07:51:20.000000000 +0200
-@@ -76,10 +76,16 @@
++++ src/png.c 2012-05-06 13:39:28.000000000 +0200
+@@ -20,6 +20,7 @@
+ #else
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+
+ static unsigned int p_cmap_inited = False;
+@@ -76,10 +77,16 @@
return fp;
}
@@ -19,7 +27,7 @@
Pixmap pixmap;
FILE *volatile vol_fp = NULL;
void *volatile vol_pic = NULL;
-@@ -92,13 +98,21 @@
+@@ -92,13 +99,21 @@
init_png_cmap();
@@ -46,7 +54,7 @@
ArtTextAddLine(main_widgets.text, "[knews: png error.]",
ascii_font->body_font, global.alert_pixel);
else {
-@@ -108,58 +122,55 @@
+@@ -108,58 +123,55 @@
unsigned int per_line = 0;
unsigned int i, j, pass;
@@ -117,7 +125,7 @@
vol_pn = pn;
} else {
- png_set_dither(&p_str, p_cmap, cmap_size,
-+ png_set_dither(png_ptr, p_cmap, cmap_size,
++ png_set_quantize(png_ptr, p_cmap, cmap_size,
cmap_size, NULL, True);
}
@@ -128,7 +136,7 @@
vol_pic = pic = (unsigned char *)XtMalloc(h * per_line);
-@@ -167,14 +178,14 @@
+@@ -167,14 +179,14 @@
for (i = 0 ; i < pass ; i++) {
row = pic;
for (j = 0 ; j < h ; j++) {
@@ -145,7 +153,7 @@
}
if (!vol_did)
-@@ -204,7 +215,7 @@
+@@ -204,7 +216,7 @@
}
}
diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile
index d80439478dc3..7220d6b2f642 100644
--- a/news/lottanzb/Makefile
+++ b/news/lottanzb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lottanzb
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= news
MASTER_SITES= http://www.lottanzb.org/releases/ \
http://launchpadlibrarian.net/64247317/ \
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 19254d462512..ea89645b336c 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pan
PORTVERSION= 0.135
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= news gnome
MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
DIST_SUBDIR= gnome2
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 3dcaffa5f0f1..b8a38ece4d55 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slrn
PORTVERSION= 0.9.9p1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= news ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
ftp://angel.sovam.com/pub/tools/net/news/ \
diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index 2d93821d3812..e34ad704925d 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= slrnconf
PORTVERSION= 0.8.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= news
MASTER_SITES= http://home.arcor.de/kaffeetisch/downloads/
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 36a4716a6937..9ecd4a234c34 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tin
PORTVERSION= 2.0.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= news ipv6
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index 2d4c0ea24268..c249fe375046 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-pilot-conduits
PORTVERSION= 2.0.17
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= palm comms gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 8643c2af4288..4250f2d5f57d 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-pilot
PORTVERSION= 2.0.17
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= palm comms gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index 100bf35ff3b8..f9bfe7696691 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imgvtopgm
PORTVERSION= 2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= palm graphics
MASTER_SITES= http://linuxmafia.com/pub/palmos/other-os/
diff --git a/palm/jpilot-picsnvideos/Makefile b/palm/jpilot-picsnvideos/Makefile
index 24fcb69320f1..5013b9790750 100644
--- a/palm/jpilot-picsnvideos/Makefile
+++ b/palm/jpilot-picsnvideos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= picsnvideos
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= palm comms graphics
MASTER_SITES= SF/${PORTNAME}/source%20code/${PORTVERSION}
PKGNAMEPREFIX= jpilot-
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 7356788733f7..ff823f376466 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -8,6 +8,7 @@
PORTNAME= jpilot
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES+= palm comms
MASTER_SITES= http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \
http://jpilot.org/
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index f3e70de5ecf5..1113813382cb 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -52,7 +52,7 @@ LDFLAGS+= ${PTHREAD_LIBS}
.endif
.if defined(WITH_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-libpng=${PREFIX}
.else
CONFIGURE_ARGS+= --disable-png
diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index f33c9bbc2d03..65a7a07e25df 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ppmtoTbmp
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= palm graphics
MASTER_SITES= http://www.isaac.cs.berkeley.edu/pilot/
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index e93977d8a12b..f4070caf48b9 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= synce-gvfs
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= palm
MASTER_SITES= SF/synce/SynCE-GNOME/0.14
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index e381f8759755..4cff4cded99e 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -6,7 +6,7 @@
PORTNAME= synce-trayicon
PORTVERSION= 0.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= palm
MASTER_SITES= SF/synce/SynCE-GNOME/${PORTVERSION}
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index b65697d741a2..7c5d96bd4ca3 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnugadu2
PORTVERSION= 2.3.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= polish net-im
MASTER_SITES= SF/ggadu/gg2/${PORTVERSION}
DISTNAME= gg2-${PORTVERSION}
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index e610ebbf5b97..5567eb710232 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kadu
PORTVERSION= 0.11.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= polish net-im
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index c3428a29aad8..866a9932b12e 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= polish kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 583a1eaa6f22..6cde75482e2b 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= polish kde
MAINTAINER= kde@FreeBSD.org
diff --git a/polish/qfaktury/Makefile b/polish/qfaktury/Makefile
index 04f48f670bf3..46d4bdd7830c 100644
--- a/polish/qfaktury/Makefile
+++ b/polish/qfaktury/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qfaktury
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= polish deskutils
MASTER_SITES= SF
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 7441f746c7b4..ca1ebfaf2828 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qnapi
PORTVERSION= 0.1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= polish multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index 4d65ab5547ed..4cf256f44937 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tleenx2
PORTVERSION= 20040214
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= polish net
MASTER_SITES= SF/tleenx/tleenx2/${DISTNAME}
DISTNAME= TleenX2-${PORTVERSION}
diff --git a/ports-mgmt/bpm/Makefile b/ports-mgmt/bpm/Makefile
index 6601732a23e3..f5348b29a1b5 100644
--- a/ports-mgmt/bpm/Makefile
+++ b/ports-mgmt/bpm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bpm
PORTVERSION= 0.4.1b
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= ports-mgmt
MASTER_SITES= http://www.meowfishies.com/code/bpm/
EXTRACT_SUFX= .tgz
diff --git a/ports-mgmt/bxpkg/Makefile b/ports-mgmt/bxpkg/Makefile
index dee1a793b038..2502d038b069 100644
--- a/ports-mgmt/bxpkg/Makefile
+++ b/ports-mgmt/bxpkg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bxpkg
DISTVERSION= 0.0.4_0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ports-mgmt
MASTER_SITES= http://bxpkg.bsdroot.lv/files/
DISTNAME= ${PORTNAME}-${DISTVERSION}
diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index 8fe98ebb7cf1..691b5c253c79 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-packagekit
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt sysutils gnome
MASTER_SITES= GNOME
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index 2e5800ef5c7a..0532860ce501 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -6,7 +6,7 @@
PORTNAME= KPackageKit
PORTVERSION= 0.6.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ports-mgmt sysutils kde
MASTER_SITES= http://opendesktop.org/CONTENT/content-files/
DISTNAME= 84745-${PORTNAME:L}-${PORTVERSION}
diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index 6bd19a98c0f1..6cdf2085b579 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kports
PORTVERSION= 0.8.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= ports-mgmt kde
MASTER_SITES= SF
diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile
index e5eff0d481e2..373ccce2a12e 100644
--- a/ports-mgmt/kports/Makefile
+++ b/ports-mgmt/kports/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kports
PORTVERSION= 0.6.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= ports-mgmt kde
MASTER_SITES= SF
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 367516bc4a19..d72ae1364a9a 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= PackageKit
PORTVERSION= 0.6.11
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= http://www.packagekit.org/releases/
diff --git a/ports-mgmt/portrac/Makefile b/ports-mgmt/portrac/Makefile
index fd1c527fc313..b5cbb8c7fc34 100644
--- a/ports-mgmt/portrac/Makefile
+++ b/ports-mgmt/portrac/Makefile
@@ -7,6 +7,7 @@
PORTNAME= portrac
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= http://e-soul.org/distfiles/ \
http://home.e-soul.org/~mgp/distfiles/
diff --git a/ports-mgmt/qtpkg/Makefile b/ports-mgmt/qtpkg/Makefile
index 1ec78bbc770f..1c1c65d7d09b 100644
--- a/ports-mgmt/qtpkg/Makefile
+++ b/ports-mgmt/qtpkg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtpkg
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= ports-mgmt
# mastersite disappeared around July 6 2003
MASTER_SITES= # http://gauss.cord.edu/homepages/twschulz/demo/
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index be1dfc52f8aa..3db43cf11a2d 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= portuguese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index 81ea3562b493..53b280547c38 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= portuguese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index 4ebd87e3a4d8..38871ebba370 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= portuguese kde
MAINTAINER= kde@FreeBSD.org
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index 13c32b25f76c..8b69c7a7ba10 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= portuguese kde
MAINTAINER= kde@FreeBSD.org
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 1a62644311c6..eeea1fb3cd86 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= advi
PORTVERSION= 1.9
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://gallium.inria.fr/${PORTNAME}/ \
http://caml.inria.fr/distrib/bazar-ocaml/${PORTNAME}/
@@ -19,7 +19,7 @@ COMMENT= Active-DVI viewer
BUILD_DEPENDS= ${CI_DEPEND}:${PORTSDIR}/graphics/ocaml-images \
kpsewhich:${PORTSDIR}/print/teTeX-base
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
RUN_DEPENDS= kpsewhich:${PORTSDIR}/print/teTeX-base
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 4bc422333e65..2eed47028037 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apsfilter
PORTVERSION= 7.2.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 7bc120aeab41..1f577906d23d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= auctex
PORTVERSION= 11.86
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print elisp
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index ff811ddac30c..2adc206dd6d3 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= catdvi
PORTVERSION= 0.14
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 59b42f7279ad..c8f2f52bbec6 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.4.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print chinese japanese korean
MASTER_SITES= ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/ \
ftp://ftp.u-aizu.ac.jp/pub/tex/cjk-lyx/qt/ \
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index 0571ca7bc3fb..7dce078fc194 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cm-super
PORTVERSION= 0.3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print x11-fonts
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= hrs
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 397040686c9d..1b8f8be7003d 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -71,15 +71,15 @@ CUPSSYSGRP= wheel
# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
.if defined(CUPS_CLIENT)
-PORTREVISION= 1
+PORTREVISION= 2
LICENSE= LGPL21
CUPS_SUFFIX= -client
.elif defined(CUPS_IMAGE)
-PORTREVISION= 0
+PORTREVISION= 1
CUPS_SUFFIX= -image
LICENSE= LGPL21
.else
-PORTREVISION= 0
+PORTREVISION= 1
CUPS_SUFFIX= -base
CONFLICTS+= cupsddk-*
.endif
@@ -102,7 +102,7 @@ DESCR= ${MASTERDIR}/pkg-descr.client
.elif defined(CUPS_IMAGE)
LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
# force build if old cups is installed.
BUILD_DEPENDS+= cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index 8c7a4cab051e..ae80739de7bf 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cups-bjnp
PORTVERSION= 0.5.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index 013848a1fdad..a7dcdf90d16b 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cups-pdf
PORTVERSION= 2.6.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.cups-pdf.de/src/ \
http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 03467b2f783b..f4b116982426 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cups-pk-helper
PORTVERSION= 0.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/releases/
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 666106ba4140..72ceef7ce21a 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cups-pstoraster
PORTVERSION= 8.15.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= ghostscript/${PORTVERSION}
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index f047f8b33c37..af779b297ac1 100644
--- a/print/dot2tex/Makefile
+++ b/print/dot2tex/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dot2tex
PORTVERSION= 2.8.7
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index a9fd0f7f71a7..763bb2eb18b5 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvipdfmx
PORTVERSION= 20100328
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://project.ktug.or.kr/dvipdfmx/snapshot/latest/ \
http://project.ktug.or.kr/dvipdfmx/snapshot/archive/
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Dvipdfm with Asian languages by CID-keyed font technology support
BUILD_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
paper:${PORTSDIR}/print/libpaper
RUN_DEPENDS= ${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
kpsepath:${PORTSDIR}/print/teTeX-base
diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index e12b58528afa..32375bcc50b3 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dvipsk-tetex
PORTVERSION= 5.95a
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
mktexlsr:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
diff --git a/print/dvisvg/Makefile b/print/dvisvg/Makefile
index 36ab51efebcb..e7ae960c9801 100644
--- a/print/dvisvg/Makefile
+++ b/print/dvisvg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dvisvg
DISTVERSION= 0.7.1d
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= http://dvisvg.sourceforge.net/files/
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index a01242dcb91f..3af06d6d8aa8 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enscript
PORTVERSION= 1.6.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES+= print
MASTER_SITES= http://www.codento.com/people/mtr/genscript/
PKGNAMESUFFIX= -${PAPERSIZE}
diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index 8ca7aa9fac13..11c4efb0498b 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epsonepl
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GS-IJS%20Plugin%20v${PORTVERSION}
DISTNAME= ${PORTNAME}ijs-${PORTVERSION}
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 73b8a94968e0..d1c2503af113 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flpsed
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.ecademix.com/JohannesHofmann/
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index e4658bb61575..4c2f678c81be 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fontforge
PORTVERSION= 20110222
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source
DISTFILES= ${EXTRACT_ONLY}
@@ -19,7 +19,7 @@ COMMENT= Type 1/TrueType/OpenType/bitmap font editor
LIB_DEPENDS= uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
gif.5:${PORTSDIR}/graphics/giflib \
freetype.9:${PORTSDIR}/print/freetype2 \
xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index befdad2c3560..2b7bdb798791 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= foo2zjs
PORTVERSION= 20110609
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 68594dd42ffb..651c92538129 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -7,6 +7,7 @@
PORTNAME= foomatic-filters
PORTVERSION= 4.0.7
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.linuxprinting.org/download/foomatic/ \
http://www.openprinting.org/download/foomatic/
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index 02809bb7ed3c..61915786e8c6 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freetype-tools
PORTVERSION= 1.3.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= SF/freetype/freetype/${PORTVERSION} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile
index 7adb5b8d0222..3c193c7b1c5c 100644
--- a/print/frescobaldi/Makefile
+++ b/print/frescobaldi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= frescobaldi
PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= http://lilykde.googlecode.com/files/
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 04e4457011b2..265c81b350bf 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ggv
PORTVERSION= 2.12.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index 8afb6d6cd38a..5f802a1ff446 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghostscript7-commfont
PORTVERSION= 7.07
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 4bb40979b45f..c4579ab79739 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghostscript7
PORTVERSION= 7.07
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= print
MASTER_SITES= SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
@@ -23,7 +23,7 @@ MAINTAINER= doceng@FreeBSD.org
COMMENT= Ghostscript 7.x PostScript interpreter
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
# normazile WRKSRC so things like cups-pstoraster may work
@@ -43,7 +43,8 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \
MAKE_JOBS_UNSAFE= yes
CONFIGURE_ENV= ${MAKE_ENV}
-CPPFLAGS+= -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+CPPFLAGS+= -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= ${XLDFLAGS}
CONFIGURE_ARGS= --disable-compile-inits \
--with-ijs
diff --git a/print/ghostscript7/files/patch-src-gdevpng.c b/print/ghostscript7/files/patch-src-gdevpng.c
new file mode 100644
index 000000000000..697f6c71ff7d
--- /dev/null
+++ b/print/ghostscript7/files/patch-src-gdevpng.c
@@ -0,0 +1,11 @@
+--- src/gdevpng.c.orig 2003-05-15 12:05:29.000000000 +0200
++++ src/gdevpng.c 2012-04-27 20:17:30.000000000 +0200
+@@ -258,7 +258,7 @@
+ goto done;
+ }
+ /* set error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ code = gs_note_error(gs_error_VMerror);
+ goto done;
diff --git a/print/ghostscript7/files/patch-src-png_.h b/print/ghostscript7/files/patch-src-png_.h
new file mode 100644
index 000000000000..3ab10a5af90a
--- /dev/null
+++ b/print/ghostscript7/files/patch-src-png_.h
@@ -0,0 +1,9 @@
+--- src/png_.h.orig 2003-01-17 01:49:05.000000000 +0100
++++ src/png_.h 2012-04-27 19:22:59.000000000 +0200
+@@ -27,5 +27,6 @@
+ #else
+ #include "png.h"
+ #endif
++#include "pngpriv.h"
+
+ #endif /* png__INCLUDED */
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9b80c6fa7507..91044c7cb61d 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghostscript8
PORTVERSION= 8.71
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -27,7 +27,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
jasper:${PORTSDIR}/graphics/jasper \
jbig2dec:${PORTSDIR}/graphics/jbig2dec \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME:S,8,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
@@ -56,7 +56,7 @@ CONFIGURE_ARGS= --disable-compile-inits \
--with-drivers=""
CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
-I${WRKSRC}/jasper/src/libjasper/include \
- -I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include/libpng15 \
-I${LOCALBASE}/include
XCFLAGS= ${PTHREAD_CFLAGS}
XLDFLAGS= ${PTHREAD_LIBS}
diff --git a/print/ghostscript8/files/patch-base-gdevpng.c b/print/ghostscript8/files/patch-base-gdevpng.c
new file mode 100644
index 000000000000..e60b57eb8ec1
--- /dev/null
+++ b/print/ghostscript8/files/patch-base-gdevpng.c
@@ -0,0 +1,11 @@
+--- base/gdevpng.c.orig 2008-07-17 04:34:01.000000000 +0200
++++ base/gdevpng.c 2012-04-27 20:19:52.000000000 +0200
+@@ -280,7 +280,7 @@
+ goto done;
+ }
+ /* set error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ code = gs_note_error(gs_error_VMerror);
+ goto done;
diff --git a/print/ghostscript8/files/patch-base-png_.h b/print/ghostscript8/files/patch-base-png_.h
new file mode 100644
index 000000000000..f41e1f171439
--- /dev/null
+++ b/print/ghostscript8/files/patch-base-png_.h
@@ -0,0 +1,9 @@
+--- base/png_.h.orig 2007-06-06 00:23:38.000000000 +0200
++++ base/png_.h 2012-04-27 19:31:55.000000000 +0200
+@@ -22,5 +22,6 @@
+ #else
+ #include "png.h"
+ #endif
++#include "pngpriv.h"
+
+ #endif /* png__INCLUDED */
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 9cbd9a7cde38..d784cddb484d 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghostscript9
PORTVERSION= 9.05
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -27,7 +27,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
idn:${PORTSDIR}/dns/libidn \
jbig2dec:${PORTSDIR}/graphics/jbig2dec \
jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
# XXX: lcms shared lib support is broken
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 46ac3ff33a5a..c648e5810020 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-cups-manager
PORTVERSION= 0.31
-PORTREVISION= 13
+PORTREVISION= 14
PORTEPOCH= 1
CATEGORIES= print gnome
MASTER_SITES= GNOME
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index ea38c712029d..9a094b28b1c2 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-print
PORTVERSION= 0.37
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= print gnome
MASTER_SITES= GNOME
DISTNAME= gnome-print-${PORTVERSION}
diff --git a/print/gnome-specimen/Makefile b/print/gnome-specimen/Makefile
index 4e419bab9bef..05d5064bdfb2 100644
--- a/print/gnome-specimen/Makefile
+++ b/print/gnome-specimen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-specimen
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= http://uwstopia.nl/geek/projects/gnome-specimen/releases/
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index ad2f00e51bd0..52f28ec5b038 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomephotoprinter
PORTVERSION= 0.7.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print gnome
MASTER_SITES= http://www.fogman.de/gpp/
DISTNAME= gpp-${PORTVERSION}
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index 11e29f557b88..1eb7a37aa59b 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gribouy
PORTVERSION= 0.0.8
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= print gnome
#MASTER_SITES= ${MASTER_SITE_SAVANNAH}
#MASTER_SITE_SUBDIR= gribouy/unstable.pkg/${PORTVERSION:R}
diff --git a/print/gsview/Makefile b/print/gsview/Makefile
index b40836f189ba..a06be714b885 100644
--- a/print/gsview/Makefile
+++ b/print/gsview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsview
PORTVERSION= 4.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= http://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 998dd9553cd6..eac50768eee0 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtklp
PORTVERSION= 1.2.9
+PORTREVISION= 1
DISTVERSIONSUFFIX= .src
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 9da4d9e955a3..f8863b3ebe19 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -8,6 +8,7 @@
PORTNAME?= gutenprint
PORTVERSION= 5.2.7
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION}
PKGNAMESUFFIX?= -base
diff --git a/print/gv/Makefile b/print/gv/Makefile
index dc63af76f635..ed6136bf6238 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gv
PORTVERSION= 3.7.3
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index bdeca88d63c3..cff156dca901 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hp2xx
PORTVERSION= 3.4.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A HPGL to vector- and raster formats converter and previewer for X11
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${DISTNAME}/sources
diff --git a/print/hp2xx/files/patch-png.c b/print/hp2xx/files/patch-png.c
new file mode 100644
index 000000000000..48162b3d7dae
--- /dev/null
+++ b/print/hp2xx/files/patch-png.c
@@ -0,0 +1,19 @@
+--- png.c.orig 2003-06-21 17:31:51.000000000 +0200
++++ png.c 2012-05-06 06:59:14.000000000 +0200
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include "to_png.h"
+ #include <png.h>
++#include <zlib.h>
+
+ #define PDNCOL 256
+
+@@ -36,7 +37,7 @@
+ }
+
+ /* set up error handlimg for libpng */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return;
+ }
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 0b3b301aa01c..9bc84d34a568 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hpijs
PORTVERSION= 2.1.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION}
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 9b4c976a7011..47b03499482f 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hplip
PORTVERSION= 3.12.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 8b730e0ce25f..03fec69135ca 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Hyperlatex
DISTVERSION= 2.9a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/2.9a
diff --git a/print/ifxetex/Makefile b/print/ifxetex/Makefile
index f6a2c3ab22a4..4a0350b4bc2e 100644
--- a/print/ifxetex/Makefile
+++ b/print/ifxetex/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ifxetex
PORTVERSION= 20090124
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/generic/
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 138f08f0e0df..260884041109 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jadetex
PORTVERSION= 3.13
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= SF
@@ -15,7 +15,7 @@ MAINTAINER= doceng@FreeBSD.org
COMMENT= A TeX backend for Jade, for typesetting SGML documents
BUILD_DEPENDS= etex:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= etex:${PORTSDIR}/print/teTeX-base
MAKE_JOBS_UNSAFE= yes
diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile
index 7383efb2e228..6da444a23768 100644
--- a/print/kcdlabel/Makefile
+++ b/print/kcdlabel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kcdlabel
PORTVERSION= 2.12
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= print kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-KDE3
DISTNAME= ${PORTNAME}-${PORTVERSION}-KDE3
diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
index 2e5442484100..dca2455e66ed 100644
--- a/print/kdeutils4-printer-applet/Makefile
+++ b/print/kdeutils4-printer-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= printer-applet
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/print/kover/Makefile b/print/kover/Makefile
index d2c2fe465e16..5a80a731f8bb 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kover
PORTVERSION= 4
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= http://lisas.de/kover/
diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile
index 3a1b1b3b786b..0c5535e6598d 100644
--- a/print/kpdftool/Makefile
+++ b/print/kpdftool/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kpdftool
PORTVERSION= 0.23.1
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/
DISTFILES= 33194-${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/print/latex-arydshln/Makefile b/print/latex-arydshln/Makefile
index c0c1646b7b62..a529690e6c04 100644
--- a/print/latex-arydshln/Makefile
+++ b/print/latex-arydshln/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-arydshln
PORTVERSION= 1.71.20040831
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-bytefield/Makefile b/print/latex-bytefield/Makefile
index f630fbb4ca10..b50f01ac1216 100644
--- a/print/latex-bytefield/Makefile
+++ b/print/latex-bytefield/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-bytefield
PORTVERSION= 1.2.20050731
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/latex/contrib/bytefield
diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index e6e5ffa5552f..ae405a3f7973 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-caption
PORTVERSION= 3.1.20100114
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-chapterfolder/Makefile b/print/latex-chapterfolder/Makefile
index dab1572c7e0f..b3f88368c6e4 100644
--- a/print/latex-chapterfolder/Makefile
+++ b/print/latex-chapterfolder/Makefile
@@ -6,6 +6,7 @@
PORTNAME= chapterfolder
PORTVERSION= 2.0.20051124
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-circ/Makefile b/print/latex-circ/Makefile
index 4a3338106cf7..ea46895bfaba 100644
--- a/print/latex-circ/Makefile
+++ b/print/latex-circ/Makefile
@@ -7,7 +7,7 @@
PORTNAME= circ
PORTVERSION= 1.0f
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ftp://cam.ctan.org/tex-archive/macros/generic/diagrams/ \
http://theory.uwinnipeg.ca/scripts/CTAN/macros/generic/diagrams/
diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index bdc99dee6ecc..fe954d707317 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex-cjk
PORTVERSION= 4.8.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print chinese japanese korean
MASTER_SITES= http://cjk.ffii.org/ \
ftp://freebsd.csie.ntu.edu.tw/users/rafan/
diff --git a/print/latex-feynmf/Makefile b/print/latex-feynmf/Makefile
index 3e125408521b..24ed314e7a44 100644
--- a/print/latex-feynmf/Makefile
+++ b/print/latex-feynmf/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-feynmf
PORTVERSION= 1.08.19961202
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/latex/contrib/feynmf
diff --git a/print/latex-logpap/Makefile b/print/latex-logpap/Makefile
index 71732db4737d..a59721e1b038 100644
--- a/print/latex-logpap/Makefile
+++ b/print/latex-logpap/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-logpap
PORTVERSION= 0.6.20040201
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-nomencl/Makefile b/print/latex-nomencl/Makefile
index 025b857c4d50..e4f46874c692 100644
--- a/print/latex-nomencl/Makefile
+++ b/print/latex-nomencl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= nomencl
PORTVERSION= 4.2.20050922
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
diff --git a/print/latex-prettyref/Makefile b/print/latex-prettyref/Makefile
index 8ab9e7199954..eca78ee9c4b5 100644
--- a/print/latex-prettyref/Makefile
+++ b/print/latex-prettyref/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex-prettyref
PORTVERSION= 3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/latex/contrib
diff --git a/print/latex-subfloat/Makefile b/print/latex-subfloat/Makefile
index 2e307aed935a..31e91329cfa2 100644
--- a/print/latex-subfloat/Makefile
+++ b/print/latex-subfloat/Makefile
@@ -6,7 +6,7 @@
PORTNAME= latex-subfloat
PORTVERSION= 2.14.20030821
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/latex/contrib/subfloat
diff --git a/print/latex-supertabular/Makefile b/print/latex-supertabular/Makefile
index 069827ed5f59..9d6756103fbb 100644
--- a/print/latex-supertabular/Makefile
+++ b/print/latex-supertabular/Makefile
@@ -7,7 +7,7 @@
PORTNAME= latex-supertabular
PORTVERSION= 1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/supertabular/
DISTFILES= supertabular.dtx supertabular.ins ${DOC_FILES}
diff --git a/print/latex-svninfo/Makefile b/print/latex-svninfo/Makefile
index 1532fe5f0f3c..309d008baf44 100644
--- a/print/latex-svninfo/Makefile
+++ b/print/latex-svninfo/Makefile
@@ -6,7 +6,7 @@
PORTNAME= svninfo
PORTVERSION= 0.7.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= http://www.brucker.ch/projects/svninfo/download/ \
${MASTER_SITE_LOCAL}
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 0072cab0c4ab..72f80526831b 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lgrind
PORTVERSION= 3.67
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= LOCAL/pav
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index a98cc37d5b38..889a56956b03 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -9,6 +9,7 @@
PORTNAME= libgnomeprint
PORTVERSION= 2.18.8
+PORTREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index a67217897a94..8a1a7d029a23 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeprintmm
PORTVERSION= 2.5.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index 3c36b1a886a5..5e1b0b96e20c 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -8,17 +8,18 @@
PORTNAME= libharu
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://libharu.org/files/
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Haru Free PDF Library
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-png=${LOCALBASE}
-CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
USE_LDCONFIG= yes
SOVERSION= 2
diff --git a/print/libharu/files/patch-hpdf_image_png.c b/print/libharu/files/patch-hpdf_image_png.c
new file mode 100644
index 000000000000..57f59185f63d
--- /dev/null
+++ b/print/libharu/files/patch-hpdf_image_png.c
@@ -0,0 +1,10 @@
+--- src/hpdf_image_png.c.orig 2010-02-08 10:27:51.000000000 +0100
++++ src/hpdf_image_png.c 2012-05-06 06:53:50.000000000 +0200
+@@ -21,6 +21,7 @@
+
+ #ifndef LIBHPDF_HAVE_NOPNGLIB
+ #include <png.h>
++#include <pngpriv.h>
+
+ static void
+ PngErrorFunc (png_structp png_ptr,
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index adff55787987..1751a6065083 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libspectre
PORTVERSION= 0.2.6
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://libspectre.freedesktop.org/releases/
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 15e2d62a73df..e7e135af82ce 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -9,7 +9,7 @@
PORTNAME= lilypond
PORTVERSION= 2.14.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print audio
MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.14/
diff --git a/print/lpr-wrapper/Makefile b/print/lpr-wrapper/Makefile
index 7558a7ecc60d..a03e702657d8 100644
--- a/print/lpr-wrapper/Makefile
+++ b/print/lpr-wrapper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lpr-wrapper
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 68a439f8706b..816e611a73e8 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION}
+PORTREVISION= 1
CATEGORIES= print editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index b8f54dc7a834..313e64680664 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lyx
PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 8a65f97353fc..5e9df537ab25 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= magicfilter
PORTVERSION= 2.3.h
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= http://www.pell.portland.or.us/~orc/Code/magicfilter/
diff --git a/print/mapagi/Makefile b/print/mapagi/Makefile
index acbc7dc22526..e1f76ce7cdb4 100644
--- a/print/mapagi/Makefile
+++ b/print/mapagi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mapagi
PORTVERSION= 0.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= http://members.ferrara.linux.it/calicant/mapagi/
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index 093d5934cb16..e49a0a348244 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mftrace
PORTVERSION= 1.2.18
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://lilypond.org/download/sources/mftrace/ \
LOCAL/nivit/${PORTNAME}/
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 4568a0d69234..2dfbd085931c 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Net-CUPS
PORTVERSION= 0.61
+PORTREVISION= 1
CATEGORIES= print perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 73cbc9159c23..5b3a6c31aa33 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= panda
PORTVERSION= 0.5.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= SF \
SAVANNAH \
@@ -20,7 +20,7 @@ LICENSE= GPLv2 LGPL21
LICENSE_COMB= dual
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_BZIP2= yes
diff --git a/print/paps/Makefile b/print/paps/Makefile
index 1badb64e4e17..4b22654a414f 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paps
PORTVERSION= 0.6.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/passivetex/Makefile b/print/passivetex/Makefile
index 6991eaca1d82..4ba245f73610 100644
--- a/print/passivetex/Makefile
+++ b/print/passivetex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= passivetex
PORTVERSION= 1.24
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= http://www.tei-c.org/Software/passivetex/
DISTNAME= ${PORTNAME}
diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile
index ec33b01740a4..cec0ab68ae0f 100644
--- a/print/pdfcube/Makefile
+++ b/print/pdfcube/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdfcube
DISTVERSION= 0.0.4-beta
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://code.100allora.it/releases/pdfcube/
diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index fec3dc60d089..1a1c1c9702a8 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdfjam
PORTVERSION= 2.08
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/ \
ftp://ftp.stack.nl/pub/users/johans/pdfjam/
diff --git a/print/pdfmod/Makefile b/print/pdfmod/Makefile
index 8447225e0153..378d3440d04f 100644
--- a/print/pdfmod/Makefile
+++ b/print/pdfmod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdfmod
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= GNOME
diff --git a/print/pips-sc60s/Makefile b/print/pips-sc60s/Makefile
index 1cf79ea1ca3f..2d608a52507a 100644
--- a/print/pips-sc60s/Makefile
+++ b/print/pips-sc60s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.5.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus C60 Series
diff --git a/print/pips-sc65_66s/Makefile b/print/pips-sc65_66s/Makefile
index 0d38a7dd74da..c4cdedbe3dbd 100644
--- a/print/pips-sc65_66s/Makefile
+++ b/print/pips-sc65_66s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus C65/C66 Series
diff --git a/print/pips-sc80s/Makefile b/print/pips-sc80s/Makefile
index 7dcd98c62c67..35b0910f34c3 100644
--- a/print/pips-sc80s/Makefile
+++ b/print/pips-sc80s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.5.2
-PORTREVISION= 5
+PORTREVISION= 6
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus C80 Series
diff --git a/print/pips-sc84_83s/Makefile b/print/pips-sc84_83s/Makefile
index 53b43add4002..c2b255d5200f 100644
--- a/print/pips-sc84_83s/Makefile
+++ b/print/pips-sc84_83s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus C84/C83 Series
diff --git a/print/pips-sc85_86s/Makefile b/print/pips-sc85_86s/Makefile
index d20e7d5ea321..412c8fe60513 100644
--- a/print/pips-sc85_86s/Makefile
+++ b/print/pips-sc85_86s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus C85/C86 Series
diff --git a/print/pips-scx3500_3600s/Makefile b/print/pips-scx3500_3600s/Makefile
index dd64e4a44ae5..f16f685dd258 100644
--- a/print/pips-scx3500_3600s/Makefile
+++ b/print/pips-scx3500_3600s/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus CX3500/CX3600 Series
diff --git a/print/pips-sp2100_2200/Makefile b/print/pips-sp2100_2200/Makefile
index 7e08716ed475..2160663ca23c 100644
--- a/print/pips-sp2100_2200/Makefile
+++ b/print/pips-sp2100_2200/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus Photo 2100/2200
diff --git a/print/pips-spr200_210/Makefile b/print/pips-spr200_210/Makefile
index f2d5276d1633..674a6b8fb05e 100644
--- a/print/pips-spr200_210/Makefile
+++ b/print/pips-spr200_210/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus Photo R200/R210
diff --git a/print/pips-spr300_310/Makefile b/print/pips-spr300_310/Makefile
index 498e20571640..870038737f12 100644
--- a/print/pips-spr300_310/Makefile
+++ b/print/pips-spr300_310/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus Photo R300/R310
diff --git a/print/pips-spr800/Makefile b/print/pips-spr800/Makefile
index d4f21bc9e2d2..8e55c16c7d22 100644
--- a/print/pips-spr800/Makefile
+++ b/print/pips-spr800/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON Stylus Photo R800
diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index 0fd2c071d90e..d4ddc0062b79 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-2200C
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index 6a3dbe0c87d2..fa9c29322ee8 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-3000C
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index 6f16e91eabb8..f0dd8eca1f4d 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-3300C
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index ce29282aaacd..c1d18e7e38b4 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.1.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-3500C
diff --git a/print/pips4000/Makefile b/print/pips4000/Makefile
index 9a314f4b617e..0005f56ae84a 100644
--- a/print/pips4000/Makefile
+++ b/print/pips4000/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-4000PX
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index 7abb186a5961..2caf930170f6 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-670C
diff --git a/print/pips730/Makefile b/print/pips730/Makefile
index 4b605820392c..ea7d1aea9a37 100644
--- a/print/pips730/Makefile
+++ b/print/pips730/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.5.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-730C
diff --git a/print/pips740-cups/Makefile b/print/pips740-cups/Makefile
index c191605ea753..8e0fd82678b5 100644
--- a/print/pips740-cups/Makefile
+++ b/print/pips740-cups/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-740C (for CUPS)
diff --git a/print/pips740/Makefile b/print/pips740/Makefile
index 5d34b93af918..7ab8e1658da7 100644
--- a/print/pips740/Makefile
+++ b/print/pips740/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-740C (for LPR)
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index 3d02dd1fe588..657047bafeec 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index d66d32044bb5..15d1ff71009a 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-760C
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index e92d7a33ff71..c401b91e0afe 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-770C
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index 583c22582ea2..9b7d466c996a 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.1.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-780C
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index 5d35c25d6079..84ea55267c84 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 8
+PORTREVISION= 9
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-800C
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index 43fa66ed5784..426407146b1b 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -57,7 +57,7 @@ MASTER_SITE_SUBDIR= ${PRT_MODEL:L}${SUBDIR_SUFFIX}
MAINTAINER= ume@FreeBSD.org
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= pstops:${PORTSDIR}/print/psutils-${PAPERSIZE} \
${LOCALBASE}/lib/pluginwrapper/pips.so:${PORTSDIR}/www/linuxpluginwrapper
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index 702aa15c2e4f..567a04b9e8be 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 1.3.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-820C
diff --git a/print/pips870-cups/Makefile b/print/pips870-cups/Makefile
index d3ad7f8c09ac..81ed6dafb139 100644
--- a/print/pips870-cups/Makefile
+++ b/print/pips870-cups/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-870C (for CUPS)
diff --git a/print/pips870/Makefile b/print/pips870/Makefile
index bc225cd3b801..694210086a84 100644
--- a/print/pips870/Makefile
+++ b/print/pips870/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-870C (for LPR)
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index 1e74428bc0fa..7469f3345149 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.1.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-880C
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 0530866fbf02..404b8637e4e9 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.1.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-900C
diff --git a/print/pips930/Makefile b/print/pips930/Makefile
index d4652a01dec1..6f76e2ed127c 100644
--- a/print/pips930/Makefile
+++ b/print/pips930/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 5
+PORTREVISION= 6
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-930C (for LPR)
diff --git a/print/pips940/Makefile b/print/pips940/Makefile
index e8fa24dc45b7..f70a656fd5f9 100644
--- a/print/pips940/Makefile
+++ b/print/pips940/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-940C
diff --git a/print/pips970-cups/Makefile b/print/pips970-cups/Makefile
index b8c0e6b1f52c..4a2bf71f5620 100644
--- a/print/pips970-cups/Makefile
+++ b/print/pips970-cups/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-970C (for CUPS)
diff --git a/print/pips970/Makefile b/print/pips970/Makefile
index 3fcda42617d7..71dd80fabe50 100644
--- a/print/pips970/Makefile
+++ b/print/pips970/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-970C (for LPR)
diff --git a/print/pips980/Makefile b/print/pips980/Makefile
index e6c29939efbf..fded78e859e9 100644
--- a/print/pips980/Makefile
+++ b/print/pips980/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-980C
diff --git a/print/pipsg700/Makefile b/print/pipsg700/Makefile
index 9734d501d754..824e138a2bdd 100644
--- a/print/pipsg700/Makefile
+++ b/print/pipsg700/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 8
+PORTREVISION= 9
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-G700
diff --git a/print/pipsg800/Makefile b/print/pipsg800/Makefile
index 8599248cbc3a..eb90e96e8ef1 100644
--- a/print/pipsg800/Makefile
+++ b/print/pipsg800/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PM-G800
diff --git a/print/pipsg900/Makefile b/print/pipsg900/Makefile
index 88346bc1a255..411aecf21264 100644
--- a/print/pipsg900/Makefile
+++ b/print/pipsg900/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PX-G900
diff --git a/print/pipsv500/Makefile b/print/pipsv500/Makefile
index 1631783b0c97..8850a4c0a217 100644
--- a/print/pipsv500/Makefile
+++ b/print/pipsv500/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PX-V500
diff --git a/print/pipsv600/Makefile b/print/pipsv600/Makefile
index 958244075b2a..2d22451ea48c 100644
--- a/print/pipsv600/Makefile
+++ b/print/pipsv600/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PX-V600
diff --git a/print/pipsv700-cups/Makefile b/print/pipsv700-cups/Makefile
index 6c296d360707..d73147aa51e7 100644
--- a/print/pipsv700-cups/Makefile
+++ b/print/pipsv700-cups/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 7
+PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PX-V700 (for CUPS)
diff --git a/print/pipsv700/Makefile b/print/pipsv700/Makefile
index 4f5a57685ee5..326252fb8787 100644
--- a/print/pipsv700/Makefile
+++ b/print/pipsv700/Makefile
@@ -6,7 +6,7 @@
#
PORTVERSION= 2.6.2
-PORTREVISION= 6
+PORTREVISION= 7
MASTERDIR= ${.CURDIR}/../pips800
COMMENT= Photo Image Print System for Linux --- EPSON PX-V700 (for LPR)
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 8c621c7f5a5d..54b35b61e7f0 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pnm2ppa
PORTVERSION= 1.13
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
diff --git a/print/ps2eps/Makefile b/print/ps2eps/Makefile
index d96b9f293bed..c2398184c069 100644
--- a/print/ps2eps/Makefile
+++ b/print/ps2eps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ps2eps
PORTVERSION= 1.64
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= http://www.tm.uka.de/~bless/ \
http://www.ipv6.tm.uka.de/~bless/
diff --git a/print/psdim/Makefile b/print/psdim/Makefile
index 9327f792fed5..9753aff43218 100644
--- a/print/psdim/Makefile
+++ b/print/psdim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= psdim
PORTVERSION= 1.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= http://www.mathstat.dal.ca/~selinger/psdim/download/
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index b7cb9910d558..09afe26070c7 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pslib
PORTVERSION= 0.4.5
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF
@@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org
COMMENT= A C-library for generating multi page PostScript documents
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_GNOME= gnomehack intlhack pkgconfig
diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index ae0df00d8fa9..04712b35cb2c 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pstotext
PORTVERSION= 1.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= http://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index f4b793c734ea..fe8aada3c713 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyscript
PORTVERSION= 0.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print graphics python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index 557462626d42..7254705b9ad1 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= relatorio
PORTVERSION= 0.5.6
+PORTREVISION= 1
CATEGORIES= print python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/print/ruby-panda/Makefile b/print/ruby-panda/Makefile
index d196d20cc140..37baf1de3cb4 100644
--- a/print/ruby-panda/Makefile
+++ b/print/ruby-panda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= panda
PORTVERSION= 0.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print ruby
MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ COMMENT= A Ruby extension library to access Panda
LIB_DEPENDS= panda.0:${PORTSDIR}/print/panda \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_RUBY= yes
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 5969b32c44f6..1a78377cafed 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scribus
PORTVERSION= 1.5.0
+PORTREVISION= 1
CATEGORIES= print editors
MASTER_SITES= http://download.tuxfamily.org/bartcoding/FreeBSD/ \
${MASTER_SITE_LOCAL}
@@ -17,7 +18,7 @@ COMMENT= A comprehensive desktop publishing program
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
lcms:${PORTSDIR}/graphics/lcms \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
cups:${PORTSDIR}/print/cups-base \
freetype:${PORTSDIR}/print/freetype2 \
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index cc7e5468de8a..4e8d5bbe1426 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= scribus
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= print editors
MASTER_SITES= SF \
http://www.scribus.net/downloads/${PORTVERSION}/
@@ -17,7 +18,7 @@ COMMENT= A comprehensive desktop publishing program
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
cups.2:${PORTSDIR}/print/cups-client \
freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/print/sgf2tex/Makefile b/print/sgf2tex/Makefile
index e726629ea44a..da655ce8398b 100644
--- a/print/sgf2tex/Makefile
+++ b/print/sgf2tex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sgf2tex
PORTVERSION= 3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= http://sporadic.stanford.edu/bump/
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 4c1f4a55b804..be62b48311ab 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= splix
PORTVERSION= 2.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= print
MASTER_SITES= SF
diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile
index d0bb18bf898a..ca1ac8ba3e07 100644
--- a/print/system-config-printer-kde/Makefile
+++ b/print/system-config-printer-kde/Makefile
@@ -7,6 +7,7 @@
PORTNAME= system-config-printer-kde
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 9bfd8af89b41..925314dd0078 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= system-config-printer
PORTVERSION= 1.1.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print gnome
MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 426e34aaa2a4..cf05e6b9ef5f 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= teTeX-base
PORTVERSION= 3.0
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTe
RUN_DEPENDS= ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
texi2html:${PORTSDIR}/textproc/texi2html
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib \
gd.4:${PORTSDIR}/graphics/gd
@@ -50,7 +50,7 @@ CONFIGURE_ARGS= --disable-multiplatform \
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-CFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
PKGMESSAGE= ${WRKDIR}/pkg-message
CONFLICTS= ja-ptex-base-[0-9]* latex2e-[0-9]* \
tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
diff --git a/print/teTeX-base/files/patch-texk-pdftexdir-writepng.c b/print/teTeX-base/files/patch-texk-pdftexdir-writepng.c
new file mode 100644
index 000000000000..1bc4ab625be7
--- /dev/null
+++ b/print/teTeX-base/files/patch-texk-pdftexdir-writepng.c
@@ -0,0 +1,19 @@
+--- texk/web2c/pdftexdir/writepng.c.orig 2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writepng.c 2012-04-27 09:06:18.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+
+ static const char perforce_id[] =
+ "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/writepng.c#5 $";
+@@ -34,7 +35,7 @@
+ pdftex_fail("libpng: png_create_read_struct() failed");
+ if ((png_info(img) = png_create_info_struct(png_ptr(img))) == NULL)
+ pdftex_fail("libpng: png_create_info_struct() failed");
+- if (setjmp(png_ptr(img)->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr(img))))
+ pdftex_fail("libpng: internal error");
+ png_init_io(png_ptr(img), png_file);
+ png_read_info(png_ptr(img), png_info(img));
diff --git a/print/teTeX-base/files/patch-texk-web2c-pdftexdir-writeimg.c b/print/teTeX-base/files/patch-texk-web2c-pdftexdir-writeimg.c
new file mode 100644
index 000000000000..fa3b43fdc83e
--- /dev/null
+++ b/print/teTeX-base/files/patch-texk-web2c-pdftexdir-writeimg.c
@@ -0,0 +1,10 @@
+--- texk/web2c/pdftexdir/writeimg.c.orig 2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writeimg.c 2012-04-27 09:30:39.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+ #include <kpathsea/c-auto.h>
+ #include <kpathsea/c-memstr.h>
+
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 8df3a422253c..a888ef8e9958 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -7,7 +7,7 @@
PORTNAME= teTeX
PORTVERSION= 3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/print/tex-mfpic/Makefile b/print/tex-mfpic/Makefile
index fa13fd26123b..7f9cd1f4128c 100644
--- a/print/tex-mfpic/Makefile
+++ b/print/tex-mfpic/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mfpic
PORTVERSION= 1.06.20110308
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://comp.uark.edu/~luecking/tex/
PKGNAMEPREFIX= tex-
diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile
index 213c749a79b5..a9494128343e 100644
--- a/print/tex-omegaware-old/Makefile
+++ b/print/tex-omegaware-old/Makefile
@@ -6,7 +6,7 @@
PORTNAME= tex-omegaware-old
PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hrs/teTeX
diff --git a/print/texpower/Makefile b/print/texpower/Makefile
index 4c2fe87649a5..b77ed18a192b 100644
--- a/print/texpower/Makefile
+++ b/print/texpower/Makefile
@@ -8,7 +8,7 @@
PORTNAME= texpower
PORTVERSION= 0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= SF
PKGNAMEPREFIX= latex-
diff --git a/print/texvc/Makefile b/print/texvc/Makefile
index 6235dd6e9126..5208d91177b7 100644
--- a/print/texvc/Makefile
+++ b/print/texvc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= texvc
PORTVERSION= 20050202
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print
MASTER_SITES= SF/wikipedia/Support%20files/${PORTNAME}%20Linux-x86%20source%20%2B%20binary
DISTNAME= ${PORTNAME}-linux-x86-${PORTVERSION}
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 6570fe42c7c7..1dbda7b715da 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= transfig
PORTVERSION= 3.2.5d
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF/mcj/mcj_dist_src/3.0/
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -15,13 +16,14 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tools to convert Xfig's .fig files
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GHOSTSCRIPT_RUN= yes
USE_IMAKE= yes
USE_XORG= xpm
MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_ARGS+= INSTALLFLAGS="${COPY}" \
INSTPGMFLAGS="${STRIP} ${_BINOWNGRP} -m ${BINMODE}" \
INSTBINFLAGS="${_BINOWNGRP} -m ${BINMODE}" \
diff --git a/print/transfig/files/patch-fig2dev_dev_readpng.c b/print/transfig/files/patch-fig2dev_dev_readpng.c
new file mode 100644
index 000000000000..79d259209a20
--- /dev/null
+++ b/print/transfig/files/patch-fig2dev_dev_readpng.c
@@ -0,0 +1,19 @@
+--- fig2dev/dev/readpng.c.orig 2010-04-21 18:02:14.000000000 +0200
++++ fig2dev/dev/readpng.c 2012-05-05 13:20:54.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include "fig2dev.h"
+ #include "object.h"
+ #include <png.h>
++#include <pngpriv.h>
+
+ /* return codes: 1 : success
+ 0 : invalid file
+@@ -62,7 +63,7 @@
+ }
+
+ /* set long jump here */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* if we get here there was a problem reading the file */
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return 0;
diff --git a/print/typetools/Makefile b/print/typetools/Makefile
index 0e08bc28207f..b247771232d3 100644
--- a/print/typetools/Makefile
+++ b/print/typetools/Makefile
@@ -8,6 +8,7 @@
PORTNAME= typetools
PORTVERSION= 2.92
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.lcdf.org/type/
DISTNAME= lcdf-${PORTNAME}-${PORTVERSION}
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index de5a4514ec0e..850fc7b97bc2 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdvik
PORTVERSION= 22.84.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -tetex
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 7c704ed4bcfb..fe69142b109e 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R}
diff --git a/print/xmltex/Makefile b/print/xmltex/Makefile
index c316c94d272a..d2df86a84176 100644
--- a/print/xmltex/Makefile
+++ b/print/xmltex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmltex
PORTVERSION= 1.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
${MASTER_SITE_TEX_CTAN}
@@ -21,7 +21,7 @@ COMMENT= A non-validating XML parser, written in TeX
BUILD_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
latex:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
latex:${PORTSDIR}/print/teTeX-base
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 130360c3974b..bb2f225f8478 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xpp
PORTVERSION= 1.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= SF/cups/${PORTNAME}/${PORTVERSION}
diff --git a/print/xtexsh/Makefile b/print/xtexsh/Makefile
index 4889beee4e0c..1fefa9829325 100644
--- a/print/xtexsh/Makefile
+++ b/print/xtexsh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtexsh
PORTVERSION= 1.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= http://www.mat.univie.ac.at/~gerald/ftp/xtexsh/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index f6fd81d06ec5..cb93d1894623 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yatex
PORTVERSION= 1.73
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= print elisp
MASTER_SITES= http://www.yatex.org/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index 6a33b7345e64..47f62bc566a6 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= russian kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 64378c9c5059..727e3345066f 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES?= russian kde
MAINTAINER= kde@FreeBSD.org
diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile
index 5d490e314029..335ad4ef57df 100644
--- a/russian/ksocrat/Makefile
+++ b/russian/ksocrat/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ksocrat
PORTVERSION= 3.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= russian kde
MASTER_SITES= http://ksocrat.linux.kiev.ua/download/
MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 644c947da830..08b77e10cb0f 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abinit
PORTVERSION= 5.7.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= science
MASTER_SITES= ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 1d49312999b0..18a6dc8e3f57 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -16,6 +16,7 @@
PORTNAME= afni
PORTVERSION= 2012.04.17.2129
+PORTREVISION= 1
CATEGORIES= science biology graphics
MASTER_SITES= http://personalpages.tds.net/~jwbacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
http://www.acadix.biz/Ports/distfiles/AFNI/${PORTVERSION}/
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index da22617261a3..1272c7d00f5b 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= avogadro
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= SF
diff --git a/science/brian/Makefile b/science/brian/Makefile
index 9ac83ee3d835..b80b3350a55b 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -7,6 +7,7 @@
PORTNAME= brian
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP \
SF/${PORTNAME}/Brian/${PORTVERSION}
diff --git a/science/cdcl/Makefile b/science/cdcl/Makefile
index 4075ff4160a3..41c4e84b5f7e 100644
--- a/science/cdcl/Makefile
+++ b/science/cdcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cdcl
PORTVERSION= 5.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science graphics
MASTER_SITES= http://www.gfd-dennou.org/arch/dcl/ \
http://dennou-h.gfd-dennou.org/arch/dcl/ \
diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
index e17ba9fe9538..dd148d964742 100644
--- a/science/chemical-mime-data/Makefile
+++ b/science/chemical-mime-data/Makefile
@@ -6,7 +6,7 @@
PORTNAME= chemical-mime-data
PORTVERSION= 0.1.94
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science
MASTER_SITES= SF/chemical-mime/${PORTNAME}/${PORTVERSION}
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 2b28a163aa5d..9c035fc7ab42 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= chemtool
PORTVERSION= 1.7.20050716
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science
MASTER_SITES= http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 958fac5f9962..564616a08bf1 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -6,7 +6,7 @@
PORTNAME= chemtool
PORTVERSION= 1.6.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
diff --git a/science/dcl/Makefile b/science/dcl/Makefile
index 93a2f7aa4af5..daa476886d10 100644
--- a/science/dcl/Makefile
+++ b/science/dcl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dcl
PORTVERSION= 5.4.4
+PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= http://www.gfd-dennou.org/library/dcl/ \
http://dennou-h.gfd-dennou.org/library/dcl/ \
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index b92d6396c852..d1177ffcdfa7 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecs
PORTVERSION= 1.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/science/euler/Makefile b/science/euler/Makefile
index 41eca08d63ef..de7645f4ed67 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -8,7 +8,7 @@
PORTNAME= euler
PORTVERSION= 1.61.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.61
EXTRACT_SUFX= .tgz
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 6b71f83ef247..f58af0051bbf 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -8,7 +8,7 @@
PORTNAME= flounder
PORTVERSION= 0.40
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= science
MASTER_SITES= http://www.enel.ucalgary.ca/People/vigmond/flounder/
EXTRACT_SUFX= .tgz
@@ -18,7 +18,7 @@ COMMENT= A quick way to visualize regularly spaced 4D data
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
ungif:${PORTSDIR}/graphics/libungif \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_GL= glut
GNU_CONFIGURE= yes
diff --git a/science/flounder/files/patch-PNGwrite.cc b/science/flounder/files/patch-PNGwrite.cc
new file mode 100644
index 000000000000..9906e80c4225
--- /dev/null
+++ b/science/flounder/files/patch-PNGwrite.cc
@@ -0,0 +1,11 @@
+--- src/PNGwrite.cc.orig 2002-12-19 19:56:35.000000000 +0100
++++ src/PNGwrite.cc 2012-05-05 09:40:41.000000000 +0200
+@@ -38,7 +38,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return;
+ }
+- setjmp(png_ptr->jmpbuf);
++ setjmp( png_jmpbuf(png_ptr));
+ png_init_io(png_ptr, fp);
+ }
+
diff --git a/science/g3data/Makefile b/science/g3data/Makefile
index f3d414b2a854..a813be978c93 100644
--- a/science/g3data/Makefile
+++ b/science/g3data/Makefile
@@ -7,7 +7,7 @@
PORTNAME= g3data
PORTVERSION= 1.5.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= http://www.frantz.fi/software/
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 05f6990fd9e6..f9a42b002bde 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.12.10
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/0.12
diff --git a/science/gdis/Makefile b/science/gdis/Makefile
index 1ef289841fc5..4d969a0cdd2d 100644
--- a/science/gdis/Makefile
+++ b/science/gdis/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gdis
PORTVERSION= 0.89
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= -source.tgz
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index c5d0b18b0e94..a619284427a1 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= getdp
PORTVERSION= 1.2.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= science
MASTER_SITES= http://www.geuz.org/getdp/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 4f59ae42eb46..f3b39fe83098 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ghemical
PORTVERSION= 2.99.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science
MASTER_SITES= http://www.uku.fi/~thassine/projects/download/release20090911/ \
http://bioinformatics.org/ghemical/download/
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 6458ae405a57..11199dd9212c 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnudatalanguage
DISTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science lang
MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION}
.if defined(BUILD_PYTHON_MODULE)
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 6a3243a714b5..549114db22d4 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gramps
PORTVERSION= 3.3.0
+PORTREVISION= 1
CATEGORIES= science gnome python
MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index b8060480c8db..ee7ef302da0d 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsmc
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science hamradio
MASTER_SITES= http://www.qsl.net/ik5nax/
diff --git a/science/gsystem/Makefile b/science/gsystem/Makefile
index ea2f21a31cd8..3c22633db3ea 100644
--- a/science/gsystem/Makefile
+++ b/science/gsystem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsystem
PORTVERSION= 0.5.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science devel games
MASTER_SITES= ftp://ftp.g-system.at/pub/gsystem/releases/development/${PORTVERSION}/
DISTNAME= G-System-${PORTVERSION}
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index e4135783c4b6..5769ec5fcd3b 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwyddion
PORTVERSION= 2.27
+PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= SF
@@ -17,6 +18,7 @@ MAINTAINER= yeti@gwyddion.net
COMMENT= A gtk2 based SPM data visualization and analysis tool
LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
+ png15:${PORTSDIR}/graphics/png \
fftw3:${PORTSDIR}/math/fftw3
GNU_CONFIGURE= yes
diff --git a/science/gwyddion/files/patch-pixmap.c b/science/gwyddion/files/patch-pixmap.c
new file mode 100644
index 000000000000..85a897fcded2
--- /dev/null
+++ b/science/gwyddion/files/patch-pixmap.c
@@ -0,0 +1,10 @@
+--- modules/file/pixmap.c.orig 2012-01-09 08:43:04.000000000 +0100
++++ modules/file/pixmap.c 2012-05-09 13:09:36.000000000 +0200
+@@ -40,6 +40,7 @@
+
+ #ifdef HAVE_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+
+ #include <libgwyddion/gwymacros.h>
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 93d885c16c57..a267d8f9023e 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -5,6 +5,7 @@
PORTNAME= h5utils
PORTVERSION= 1.12.1
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= http://ab-initio.mit.edu/${PORTNAME}/
@@ -18,11 +19,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
MAN1= h5totxt.1 h5fromtxt.1 h5tovtk.1 h5topng.1 h5math.1
GNU_CONFIGURE= YES
-CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include ${PTHREAD_LIBS}
+CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/libpng15 ${PTHREAD_LIBS}
BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
LIB_DEPENDS += hdf5:${PORTSDIR}/science/hdf5 \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
matheval.1:${PORTSDIR}/devel/libmatheval
.include <bsd.port.mk>
diff --git a/science/h5utils/files/patch-writepng.c b/science/h5utils/files/patch-writepng.c
new file mode 100644
index 000000000000..fa98cfe9ea8b
--- /dev/null
+++ b/science/h5utils/files/patch-writepng.c
@@ -0,0 +1,19 @@
+--- writepng.c.orig 2009-06-12 22:58:50.000000000 +0200
++++ writepng.c 2012-05-06 06:49:53.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "writepng.h"
+
+@@ -309,7 +310,7 @@
+ }
+ /* Set error handling. REQUIRED if you aren't supplying your own *
+ * error hadnling functions in the png_create_write_struct() call. */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index 58e082acb8a4..782869829523 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kalzium
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= science kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile
index 306214e43b14..31dfddaf9164 100644
--- a/science/kmovisto/Makefile
+++ b/science/kmovisto/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kmovisto
PORTVERSION= 0.7.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= science
MASTER_SITES= http://mitglied.multimania.de/pageofmh/download/
diff --git a/science/kst/Makefile b/science/kst/Makefile
index fd07764cdd34..4055086110d7 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kst
PORTVERSION= 1.9.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/apps/KDE3.x/scientific
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 24b86b538fa0..45b929e03882 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kst
DISTVERSION= 2.0.5
+PORTREVISION= 1
CATEGORIES= science kde
MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index b2d9b0f7200e..721baa6344e7 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -8,6 +8,7 @@
PORTNAME= linsmith
PORTVERSION= 0.99.22
+PORTREVISION= 1
CATEGORIES= science hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index f4b7629e31c5..1689dc767657 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -7,6 +7,7 @@
PORTNAME= massxpert
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= http://download.tuxfamily.org/massxpert/source/
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index 71654b6ce44c..cef332f2dec3 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mayavi
PORTVERSION= 1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science python
MASTER_SITES= SF
DISTNAME= MayaVi-${PORTVERSION}
diff --git a/science/mcstas/Makefile b/science/mcstas/Makefile
index 89d503b88ac3..ddad64a190a0 100644
--- a/science/mcstas/Makefile
+++ b/science/mcstas/Makefile
@@ -6,6 +6,7 @@
PORTNAME= mcstas
PORTVERSION= 1.12c
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= http://www.mcstas.org/download/ \
http://www.c-s.li/ports/
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 03e2eec0eb81..1184777ade3f 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpqc
PORTVERSION= 2.3.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= science parallel
MASTER_SITES= SF
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 738c2f0d74ab..70eae35c66e7 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ncs
PORTVERSION= 1.3.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= science parallel
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/science/omnetpp/Makefile b/science/omnetpp/Makefile
index 4719c9e7b8ff..5a6705c773e1 100644
--- a/science/omnetpp/Makefile
+++ b/science/omnetpp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= omnetpp
PORTVERSION= 3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science
MASTER_SITES= http://www.omnetpp.org/download/release/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/science/ovt/Makefile b/science/ovt/Makefile
index 5d6c5c56a2cc..adc0e2a4dcb3 100644
--- a/science/ovt/Makefile
+++ b/science/ovt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ovt
PORTVERSION= 2.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= science astro java
MASTER_SITES= http://ovt.irfu.se/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}_${OVTBUILD}-src
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index f8ea66a8fc80..5359a834ed71 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= paraview
PORTVERSION= 3.10.1
+PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/
DISTNAME= ParaView-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= devel@stasyan.com
COMMENT= Powerful scientific data visualization application
LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/hdf5-18 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/science/peekabot/Makefile b/science/peekabot/Makefile
index b30a882dd023..3b0cd11b9e77 100644
--- a/science/peekabot/Makefile
+++ b/science/peekabot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peekabot
PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index dd6645a23c61..312641bba50e 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= psychopy
PORTVERSION= 1.65.00
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= PsychoPy-${PORTVERSION}
diff --git a/science/py-hcluster/Makefile b/science/py-hcluster/Makefile
index c06599c90339..9382ac4c0f03 100644
--- a/science/py-hcluster/Makefile
+++ b/science/py-hcluster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hcluster
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy-core/Makefile b/science/py-obspy-core/Makefile
index 6fa4de83826a..2a7ca5c331f0 100644
--- a/science/py-obspy-core/Makefile
+++ b/science/py-obspy-core/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy-core
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.db/Makefile b/science/py-obspy.db/Makefile
index f7aa4fd0487c..1d072c0b3ac8 100644
--- a/science/py-obspy.db/Makefile
+++ b/science/py-obspy.db/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.db
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.gse2/Makefile b/science/py-obspy.gse2/Makefile
index e9b0d9667c1f..10ecf5b38353 100644
--- a/science/py-obspy.gse2/Makefile
+++ b/science/py-obspy.gse2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.gse2
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.imaging/Makefile b/science/py-obspy.imaging/Makefile
index 0be6d667c41d..bfd554e712ea 100644
--- a/science/py-obspy.imaging/Makefile
+++ b/science/py-obspy.imaging/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.imaging
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.iris/Makefile b/science/py-obspy.iris/Makefile
index 1c0a59305d65..813a0fefa328 100644
--- a/science/py-obspy.iris/Makefile
+++ b/science/py-obspy.iris/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.iris
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.mseed/Makefile b/science/py-obspy.mseed/Makefile
index 7e0194291eda..2aaa6b7a2ad4 100644
--- a/science/py-obspy.mseed/Makefile
+++ b/science/py-obspy.mseed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.mseed
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.signal/Makefile b/science/py-obspy.signal/Makefile
index 879cbe2186a6..7f72cd0f9812 100644
--- a/science/py-obspy.signal/Makefile
+++ b/science/py-obspy.signal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.signal
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.taup/Makefile b/science/py-obspy.taup/Makefile
index 029d6464591e..e54f6f438018 100644
--- a/science/py-obspy.taup/Makefile
+++ b/science/py-obspy.taup/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.taup
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.wav/Makefile b/science/py-obspy.wav/Makefile
index 82129a3f7a26..f7900a1bfe56 100644
--- a/science/py-obspy.wav/Makefile
+++ b/science/py-obspy.wav/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.wav
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-obspy.xseed/Makefile b/science/py-obspy.xseed/Makefile
index 6d2f884f3b35..efe98999a484 100644
--- a/science/py-obspy.xseed/Makefile
+++ b/science/py-obspy.xseed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= obspy.xseed
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/science/qtresistors/Makefile b/science/qtresistors/Makefile
index 5f4879a7636e..5be7ec70fcd6 100644
--- a/science/qtresistors/Makefile
+++ b/science/qtresistors/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtresistors
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= http://qt-apps.org/CONTENT/content-files/
DISTNAME= 118297-qtResistors-201001102229
diff --git a/science/ruby-dcl/Makefile b/science/ruby-dcl/Makefile
index 1ada91b1dc48..58d6c4c6d02b 100644
--- a/science/ruby-dcl/Makefile
+++ b/science/ruby-dcl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dcl
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= science graphics ruby
MASTER_SITES= http://ruby.gfd-dennou.org/products/ruby-dcl/release/ \
http://dennou-h.gfd-dennou.org/library/ruby/products/ruby-dcl/release/ \
diff --git a/science/ruby-gphys/Makefile b/science/ruby-gphys/Makefile
index 9b67a61d8b05..4bd43f9ff094 100644
--- a/science/ruby-gphys/Makefile
+++ b/science/ruby-gphys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gphys
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science ruby
MASTER_SITES= http://ruby.gfd-dennou.org/products/gphys/ \
http://dennou-h.gfd-dennou.org/library/ruby/products/gphys/ \
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 7b8a4ad2041a..c670496e4c23 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silo
PORTVERSION= 4.6.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= science
MASTER_SITES= https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/
diff --git a/science/step/Makefile b/science/step/Makefile
index 01a47953faec..0e1eda188146 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -7,6 +7,7 @@
PORTNAME= step
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= science kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 9834a6cbce85..0e649c6891e4 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -6,6 +6,7 @@
PORTNAME= v_sim
PORTVERSION= 3.5.2
+PORTREVISION= 1
CATEGORIES= science
MASTER_SITES= http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/download/
diff --git a/science/veusz/Makefile b/science/veusz/Makefile
index 92d7935250ad..70a2189632fb 100644
--- a/science/veusz/Makefile
+++ b/science/veusz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= veusz
PORTVERSION= 1.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science kde
MASTER_SITES= http://download.gna.org/veusz/
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 25ce8373f168..baf649badf65 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vis5d+
PORTVERSION= 1.2.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= science
MASTER_SITES= SF/vis5d/vis5d/${PORTVERSION}
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index c4a6ded42378..05860e10d6d3 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clamtk
PORTVERSION= 4.38
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/ClamTk/${PORTVERSION}
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index c18691a9326a..2e011445d920 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clusterssh
PORTVERSION= 3.28
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= SF/${PORTNAME}/1.%20ClusterSSH%20Series%203/${PORTVERSION}
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 922adc525fe8..c4fa881057b3 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fpm
PORTVERSION= 0.60
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index e775ace40761..d63a97d9ac3e 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fprint_demo
PORTVERSION= 20080303
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/f/${PORTNAME:C/_/-/}
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index e15d17ab5a89..9b950414fd7e 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fwanalog
PORTVERSION= 0.6.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= http://tud.at/programm/fwanalog/
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index f3fead3eddc9..3f9f39e523e0 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -8,12 +8,14 @@
PORTNAME= fwbuilder
DISTVERSION= 5.1.0
PORTVERSION= ${DISTVERSION}
+PORTREVISION= 1
CATEGORIES= security
BUILD= 3599
# XXX in developement version of this port: PKGNAMESUFFIX= -devel
.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
MASTER_SITES= http://www.fwbuilder.org/nightly_builds/fwbuilder-5.0/current_build/
PORTVERSION= ${DISTVERSION}.b${BUILD}
+PORTREVISION= 1
.else
MASTER_SITES= SF/${PORTNAME}/Current_Packages/${PORTVERSION}
.endif
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 4dde9ec402dc..37be716699ca 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcipher
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= SF
diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index 38205ee7f07f..63328ab944fc 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-gpg
PORTVERSION= 0.5.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security
MASTER_SITES= GNOME
diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile
index 25f9eb8cb179..faef38897715 100644
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-keyring-sharp
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.go-mono.com/archive/${PORTNAME}/
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 789888cb4fc7..7a6f29387052 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-keyring
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index 92cb4a7d40b5..af0e5f55df21 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-password-generator
PORTVERSION= 1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security gnome python
MASTER_SITES= SF/gnome-password/Gnome%20Password%20Generator/${PORTVERSION}
diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile
index a2eb65ccaa2b..798aa690506e 100644
--- a/security/gnome-ssh-askpass/Makefile
+++ b/security/gnome-ssh-askpass/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gnome-ssh-askpass
PORTVERSION= 5.8p2
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= OPENBSD/OpenSSH/portable/
DISTNAME= openssh-${PORTVERSION}
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index df2924990da4..30a44ca235d6 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpass
PORTVERSION= 0.5.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security gnome
MASTER_SITES= http://projects.netlab.jp/gpass/release/
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 33cc581d9e60..5f19ce3ea5c5 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gringotts
PORTVERSION= 1.2.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= BERLIOS
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 121ac2dcbd7a..7f11182cceaa 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkpasman
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTVERSION}
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 0ab7440df09a..64ae460c1b4a 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hotssh
PORTVERSION= 0.2.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/security/ike/Makefile b/security/ike/Makefile
index 872655fe0fca..672e6f91c0a4 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ike
PORTVERSION= 2.1.7
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= http://www.shrew.net/download/ike/
DISTNAME= ${PORTNAME}-${PORTVERSION}-release
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 53fd70142867..a1bc8885d8d1 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kedpm
PORTVERSION= 0.4.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 7b86c3156b39..d193afe74dbe 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= KeePassX
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME:L}/KeePassX/${PORTVERSION}/
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index f45e02ef2075..c5b244251a68 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kgpg
PORTVERSION= 1.0.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= security kde
MASTER_SITES= http://developer.kde.org/~kgpg/src/
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 28bec1f9cfdc..508d4f86c30b 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klamav
PORTVERSION= 0.46
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/Source%20%28For%20ClamAV%20and%20gt_%3D%200.9x%29/KlamAV-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
diff --git a/security/kopete-otr/Makefile b/security/kopete-otr/Makefile
index fea39231329d..c9e1aef090af 100644
--- a/security/kopete-otr/Makefile
+++ b/security/kopete-otr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= otr
PORTVERSION= 0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security net-im kde
MASTER_SITES= http://kopete-otr.follefuder.org/
PKGNAMEPREFIX= kopete-
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index 941030b1f066..12d9b1f86e32 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kovpn
PORTVERSION= 0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security kde
MASTER_SITES= https://projects.fslab.de/projects/kovpn/chrome/site/
DISTNAME= ${PORTNAME}-${PORTVERSION}.pre7
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 77f1c3e6769b..1b3697ff4a3d 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krb5
PORTVERSION= 1.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
PATCH_SITES= http://web.mit.edu/kerberos/advisories/
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 5a512dea919a..c275ad7b438e 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kssh
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 0b95b184c55c..929e9c3bc586 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libfprint
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://people.freedesktop.org/~hadess/
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index f27a9179118e..fe7a17f65633 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnome-keyring
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security gnome
MASTER_SITES= GNOME
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index ab8bb0c7bd65..3f501cd0d41a 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomesu
PORTVERSION= 1.0.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security gnome
MASTER_SITES= http://members.chello.nl/~h.lai/libgnomesu/
diff --git a/security/log2timeline/Makefile b/security/log2timeline/Makefile
index 2ba0e3adc90d..b4cb7967e297 100644
--- a/security/log2timeline/Makefile
+++ b/security/log2timeline/Makefile
@@ -7,6 +7,7 @@
PORTNAME= log2timeline
PORTVERSION= 0.62
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://log2timeline.net/files/
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/security/nmapsi4/Makefile b/security/nmapsi4/Makefile
index e154317d35d5..44dc5b8f70a6 100644
--- a/security/nmapsi4/Makefile
+++ b/security/nmapsi4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nmapsi4
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= GOOGLE_CODE
diff --git a/security/openvas-client/Makefile b/security/openvas-client/Makefile
index 6838dd73d076..e38a48edf92e 100644
--- a/security/openvas-client/Makefile
+++ b/security/openvas-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openvas-client
PORTVERSION= 2.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/595/
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index 12c10f35c6dd..a17d59e753e3 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openvpn-admin
PORTVERSION= 1.9.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security gnome
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index 7d8d9b19f0ab..f89a8f5a8e75 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ophcrack
PORTVERSION= 3.4.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index 18c5e391de6f..bece76f21b41 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Authen-Captcha
PORTVERSION= 1.023
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 4b32798b22cb..2216ec5493a2 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= GD-SecurityImage
PORTVERSION= 1.71
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index b66f46e53fb5..47379d16a0d0 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pam_fprint
PORTVERSION= 20080330
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/p/${PORTNAME:C/_/-/}
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 6c7daa2a5d5d..42997ce7aa49 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -7,7 +7,7 @@
PORTNAME= parano
PORTVERSION= 0.3.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= BERLIOS
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 2ff5b69468a4..0754f8b6ec4b 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pidgin
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}-encrypt/Releases/${PORTVERSION}
PKGNAMESUFFIX= -encryption
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 424e9ab519c7..9644224558d4 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinentry
PORTVERSION= 0.8.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= pinentry
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 3282e874d8e9..da1c91d02443 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -7,6 +7,7 @@
PORTNAME= putty
PORTVERSION= 0.62
+PORTREVISION= 1
CATEGORIES= security ipv6
MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \
ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 9188edbef9ef..4c8bbf9be236 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qca-tls
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/ \
http://psi.affinix.com/beta/
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index c69915213a2b..2a13b4644a83 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtfw
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index b8b6e347b181..3f1be19b99c7 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quantis
DISTVERSION= v11.12.13
+PORTREVISION= 1
CATEGORIES= security devel java
MASTER_SITES= http://www.idquantique.com/files/products/quantis/ \
${MASTER_SITE_LOCAL}
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 200d71fd71e3..bd7b6aba46cb 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -7,7 +7,7 @@
PORTNAME= revelation
PORTVERSION= 0.4.11
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security gnome
MASTER_SITES= ftp://oss.codepoet.no/revelation/
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index e4ff75cfcacf..21a97e3cf16a 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -8,7 +8,7 @@
PORTNAME= seahorse-plugins
PORTVERSION= 2.30.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 9335cb9350c2..631a0e0cbd45 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= seahorse
PORTVERSION= 2.32.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index bdd50dfdd90f..821fe3a7b862 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -7,7 +7,7 @@
PORTNAME= signing-party
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/signing-party/ \
${MASTER_SITE_DEBIAN}
diff --git a/security/snortreport/Makefile b/security/snortreport/Makefile
index f735daa878e1..272fda5c8eef 100644
--- a/security/snortreport/Makefile
+++ b/security/snortreport/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snortreport
PORTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= security www
MASTER_SITES= http://www.symmetrixtech.com/ids/
diff --git a/security/ssh_askpass_gtk2/Makefile b/security/ssh_askpass_gtk2/Makefile
index 4367ad525e01..f7ac6970004d 100644
--- a/security/ssh_askpass_gtk2/Makefile
+++ b/security/ssh_askpass_gtk2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ssh_askpass_gtk2
PORTVERSION= 0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= http://www.cgabriel.org/download/ssh-askpass-fullscreen/
DISTNAME= ssh-askpass-fullscreen-${PORTVERSION}
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index 8c7c5e4093a1..b8fe78c0ed36 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= starttls
PORTVERSION= 0.10
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security
MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 6155f8977e3b..c22611ec727c 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tpmmanager
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}
diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile
index ba6509511c91..bc467da63392 100644
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tuntun
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security gnome
MASTER_SITES= http://tuntun.googlecode.com/files/
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 0ff463df9720..1873e5ae359b 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= umit
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 4c4cd7c1ced2..c8d28e526f06 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xca
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 41ac01dbf388..9405d983ce2b 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zenmap
PORTVERSION= 5.21
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security ipv6
MASTER_SITES= http://nmap.org/dist/ \
http://nmap.ucsd.edu/dist/ \
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index fb478a1e9fe7..c774d9e51049 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fish
PORTVERSION= 1.23.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= shells
MASTER_SITES= SF
diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index e67c5a15a5a1..8edc754e286b 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -7,7 +7,7 @@
PORTNAME= viewglob
PORTVERSION= 2.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= shells
MASTER_SITES= SF
diff --git a/sysutils/LPRngTool/Makefile b/sysutils/LPRngTool/Makefile
index aa891f77e79a..3a8bb8dc49c4 100644
--- a/sysutils/LPRngTool/Makefile
+++ b/sysutils/LPRngTool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= LPRngTool
PORTVERSION= 1.3.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils print
MASTER_SITES= ftp://ftp.lprng.com/pub/%SUBDIR%/ \
ftp://ftp.cise.ufl.edu/pub/mirrors/%SUBDIR%/ \
diff --git a/sysutils/abgx360gui/Makefile b/sysutils/abgx360gui/Makefile
index f6b81d1b91fe..6610890199bf 100644
--- a/sysutils/abgx360gui/Makefile
+++ b/sysutils/abgx360gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abgx360gui
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://update.cooltrainer.org/abgx360/ \
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 48a7b32aa978..c93a6fe8b177 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asusoled
PORTVERSION= 0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jkim
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index d2ef0ce759ef..dafbe81bcde1 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bacula
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -bat
COMMENT= The network backup solution (GUI)
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index b78b4950a7be..b5cf5f8eaa7b 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -7,7 +7,7 @@
PORTNAME= battfink
PORTVERSION= 0.6.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index 64822fc59188..088fdcb7b56a 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= battray
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= sysutils python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 546b4a1b6b0a..d99d89cdf31a 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brasero
PORTVERSION= 2.32.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index d41019ef5ed0..9888a3b134d4 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bubblemon2
PORTVERSION= 2.0.17
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils gnome
MASTER_SITES= SAVANNAH/bubblemon
DISTNAME= bubblemon-${PORTVERSION}
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index d1392bad3709..5b8e76f01255 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= cdrdao
PORTVERSION= 1.2.3
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= sysutils audio
MASTER_SITES= SF
MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION}
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index bf9878a486fb..4e77fc04a165 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cog
PORTVERSION= 0.8.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.krakoa.dk/progs/cog/
diff --git a/sysutils/desktopbsd-tools/Makefile b/sysutils/desktopbsd-tools/Makefile
index d600358774bc..6be4f0b40648 100644
--- a/sysutils/desktopbsd-tools/Makefile
+++ b/sysutils/desktopbsd-tools/Makefile
@@ -6,7 +6,7 @@
PORTNAME= desktopbsd-tools
PORTVERSION= 1.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.desktopbsd.net/pub/DesktopBSD/Tools/
diff --git a/sysutils/dircomp/Makefile b/sysutils/dircomp/Makefile
index ac777f723ded..ed2f9199c62a 100644
--- a/sysutils/dircomp/Makefile
+++ b/sysutils/dircomp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DirComp
PORTVERSION= 1.3.11
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME:S/C/c/}-${PORTVERSION}/
diff --git a/sysutils/downtime/Makefile b/sysutils/downtime/Makefile
index f74281e129dd..7822cf3c0b39 100644
--- a/sysutils/downtime/Makefile
+++ b/sysutils/downtime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= downtime
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.nickwithers.com/downtime/
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index 8a9c7805c2a5..446a40d9fc4d 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dvdisaster
PORTVERSION= 0.72.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF \
http://dvdisaster.net/downloads/
diff --git a/sysutils/easypbi/Makefile b/sysutils/easypbi/Makefile
index dbaaa7df7202..bf2672af32fb 100644
--- a/sysutils/easypbi/Makefile
+++ b/sysutils/easypbi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= easypbi
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF/makeapbi/${PORTNAME}/
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 1c40b566d5e5..891775dab000 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eiciel
PORTVERSION= 0.9.8.1
+PORTREVISION= 1
CATEGORIES= sysutils security
MASTER_SITES= http://rofi.roger-ferrer.org/eiciel/download/
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index 4aa8388c105b..04015c76000e 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -8,6 +8,7 @@
PORTNAME= empower
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= sysutils enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 7f577e0f6818..7daf2b287f5b 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eroaster
PORTVERSION= 2.2.0.0.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/Development/2.2.0-0.6
DISTNAME= ${PORTNAME}-2.2.0-0.6
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 7bb8606e6323..b37b8a49020c 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= filelight
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 2128621f3afc..50fb9f956fc0 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -7,7 +7,7 @@
PORTNAME= filelight
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils kde
MASTER_SITES= http://www.methylblue.com/filelight/packages/
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 3fa327d846c9..296c22de4f00 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ftwin
PORTVERSION= 0.8.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://download.meroware.org/ftwin/
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index 0f95a3cc261f..5ff4b86f46b8 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fusefs-gnome-vfs
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.evolware.org/chri/
DISTNAME= ${RPORTNAME}-${PORTVERSION}
diff --git a/sysutils/fusefs-pod/Makefile b/sysutils/fusefs-pod/Makefile
index 13942ef10f52..0ff8be8de9b1 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/sysutils/fusefs-pod/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pod
PORTVERSION= 0.5.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils audio
MASTER_SITES= SF/fuse${PORTNAME}/fuse${PORTNAME}/FUSEPod%20v${PORTVERSION}
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index 1cdc9250e08f..5ee2b4bdad10 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -6,6 +6,7 @@
PORTNAME= smbnetfs
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
PKGNAMEPREFIX= fusefs-
diff --git a/sysutils/gai-leds/Makefile b/sysutils/gai-leds/Makefile
index 2cbeb7852c06..511398706988 100644
--- a/sysutils/gai-leds/Makefile
+++ b/sysutils/gai-leds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gai-leds
PORTVERSION= 0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= SF/gai/GAI%20-%20Applets/${PORTNAME}
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index cd75196ea5a9..ee4caf525c3e 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monitor-core
PORTVERSION= 3.1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils net parallel
MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
PKGNAMEPREFIX= ganglia-
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index 6cce6bb2d9e7..e04377ffe723 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gapcmon
PORTVERSION= 0.8.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= SF
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 1e413ab9254f..87db72c8aaea 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gconf-editor
PORTVERSION= 2.32.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index 58e43f497fe8..e25971140291 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdmap
PORTVERSION= 0.7.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils gnome
MASTER_SITES= SF
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 2fe66bf4ffcd..4618073317cd 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= geomgui
PORTVERSION= 0.12
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils
MASTER_SITES= http://geomgui.xride.dk/files/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index c36aebcb2ada..a6d6544e6ff8 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkfreq
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
DISTNAME= gkrellm-gkfreq-${PORTVERSION}
MASTER_SITES= http://www.peakunix.net/downloads/
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 6b06ab84cbf5..9eba2eca197b 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkleds2
PORTVERSION= 0.8.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://heim.ifi.uio.no/~oyvinha/files/files/
DISTNAME= gkleds-${PORTVERSION}
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index 2f405e6b8713..d500a991f8c2 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellfire
PORTVERSION= 0.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://freenet-homepage.de/thomas-steinke/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index 9dad7e684fb2..9289152248bd 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellflynn
PORTVERSION= 0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \
http://horus.comlab.uni-rostock.de/flynn/
diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile
index f1c61958c743..f3aebd2bfc62 100644
--- a/sysutils/gkrellm-trayicons/Makefile
+++ b/sysutils/gkrellm-trayicons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trayicons
PORTVERSION= 1.03
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://tripie.sweb.cz/gkrellm/trayicons/dist/
PKGNAMEPREFIX= gkrellm-
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 6df562bfa09c..da2f1a7fa862 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm
PORTVERSION= 1.2.13
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils ipv6
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 624e35ea2e3f..5742894fedaf 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellm
PORTVERSION= 2.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils ipv6
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellmwho2/Makefile b/sysutils/gkrellmwho2/Makefile
index 7ec55c57d727..d91fe34ac554 100644
--- a/sysutils/gkrellmwho2/Makefile
+++ b/sysutils/gkrellmwho2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrellmwho2
PORTVERSION= 0.2.8
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= sysutils
MASTER_SITES= http://shisha.spb.ru/ \
http://users.podolsk.ru/c104598/
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 3b320463cbd0..71272fb0cd9e 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gkrelltop
PORTVERSION= 2.2.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= sysutils
MASTER_SITES= http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
DISTNAME= ${PORTNAME}_2.2-6
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index c8cc0cad914d..a4bb87fad9ea 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gksu
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://people.debian.org/~kov/gksu/
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 73e45bb7c64d..96cc3e7f63ec 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-control-center
PORTVERSION= 2.32.1
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 476c2236db26..a5b7b0bce300 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-device-manager
PORTVERSION= 0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 203ec2c65c0a..268fc0cf151f 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-mount
PORTVERSION= 0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index dcdcc6b03bf3..2426f1e16bb3 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-pkgview
PORTVERSION= 1.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.mikegtn.net/packages/gnome-pkgview/
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 7fab7edda9c2..7b720f31d12b 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-power-manager
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 8c519ec87a7f..fe1b6d9915e7 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-schedule
PORTVERSION= 2.1.5
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-2/${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index dab58d5e9a8c..d726ab4cbe3e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-settings-daemon
PORTVERSION= 2.32.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 344e3125fae4..9296e0c53f11 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-system-monitor
PORTVERSION= 2.28.2
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index c23d84d8c040..dd2d4f4cd1d7 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-system-tools
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 67f4350fd4b9..6860caa93d2d 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomebaker
PORTVERSION= 0.6.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils gnome
MASTER_SITES= SF
DIST_SUBDIR= gnome2
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index 6b32997a80aa..1d823ea6fc4e 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gpkgdep
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/
diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile
index ac12cb8786f8..c8c412b8c92e 100644
--- a/sysutils/graphicboot/Makefile
+++ b/sysutils/graphicboot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= graphicboot
PORTVERSION= 1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://matt.sixxgate.com/files/
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index da5972386382..1bc4fb904539 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= graveman
PORTVERSION= 0.3.12.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= http://graveman.tuxfamily.org/sources/
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 0072c35cb8d7..a959fc0dcec6 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsmartcontrol
PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 014908281645..761c4b24eb9b 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-imonc
PORTVERSION= 0.6.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 02e3f06913b7..27b6abae7c95 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-send-pr
PORTVERSION= 0.4.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 894b658dcf51..fb2fb2d0ceb7 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gupsc
PORTVERSION= 0.3.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils gnome
MASTER_SITES= http://heim.ifi.uio.no/~hennikul/gupsc/download/
diff --git a/sysutils/hachoir-wx/Makefile b/sysutils/hachoir-wx/Makefile
index a608e99d2cd0..014c60b72b89 100644
--- a/sysutils/hachoir-wx/Makefile
+++ b/sysutils/hachoir-wx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hachoir-wx
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index edf76ef2c72b..5b75968ad18e 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hoz
PORTVERSION= 1.65
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 99d65c1c1e63..d08992b645e1 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= isomaster
PORTVERSION= 1.3.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://littlesvr.ca/isomaster/releases/
diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile
index 7af28eea6b15..2473c3d1bd27 100644
--- a/sysutils/jfbterm/Makefile
+++ b/sysutils/jfbterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jfbterm
PORTVERSION= 0.6.1
DISTVERSIONPREFIX=${OPSYS}-
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://www.ac.auone-net.jp/~baba/${PORTNAME}/ \
http://chirashi-no-ura.net/files/
@@ -76,7 +76,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
.if !defined(WITHOUT_PNG)
. if !defined(NO_SHARED)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
. else
BUILD_DEPENDS+= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
. endif
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 2cf77c388dab..5a2868767a74 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 2.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index e464e9e7b304..3eb22c6fb336 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile
index aedf28815426..e28a0faaf7a0 100644
--- a/sysutils/kcpuload/Makefile
+++ b/sysutils/kcpuload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kcpuload
PORTVERSION= 1.99
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils kde
MASTER_SITES= http://www.brueffer.de/distfiles/
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index b7d02f32f9f0..81a3b0845097 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdeadmin
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index c56552709e07..68cb0c93be29 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdeadmin
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index f992b383d10c..0e4e0094a162 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdirstat
PORTVERSION= 2.4.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils kde
MASTER_SITES= http://kdirstat.sourceforge.net/download/
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index 01b6aa0588d2..01e35bf1d9f5 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= keep
PORTVERSION= 0.4.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils kde
MASTER_SITES= http://jr.falleri.free.fr/files/devel/keep/
diff --git a/sysutils/kgrubeditor/Makefile b/sysutils/kgrubeditor/Makefile
index aca8a5bccdcd..53b26b4e8ce8 100644
--- a/sysutils/kgrubeditor/Makefile
+++ b/sysutils/kgrubeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kgrubeditor
PORTVERSION= 0.8.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/KGRUBEditor%20${PORTVERSION}
DISTNAME= KGRUBEditor-${PORTVERSION}-src
diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile
index aae89309332b..1f136dcd29d8 100644
--- a/sysutils/kgtk/Makefile
+++ b/sysutils/kgtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kgtk
PORTVERSION= 0.9.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= sysutils kde
MASTER_SITES= http://source.antisupport.com/kgtk/ \
http://home.freeuk.com/cpdrummond/
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 5daecf6578cf..76967a370567 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kkbswitch
PORTVERSION= 1.4.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils kde
MASTER_SITES= SF
diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile
index 0b3a38d466be..6c1e535bab52 100644
--- a/sysutils/kkeyled/Makefile
+++ b/sysutils/kkeyled/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kkeyled
PORTVERSION= 0.8.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index 532d0ff29486..b6619679c5cb 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klaptopdaemon
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/kleansweep/Makefile b/sysutils/kleansweep/Makefile
index f9b37a5084fa..502c8496be5e 100644
--- a/sysutils/kleansweep/Makefile
+++ b/sysutils/kleansweep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kleansweep
PORTVERSION= 0.2.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://linux.bydg.org/~yogin/
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index 057c7a3ea44b..b5b5788ed393 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klineakconfig
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= SF/lineak/Klineakconfig/Klineakconfig-${PORTVERSION}
DIST_SUBDIR= lineak
diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile
index 223faf37230f..808120e6c452 100644
--- a/sysutils/kmilo/Makefile
+++ b/sysutils/kmilo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kmilo
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 66ab3b060e1e..6e91cae94286 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knutclient
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils kde
MASTER_SITES= ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
http://www.ringofsaturn.com/distfiles \
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index a3c5840305a2..09028223134a 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knutclient
PORTVERSION= 0.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils kde
MASTER_SITES= ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
http://www.vg.kernel.org/pub/mirrors/gentoo/source/distfiles/
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index 1b53cc27504f..37e6cf72f616 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -6,6 +6,7 @@
PORTNAME= komparator
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= SF
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 9546b7c6c090..2f8d58588fae 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krename
PORTVERSION= 4.0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KDE4%20${PORTNAME}-stable/${PORTVERSION}
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index ed402e8dc6db..06b105541646 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krename
PORTVERSION= 3.0.14
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KDE3%20${PORTNAME}-stable/${PORTVERSION}
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 0b78af90b707..604a16e96272 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kshutdown
DISTVERSION= 3.0beta4
+PORTREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KShutdown/3.0%20Beta%204/
DISTNAME= ${PORTNAME}-source-${DISTVERSION}
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index e1837fbfe3a9..753dccc137f0 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kshutdown
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KShutdown/${PORTVERSION}%20for%20KDE%203
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index c7fb4fbcc255..a4190ccad64e 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ksynaptics
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= http://qsynaptics.sourceforge.net/
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 080f516b7261..eda64fcdfdc5 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgksu
PORTVERSION= 2.0.9
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://people.debian.org/~kov/gksu/
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index 2a5a67684a69..d35fd4a0eb6b 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lineak-kdeplugins
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils deskutils
MASTER_SITES= SF/lineak/lineak_kdeplugins/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index 9e6435460286..484f5f2d00f4 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lineak-xosdplugin
PORTVERSION= 0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils deskutils
MASTER_SITES= SF/lineak/lineak_xosdplugin/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index c043613de739..35b9824e8227 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -13,7 +13,7 @@
PORTNAME= lire
PORTVERSION= 2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://download.logreport.org/pub/
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index a768ddc0a9c4..0d560f1075ca 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -7,7 +7,7 @@
PORTNAME= logstalgia
PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils www
MASTER_SITES= GOOGLE_CODE CRITICAL
@@ -17,7 +17,7 @@ COMMENT= A website access log visualization tool
LICENSE= GPLv3
LIB_DEPENDS= ftgl:${PORTSDIR}/graphics/ftgl \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
pcre.1:${PORTSDIR}/devel/pcre
diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index 7db50e3837ab..b834493a219a 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -6,6 +6,7 @@
PORTNAME= luckybackup
PORTVERSION= 0.4.7
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/source
diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index 9f40cb755d4e..fa56bd2a1325 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -7,7 +7,7 @@
PORTNAME= luma
PORTVERSION= 2.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils net-mgmt
MASTER_SITES= SF
# MASTER_SITES= http://home.tu-clausthal.de/~ifwd/luma/
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index df26e2202726..552c7d5a48c6 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxinput
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/lxde/LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/LXInput%200.3.1
diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index 0a5dbbe96e7b..c08adc8824a2 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxtask
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= SF/lxde/LXTask%20%28task%20manager%29/LXTask%20${PORTVERSION}
diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index 8a26ab86c025..f50cc77fcecb 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxterminal
PORTVERSION= 0.1.11
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20${PORTVERSION}
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index c7d10d368aa6..0420d29a07aa 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monitorix
PORTVERSION= 2.5.2
+PORTREVISION?= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.monitorix.org/ \
http://www.monitorix.org/old_versions/ \
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index ff1b32b641df..b8a9d73002db 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -7,7 +7,7 @@
PORTNAME= most
PORTVERSION= 5.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://space.mit.edu/pub/davis/most/ \
CRITICAL
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 3ea2c57ec8cc..e14a2b1d6c35 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mountapp
PORTVERSION= 3.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils windowmaker
MASTER_SITES= SF
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index a00ca81c9388..1021f74878f8 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -7,7 +7,7 @@
PORTNAME= munin
PORTVERSION= 1.4.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils perl5
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
PKGNAMESUFFIX= -master
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index dba584de9dea..dce8d0634d60 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nautilus-cd-burner
PORTVERSION= 2.24.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index 1401a8320198..ceece4b7cb7e 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nbosd
PORTVERSION= 0.5.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index 9d5bd10eb298..7a4ab004e2a5 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nitrogen
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://projects.l3ib.org/nitrogen/files/
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 3feb9a7ba60c..28dc922b937d 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nvclock
DISTVERSION= 0.8b4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.8%20%28beta4%29
DISTNAME= nvclock${DISTVERSION}
diff --git a/sysutils/pbreg/Makefile b/sysutils/pbreg/Makefile
index 8dd2a2bebfc1..8c39674c55bf 100644
--- a/sysutils/pbreg/Makefile
+++ b/sysutils/pbreg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pbreg
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \
http://www.pcbsd.org/~kris/software/
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 2afb2c0d4b8e..d9deab8a4a57 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pessulus
PORTVERSION= 2.30.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index d8965b9431db..5d4c1494adfc 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pfstat
PORTVERSION= 2.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils net
MASTER_SITES= http://www.benzedrine.cx/
diff --git a/sysutils/plasma-applet-apcups/Makefile b/sysutils/plasma-applet-apcups/Makefile
index 699d4a5cfc17..a7827e8cdadb 100644
--- a/sysutils/plasma-applet-apcups/Makefile
+++ b/sysutils/plasma-applet-apcups/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apcups
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils kde
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= plasma-applet-
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index 1b6c7d0ec83c..a499e07da52b 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= policykit-gnome
PORTVERSION= 0.9.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
DISTNAME= PolicyKit-gnome-${PORTVERSION}
diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile
index 67e5b6aaeca1..dad753f51cde 100644
--- a/sysutils/policykit-qt/Makefile
+++ b/sysutils/policykit-qt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= policykit-qt
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index b10e0ea57ff6..39c930948a84 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -8,6 +8,7 @@
PORTNAME= polkit-gnome
PORTVERSION= 0.99
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index f3454a19735f..d49bdb0661a6 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -7,7 +7,7 @@
PORTNAME= polkit-kde
PORTVERSION= 0.99.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index f9f9e4d274aa..90bea20d6167 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= polkit-qt
PORTVERSION= 0.103.0
+PORTREVISION= 1
DISTVERSIONPREFIX= 1-
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 49b4dcb3cb9a..1f5dcf8d1c42 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pwg
PORTVERSION= 0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils kde
MASTER_SITES= SF
diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index e551edd59640..8df6efdf9566 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pyrenamer
PORTVERSION= 0.6.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils python gnome
MASTER_SITES= http://www.infinicode.org/code/pyrenamer/files/
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index 8b5791226b79..dec0bf284abf 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -7,12 +7,15 @@
PORTNAME= qpxtool
DISTVERSION= 0.7.1_002
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION:C/\.[^.]*$/.x/}/${DISTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A GUI for testing CD/DVD quality and transfer rate
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_QT_VER= 4
diff --git a/sysutils/qpxtool/files/patch-f1tattoo.cpp b/sysutils/qpxtool/files/patch-f1tattoo.cpp
new file mode 100644
index 000000000000..abd17938a7b2
--- /dev/null
+++ b/sysutils/qpxtool/files/patch-f1tattoo.cpp
@@ -0,0 +1,10 @@
+--- console/f1tattoo/f1tattoo.cpp.orig 2009-11-25 08:55:44.000000000 +0100
++++ console/f1tattoo/f1tattoo.cpp 2012-05-09 13:18:22.000000000 +0200
+@@ -18,6 +18,7 @@
+
+ #ifdef USE_LIBPNG
+ #include <png.h>
++#include <pngpriv.h>
+ #endif
+
+ #include "version.h"
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index 8f7ad785cd57..0152213b5f0d 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quicksynergy
PORTVERSION= 0.9.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/Linux/${PORTVERSION}
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index 7b7f40e5bd76..318cf02b5516 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -7,6 +7,7 @@
PORTNAME= searchmonkey
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/Searchmonkey2/${PORTVERSION}%20%5Bstable%5D
DISTNAME= ${PORTNAME}_v${PORTVERSION}
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index d96d92278639..9ad3fe4a6a30 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sensors-applet
PORTVERSION= 1.6.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GNOME%20Sensors%20Applet%20Version%20${PORTVERSION}
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 8ec9776a6360..869ddcf4da68 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= serpentine
PORTVERSION= 0.7
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils
MASTER_SITES= BERLIOS
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 0328d94b090a..8ed03e661015 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= slmon
PORTVERSION= 0.5.13
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/SLmon/${PORTVERSION}
diff --git a/sysutils/spassgen/Makefile b/sysutils/spassgen/Makefile
index 31f57ad30e7c..ca2ad2a8e391 100644
--- a/sysutils/spassgen/Makefile
+++ b/sysutils/spassgen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spassgen
PORTVERSION= 1.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index c28fe5f05ac7..1daa8b88fcaf 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= symon
PORTVERSION= 2.85
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://wpd.home.xs4all.nl/symon/philes/ \
${MASTER_SITE_LOCAL}
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 0ad2983d865e..1a07ccb345d0 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thefish
PORTVERSION= 0.6.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 39ce63b4383c..ab711623a05c 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tracker
PORTVERSION= 0.6.95
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= -client
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+= --disable-libtrackergtk --disable-gui \
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng14|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
post-build:
.if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
index b13605a54c40..404175ab9a87 100644
--- a/sysutils/usbhotkey/Makefile
+++ b/sysutils/usbhotkey/Makefile
@@ -7,7 +7,7 @@
PORTNAME= usbhotkey
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile
index 076012dce901..7d5f4d7422de 100644
--- a/sysutils/vimpager/Makefile
+++ b/sysutils/vimpager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vimpager
PORTVERSION= 1.6.8
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://github.com/${GH_DEVELOPER}/${GH_PORTNAME}/tarball/${DISTVERSION}/
DISTNAME= ${GH_DEVELOPER}-${GH_PORTNAME}-${DISTVERSION}-0-g${GH_VERSION}
diff --git a/sysutils/warden/Makefile b/sysutils/warden/Makefile
index ae7370a077e2..47b28b60d6d3 100644
--- a/sysutils/warden/Makefile
+++ b/sysutils/warden/Makefile
@@ -7,6 +7,7 @@
PORTNAME= warden
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.pcbsd.org/pub/software/ \
http://www.pcbsd.org/~kris/software/
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 25030710229f..b1563f03bd2e 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmfire
PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://www.swanson.ukfsn.org/wmfire/
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 843fe8c915ae..47a763b5693b 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcdroast
PORTVERSION= 0.98.a.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.98alpha16 \
http://www.xcdroast.org/download/
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 0868d7206c9f..e85d100a72ce 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfburn
PORTVERSION= 0.4.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 3acd4ca056d8..483f3e2506ca 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-battery-plugin
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 30c6608aa1af..4f1f858acf99 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 169f18e87f9b..bdc99a639fe1 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index f82da13bd4e0..7b15a2dc9fcd 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-genmon-plugin
PORTVERSION= 3.4.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 2d8b57c372e1..cc81cde43fe5 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-minicmd-plugin
PORTVERSION= 0.4
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= sysutils xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index adaee86eb66f..36b4de9534c3 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-netload-plugin
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 3b1254c751f7..88f9f69b36f1 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-power-manager
PORTVERSION= 1.0.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index e7e55163acd9..de17456b4878 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-settings
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 27ea23410b67..752e70cdbd26 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-systemload-plugin
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index e6b2471e24d6..305079b0c2fd 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-utils
PORTVERSION= 4.8.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/xfce-utils/${PORTVERSION:R}
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index aac243e5d5df..0af11a2ad2b0 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wavelan-plugin
PORTVERSION= 0.5.4
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -16,7 +16,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Displays various information about a WaveLAN device
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/sysutils/xsu/Makefile b/sysutils/xsu/Makefile
index 1eaf67d246db..79a60cba139f 100644
--- a/sysutils/xsu/Makefile
+++ b/sysutils/xsu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xsu
PORTVERSION= 0.2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= SF
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index bcf68e531a24..a2544c1dd77f 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xvidcap
DISTVERSION= 1.1.4p1
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= sysutils multimedia
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index a6d6460e1d21..1f1a4a38af1a 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zeitgeist
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
index f30c42d0acbf..0aa713f7f04a 100644
--- a/textproc/aiksaurus-gtk/Makefile
+++ b/textproc/aiksaurus-gtk/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc deskutils
PKGNAMESUFFIX= -gtk
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index d9c9f4be3224..837b5c085cce 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -7,7 +7,7 @@
PORTNAME= artha
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/beediff/Makefile b/textproc/beediff/Makefile
index 9ef71f7587ed..f84092c5e730 100644
--- a/textproc/beediff/Makefile
+++ b/textproc/beediff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beediff
PORTVERSION= 1.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc devel
MASTER_SITES= http://www.beesoft.pl/download/
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index ce4293c93411..f1ef50ccd38b 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bibtool
PORTVERSION= 2.48
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= biblio/bibtex/utils/${PORTNAME}
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index 23dd939e5846..2e3049cac136 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chm2pdf
PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 12e7561ced14..24aaa80e12a4 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dblatex
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 61c72b7881ce..4d2eab710c76 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dictem
PORTVERSION= 1.0.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc net elisp
MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 2e57fc33342e..053268d780b9 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dictionary
PORTVERSION= 1.8.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc net elisp
MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \
http://bsdchat.com/dist/dryice/
diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile
index e3f870925037..ec237a1f1ab3 100644
--- a/textproc/dikt/Makefile
+++ b/textproc/dikt/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dikt
PORTVERSION= 2g
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc net kde
MASTER_SITES= GOOGLE_CODE
EXTRACT_SUFX= .txz
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 1d42832ec344..442708a7b3ce 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dixit
PORTVERSION= 10.8
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:dixit \
SF/${PORTNAME}/${PORTNAME}_qdb/:db
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index 56b08571ad01..6c0e077d9966 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= docbook-utils
PORTVERSION= 0.6.14
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= docbook-tools/new-trials/SOURCES
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 3e5d24198e7a..335c0b975404 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -7,7 +7,7 @@
PORTNAME= docproj
PORTVERSION= 1.17
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile
index 4c92537d0ece..1bbbed9796d6 100644
--- a/textproc/emacs-wiki/Makefile
+++ b/textproc/emacs-wiki/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs-wiki
PORTVERSION= 2.72
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc elisp
MASTER_SITES= http://www.mwolson.org/static/dist/emacs-wiki/ \
http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile
index 09009e6e6343..c28413e677af 100644
--- a/textproc/eqe/Makefile
+++ b/textproc/eqe/Makefile
@@ -6,7 +6,7 @@
PORTNAME= eqe
PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://rlehy.free.fr/
diff --git a/textproc/fcitx-keyboard/Makefile b/textproc/fcitx-keyboard/Makefile
index 5475cdbd2066..0c9718a04b42 100644
--- a/textproc/fcitx-keyboard/Makefile
+++ b/textproc/fcitx-keyboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fcitx-keyboard
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DIST_SUBDIR= fcitx
diff --git a/textproc/fixrtf/Makefile b/textproc/fixrtf/Makefile
index 674f09165cc2..ff0f19223952 100644
--- a/textproc/fixrtf/Makefile
+++ b/textproc/fixrtf/Makefile
@@ -9,7 +9,7 @@
PORTNAME= fixrtf
PORTVERSION= 0.1.20060303
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= # none
DISTFILES= # none
@@ -20,7 +20,7 @@ DISTFILES= # none
MAINTAINER= delphij@FreeBSD.org
COMMENT= A patch making it possible to embed PNGs into RTFs
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/src
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 8eade12a7d74..c0f29e2a50e2 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fldiff
PORTVERSION= 1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= http://www.easysw.com/~mike/fldiff/ \
CRITICAL
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 5aaeaf66bc58..83abd502c7a3 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= foiltex
PORTVERSION= 2.1.4b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= macros/latex/contrib/${PORTNAME}
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index e2c89281d459..694c1d162b23 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gladtex
PORTVERSION= 1.2
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc math www
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT= A program to replace LaTeX formulas in HTML files with images
LICENSE= GPLv2
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \
dvips:${PORTSDIR}/print/dvipsk-tetex
@@ -28,7 +28,7 @@ BINPATH= ${PREFIX}/bin
INCPATH= -I${LOCALBASE}/include
LIBPATH= -L${LOCALBASE}/lib
-MAKE_ENV+= BINPATH=${BINPATH} INCPATH=${INCPATH} LIBPATH=${LIBPATH}
+MAKE_ENV+= BINPATH=${BINPATH} INCPATH="${INCPATH}" LIBPATH=${LIBPATH}
.if !defined(NO_INSTALL_MANPAGES)
MAN1= ${PORTNAME}.1
diff --git a/textproc/gladtex/files/patch-eqn2img.c b/textproc/gladtex/files/patch-eqn2img.c
index 8ce0099711e6..321948086d70 100644
--- a/textproc/gladtex/files/patch-eqn2img.c
+++ b/textproc/gladtex/files/patch-eqn2img.c
@@ -1,5 +1,23 @@
---- ./eqn2img.c.orig 2012-05-01 18:17:08.000000000 +0200
-+++ ./eqn2img.c 2012-05-01 18:18:00.000000000 +0200
+--- eqn2img.c.orig 2010-07-31 17:30:20.000000000 +0200
++++ eqn2img.c 2012-05-06 15:41:55.000000000 +0200
+@@ -367,7 +367,7 @@
+ info_ptr = png_create_info_struct(png_ptr);
+ assert(info_ptr);
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ return NULL;
+@@ -580,7 +580,7 @@
+ assert(info_ptr);
+
+ /* error handling, libpng longjmps here on any error */
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ return -1;
@@ -715,7 +715,7 @@
fprintf(stderr, " -> ps");
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index aaa233057d32..dd1f90c97b4e 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-spell
PORTVERSION= 1.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 9fc0a9c64161..66e4827f8134 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-translate
PORTVERSION= 0.99
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= libtranslate
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index e5a332c8fb9a..b9a107d5b87f 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -7,7 +7,7 @@
PORTNAME= goldendict
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index d374bcb5eba5..cf0a664e4aec 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= groff
PORTVERSION= 1.21
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= groff
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 15110fa5557b..905b23d950fe 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkdiff
PORTVERSION= 1.8.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc gnome
MASTER_SITES= TUCOWS
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 0029bbb70717..a1d8f3bfabae 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkspell
PORTVERSION= 2.0.16
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= marcus
diff --git a/textproc/gutenmark/Makefile b/textproc/gutenmark/Makefile
index 6d9dda081c07..c1230a9587f3 100644
--- a/textproc/gutenmark/Makefile
+++ b/textproc/gutenmark/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gutenmark
PORTVERSION= 20090510
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.sandroid.org/GutenMark/wasftp.GutenMark/SoftwareSnapshots/
DISTNAME= GutenMark_source_dev-${PORTVERSION}
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index ebbf123b16cc..ba462077e34e 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gxmlviewer
PORTVERSION= 1.3.3
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-0
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index edcabfe39aba..30622ed12fba 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index a31606f1687a..2df6b492d83f 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= htmldoc
PORTVERSION= 1.8.27
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -17,7 +17,7 @@ MAINTAINER= jose@diasfernandes.pt
COMMENT= Converts HTML to PDF and/or PostScript
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
OPTIONS= HTMLDOCGUI "Build GUI front-end" off
# .bz2 file is available since Aug 2, but we don't want to
@@ -36,7 +36,7 @@ MAN1= htmldoc.1
post-patch:
${REINPLACE_CMD} -e 's,@JPEG@ @ZLIB@ @PNG@ ,,' ${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e 's|@LDFLAGS@|-L${LOCALBASE}/lib @LDFLAGS@|' \
- -e 's|@JPEGINC@ @PNGINC@ @ZLIBINC@|-I${LOCALBASE}/include|' \
+ -e 's|@JPEGINC@ @PNGINC@ @ZLIBINC@|-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15|' \
${WRKSRC}/Makedefs.in
# Remove redundant code:
${REINPLACE_CMD} -Ee 's,(md5|snprintf|rc4)\.o,,g' \
diff --git a/textproc/htmldoc/files/patch-image.cxx b/textproc/htmldoc/files/patch-image.cxx
new file mode 100644
index 000000000000..7aba1dfbf53b
--- /dev/null
+++ b/textproc/htmldoc/files/patch-image.cxx
@@ -0,0 +1,19 @@
+--- htmldoc/image.cxx.orig 2006-05-31 21:00:02.000000000 +0200
++++ htmldoc/image.cxx 2012-05-06 15:44:04.000000000 +0200
+@@ -56,6 +56,7 @@
+ }
+
+ #include <png.h> /* Portable Network Graphics (PNG) definitions */
++#include <pngpriv.h>
+
+
+ /*
+@@ -1499,7 +1500,7 @@
+
+ rows = NULL;
+
+- if (setjmp(pp->jmpbuf))
++ if (setjmp(png_jmpbuf(pp)))
+ {
+ progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+
diff --git a/textproc/htmlize.el/Makefile b/textproc/htmlize.el/Makefile
index 0c2519a82a3b..26a586123e85 100644
--- a/textproc/htmlize.el/Makefile
+++ b/textproc/htmlize.el/Makefile
@@ -7,6 +7,7 @@
PORTNAME= htmlize.el
PORTVERSION= 1.39
+PORTREVISION= 1
CATEGORIES= textproc elisp
MASTER_SITES= http://fly.srk.fer.hr/~hniksic/emacs/
DISTNAME= ${PORTNAME}.cgi
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index 49a79ea8a7a7..8101c27a9235 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= htmltolatex
PORTVERSION= 1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc
MASTER_SITES= http://people.FreeBSD.org/~foxfair/distfiles/
DISTNAME= ${PORTNAME}
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index 9a26d2d5733a..f3f94b460cba 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ibus-el
PORTVERSION= 0.3.1
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc elisp
MASTER_SITES= http://www11.atwiki.jp/s-irie/pub/emacs/ibus/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index cb5339f48ef0..419371444076 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ibus-kmfl
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/kmfl/${PORTNAME}/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index 18c10287b274..3e00dd6b0a1d 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-m17n
PORTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index 697b4013538c..b62c8b746927 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ibus-qt
PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index e61fb244c37a..1e54367567f7 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus-table
PORTVERSION= 1.3.9.20110827
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 36cf4cf67a40..69081ad6a2f8 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ibus
PORTVERSION= 1.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile
index c6a8b0e26384..8193adbfbcf4 100644
--- a/textproc/ipdf/Makefile
+++ b/textproc/ipdf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ipdf
PORTVERSION= 1.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= http://hoopajoo.net/static/projects/
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Creates indexed pdf documents from text files
LIB_DEPENDS= pdf.6:${PORTSDIR}/print/pdflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GNU_CONFIGURE= yes
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index c5879dac71a5..88f3dabbed1e 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kbedic
PORTVERSION= 4.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc kde
MASTER_SITES= SF/${PORTNAME}/KBE%20Dictionary/${PORTVERSION}
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 08ef32b211f7..7ca061809f87 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdiff3
PORTVERSION= 0.9.95
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc kde
MASTER_SITES= SF
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 1b2af5f379c8..2f6904352c04 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -7,6 +7,7 @@
PORTNAME= latex2html
PORTVERSION= 2008
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/${PORTNAME}
diff --git a/textproc/libvisio/Makefile b/textproc/libvisio/Makefile
index a26a74b95df3..03b018dddaa8 100644
--- a/textproc/libvisio/Makefile
+++ b/textproc/libvisio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libvisio
PORTVERSION= 0.0.16
+PORTREVISION= 1
CATEGORIES= textproc devel
MASTER_SITES= http://dev-www.libreoffice.org/src/ \
LOCAL/sunpoet
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 00bb5fbd1b4e..094f0273049d 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libwpd
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index efd093ab9b08..09ddb3a101f2 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libwpd
PORTVERSION= 0.8.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 211d48437fd8..e686933aae95 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libwps
PORTVERSION= 0.2.6
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index 9043ae563079..6145a87af7da 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -7,7 +7,7 @@
PORTNAME= m17n-im-config
PORTVERSION= 0.9.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= http://www.m17n.org/common/im-config/ \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 6ea7c10cdba1..82e5c7e6c914 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,6 +7,7 @@
PORTNAME= meld
PORTVERSION= 1.6.0
+PORTREVISION= 1
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index fb685792782c..d77b842c743a 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modlogan
PORTVERSION= 0.8.13
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc www
MASTER_SITES= http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 2514daeacd3e..94c500c68518 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= muse
PORTVERSION= 3.20
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc elisp
MASTER_SITES= http://download.gna.org/muse-el/ \
${MASTER_SITE_LOCAL} \
diff --git a/textproc/opensched/Makefile b/textproc/opensched/Makefile
index d6f3bdf3a0fd..b78a6d4976eb 100644
--- a/textproc/opensched/Makefile
+++ b/textproc/opensched/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opensched
PORTVERSION= 0.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= http://hitachi-id.com/dlsoftware/opensched/
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 3fa49b0f30f7..2e9f6c51fc5a 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openvanilla-modules
PORTVERSION= 0.7.2.20070514
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= rafan
diff --git a/textproc/p5-HTML-HTMLDoc/Makefile b/textproc/p5-HTML-HTMLDoc/Makefile
index 3aa0d4f27753..14744763ac5b 100644
--- a/textproc/p5-HTML-HTMLDoc/Makefile
+++ b/textproc/p5-HTML-HTMLDoc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= HTML-HTMLDoc
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= http://kostjn.spb.ru/freebsd/ \
CPAN
diff --git a/textproc/p5-HTML-QRCode/Makefile b/textproc/p5-HTML-QRCode/Makefile
index b41679242aa2..87397208031b 100644
--- a/textproc/p5-HTML-QRCode/Makefile
+++ b/textproc/p5-HTML-QRCode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= HTML-QRCode
PORTVERSION= 0.01
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-LaTeX-Driver/Makefile b/textproc/p5-LaTeX-Driver/Makefile
index fa003a952489..8662aef3cd4a 100644
--- a/textproc/p5-LaTeX-Driver/Makefile
+++ b/textproc/p5-LaTeX-Driver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= LaTeX-Driver
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index 7b0de162a083..fb84cdbbdff6 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -7,6 +7,7 @@
PORTNAME= LaTeX-Table
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-QRCode/Makefile b/textproc/p5-Text-QRCode/Makefile
index e227b76bd505..7d4c150dbb1a 100644
--- a/textproc/p5-Text-QRCode/Makefile
+++ b/textproc/p5-Text-QRCode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Text-QRCode
PORTVERSION= 0.01
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index 5356b0b314e2..9c28619dacdb 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Text-VimColor
PORTVERSION= 0.14
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Tk-Pod/Makefile b/textproc/p5-Tk-Pod/Makefile
index 290b5c1375e2..864216a11f5a 100644
--- a/textproc/p5-Tk-Pod/Makefile
+++ b/textproc/p5-Tk-Pod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Tk-Pod
PORTVERSION= 0.9940
+PORTREVISION= 1
CATEGORIES= textproc tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index b345ebac014b..abd1cb17bec6 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-XMLViewer
PORTVERSION= 0.21
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index e0674466575f..dcba2a8f41cc 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -7,7 +7,7 @@
PORTNAME= UML-Class-Simple
PORTVERSION= 0.18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-UML-Sequence/Makefile b/textproc/p5-UML-Sequence/Makefile
index 9ca0dbd95363..d99157a79be0 100644
--- a/textproc/p5-UML-Sequence/Makefile
+++ b/textproc/p5-UML-Sequence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= UML-Sequence
PORTVERSION= 0.08
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 6897837b0eb6..fc206e2f912d 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmltv
PORTVERSION= 0.5.61
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= SF
PKGNAMEPREFIX= p5-
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index ffe0df960e26..6e06cb75807c 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pdfgrep
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile
index 97c038faafd3..f79fe31692f8 100644
--- a/textproc/pdftohtml/Makefile
+++ b/textproc/pdftohtml/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pdftohtml
PORTVERSION= 0.39
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index ddf4f9adf02f..97bdd715c312 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enchant
PORTVERSION= 1.6.5
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index 9c9b09500efe..32ade50ba54e 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -6,6 +6,7 @@
PORTNAME= xml
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index 214e48ee0919..7abc54971d7e 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -6,6 +6,7 @@
PORTNAME= xmlpatterns
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 3ce1b564b189..ccffcb313e07 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xmltools
PORTVERSION= 1.4.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc python
MASTER_SITES= LOGILAB
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 3f4c532d7911..1b2efa1ee1ee 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qstardict
PORTVERSION= 0.13.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://qstardict.ylsoftware.com/files/
diff --git a/textproc/rst.el/Makefile b/textproc/rst.el/Makefile
index 81660ad148bd..43397bc6ed5d 100644
--- a/textproc/rst.el/Makefile
+++ b/textproc/rst.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rst.el
PORTVERSION= 6390
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc elisp
MASTER_SITES= http://svn.berlios.de/viewcvs/docutils/trunk/docutils/tools/editors/emacs/
PKGNAMESUFFIX= -${EMACS_NAME}
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index e1f00aabcff6..1f313b9b539e 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rubber
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://launchpadlibrarian.net/53558954/
diff --git a/textproc/rubygem-compass/Makefile b/textproc/rubygem-compass/Makefile
index 947f13e9e3e3..5b0715899aac 100644
--- a/textproc/rubygem-compass/Makefile
+++ b/textproc/rubygem-compass/Makefile
@@ -7,6 +7,7 @@
PORTNAME= compass
PORTVERSION= 0.11.7
+PORTREVISION= 1
CATEGORIES= textproc ruby
MASTER_SITES= RG
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 35400304f3d9..5f921878e062 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sagasu
PORTVERSION= 2.0.10
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/
diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile
index 6f77caec338a..65db67ad0cfd 100644
--- a/textproc/scim-bridge-qt4/Makefile
+++ b/textproc/scim-bridge-qt4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-bridge
PORTVERSION= 0.4.16
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -qt4
diff --git a/textproc/scim-bridge/Makefile b/textproc/scim-bridge/Makefile
index 7600821a31e0..dcbb28812bc6 100644
--- a/textproc/scim-bridge/Makefile
+++ b/textproc/scim-bridge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-bridge
PORTVERSION= 0.4.16
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index dc817f18e411..1e8e638296f6 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-input-pad
PORTVERSION= 0.1.3.1
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/scim/${PORTNAME}/0.1.3/ \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 1ff4b45a9c6c..a70581d369e0 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-kmfl-imengine
PORTVERSION= 0.9.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -21,7 +21,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
kmfl.0:${PORTSDIR}/textproc/libkmfl \
kmflcomp.0:${PORTSDIR}/textproc/kmflcomp \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp \
scim:${PORTSDIR}/textproc/scim
diff --git a/textproc/scim-m17n/Makefile b/textproc/scim-m17n/Makefile
index 66d72b9d991d..3335b0caa554 100644
--- a/textproc/scim-m17n/Makefile
+++ b/textproc/scim-m17n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-m17n
PORTVERSION= 0.2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 22aa312c5f40..8e6d54dc5f0f 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-openvanilla
PORTVERSION= 0.7.2.20070514
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= rafan
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index cc7d6d361cea..30c4a1ae7c64 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-table-imengine
PORTVERSION= 0.5.10
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/scim/scim-tables/${PORTVERSION}
DISTNAME= scim-tables-${PORTVERSION}
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 588b8fea6cfd..3f66ccf9c97a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim
PORTVERSION= 1.4.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 2bd44d310916..06e685c3af74 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sgmltools-lite
PORTVERSION= 3.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 383b0784d463..e1ccc4e66a70 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sigil
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= Sigil-${PORTVERSION}-Code
diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile
index b7fe33e1f79b..93030e00c0b5 100644
--- a/textproc/sowing/Makefile
+++ b/textproc/sowing/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sowing
PORTVERSION= 1.1.16
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://ftp.mcs.anl.gov/pub/sowing/
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 439c5bc9935c..156576c4911c 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.8
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc
MASTER_SITES= SF
DIST_SUBDIR= stardict
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 38d5c478e644..3111fa3f6fa3 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stardict
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GOOGLE_CODE
DIST_SUBDIR= stardict
diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile
index a3394a0c94e0..ef30c198bd80 100644
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tex2im
PORTVERSION= 1.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc
MASTER_SITES= http://www.nought.de/
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index 795a7f51d54f..d4dd3f187654 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tth
PORTVERSION= 3.89
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://hutchinson.belmont.ma.us/tth/tth-noncom/ \
http://redundancy.redundancy.org/mirror/
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index b4e8cf375532..6ab27475c485 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uim-el
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index eafd2c9d106a..e20a69c37f55 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uim
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index b93ee633a6e6..67d21b1e6422 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wv
PORTVERSION= 1.2.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.abisource.com/downloads/wv/${PORTVERSION}/
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index dac6c88a2139..c54ce30361c7 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wv2
PORTVERSION= 0.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF/wvware/
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 4d27ef5f6cba..69e956a7ca78 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-dict
PORTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index 30fdd8a371a5..a9862da71808 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xml-lite.el
PORTVERSION= 1.1
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= textproc elisp
MASTER_SITES= http://dogbiscuit.org/mdub/software/
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index c20e1f1e21f6..c4205b0e713c 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmlroff
PORTVERSION= 0.6.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://xmlroff.org/download/
diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile
index fce3c5cfce37..4f5f07df500f 100644
--- a/textproc/xxdiff-scripts/Makefile
+++ b/textproc/xxdiff-scripts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xxdiff
PORTVERSION= 3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF
PKGNAMESUFFIX= -scripts
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 236fea20fe39..c17cb07170ce 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xxdiff
PORTVERSION= 3.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile
index adc4cdbe1f7f..5fbe37e6fe12 100644
--- a/textproc/yaml-mode.el/Makefile
+++ b/textproc/yaml-mode.el/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yaml-mode.el
PORTVERSION= 0.0.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc elisp
MASTER_SITES= http://yaml-mode.clouder.jp/attachment/wiki/WikiStart/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 7d407b9754c5..d5b3f9de64ef 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yodl
PORTVERSION= 3.00.0
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index e322599a41ef..908e99cfbaf8 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zorba
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index 3280518b1a90..8f25b8883354 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= ukrainian kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 998f3e6a93ba..d2fbd7088165 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-l10n
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= ukrainian kde
MAINTAINER= kde@FreeBSD.org
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index 879f6e899e36..774a53fec738 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES?= vietnamese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile
index 204d7cc84a77..381edc2f0366 100644
--- a/vietnamese/xvnkb/Makefile
+++ b/vietnamese/xvnkb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xvnkb
PORTVERSION= 0.2.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= vietnamese
MASTER_SITES= SF
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index f0b7e8b93452..455a95f5f380 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= WebMagick
PORTVERSION= 2.03p12
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www graphics
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}-beta/2.03pre12
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 0bdd7719a7b7..2cf4d75321cc 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= analog
PORTVERSION= 6.0
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.analog.cx/ \
@@ -23,7 +23,7 @@ LICENSE= GPLv2
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index bb4c5422ed31..258cf25db797 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aria2fe
DISTVERSION= 0.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/www/arora/Makefile b/www/arora/Makefile
index 1b7384eb77b9..0dab64ea1e78 100644
--- a/www/arora/Makefile
+++ b/www/arora/Makefile
@@ -6,6 +6,7 @@
PORTNAME= arora
PORTVERSION= 0.11.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= GOOGLE_CODE
diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile
index 83bd61e51e06..f94d925b44c9 100644
--- a/www/asterisk-stat/Makefile
+++ b/www/asterisk-stat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk-stat
PORTVERSION= 2.0.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www
MASTER_SITES= http://www.areski.net/${SITE_SUBDIR}/
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index 654820757043..a16497bef2e6 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -7,7 +7,7 @@
PORTNAME= awffull
PORTVERSION= 3.10.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= www
MASTER_SITES= http://www.stedee.id.au/files/
@@ -16,7 +16,7 @@ COMMENT= AWFFull is a webserver log analysis tool forked from Webalizer
BUILD_DEPENDS= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
pcre.1:${PORTSDIR}/devel/pcre
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile
index f2aa94c75a66..063dc175c33e 100644
--- a/www/bigbluebutton/Makefile
+++ b/www/bigbluebutton/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bigbluebutton
PORTVERSION= 0.71
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www java
MASTER_SITES= http://bigbluebutton.org/downloads/${PORTVERSION}/ \
http://bigbluebutton.org/downloads/0.70/:2 \
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2dcaac2d5e3e..15840d26fb5e 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -8,6 +8,7 @@
PORTNAME= bluefish
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= www editors
MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/ \
http://bluefish.mrball.net/stable/source/ \
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 601ce69b633e..4730540374bf 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bookmarkbridge
PORTVERSION= 0.76
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= SF
diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index c9eed31b1432..c807c63e14ff 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= caudium14
PORTVERSION= 1.4.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ftp://ftp.caudium.net/caudium/source/ \
ftp://ftp.oav.net/caudium/source/
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 258c353a17cf..00dfabf6b09d 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cgicc
PORTVERSION= 3.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel
MASTER_SITES= GNU
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index bef825938c83..7e153dba8a76 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cherokee
PORTVERSION= 1.2.101
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index dec0d6555171..e05a7a0f6c6f 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -7,6 +7,7 @@
PORTNAME= choqok
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= SF/${PORTNAME}/Choqok/
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index f54ebe7db18f..9edcc4eb31f1 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -8,6 +8,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 19.0.1084.52
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.goodking.org/downloads/ \
ftp://rene-ladan.nl/pub/distfiles/ \
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index 3c5b7554f036..cdecb7b92cad 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cssed
PORTVERSION= 0.4.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= SF
diff --git a/www/cutycapt/Makefile b/www/cutycapt/Makefile
index aab40dcea7eb..0850239441c0 100644
--- a/www/cutycapt/Makefile
+++ b/www/cutycapt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cutycapt
PORTVERSION= 20100608
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://bsd.e-shell.net/local/
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index cb0ab197b9e5..c9db00648218 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -16,7 +16,7 @@
PORTNAME= dillo
PORTVERSION= ${DILLOVERSION}.${I18NVERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www ipv6
MASTER_SITES= http://teki.jpn.ph/pc/software/
PKGNAMESUFFIX= -i18n
@@ -27,7 +27,7 @@ COMMENT= A fast, small graphical Web browser with support for i18n
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
DILLOVERSION= 0.8.6
I18NVERSION= 20060709
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 7ae3d16beace..ad953b9fd5d7 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -11,7 +11,7 @@
PORTNAME= dillo
PORTVERSION= 0.8.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www ipv6
MASTER_SITES= http://www.dillo.org/download/
@@ -20,7 +20,7 @@ COMMENT= A fast, small graphical Web browser built upon GTK+
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_GNOME= gtk12
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 0a96ecb23639..11e5e4684df8 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -6,6 +6,7 @@
PORTNAME= dillo
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.dillo.org/download/ LOCAL/bf
diff --git a/www/drupal6-advanced_help/Makefile b/www/drupal6-advanced_help/Makefile
index a042dcda9ab3..d2776488a042 100644
--- a/www/drupal6-advanced_help/Makefile
+++ b/www/drupal6-advanced_help/Makefile
@@ -7,7 +7,7 @@
PORTNAME= advanced_help
DISTVERSION= 6.x-1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
diff --git a/www/drupal6-cck/Makefile b/www/drupal6-cck/Makefile
index a36425c76ab5..221886b754f2 100644
--- a/www/drupal6-cck/Makefile
+++ b/www/drupal6-cck/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cck
DISTVERSION= 6.x-2.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
diff --git a/www/drupal6-chaos/Makefile b/www/drupal6-chaos/Makefile
index 2a3a27ba0012..c70527cb120e 100644
--- a/www/drupal6-chaos/Makefile
+++ b/www/drupal6-chaos/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ctools
DISTVERSION= 6.x-1.6
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
diff --git a/www/drupal6-ckeditor/Makefile b/www/drupal6-ckeditor/Makefile
index c29f06fc6864..eb3fb8e085e9 100644
--- a/www/drupal6-ckeditor/Makefile
+++ b/www/drupal6-ckeditor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ckeditor
DISTVERSION= 6.x-1.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/:1 \
http://download.cksource.com/CKEditor/CKEditor/CKEditor%203.3/:2
diff --git a/www/drupal6-imce/Makefile b/www/drupal6-imce/Makefile
index 9384e1e146da..d5e146dfacfc 100644
--- a/www/drupal6-imce/Makefile
+++ b/www/drupal6-imce/Makefile
@@ -7,6 +7,7 @@
PORTNAME= imce
DISTVERSION= 6.x-1.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
diff --git a/www/drupal6-nice_menus/Makefile b/www/drupal6-nice_menus/Makefile
index 746e568eff40..80d8730a9e10 100644
--- a/www/drupal6-nice_menus/Makefile
+++ b/www/drupal6-nice_menus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nice_menus
DISTVERSION= 6.x-1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MAINTAINER= nick@foobar.org
diff --git a/www/drupal6-panels/Makefile b/www/drupal6-panels/Makefile
index abf3f828d3d9..acc74248e8e2 100644
--- a/www/drupal6-panels/Makefile
+++ b/www/drupal6-panels/Makefile
@@ -7,6 +7,7 @@
PORTNAME= panels
DISTVERSION= 6.x-3.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
diff --git a/www/drupal6-views/Makefile b/www/drupal6-views/Makefile
index 7af9a65e1b80..38bc3272c9f7 100644
--- a/www/drupal6-views/Makefile
+++ b/www/drupal6-views/Makefile
@@ -7,6 +7,7 @@
PORTNAME= views
DISTVERSION= 6.x-2.12
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= rea@FreeBSD.org
diff --git a/www/drupal6-webform/Makefile b/www/drupal6-webform/Makefile
index 2bfabe8d8de7..562da21ab2ea 100644
--- a/www/drupal6-webform/Makefile
+++ b/www/drupal6-webform/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webform
DISTVERSION= 6.x-3.17
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= nick@foobar.org
diff --git a/www/drupal6-zeropoint/Makefile b/www/drupal6-zeropoint/Makefile
index e665af201cc7..71b969b6096c 100644
--- a/www/drupal6-zeropoint/Makefile
+++ b/www/drupal6-zeropoint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zeropoint
DISTVERSION= 6.x-2.3
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= whitekid@gmail.com
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 1cdd1aca1574..523112500003 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emacs-w3m
PORTVERSION= 1.4.471.b.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= www elisp
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nobutaka
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 84193bad3183..1fbda9e3ad5d 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -8,7 +8,7 @@
PORTNAME= epiphany-extensions
PORTVERSION= 2.30.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 6893b5b8cebb..6981665cdd1a 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -8,7 +8,7 @@
PORTNAME= epiphany
PORTVERSION= 2.30.6
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 0401f11f213a..547fb8ee0f72 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= erwn
PORTVERSION= 0.8
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= www editors
MASTER_SITES= http://lisas.de/erwin/
DISTNAME= erwin-${PORTVERSION}
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 7cd5dfd275ea..1d3dcdffad32 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-webcal
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= GNOME
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 54522af5b1c8..7181e30a9f68 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= firefox
DISTVERSION= 10.0.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c07088ea1c85..dbbfdfe9973a 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= firefox
DISTVERSION= 12.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index ff72b720c988..52506e2b77cc 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gallery2
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION}
DISTNAME= gallery-${PORTVERSION}-full
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index e7dce5b6df0b..22ff3799775c 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gallery3
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION}
DISTNAME= gallery-${PORTVERSION}
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index 23c1762f212a..d33d108f21c1 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gecko-mediaplayer
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= www multimedia gnome
MASTER_SITES= GOOGLE_CODE
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index 4ad47befb15b..93673a9ceacc 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gecko-sharp
PORTVERSION= 0.13
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}2/
DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 8a7301774fdd..1e80cb89b6a8 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-user-share
PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index 97a9f106e576..bc2a64f262d0 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -9,6 +9,7 @@
PORTNAME= gnome-web-photo
PORTVERSION= 0.10.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= GNOME
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 4a8c99e92a00..c8df54b1b82d 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkhtml3
PORTVERSION= 3.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index c9b6d45decf0..c2a45cd4167a 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gurlchecker
PORTVERSION= 0.10.1
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= www gnome
MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
MASTER_SITE_SUBDIR= 547
diff --git a/www/helixplugin/Makefile b/www/helixplugin/Makefile
index 9572d6b92650..7fb6c96c7b59 100644
--- a/www/helixplugin/Makefile
+++ b/www/helixplugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hxplugin
PORTVERSION= 20080318
+PORTREVISION= 1
CATEGORIES= www multimedia
MASTER_SITES= http://virtual-estates.net/~mi/port-stuff/
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index 4882232e11bc..5f5d8daf53d1 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webkit
PORTVERSION= 0.12.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index f3ae91330952..cced505f6e42 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -6,7 +6,7 @@
PORTNAME= http-analyze
PORTVERSION= 2.01
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www
MASTER_SITES= http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/www/igal/Makefile b/www/igal/Makefile
index 343e9dfc191b..b53a11ec4f11 100644
--- a/www/igal/Makefile
+++ b/www/igal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= igal
PORTVERSION= 1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www graphics
MASTER_SITES= http://www.stanford.edu/~epop/igal/
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index e555c73a607b..d17b905b2319 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ilias
PORTVERSION= 4.2.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/1.%20ILIAS%204.2/ILIAS%20${PORTVERSION}
@@ -20,7 +21,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= ilias-3.[0-9].*
diff --git a/www/ilias3/Makefile b/www/ilias3/Makefile
index f8050c857fe2..c8d2ca4995b3 100644
--- a/www/ilias3/Makefile
+++ b/www/ilias3/Makefile
@@ -6,6 +6,7 @@
PORTNAME= ilias
PORTVERSION= 3.10.14
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/3.%20ILIAS%203.10/ILIAS%20${PORTVERSION}
@@ -20,7 +21,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= ilias-4.[0-9].*
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index b47c1757e4ce..2bd744a05b75 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 2
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 274c3f671145..501fae0e177e 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/www/khtml2png/Makefile b/www/khtml2png/Makefile
index 420f0f5b4006..08cec3d9965e 100644
--- a/www/khtml2png/Makefile
+++ b/www/khtml2png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= khtml2png
DISTVERSION= 2.7.7
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index 7ef879537395..06efcac6d859 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kompozer
DISTVERSION= 0.8b3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/current/${DISTVERSION}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gecko@FreeBSD.org
COMMENT= Complete Web Authoring Suite
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
+
WANT_GNOME= yes
WANT_PERL= yes
USE_BZIP2= yes
@@ -24,6 +26,7 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= client.mk
ALL_TARGET= build_all
+#CFLAGS+= -I${LOCALBASE}/include/libpng15
MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-application=composer \
diff --git a/www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp b/www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
new file mode 100644
index 000000000000..252fc589ae2a
--- /dev/null
+++ b/www/kompozer/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
@@ -0,0 +1,65 @@
+--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig 2009-05-02 18:39:49.000000000 +0200
++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp 2012-05-09 13:14:57.000000000 +0200
+@@ -171,7 +171,7 @@
+ }
+
+ // we need to do the setjmp here otherwise bad things will happen
+- if (setjmp(decoder->mPNG->jmpbuf)) {
++ if (setjmp(png_jmpbuf(decoder->mPNG))) {
+ png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+
+ decoder->mError = PR_TRUE;
+@@ -227,7 +227,7 @@
+ if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
+ nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
+ png_get_progressive_ptr(png_ptr));
+- longjmp(decoder->mPNG->jmpbuf, 1);
++ longjmp(png_jmpbuf(decoder->mPNG), 1);
+ }
+ #undef MOZ_PNG_MAX_DIMENSION
+
+@@ -307,7 +307,7 @@
+
+ decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
+ if (!decoder->mImage)
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+
+ decoder->mImageLoad->SetImage(decoder->mImage);
+
+@@ -319,7 +319,7 @@
+
+ decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+ if (!decoder->mFrame)
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+
+ gfx_format format;
+
+@@ -341,7 +341,7 @@
+ // then initalize the frame and append it to the container
+ nsresult rv = decoder->mFrame->Init(0, 0, width, height, format, 24);
+ if (NS_FAILED(rv))
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+
+ decoder->mImage->AppendFrame(decoder->mFrame);
+
+@@ -362,7 +362,7 @@
+ decoder->ibpr = bpr;
+ decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(decoder->ibpr*height);
+ if (!decoder->interlacebuf) {
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ }
+ }
+
+@@ -555,7 +555,7 @@
+ error_callback(png_structp png_ptr, png_const_charp error_msg)
+ {
+ PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+
diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile
index b6fe3cb144b2..6cca484df76e 100644
--- a/www/kwebkitpart/Makefile
+++ b/www/kwebkitpart/Makefile
@@ -6,7 +6,7 @@
PORTNAME= kwebkitpart
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= avilla
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index cb5f18dbb217..b1648f6590b9 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libepc
PORTVERSION= 0.3.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= GNOME
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 7a48d2eaf996..6885382bb582 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgtkhtml
PORTVERSION= 2.11.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 0991ba489a60..1eb971003dc8 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxul
DISTVERSION= 1.9.2.28
+PORTREVISION= 1
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= firefox/releases/3.6.28/source
diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile
index 699c8ea4df9c..8ad1bfd9c969 100644
--- a/www/links-hacked/Makefile
+++ b/www/links-hacked/Makefile
@@ -7,6 +7,7 @@
PORTNAME= links-hacked
DISTVERSION= 101110
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= http://xray.sai.msu.ru/~karpov/links-hacked/downloads/ http://links-hacked.nm.ru/
@@ -39,7 +40,7 @@ OPTIONS= SVGALIB "non-X11 graphics support" off \
.include <bsd.port.options.mk>
.ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --enable-graphics
diff --git a/www/links-hacked/files/patch-png.c b/www/links-hacked/files/patch-png.c
new file mode 100644
index 000000000000..6e605f609c66
--- /dev/null
+++ b/www/links-hacked/files/patch-png.c
@@ -0,0 +1,38 @@
+--- png.c.orig 2008-06-07 09:41:41.000000000 +0200
++++ png.c 2012-05-06 09:32:52.000000000 +0200
+@@ -38,7 +38,7 @@
+ /* Error for from-web PNG images. */
+ void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
+ {
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+ void png_info_callback(png_structp png_ptr, png_infop info_ptr)
+@@ -192,7 +192,7 @@
+ #ifdef DEBUG
+ if (!info_ptr) internal ("png_create_info_struct failed\n");
+ #endif /* #ifdef DEBUG */
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ error:
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+@@ -202,7 +202,7 @@
+ png_set_progressive_read_fn(png_ptr, NULL,
+ png_info_callback, png_row_callback,
+ png_end_callback);
+- if (setjmp(png_ptr->jmpbuf)) goto error;
++ if (setjmp(png_jmpbuf(png_ptr))) goto error;
+ decoder=mem_alloc(sizeof(*decoder));
+ decoder->png_ptr=png_ptr;
+ decoder->info_ptr=info_ptr;
+@@ -221,7 +221,7 @@
+ png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr;
+ info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr;
+ end_callback_hit=0;
+- if (setjmp(png_ptr->jmpbuf)){
++ if (setjmp(png_jmpbuf(png_ptr))){
+ img_end(cimg);
+ return;
+ }
diff --git a/www/links/Makefile b/www/links/Makefile
index 02c9c200391a..9e79f54f57cf 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -7,6 +7,7 @@
PORTNAME= links
DISTVERSION= 2.6
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES?= www
MASTER_SITES= http://links.twibright.com/download/ LOCAL/bf
@@ -41,7 +42,7 @@ LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
.endif
.ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --enable-graphics
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 08aa25c50cd8..9f5559a3e136 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www linux
MASTER_SITES= http://snapshot.opera.com/${MASTER_SITES_VER_PATH}/
PKGNAMEPREFIX= linux-
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index d048b6995f3e..62346a39486f 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}
+PORTREVISION= 1
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 9623defa5aba..421b81d02513 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -6,6 +6,7 @@
PORTNAME= llgal
PORTVERSION= 0.13.17
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.gna.org/llgal/
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index c4fd5c119c0b..8420d599994a 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= luakit
PORTVERSION= 2011.07.22
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://github.com/mason-larobina/${PORTNAME}/tarball/${PORTVERSION}-r1/
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index 8e1b98510b9d..ce71bc0bf103 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mgstat
PORTVERSION= 0.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 6adb61429aa9..3d17067e6708 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -8,6 +8,7 @@
PORTNAME= midori
PORTVERSION= 0.4.6
+PORTREVISION= 1
CATEGORIES= www xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile
index 9799b160e924..9f8ed2312db6 100644
--- a/www/mod_pagespeed/Makefile
+++ b/www/mod_pagespeed/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mod_pagespeed
PORTVERSION= 0.10.21.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -22,7 +22,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
gsed:${PORTSDIR}/textproc/gsed \
svn:${PORTSDIR}/devel/subversion \
flock:${PORTSDIR}/sysutils/flock
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
icutu.48:${PORTSDIR}/devel/icu \
opencv_legacy.2:${PORTSDIR}/graphics/opencv \
diff --git a/www/moonshine/Makefile b/www/moonshine/Makefile
index 49ca9ed612ac..c7c73d91ee7a 100644
--- a/www/moonshine/Makefile
+++ b/www/moonshine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moonshine
PORTVERSION= 0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www multimedia
MASTER_SITES= http://romain.blogreen.org/distfiles/
DISTNAME= abock-${PORTNAME}-${GITCOMMIT}
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index e694d4d9789f..e1da6a1ed715 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netsurf
PORTVERSION= 2.9
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.netsurf-browser.org/projects/releases/ \
http://www.netsurf-browser.org/downloads/releases/:netsurf
diff --git a/www/npapi-xine/Makefile b/www/npapi-xine/Makefile
index 704c84528573..991f91f6be46 100644
--- a/www/npapi-xine/Makefile
+++ b/www/npapi-xine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 1.0.2
-PORTREVISION= 6
+PORTREVISION= 7
DISTVERSIONPREFIX= plugin-
CATEGORIES= www multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-plugin/${PORTVERSION}
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index fe710cf746bb..3cc64174ea14 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openvrml
PORTVERSION= 0.18.9
+PORTREVISION= 1
CATEGORIES= www graphics
MASTER_SITES= SF
@@ -18,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
js.1:${PORTSDIR}/lang/spidermonkey \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
curl.6:${PORTSDIR}/ftp/curl \
gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
@@ -33,7 +34,8 @@ CONFIGURE_ARGS= --enable-gecko-rpath \
--disable-mozilla-plugin
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
LIBS="-lm" BOOST_LIB_SUFFIX=""
-CPPFLAGS+= -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}
+CPPFLAGS+= -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L} \
+ -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/www/openvrml/files/patch-image_stream_listener.cpp b/www/openvrml/files/patch-image_stream_listener.cpp
new file mode 100644
index 000000000000..0fc98102a720
--- /dev/null
+++ b/www/openvrml/files/patch-image_stream_listener.cpp
@@ -0,0 +1,10 @@
+--- src/node/vrml97/image_stream_listener.cpp.orig 2010-05-28 17:18:15.927540000 +0200
++++ src/node/vrml97/image_stream_listener.cpp 2012-05-06 15:48:10.000000000 +0200
+@@ -39,6 +39,7 @@
+ }
+
+ # ifdef OPENVRML_ENABLE_PNG_TEXTURES
++# include "pngpriv.h"
+ void openvrml_png_info_callback(png_structp png_ptr, png_infop info_ptr)
+ {
+ using boost::shared_mutex;
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 4ffb5eb5e79d..2d113ce526fd 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Apache-Gallery
PORTVERSION= 1.0.2
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= www perl5
MASTER_SITES= http://apachegallery.dk/download/ \
diff --git a/www/p5-Catalyst-Plugin-Captcha/Makefile b/www/p5-Catalyst-Plugin-Captcha/Makefile
index ffa9f99982a1..d775068a5900 100644
--- a/www/p5-Catalyst-Plugin-Captcha/Makefile
+++ b/www/p5-Catalyst-Plugin-Captcha/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Catalyst-Plugin-Captcha
PORTVERSION= 0.04
+PORTREVISION= 1
CATEGORIES= www security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-Catalyst-View-GraphViz/Makefile b/www/p5-Catalyst-View-GraphViz/Makefile
index cb1baa0df108..7a3049147f87 100644
--- a/www/p5-Catalyst-View-GraphViz/Makefile
+++ b/www/p5-Catalyst-View-GraphViz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Catalyst-View-GraphViz
PORTVERSION= 0.05
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-Catalyst-View-RRDGraph/Makefile b/www/p5-Catalyst-View-RRDGraph/Makefile
index e1d0a8093f94..b1dcbc2c6150 100644
--- a/www/p5-Catalyst-View-RRDGraph/Makefile
+++ b/www/p5-Catalyst-View-RRDGraph/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Catalyst-View-RRDGraph
PORTVERSION= 0.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index 0daff8feae4c..c5984eccb28c 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Gtk2-WebKit
PORTVERSION= 0.09
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FLORA
diff --git a/www/p5-HTML-FormFu-Imager/Makefile b/www/p5-HTML-FormFu-Imager/Makefile
index 646e681dd1a2..fe26d67e2762 100644
--- a/www/p5-HTML-FormFu-Imager/Makefile
+++ b/www/p5-HTML-FormFu-Imager/Makefile
@@ -6,7 +6,7 @@
PORTNAME= HTML-FormFu-Imager
PORTVERSION= 0.03006
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-MojoMojo/Makefile b/www/p5-MojoMojo/Makefile
index 93d1b4dab519..cdd4d80bfcd0 100644
--- a/www/p5-MojoMojo/Makefile
+++ b/www/p5-MojoMojo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= MojoMojo
PORTVERSION= 1.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MRAMBERG
diff --git a/www/p5-RT-Authen-ExternalAuth/Makefile b/www/p5-RT-Authen-ExternalAuth/Makefile
index a1edbcad1aee..bcdfea5eee44 100644
--- a/www/p5-RT-Authen-ExternalAuth/Makefile
+++ b/www/p5-RT-Authen-ExternalAuth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RT-Authen-ExternalAuth
DISTVERSION= 0.09
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www net perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:FALCONE
diff --git a/www/p5-RT-Extension-LDAPImport/Makefile b/www/p5-RT-Extension-LDAPImport/Makefile
index 3258c7338a94..30e64131708b 100644
--- a/www/p5-RT-Extension-LDAPImport/Makefile
+++ b/www/p5-RT-Extension-LDAPImport/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RT-Extension-LDAPImport
PORTVERSION= 0.31
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-RT-Extension-SLA/Makefile b/www/p5-RT-Extension-SLA/Makefile
index 3ff91a3cacfd..9a1188f7a687 100644
--- a/www/p5-RT-Extension-SLA/Makefile
+++ b/www/p5-RT-Extension-SLA/Makefile
@@ -7,6 +7,7 @@
PORTNAME= RT-Extension-SLA
PORTVERSION= 0.05
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-RTx-Calendar/Makefile b/www/p5-RTx-Calendar/Makefile
index 5a7ec77d5b0b..80e2a208f99c 100644
--- a/www/p5-RTx-Calendar/Makefile
+++ b/www/p5-RTx-Calendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RTx-Calendar
PORTVERSION= 0.08
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-ZConf-RSS-GUI-GTK/Makefile b/www/p5-ZConf-RSS-GUI-GTK/Makefile
index 55b177466b2c..1871cce578d2 100644
--- a/www/p5-ZConf-RSS-GUI-GTK/Makefile
+++ b/www/p5-ZConf-RSS-GUI-GTK/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ZConf-RSS-GUI-GTK
PORTVERSION= 0.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 36b71ed7d65c..37165fc25406 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= funkload
PORTVERSION= 1.14.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index d3f42197b311..e58b81fa1c21 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graphite-web
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= http://launchpad.net/graphite/0.9/${PORTVERSION}/+download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index d3eda1dafb58..25ae88e576ab 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jswebkit
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 8865369ee76b..0ff74ce89510 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -6,6 +6,7 @@
PORTNAME= webkit
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
CATEGORIES= www devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4-
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index 714344b0bf06..17809bf63b06 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webkitgtk
PORTVERSION= 1.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 4c6cbe4d0ae4..2d06e8783704 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webkit
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= www
PKGNAMEPREFIX= qt4-
diff --git a/www/redmine-backlogs/Makefile b/www/redmine-backlogs/Makefile
index 94d2e598cc41..ceeec39e0021 100644
--- a/www/redmine-backlogs/Makefile
+++ b/www/redmine-backlogs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= backlogs
PORTVERSION= 0.6.16
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://people.freebsd.org/~pgollucci/ \
LOCAL/pgollucci
diff --git a/www/redmine-http-auth/Makefile b/www/redmine-http-auth/Makefile
index 8e1893eccd43..5c533f1447f2 100644
--- a/www/redmine-http-auth/Makefile
+++ b/www/redmine-http-auth/Makefile
@@ -7,6 +7,7 @@
PORTNAME= http-auth
PORTVERSION= 20100730
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://dist.codelabs.ru/fbsd/
DISTNAME= AdamLantos-redmine_http_auth-${GITREV}
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index 3b2a52717e53..ec1e981ab558 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rekonq
DISTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:R}
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 34c90127f0b2..a9b1f13e8449 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rnews
PORTVERSION= 1.01
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index ccb898cef7eb..24c3d74fc3b3 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rssowl
PORTVERSION= 1.2.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20classic%20%28dont%20use%29/${PORTVERSION}
DISTNAME= rssowl_${PORTVERSION:S|.|_|g}_src
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index c390fec05bfa..cd654c3424f5 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sarg
PORTVERSION= 2.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/www/screem/Makefile b/www/screem/Makefile
index cb6aff16b70b..3867ed613c71 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.16.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= www gnome
MASTER_SITES= SF
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 96d048bff628..80b0f96384b0 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,6 +7,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
diff --git a/www/squidstats/Makefile b/www/squidstats/Makefile
index e3302a6bf22e..5773925af47f 100644
--- a/www/squidstats/Makefile
+++ b/www/squidstats/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squidstats
PORTVERSION= 54
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= squidstats-r${PORTVERSION}
diff --git a/www/surf/Makefile b/www/surf/Makefile
index 93152d31b17d..9409fec672e1 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= surf
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://dl.suckless.org/${PORTNAME}/
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index a92852dc2dd5..b1ebb0e0e22e 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= swfdec-plugin
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
DISTNAME= swfdec-mozilla-${PORTVERSION}
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 56b02541316c..199d9027ed08 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www math python
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= brooks
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 636a17656703..59e735aabf34 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uzbl
DISTVERSION= 0.0.0.${GITDATE}
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.linta.de/distfiles/
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index a6e781906e1e..63e690e449c4 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -7,6 +7,7 @@
PORTNAME= w3m
PORTVERSION= 0.5.3
+PORTREVISION= 1
CATEGORIES+= www ipv6
MASTER_SITES= SF/w3m/w3m/w3m-${PORTVERSION}
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 5871c67c8180..cdc9c40aefe3 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webalizer
PORTVERSION= 2.23.5
+PORTREVISION= 1
CATEGORIES+= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 4cf9b4178790..853fdf167081 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= webkit
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index e22b6fe219d1..a87752a06e8b 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webkit-sharp
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 7dd429a058dd..25e20b581c2a 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wml
PORTVERSION= 2.0.12
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= www lang
MASTER_SITES= ${MASTER_SITE_BERLIOS}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=thewml
MAINTAINER= rodrigo@bebik.net
COMMENT= Website META Language, webdesign toolkit for HTML generation
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= \
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
p5-Bit-Vector>=5.2:${PORTSDIR}/math/p5-Bit-Vector \
@@ -31,6 +31,7 @@ BUILD_DEPENDS= lynx:${PORTSDIR}/www/lynx \
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
CONFIGURE_ARGS= --with-perl=${PERL5} --with-catdir=man \
--prefix=${PREFIX}
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 5cfce45778b3..1211cf386ccc 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-smartbookmark-plugin
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index 86328c533290..bac0f1afb243 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conkeror
PORTVERSION= 20090821
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://mirror.4bit.ws/ \
${MASTER_SITE_LOCAL} \
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 4b3c7f43f22c..f1593321cffd 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.7b21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index e40cdf6f450f..195b6b2f3eea 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.6g01
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/www/xxxterm/Makefile b/www/xxxterm/Makefile
index 4f30dcd89509..ea9362761cea 100644
--- a/www/xxxterm/Makefile
+++ b/www/xxxterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xxxterm
PORTVERSION= 1.10.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= https://opensource.conformal.com/snapshots/xxxterm/ \
diff --git a/x11-clocks/alarm-clock/Makefile b/x11-clocks/alarm-clock/Makefile
index a95d413d5588..f98245515900 100644
--- a/x11-clocks/alarm-clock/Makefile
+++ b/x11-clocks/alarm-clock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alarm-clock
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks deskutils
MASTER_SITES= http://www.alarm-clock.pl/media/distfiles/
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index a960c7da4986..a20cee3b7a8f 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltraxclock
PORTVERSION= 2.0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-clocks
MASTER_SITES= http://perso.wanadoo.fr/alltrax/ \
${MASTER_SITE_LOCAL}
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index b5b93e1b4c1a..9e085d3a60b3 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bmp-alarm
PORTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-clocks
MASTER_SITES= http://www.snika.uklinux.net/xmms-alarm/
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index f352849b58e5..6bf52f990faa 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cairo-clock
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks net gnome
MASTER_SITES= http://macslow.thepimp.net/projects/cairo-clock/
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 760a1b071d5e..f6765585072c 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dclock
PORTVERSION= 2.1.2.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-clocks
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/d/dclock
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index c27586b078b5..b524b7416af5 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clock
PORTVERSION= 0.32
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://www.gdesklets.info/archive/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 74fca22cdebb..edf198c55480 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
PORTNAME= countdown
PORTVERSION= 0.8
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://www.gdesklets.info/archive/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index 596f1b16f00d..f09996fc2a75 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ebichuclock
PORTVERSION= 0.1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://www.gdesklets.info/archive/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11-clocks/gtubeclock/Makefile b/x11-clocks/gtubeclock/Makefile
index 1b7656b2baff..206bd5ac0f19 100644
--- a/x11-clocks/gtubeclock/Makefile
+++ b/x11-clocks/gtubeclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtubeclock
PORTVERSION= 0.9.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-clocks
MASTER_SITES= http://www.bonnyswan.com/gtubeclock/downloads/
diff --git a/x11-clocks/intclock/Makefile b/x11-clocks/intclock/Makefile
index 521e2730ed70..7921d6d8f7b6 100644
--- a/x11-clocks/intclock/Makefile
+++ b/x11-clocks/intclock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= intclock
PORTVERSION= 2.13
+PORTREVISION= 1
CATEGORIES= x11-clocks perl5
MASTER_SITES= http://www.peterverthez.net/projects/${PORTNAME}/ CENKES
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 0a57a4ad149e..691d712fa58a 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdetoys
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-clocks kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 87a9b2473d98..a0c671ef6122 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdetoys
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-clocks kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index de113dbd2e7e..d7be99c79270 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= osdclock
PORTVERSION= 0.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks
MASTER_SITES= http://leftorium.net/software/ \
${MASTER_SITE_LOCAL}
diff --git a/x11-clocks/plasma-applet-adjustableclock/Makefile b/x11-clocks/plasma-applet-adjustableclock/Makefile
index 1882858bceea..3360f4dbae25 100644
--- a/x11-clocks/plasma-applet-adjustableclock/Makefile
+++ b/x11-clocks/plasma-applet-adjustableclock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= adjustableclock
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= x11-clocks deskutils kde
MASTER_SITES= http://kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= plasma-applet-
diff --git a/x11-clocks/plasma-applet-geekclock/Makefile b/x11-clocks/plasma-applet-geekclock/Makefile
index 967c1140b2ce..f99c27ab836e 100644
--- a/x11-clocks/plasma-applet-geekclock/Makefile
+++ b/x11-clocks/plasma-applet-geekclock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= geekclock
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-clocks deskutils kde
MASTER_SITES= http://w2f2.com/projects/${PORTNAME}/
PKGNAMEPREFIX= plasma-applet-
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index ac21b8c96ff1..df40b73dcbbd 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sanduhr
PORTVERSION= 1.93
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-clocks gnome
MASTER_SITES= http://seehuhn.de/media/programs/
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 6be26806af69..9de8102bf0a4 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmtimer
PORTVERSION= 2.92
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://www.darkops.net/wmtimer/ \
${MASTER_SITE_LOCAL}
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index ba8f7c20134e..6edcf59b74a7 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.6.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-clocks xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 0b296a696112..54107c54b813 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-time-out-plugin
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11-clocks xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index e487c09d3ab5..e20f6bfaf609 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-timer-plugin
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-fm/catseye-fm/Makefile b/x11-fm/catseye-fm/Makefile
index 343102cfaef1..e4802c132b25 100644
--- a/x11-fm/catseye-fm/Makefile
+++ b/x11-fm/catseye-fm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= catseye-fm
PORTVERSION= 4.2.0.0
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= http://catseye-fm.sourceforge.net/downloads/ \
http://catseye-fm-temp.sourceforge.net/downloads/
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index 13d291a715f5..5e6e9e4c7920 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dfm
PORTVERSION= 0.99.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fm
MASTER_SITES= http://www.kaisersite.de/dfm/
diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile
index f57fa1444104..09cef0745287 100644
--- a/x11-fm/dolphin/Makefile
+++ b/x11-fm/dolphin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dolphin
PORTVERSION= 0.8.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fm kde
MASTER_SITES= http://www.brueffer.de/distfiles/
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index e8b51417e7c1..2cb6e0dafea7 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emelfm2
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= http://emelfm2.net/rel/
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 7c3ff7b53eca..f27673364720 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ezfm
PORTVERSION= 0.4.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-fm
MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/
DISTNAME= EZFM-0.4-src
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index ef9c4e242857..498b494c215e 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gentoo
PORTVERSION= 0.19.13
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ \
http://mirror.4bit.ws/
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index ee2df434952f..2a101ac0e5cf 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-commander
PORTVERSION= 1.2.8.14
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index c185aa515bf1..8802b304c550 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krusader
PORTVERSION= 1.90.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fm kde
MASTER_SITES= SF
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index ed0127224a2b..7600edac3215 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= krusader
PORTVERSION= 2.4.0.b1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.b/-beta/}/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/}
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d38f097de580..3cbf582d3262 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nautilus
PORTVERSION= 2.32.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-fm/p5-PerlFM/Makefile b/x11-fm/p5-PerlFM/Makefile
index 0213e869ffc6..efc0be8a7867 100644
--- a/x11-fm/p5-PerlFM/Makefile
+++ b/x11-fm/p5-PerlFM/Makefile
@@ -7,7 +7,7 @@
PORTNAME= PerlFM
PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/x11-fm/pbi-thumbnailer/Makefile b/x11-fm/pbi-thumbnailer/Makefile
index c833a1917644..e58bc7ec4021 100644
--- a/x11-fm/pbi-thumbnailer/Makefile
+++ b/x11-fm/pbi-thumbnailer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pbi-thumbnailer
PORTVERSION= 0.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fm gnome
MASTER_SITES= http://www.marcuscom.com/pbi-thumbnailer/
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 3c3e138a2666..5809ae2eb6aa 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pcmanfm
PORTVERSION= 0.9.10
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 6a20fb00865b..723b6e518857 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= nautilus
PORTVERSION= 0.7.2
+PORTREVISION= 1
CATEGORIES= x11-fm gnome python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/nautilus-python/${PORTVERSION:R}
diff --git a/x11-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 149be7c0fe21..ed22ba033445 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rodent
PORTVERSION= 4.7.4
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= SF/xffm/${PORTVERSION}/
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 65209bddef31..3af0f038eaad 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,6 +6,7 @@
PORTNAME= rox-filer
PORTVERSION= 2.11
+PORTREVISION= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= SF/rox/rox/${PORTVERSION}
DISTNAME= rox-filer-${PORTVERSION}
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 6790c5a3bce8..56e37937fe55 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-mime-editor
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= SF/rox/MIME-Editor/${PORTVERSION}
DISTNAME= mime-editor-${PORTVERSION}
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 88f4c0136b3b..7112f929c308 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -6,7 +6,7 @@
PORTNAME= rox-session
PORTVERSION= 0.30
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fm
MASTER_SITES= SF/rox/ROX-Session/${PORTVERSION}
DISTNAME= rox-session-${PORTVERSION}
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index aace2877f7be..57cb7fd96cc3 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tdfsb
PORTVERSION= 0.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm
MASTER_SITES= http://www.determinate.net/webdata/data/
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 1db964b00c19..c6a25c8cb5c6 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-vfs
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/archive/${PORTNAME}/${PORTVERSION:R}
@@ -16,7 +16,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= The virtual filesystem for Thunar
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2 \
gamin-1.1:${PORTSDIR}/devel/gamin
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index e5b30ea8e24f..17390408420d 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Thunar
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= x11-fm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-fm/ultracopier/Makefile b/x11-fm/ultracopier/Makefile
index 8046a1d05fae..a5dd6e7c6281 100644
--- a/x11-fm/ultracopier/Makefile
+++ b/x11-fm/ultracopier/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ultracopier
PORTVERSION= 0.2.0.16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm kde
MASTER_SITES= http://files.first-world.info/ultracopier/${PORTVERSION}/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index e677ea00e4c9..0c9436521c32 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdiskusage
PORTVERSION= 1.48
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-fm
MASTER_SITES= http://xdiskusage.sourceforge.net/ \
http://www.gnu-darwin.org/distfiles/
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index e8879d55fca5..7604a344ddec 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfe
PORTVERSION= 1.32.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm
MASTER_SITES= SF
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 6e768b7f0614..a1a44a62eaa2 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xnc
PORTVERSION= 5.0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-fm
MASTER_SITES= http://www.xnc.dubna.su/src-5/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
@@ -23,7 +23,7 @@ COMMENT= File manager for X Window
# unarj:${PORTSDIR}/archivers/unarj \
# lha:${PORTSDIR}/archivers/lha
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -32,7 +32,7 @@ GNU_CONFIGURE= yes
USE_XORG= x11 xext xt
CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
MAN1= ives.1 xjpegroot.1 xnc.1 xnlaunch.1 iedit.1 iview.1
diff --git a/x11-fm/xnc/files/patch-IMG_png.c b/x11-fm/xnc/files/patch-IMG_png.c
new file mode 100644
index 000000000000..3c90061eb505
--- /dev/null
+++ b/x11-fm/xnc/files/patch-IMG_png.c
@@ -0,0 +1,35 @@
+--- src/lib/image2/sdl_image/IMG_png.c.orig 2002-08-05 12:43:09.000000000 +0200
++++ src/lib/image2/sdl_image/IMG_png.c 2012-05-06 16:16:38.000000000 +0200
+@@ -70,6 +70,7 @@
+ #define MACOS
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+
+ #define PNG_BYTES_TO_CHECK 4
+
+@@ -87,7 +88,7 @@
+ }
+
+ /* Load a PNG type image from an SDL datasource */
+-static void png_read_data(png_structp ctx, png_bytep area, png_size_t size)
++static void local_png_read_data(png_structp ctx, png_bytep area, png_size_t size)
+ {
+ SDL_RWops *src;
+
+@@ -138,13 +139,13 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in png_create_read_struct() earlier.
+ */
+- if ( setjmp(png_ptr->jmpbuf) ) {
++ if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ IMG_SetError("Error reading the PNG file.");
+ goto done;
+ }
+
+ /* Set up the input control */
+- png_set_read_fn(png_ptr, src, png_read_data);
++ png_set_read_fn(png_ptr, src, local_png_read_data);
+
+ /* Read PNG header info */
+ png_read_info(png_ptr, info_ptr);
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index b6dc5eb37be3..675802317e6c 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= fntsample
PORTVERSION= 3.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= x11-fonts
MASTER_SITES= SF/fntsample/fntsample/${PORTVERSION} http://unicode.org/Public/6.0.0/ucd/:unidata
DISTNAME= fntsample-${PORTVERSION}
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index e42fd0248c54..1edecaccc721 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= font-manager
PORTVERSION= 0.5.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts gnome
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile
index ef0c21f9d1a8..ea53b01fc29c 100644
--- a/x11-fonts/fontmatrix/Makefile
+++ b/x11-fonts/fontmatrix/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fontmatrix
DISTVERSION= 0.4.2
DISTVERSIONSUFFIX= -Source
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= http://www.fontmatrix.net/archives/
diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index f668a44939fd..97ac0c4c1642 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -7,7 +7,7 @@
PORTNAME= baghira
PORTVERSION= 0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-themes kde
MASTER_SITES= SF
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index b12d17351604..e39cb7d5e1dc 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -41,7 +41,7 @@ do-install: # empty
.else # master port
PORTVERSION= 7.0.0
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/7/Fedora/source/SRPMS/
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 7a1cc921f2a0..d3b2819b786f 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= clearlooks
PORTVERSION= 0.6.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-themes
MASTER_SITES= SF/clearlooks/clearlooks/clearlooks%20${PORTVERSION}
diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile
index e88d571e0e0f..5cba3244e6fe 100644
--- a/x11-themes/cursor-crystal-theme/Makefile
+++ b/x11-themes/cursor-crystal-theme/Makefile
@@ -10,7 +10,7 @@
PORTNAME= cursor-crystal-theme
DISTVERSION= 1.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes
MASTER_SITES= http://www.notmart.org/files/ \
http://pinguin.stttelkom.ac.id/gentoo/distfiles/
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 0b55d77c7056..c7703a82aff3 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= iconkit
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes gnustep
MASTER_SITES= http://download.gna.org/etoile/
PKGNAMEPREFIX= etoile-
@@ -16,7 +16,7 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project IconKit framework
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
LICENSE= BSD
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index df60c219da2b..331af375d0e1 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm-themes
PORTVERSION= 0.7.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes
MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11-themes/gnome-icons-faenza/Makefile b/x11-themes/gnome-icons-faenza/Makefile
index a430a2ed2390..52f41ffd63ef 100644
--- a/x11-themes/gnome-icons-faenza/Makefile
+++ b/x11-themes/gnome-icons-faenza/Makefile
@@ -7,7 +7,7 @@
PORTNAME= faenza
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes gnome
MASTER_SITES= http://fc05.deviantart.com/fs71/f/2011/320/4/f/
PKGNAMEPREFIX= gnome-icons-
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 03e38ea758b0..151572aa9f35 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-themes-extras
PORTVERSION= 2.22.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 8df56732aabc..2e551f1b4089 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-themes
PORTVERSION= 2.32.1
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gtk-aurora-engine/Makefile b/x11-themes/gtk-aurora-engine/Makefile
index 0ee526c76423..c0ce79b5b64d 100644
--- a/x11-themes/gtk-aurora-engine/Makefile
+++ b/x11-themes/gtk-aurora-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aurora
PORTVERSION= 1.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= http://gnome-look.org/CONTENT/content-files/
PKGNAMEPREFIX= gtk-
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index 9a5d407ea2d6..a0b97087fc03 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.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes gnome
MASTER_SITES= SF/elysium-project/gtk-engines-cleanice/${PORTVERSION} \
SF/elysium-project/gtk-engines-cleanice/1.2.7:theme
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index a36ad417884b..3def4c8035d8 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-engines
PORTVERSION= 0.12
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-themes
MASTER_SITES= GNOME
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 3da2b0a5607f..577255090fd6 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk-engines2
PORTVERSION= 2.20.2
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 99e2f8dcbadf..a643ebc517af 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= equinox
PORTVERSION= 1.50
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://gnome-look.org/CONTENT/content-files/
PKGNAMEPREFIX= gtk-
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index cbba3376421b..60ed2026138b 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= 12
+PORTREVISION= 13
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_THEMES}
MASTER_SITE_SUBDIR= gtk2flat
diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile
index cb4c13ec4c0b..bf50098cd700 100644
--- a/x11-themes/gtk-murrine-engine/Makefile
+++ b/x11-themes/gtk-murrine-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= murrine
PORTVERSION= 0.98.1.1
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= GNOME
PKGNAMEPREFIX= gtk-
diff --git a/x11-themes/gtk-nodoka-engine/Makefile b/x11-themes/gtk-nodoka-engine/Makefile
index 16ede951cc4e..13a0d24d817f 100644
--- a/x11-themes/gtk-nodoka-engine/Makefile
+++ b/x11-themes/gtk-nodoka-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-nodoka-engine
PORTVERSION= 0.7.5
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= https://fedorahosted.org/releases/n/o/nodoka/
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index 5b18b0818657..8f4c1e2939e8 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oxygen
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk2/${PORTVERSION}/src/
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 15e891e3a76d..b93d45c1e97d 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-qt4-engine
PORTVERSION= 1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-themes
MASTER_SITES= http://gtk-qt-engine.googlecode.com/files/
DISTFILES= gtk-qt-engine-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index b5582ff4b26d..0bb01d229434 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk-xfce-engine
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= x11-themes xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index fad122fdcf97..1c55848725cd 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oxygen
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk3/${PORTVERSION}/src/
diff --git a/x11-themes/icons-buuf/Makefile b/x11-themes/icons-buuf/Makefile
index de1d46538d5b..4830f812e617 100644
--- a/x11-themes/icons-buuf/Makefile
+++ b/x11-themes/icons-buuf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icons-buuf
PORTVERSION= 1.6r2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= http://ic1.deviantart.com/fs12/f/2006/266/9/0/
DISTNAME= Buuf_1.6-r2
diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile
index 53a151348055..4abdc8dc0960 100644
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icons-tango-extras
PORTVERSION= 0.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes
MASTER_SITES= http://tango.freedesktop.org/releases/ \
${MASTER_SITE_GENTOO}
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index f8498701efcf..fea68932857e 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icons-tango
PORTVERSION= 0.8.90
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
diff --git a/x11-themes/kde-style-comix/Makefile b/x11-themes/kde-style-comix/Makefile
index 7d318ba71dce..b41b78faf04d 100644
--- a/x11-themes/kde-style-comix/Makefile
+++ b/x11-themes/kde-style-comix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= comix
PORTVERSION= 1.3.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-style-
diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile
index 0cf57d16110e..e1b90febc3b4 100644
--- a/x11-themes/kde-style-lipstik/Makefile
+++ b/x11-themes/kde-style-lipstik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lipstik
PORTVERSION= 2.2.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-style-
diff --git a/x11-themes/kde-style-polyester/Makefile b/x11-themes/kde-style-polyester/Makefile
index e80b10e4610b..5038c4e71127 100644
--- a/x11-themes/kde-style-polyester/Makefile
+++ b/x11-themes/kde-style-polyester/Makefile
@@ -7,6 +7,7 @@
PORTNAME= polyester
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.notmart.org/files/ \
${MASTER_SITE_LOCAL}
diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile
index 115b784e4720..6a08b9326f7e 100644
--- a/x11-themes/kde-style-tiblit/Makefile
+++ b/x11-themes/kde-style-tiblit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tiblit
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-themes
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-style-
diff --git a/x11-themes/kde-windeco-activeheart/Makefile b/x11-themes/kde-windeco-activeheart/Makefile
index eb893e3efd0f..7cc192180c82 100644
--- a/x11-themes/kde-windeco-activeheart/Makefile
+++ b/x11-themes/kde-windeco-activeheart/Makefile
@@ -7,7 +7,7 @@
PORTNAME= activeheart
PORTVERSION= 1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde-windeco-crystal/Makefile b/x11-themes/kde-windeco-crystal/Makefile
index 1153dda2942c..8d5687ee334f 100644
--- a/x11-themes/kde-windeco-crystal/Makefile
+++ b/x11-themes/kde-windeco-crystal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= crystal
PORTVERSION= 1.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile
index 208b1d490ae6..8851bb902981 100644
--- a/x11-themes/kde-windeco-knifty/Makefile
+++ b/x11-themes/kde-windeco-knifty/Makefile
@@ -7,7 +7,7 @@
PORTNAME= knifty
PORTVERSION= 0.4.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde-windeco-neos/Makefile b/x11-themes/kde-windeco-neos/Makefile
index 65d879018712..294a73531737 100644
--- a/x11-themes/kde-windeco-neos/Makefile
+++ b/x11-themes/kde-windeco-neos/Makefile
@@ -7,7 +7,7 @@
PORTNAME= neos
PORTVERSION= 0.2b
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-themes kde
MASTER_SITES= http://perso.orange.fr/chamayou/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde-windeco-smoothblend/Makefile b/x11-themes/kde-windeco-smoothblend/Makefile
index 97295ef2fb6e..eb2e4e557b64 100644
--- a/x11-themes/kde-windeco-smoothblend/Makefile
+++ b/x11-themes/kde-windeco-smoothblend/Makefile
@@ -7,7 +7,7 @@
PORTNAME= smoothblend
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.p0z3r.org/downloads/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile
index cec4be517cfa..abe0326475e0 100644
--- a/x11-themes/kde4-style-nitrogen/Makefile
+++ b/x11-themes/kde4-style-nitrogen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nitrogen
PORTVERSION= 1.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde4-style-
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index ffc999c0fc19..9559a237c388 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -7,7 +7,7 @@
PORTNAME= polyester
PORTVERSION= 2.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.notmart.org/files/
PKGNAMEPREFIX= kde4-style-
diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile
index 6375379fa9c6..2db817a1a894 100644
--- a/x11-themes/kde4-style-skulpture/Makefile
+++ b/x11-themes/kde4-style-skulpture/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skulpture
PORTVERSION= 0.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde4-style-
diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile
index 0c62f9a91f26..bd64c2236066 100644
--- a/x11-themes/kde4-windeco-crystal/Makefile
+++ b/x11-themes/kde4-windeco-crystal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= crystal
PORTVERSION= 2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde-windeco-
diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile
index e5befd103e14..c58bc9256d35 100644
--- a/x11-themes/kde4-windeco-dekorator/Makefile
+++ b/x11-themes/kde4-windeco-dekorator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dekorator
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde4-windeco-
diff --git a/x11-themes/kde4-windeco-nitrogen/Makefile b/x11-themes/kde4-windeco-nitrogen/Makefile
index ed25d3273a9a..183c9a64d73e 100644
--- a/x11-themes/kde4-windeco-nitrogen/Makefile
+++ b/x11-themes/kde4-windeco-nitrogen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nitrogen
PORTVERSION= 3.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
PKGNAMEPREFIX= kde4-windeco-
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index ecf99cb144c9..e35a73f3543a 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdeartwork
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index d8c714388581..86f0178697ff 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdeartwork
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-themes kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index 45470ef376fe..d9def30ce086 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdmtheme
PORTVERSION= 1.2.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= http://beta.smileaf.org/files/kdmtheme/ \
${MASTER_SITE_GENTOO:S/%SUBDIR%/distfiles/}
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 98f8f42396f1..6744c8339156 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxappearance
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= SF/lxde/LXAppearance
diff --git a/x11-themes/lxde-icon-theme/Makefile b/x11-themes/lxde-icon-theme/Makefile
index 35c97604135f..dc10bdb6150c 100644
--- a/x11-themes/lxde-icon-theme/Makefile
+++ b/x11-themes/lxde-icon-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxde-icon-theme
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= SF/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-${PORTVERSION}
diff --git a/x11-themes/moodin/Makefile b/x11-themes/moodin/Makefile
index 63ab8b93c4e2..3172e9fe53ce 100644
--- a/x11-themes/moodin/Makefile
+++ b/x11-themes/moodin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= moodin
PORTVERSION= 0.4.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-themes kde
MASTER_SITES= http://moodwrod.com/files/
DISTNAME= ksplash-engine-moodin_${PORTVERSION}
diff --git a/x11-themes/murrine-configurator/Makefile b/x11-themes/murrine-configurator/Makefile
index 21c68b861ed1..30522dbb39ee 100644
--- a/x11-themes/murrine-configurator/Makefile
+++ b/x11-themes/murrine-configurator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= murrine-configurator
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= http://cimi.netsons.org/media/download_gallery/murrine/
DISTNAME= murrine-configurator-${PORTVERSION}
diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile
index a3ec31ad25f3..5f30d0c0d1f1 100644
--- a/x11-themes/nimbus/Makefile
+++ b/x11-themes/nimbus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nimbus
PORTVERSION= 0.1.7
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://dlc.sun.com/osol/jds/downloads/extras/nimbus/ \
http://devio.us/~kpedersen/distfiles/
diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile
index d946f10c30cd..96971324f900 100644
--- a/x11-themes/phase/Makefile
+++ b/x11-themes/phase/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phase
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.usermode.org/code/
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 1db85abe9d3c..a590cc856966 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= polymer
PORTVERSION= 0.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= danfe
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 5248aff71255..e0fa65c03f4d 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qinx
PORTVERSION= 1.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.usermode.org/code/
diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile
index e808f3886343..3d5aa3517e1c 100644
--- a/x11-themes/qnxstyle/Makefile
+++ b/x11-themes/qnxstyle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qnxstyle
PORTVERSION= 0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-themes kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
DISTNAME= ${KDELOOKITEM}-${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/qt4-style-float/Makefile b/x11-themes/qt4-style-float/Makefile
index 50e8a9491b0b..2af4cd37b527 100644
--- a/x11-themes/qt4-style-float/Makefile
+++ b/x11-themes/qt4-style-float/Makefile
@@ -7,6 +7,7 @@
PORTNAME= float
PORTVERSION= 0.1a2
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11-themes/qt4-style-phase/Makefile b/x11-themes/qt4-style-phase/Makefile
index 41068d44860b..8da41e3ef25e 100644
--- a/x11-themes/qt4-style-phase/Makefile
+++ b/x11-themes/qt4-style-phase/Makefile
@@ -7,6 +7,7 @@
PORTNAME= phase
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11-themes/qt4-style-quantumstyle/Makefile b/x11-themes/qt4-style-quantumstyle/Makefile
index 281cbab8701b..791188c787b6 100644
--- a/x11-themes/qt4-style-quantumstyle/Makefile
+++ b/x11-themes/qt4-style-quantumstyle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quantumstyle
DISTVERSION= rc6
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://saidlankri.free.fr/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11-themes/qtcurve-gtk2/Makefile b/x11-themes/qtcurve-gtk2/Makefile
index 0d5b685eb902..d9dba5310ce1 100644
--- a/x11-themes/qtcurve-gtk2/Makefile
+++ b/x11-themes/qtcurve-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtcurve
PORTVERSION= 1.8.12
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://craigd.wikispaces.com/file/view/
PKGNAMEPREFIX= gtk2-
diff --git a/x11-themes/qtcurve-kde3/Makefile b/x11-themes/qtcurve-kde3/Makefile
index 350c795d74c3..d5a0c8eb6962 100644
--- a/x11-themes/qtcurve-kde3/Makefile
+++ b/x11-themes/qtcurve-kde3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtcurve
PORTVERSION= 1.8.5
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://craigd.wikispaces.com/file/view/
PKGNAMEPREFIX= kde-style-
diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile
index 38424ed98e0c..abbd1d1dcb73 100644
--- a/x11-themes/qtcurve-kde4/Makefile
+++ b/x11-themes/qtcurve-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qtcurve
PORTVERSION= 1.8.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MASTER_SITES= http://craigd.wikispaces.com/file/view/
PKGNAMEPREFIX= kde4-style-
diff --git a/x11-themes/qtcurve-qt4/Makefile b/x11-themes/qtcurve-qt4/Makefile
index a79a8b2a0529..717e5d945e6b 100644
--- a/x11-themes/qtcurve-qt4/Makefile
+++ b/x11-themes/qtcurve-qt4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qtcurve
PORTVERSION= 1.8.9
+PORTREVISION= 1
CATEGORIES= x11-themes
MASTER_SITES= http://craigd.wikispaces.com/file/view/
PKGNAMEPREFIX= qt4-style-
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index 385cd568be39..7e7b4c8f162c 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rezlooks
PORTVERSION= 0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-themes
MASTER_SITES= http://www.gnome-look.org/CONTENT/content-files/
DISTNAME= 39179-rezlooks-${PORTVERSION}
diff --git a/x11-themes/thewidgetfactory/Makefile b/x11-themes/thewidgetfactory/Makefile
index ddc615365d92..1e5ee7ecbe63 100644
--- a/x11-themes/thewidgetfactory/Makefile
+++ b/x11-themes/thewidgetfactory/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thewidgetfactory
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-themes
MASTER_SITES= http://www.stellingwerff.com/TheWidgetFactory/
diff --git a/x11-themes/ubuntulooks/Makefile b/x11-themes/ubuntulooks/Makefile
index 26ca28641b60..c974e6a860d0 100644
--- a/x11-themes/ubuntulooks/Makefile
+++ b/x11-themes/ubuntulooks/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ubuntulooks
PORTVERSION= 0.9.12
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-themes
MASTER_SITES= http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntulooks/
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile
index 48500041439c..1a1ffafeb4c8 100644
--- a/x11-themes/xcursor-themes/Makefile
+++ b/x11-themes/xcursor-themes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcursor-themes
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11-themes
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 2b5bb1007ea8..ee3ced43de61 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= SoXt
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 6dce075fb240..5fa4ae71cd6e 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bakery
PORTVERSION= 2.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile
index 588e2462a368..d1b1ea68a76a 100644
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= c++-gtk-utils
PORTVERSION= 2.0.9
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/cxx-gtk-utils/cxx-gtk-utils/${PORTVERSION}/
DISTNAME= c%2B%2B-gtk-utils-${PORTVERSION}
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index c5a3c8740315..8b4857025c96 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= easygtk
PORTVERSION= 1.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= sobomax
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index c46a7a5fd25d..e1e135dea13b 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 24c12b5769e9..459d7c04e18e 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -7,14 +7,14 @@
PORTNAME= efltk
PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= SF/ede/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Extended Fast Light Toolkit
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -31,6 +31,7 @@ MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib"
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp b/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp
new file mode 100644
index 000000000000..63b1230db5db
--- /dev/null
+++ b/x11-toolkits/efltk/files/patch-src-images-Fl_Png.cpp
@@ -0,0 +1,37 @@
+--- src/images/Fl_Png.cpp.orig 2009-04-22 13:51:33.000000000 +0200
++++ src/images/Fl_Png.cpp 2012-05-06 21:06:13.000000000 +0200
+@@ -3,6 +3,7 @@
+ #if HAVE_PNG
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <stdlib.h>
+
+ #include <efltk/Fl_Image.h>
+@@ -28,7 +29,7 @@
+ png_last_error = (volatile char*)"PNG: Unknown (ERROR!)";
+ if (png_ptr != NULL && png_ptr->error_ptr != NULL)
+ png_last_error = (volatile char*)message;
+- longjmp(png_ptr->jmpbuf, 0);
++ longjmp(png_jmpbuf(png_ptr), 0);
+ }
+
+ static bool png_is_valid_file(const char *filename)
+@@ -81,7 +82,7 @@
+ if(!end_info_ptr) { return_error(); }
+
+ png_bytepp rows = 0;
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ if(rows) free(rows);
+ if(png_ptr) png_destroy_read_struct (&png_ptr, &info_ptr, &end_info_ptr);
+ fputs((const char *)png_last_error, stderr);
+@@ -318,7 +319,7 @@
+
+ bool allocated = false;
+ uint8 *wr_data = (uint8*)data;
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ if(png_ptr) png_destroy_write_struct(&png_ptr, &info_ptr);
+ if(allocated && wr_data) free(wr_data);
+ return false;
diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile
index 483a32deb86d..857274abaa68 100644
--- a/x11-toolkits/elementary/Makefile
+++ b/x11-toolkits/elementary/Makefile
@@ -7,6 +7,7 @@
PORTNAME= elementary
PORTVERSION= 0.7.0.55225
+PORTREVISION= 1
CATEGORIES= x11-toolkits enlightenment
MASTER_SITES= http://download.enlightenment.org/snapshots/2010-12-03/ \
http://files.roorback.net/e17/2010-12-03/base/
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index d163325b76bc..0193303612e8 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fl_editor
PORTVERSION= 0.4.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= http://source.robertk.com/fl_editor/
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index 451ac207361c..d00f424c6351 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flowcanvas
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://download.drobilla.net/
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index afa45fba8240..aa8d405f2cf6 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fltk
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= fltk/${PORTVERSION}
@@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= gahr@FreeBSD.org
COMMENT= Cross-platform C++ graphical user interface toolkit
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_LDCONFIG= yes
diff --git a/x11-toolkits/fltk11/Makefile b/x11-toolkits/fltk11/Makefile
index f78bdf04e088..a1dd83cec849 100644
--- a/x11-toolkits/fltk11/Makefile
+++ b/x11-toolkits/fltk11/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fltk11
PORTVERSION= 1.1.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= fltk/${PORTVERSION}
@@ -15,7 +16,7 @@ DISTNAME= ${OPORTNAME}-${PORTVERSION}-source
MAINTAINER= db@FreeBSD.org
COMMENT= Cross-platform C++ graphical user interface toolkit
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=--enable-threads \
--libdir=${PREFIX}/lib/${PORTNAME} \
--bindir=${PREFIX}/bin/${PORTNAME} \
--includedir=${PREFIX}/include/${PORTNAME}
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
OPORTNAME= fltk
diff --git a/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx b/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx
new file mode 100644
index 000000000000..66abec38b6ac
--- /dev/null
+++ b/x11-toolkits/fltk11/files/patch-src_Fl_PNG_Image.cxx
@@ -0,0 +1,19 @@
+--- src/Fl_PNG_Image.cxx.orig 2006-06-09 18:16:34.000000000 +0200
++++ src/Fl_PNG_Image.cxx 2012-05-26 13:55:30.000000000 +0200
+@@ -46,6 +46,7 @@
+ # include <zlib.h>
+ # ifdef HAVE_PNG_H
+ # include <png.h>
++# include <pngpriv.h>
+ # else
+ # include <libpng/png.h>
+ # endif // HAVE_PNG_H
+@@ -75,7 +76,7 @@
+ pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ info = png_create_info_struct(pp);
+
+- if (setjmp(pp->jmpbuf))
++ if (setjmp(png_jmpbuf(pp)))
+ {
+ Fl::warning("PNG file \"%s\" contains errors!\n", png);
+ return;
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index fd708047c7ea..37720634cd57 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fltk
PORTVERSION= 2.0.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_EASYSW}
MASTER_SITE_SUBDIR= fltk/snapshots
@@ -31,7 +32,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
# If xprop cannot connect to an X server of if xprop cannot be found, X overlay
# support will be disabled without breaking the build.
BUILD_DEPENDS= xprop:${PORTSDIR}/x11/xprop
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
SNAPSHOT= r9166
diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index fd690fdfab41..9cac31409de3 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flu
PORTVERSION= 2.14
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.osc.edu/archive/FLU/
DISTNAME= FLU_${PORTVERSION}
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index 09a6e5be0448..05899a40f68a 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flvw
PORTVERSION= 20000224
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Febrary%20beta
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index cb5f570741e2..38f810c52c57 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -17,7 +17,7 @@ MAINTAINER?= gahr@FreeBSD.org
COMMENT= Fast and extensive C++ GUI toolkit
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/x11-toolkits/fox14/files/patch-src-fxpngio.cpp b/x11-toolkits/fox14/files/patch-src-fxpngio.cpp
new file mode 100644
index 000000000000..b1854671bad9
--- /dev/null
+++ b/x11-toolkits/fox14/files/patch-src-fxpngio.cpp
@@ -0,0 +1,46 @@
+--- src/fxpngio.cpp.orig 2005-11-19 21:22:25.000000000 +0100
++++ src/fxpngio.cpp 2012-05-07 07:11:22.000000000 +0200
+@@ -21,13 +21,13 @@
+ *********************************************************************************
+ * $Id: fxpngio.cpp,v 1.35.2.1 2005/11/19 20:22:25 fox Exp $ *
+ ********************************************************************************/
++#ifdef HAVE_PNG_H
++#include "png.h"
++#endif
+ #include "fxver.h"
+ #include "fxdefs.h"
+ #include "FXHash.h"
+ #include "FXStream.h"
+-#ifdef HAVE_PNG_H
+-#include "png.h"
+-#endif
+
+ /*
+ Notes:
+@@ -76,7 +76,7 @@
+ FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
+ store->setError(FXStreamFormat); // Flag this as a format error in FXStream
+ FXTRACE((100,"Error in png: %s\n",message));
+- longjmp(png_ptr->jmpbuf,1); // Bail out
++ longjmp(png_jmpbuf(png_ptr),1); // Bail out
+ }
+
+
+@@ -121,7 +121,7 @@
+ }
+
+ // Set error handling
+- if(setjmp(png_ptr->jmpbuf)){
++ if(setjmp(png_jmpbuf(png_ptr))){
+
+ // Free all of the memory associated with the png_ptr and info_ptr
+ png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
+@@ -234,7 +234,7 @@
+ }
+
+ // Set error handling.
+- if(setjmp(png_ptr->jmpbuf)){
++ if(setjmp(png_jmpbuf(png_ptr))){
+ png_destroy_write_struct(&png_ptr,&info_ptr);
+ return FALSE;
+ }
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 3b55abb04e9d..0cf82328207a 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/
@@ -14,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org
COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
Xft.2:${PORTSDIR}/x11-fonts/libXft
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 4ba0ab1942e8..2674a9c6e64f 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= 1.7.33
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \
ftp://ftp.fox-toolkit.org/pub/
@@ -57,7 +58,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+=--disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_TIFF)
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 375a2c100f79..0b5c08a9073d 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -gtk2
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 47c35827d123..91a6c57c554e 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fxscintilla
PORTVERSION= 2.28.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SAVANNAH
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index c230fea648f0..6279df22ad16 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gai
PORTVERSION= 0.5.10
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11-toolkits gnome
MASTER_SITES= SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 9d3b9e1baf6f..eecd86311661 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.24
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 104a82115a80..edfe131c8251 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gal2
PORTVERSION= 2.5.3
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 72a0d8ee0031..da6093fbbb13 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gdl
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index 2278b2f431ad..7663bc818fb4 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gigi
PORTVERSION= 0.8.0.1048
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 59c0424e3235..380285f566dc 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnocl
DISTVERSION= ${BASE_VERSION}-${NIGHTLY_BUILD}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits devel
MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/
diff --git a/x11-toolkits/gnome-desktop-sharp20/Makefile b/x11-toolkits/gnome-desktop-sharp20/Makefile
index 36953ad77c02..b05e94340b05 100644
--- a/x11-toolkits/gnome-desktop-sharp20/Makefile
+++ b/x11-toolkits/gnome-desktop-sharp20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-desktop-sharp
PORTVERSION= 2.26.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index 001c30697445..a4f02a184500 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-sharp
PORTVERSION= 2.24.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index f518c2c30645..51aed7f50eaa 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gnustep-back
PORTVERSION= 0.20.0
.else
PORTVERSION= 0.17.1
-PORTREVISION= 3
+PORTREVISION= 4
.endif
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index e505dc5f8d5e..a9918cdfbf8b 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gnustep-gui
PORTVERSION= 0.20.0
.else
PORTVERSION= 0.17.1
-PORTREVISION= 2
+PORTREVISION= 3
.endif
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
@@ -21,7 +21,7 @@ COMMENT= GNUstep GUI library
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
.if defined(WITH_GNUSTEP_DEVEL)
LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
@@ -56,6 +56,8 @@ MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
BREAKS_IF_PEDANTIC= yes
PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
+ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/libpng15
+
.if defined(WITH_GNUSTEP_DEVEL)
EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch
.endif
@@ -93,6 +95,9 @@ PLIST_SUB+= WITH_ASPELL=""
PLIST_SUB+= WITH_ASPELL="@comment "
.endif
+post-patch:
+ ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure
+
pre-configure:
.for file in config.guess config.sub install-sh
@${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}
diff --git a/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m
new file mode 100644
index 000000000000..8432441cfac2
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m
@@ -0,0 +1,15 @@
+--- Source/NSBitmapImageRep+PNG.m.orig 2009-02-17 00:23:41.000000000 +0100
++++ Source/NSBitmapImageRep+PNG.m 2012-04-27 18:54:35.000000000 +0200
+@@ -33,9 +33,11 @@
+ #if HAVE_LIBPNG
+
+ #ifdef HAVE_LIBPNG_PNG_H
+-#include <libpng/png.h>
++#include <png.h>
++#include <pngpriv.h>
+ #else
+ #include <png.h>
++#include <pngpriv.h>
+ #endif
+
+ #include <Foundation/NSData.h>
diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile
index a06c6e5e4ba7..1e3c380c2a43 100644
--- a/x11-toolkits/gstreamer-plugins-pango/Makefile
+++ b/x11-toolkits/gstreamer-plugins-pango/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
COMMENT= Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index c3f6d55e89ed..59c585617359 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 1.0.10
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 7b800737e5b2..8bc8eaafeaf7 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 2.12.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 7483e51a0426..581ea098bd00 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -9,7 +9,7 @@
PORTNAME= gtk
PORTVERSION= 2.24.6
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 718e1668f954..cc1cd9385d17 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 3.0.12
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 17fe2467356d..cc1fdc2be78c 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkada
PORTVERSION= 2.22
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://downloads.dragonlace.net/src/ \
http://dragonlace.mirrors.ada.cx/src/
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 0c27270ba029..b1e14f072227 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkdatabox
PORTVERSION= 0.9.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= SF http://www.eudoxos.de/gtk/gtkdatabox/download/
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index bd0284e55fd1..c959b056420a 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index b00cf92ee438..ea4645317ab2 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglarea
PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DISTNAME= gtkglarea-${PORTVERSION}
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 8004b7bd7276..9da0fbf0539d 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 1.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= SF
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 53a4a2ffe3f3..81bf617fe87c 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglextmm
PORTVERSION= 1.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= SF/gtkglext/${PORTNAME}/${PORTVERSION}
diff --git a/x11-toolkits/gtkimageview/Makefile b/x11-toolkits/gtkimageview/Makefile
index ecc7786e89b4..8d82ed0b8f57 100644
--- a/x11-toolkits/gtkimageview/Makefile
+++ b/x11-toolkits/gtkimageview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkimageview
PORTVERSION= 1.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= LOCAL/kwm
# http://trac.bjourne.webfactional.com/
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index df7a91d861ff..0b96de220861 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkmathview
PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 7e80c8eedd36..ba8df81f3ea8 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 4dd2a5452342..ced7785a2a60 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION?= 12
+PORTREVISION?= 13
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index a261797dabb7..135a1ea47199 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 \
glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index f23528b3bcdc..a84386a8824d 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.24.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index feab756ad4ec..32e503a514bc 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:${PORTSDIR}/x11-toolkits/gtkmm30 \
glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 9faf1e21d642..6e378a0ebe62 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkmm
PORTVERSION= 3.0.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile
index eb960f49aa26..ea1d70c0b5a2 100644
--- a/x11-toolkits/gtksourceview-sharp/Makefile
+++ b/x11-toolkits/gtksourceview-sharp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtksourceview-sharp
PORTVERSION= 0.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp-2.0/
DISTNAME= ${PORTNAME}-2.0-${PORTVERSION}
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index a2af7d0d3883..83b33cb14970 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtksourceview
PORTVERSION= 1.8.5
-PORTREVISION?= 7
+PORTREVISION?= 8
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index ed09a63c96a5..55e6b4320819 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 2.10.5
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index b6fd4f345015..4c6f5f851f3d 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkunique
PORTVERSION= 0.9.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 4b088ea1964a..60849a675502 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guile-gtk
PORTVERSION= 0.60
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits scheme
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 98bf48a6e173..04dcb7550126 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hippo-canvas
PORTVERSION= 0.3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index 4c026144bcc1..70153704ba09 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 0.12.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index 8f671969ea26..ebdcea8e8f8d 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index b0ef2ab37560..46c9ef9c82b8 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.12.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 383ade33a0bd..82626a79cad8 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 0.12.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 632f33d577f4..4b65cc43d8c0 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vte
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 2648bc878019..f2dbaf73498e 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wx
PORTVERSION= 0.13.2.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 65888ac952b8..7cfa90ae1432 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wxcore
PORTVERSION= 0.13.2.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 0f5038543f70..aa78017db6d8 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -7,6 +7,7 @@
PORTNAME= irrlicht
PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits graphics
MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION}
@@ -14,13 +15,14 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= High performance realtime 3D engine
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_ZIP= yes
USE_DOS2UNIX= Makefile *.cpp *.h *.txt
USE_GMAKE= yes
USE_GL= yes
USE_LDCONFIG= yes
+CFLAGS+= -I${LOCALBASE}/include/libpng15
MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER}
PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER}
@@ -66,8 +68,6 @@ post-extract:
@${RM} ${WRKSRC}/media/Thumbs.db
post-patch:
- @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/source/Irrlicht/CImageLoaderPNG.cpp
@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
-e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \
-e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp
new file mode 100644
index 000000000000..ac80dbe8964f
--- /dev/null
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageLoaderPNG.cpp
@@ -0,0 +1,28 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200
++++ source/Irrlicht/CImageLoaderPNG.cpp 2012-05-26 13:58:05.000000000 +0200
+@@ -12,6 +12,7 @@
+ #else // _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #include "libpng/png.h" // use irrlicht included lib png
+ #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_
++ #include <pngpriv.h>
+ #endif // _IRR_COMPILE_WITH_LIBPNG_
+
+ #include "CImage.h"
+@@ -28,7 +29,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ // PNG function for file reading
+@@ -162,7 +163,7 @@
+ if (BitDepth < 8)
+ {
+ if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ else
+ png_set_packing(png_ptr);
+ }
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp
new file mode 100644
index 000000000000..b8b0b273af26
--- /dev/null
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_CImageWriterPNG.cpp
@@ -0,0 +1,19 @@
+--- source/Irrlicht/CImageWriterPNG.cpp.orig 2012-05-26 13:57:05.000000000 +0200
++++ source/Irrlicht/CImageWriterPNG.cpp 2012-05-26 14:39:25.000000000 +0200
+@@ -15,6 +15,7 @@
+ #ifdef _IRR_COMPILE_WITH_LIBPNG_
+ #ifndef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #include <png.h> // use system lib png
++ #include <pngpriv.h>
+ #else // _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #include "libpng/png.h" // use irrlicht included lib png
+ #endif // _IRR_USE_NON_SYSTEM_LIB_PNG_
+@@ -35,7 +36,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ // PNG function for file writing
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index efe7c69cdfd9..1407c60e85d0 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.24.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index a1025c6d81e1..e41484dc7979 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbonobouimm
PORTVERSION= 1.3.7
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 9b048e9a8cbd..c53afb4a73a1 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgail-gnome
PORTVERSION= 1.20.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index 01c16f14ee52..c3bd6bf0959f 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgdiplus
PORTVERSION= 2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
@@ -16,7 +16,7 @@ COMMENT= GDI+ API for System.Windows.Forms in Mono
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
cairo.2:${PORTSDIR}/graphics/cairo
GNU_CONFIGURE= yes
@@ -25,7 +25,7 @@ USE_GNOME= gnomehack glib20
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_XORG= x11
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= lib/libgdiplus.a \
diff --git a/x11-toolkits/libgdiplus/files/patch-pngcodec.c b/x11-toolkits/libgdiplus/files/patch-pngcodec.c
new file mode 100644
index 000000000000..2c8c9c79119d
--- /dev/null
+++ b/x11-toolkits/libgdiplus/files/patch-pngcodec.c
@@ -0,0 +1,10 @@
+--- src/pngcodec.c.orig 2011-01-13 23:28:19.000000000 +0100
++++ src/pngcodec.c 2012-04-27 12:33:01.000000000 +0200
+@@ -35,6 +35,7 @@
+ #ifdef HAVE_LIBPNG
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include "gdiplus-private.h"
+ #include "pngcodec.h"
+ #include <setjmp.h>
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 1d4cc642ae01..81bd23bff645 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomeprintui
PORTVERSION= 2.18.6
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 844fa6ea5982..16971c71c8fc 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeprintuimm
PORTVERSION= 2.5.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index a6f81b78330b..a3ad217a65bf 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnomeui
PORTVERSION= 2.24.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 450ce3f3364b..c9cf9d882c58 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.0.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11-toolkits gnome
MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index a6e4a1c3ebc8..c94e36098e63 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index 19c9e4ee4d04..39a2700d98ee 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgtk-java
PORTVERSION= 2.10.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile
index dde385d35389..5dbe37bc0d6d 100644
--- a/x11-toolkits/libgtksourceviewmm/Makefile
+++ b/x11-toolkits/libgtksourceviewmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgtksourceviewmm
PORTVERSION= 1.9.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 0b1aea366b7f..5bf696f3180e 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libpanelappletmm
PORTVERSION= 2.26.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 5e69aee19b10..8d15df9b7217 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libsexy
PORTVERSION= 0.1.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits devel
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://releases.chipx86.com/libsexy/libsexy/
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index 8818eb311c36..dc3b2213bdb6 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libsexymm
PORTVERSION= 0.1.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits devel
MASTER_SITES= http://releases.chipx86.com/libsexy/libsexymm/
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 1c2db6e8862d..5427129f79a1 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libwnck
PORTVERSION= 2.30.6
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index cc9de525868f..4872b44c2b71 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxfce4gui
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/archive/libxfcegui4/${PORTVERSION:R}
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 1250ed0ac10d..94be4964bc4b 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libzvt
PORTVERSION= 2.0.1
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 3e7fb7a5c87a..b6d3c75f8c4b 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.14.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
PKGNAMEPREFIX= linux-f10-
diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile
index fd997d03beaf..9f1313914b49 100644
--- a/x11-toolkits/linux-f10-qt33/Makefile
+++ b/x11-toolkits/linux-f10-qt33/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ${LINUX_NAME}3
PORTVERSION= 3.3.8b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
PKGNAMEPREFIX= linux-f10-
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index f339d0f2438a..7450c6f81e0a 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.6.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits linux
MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile
index 0654c784a1a3..be0198f0e1f3 100644
--- a/x11-toolkits/linux-qt33/Makefile
+++ b/x11-toolkits/linux-qt33/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qt33
PORTVERSION= 3.3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
DISTNAME= qt-${PORTVERSION}-${RPMVERSION}
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index de7e425fced0..4c229acd6c27 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nucleo
PORTVERSION= 0.7.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/
@@ -18,7 +18,7 @@ LICENSE= LGPL21
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
exif.12:${PORTSDIR}/graphics/libexif
USE_BZIP2= yes
@@ -83,10 +83,4 @@ CONFIGURE_ARGS+= --without-gd
PLIST_SUB+= GD="@comment "
.endif
-post-patch:
-# Fix for libpng 1.4
- @${REINPLACE_CMD} -e \
- 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
- ${WRKSRC}/nucleo/image/encoding/PNGenc.cxx
-
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx b/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx
new file mode 100644
index 000000000000..004549d63585
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo_image_encoding_PNGenc.cxx
@@ -0,0 +1,19 @@
+--- nucleo/image/encoding/PNGenc.cxx.orig 2008-06-05 14:52:33.000000000 +0200
++++ nucleo/image/encoding/PNGenc.cxx 2012-05-05 08:40:18.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <nucleo/image/encoding/PNGenc.H>
+
+ #include <png.h>
++#include <pngpriv.h>
+
+ namespace nucleo {
+
+@@ -170,7 +171,7 @@
+ &compression_type, &filter_type) ;
+
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha(png_ptr);
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 993d506304b9..3f6a28cb108a 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= lablgtk2
PORTVERSION= 2.14.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/561/ \
ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 361e5834a6e3..f33e747d5421 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -8,6 +8,7 @@
PORTNAME= open-motif
PORTVERSION= 2.3.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.ics.com/openmotif/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/
DISTNAME= openmotif-${PORTVERSION}
@@ -16,7 +17,7 @@ DIST_SUBDIR= openmotif
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295))
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile
index 39ae94f6d3b5..376e3062002d 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Alien-wxWidgets
PORTVERSION= 0.51
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index b18f6195fe5c..74e3a2208309 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= GdkImlib
PORTVERSION= 0.7009
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= CPAN/Gtk
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 948d73e8ead5..34bae5b2bb55 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Glade
PORTVERSION= 1.007
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:TSCH
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 590a129d1a68..607091e2ec01 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gnome2-Canvas
PORTVERSION= 1.002
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnome perl5
MASTER_SITES= CPAN/Gnome2 \
SF/gtk2-perl/Gnome2_Canvas/${PORTVERSION}
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index 1e92b73203fe..f6ab8f3ac3cd 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gnome2-VFS
PORTVERSION= 1.081
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits gnome perl5
MASTER_SITES= SF/gtk2-perl/Gnome2_VFS/${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index 98f450d13f64..69aa46859c74 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gnome2
PORTVERSION= 1.042
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits gnome perl5
MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Chmod/Makefile b/x11-toolkits/p5-Gtk2-Chmod/Makefile
index 96be375606f4..fa2be17ea8d3 100644
--- a/x11-toolkits/p5-Gtk2-Chmod/Makefile
+++ b/x11-toolkits/p5-Gtk2-Chmod/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Chmod
PORTVERSION= 0.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
index a68c46d89bde..ef44991253a7 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Ex-Dialogs
PORTVERSION= 0.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
index c09d003a44bc..f8c746939f20 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Gtk2-Ex-FormFactory
PORTVERSION= 0.67
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index ad55ffe57c38..0e80c2d14315 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Ex-PodViewer
PORTVERSION= 0.18
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
index 68dddfde0684..971e032bdc1d 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Ex-Simple-List
PORTVERSION= 0.50
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
index 9a462ba8c2db..fe047e54f12d 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-Ex-Utils
PORTVERSION= 0.09
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/Makefile b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
index 13be9bee60a0..9ff973c386a6 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/Makefile
+++ b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-GladeXML
PORTVERSION= 1.007
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index 5be9f8a5005d..30fe0cef613e 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gtk2-Html2
PORTVERSION= 0.03
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits perl5
MASTER_SITES= http://asofyet.org/muppet/software/gtk2-perl/
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile
index 7a5b8ebc22b8..f544a7195daf 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/Makefile
+++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-ImageView
PORTVERSION= 0.05
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RATCLIFFE
diff --git a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
index 836a8813d977..fac81a382fe8 100644
--- a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
+++ b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-PathButtonBar
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index f6a61b1629df..1c8dad18a8c8 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-TrayIcon
PORTVERSION= 0.06
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:BORUP
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index dc9bdf6cdce4..a269453dfc66 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Gtk2
PORTVERSION= 1.242
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= CPAN SF/${PORTNAME:L}-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Pango/Makefile b/x11-toolkits/p5-Pango/Makefile
index f48e15ef9040..798ff3829828 100644
--- a/x11-toolkits/p5-Pango/Makefile
+++ b/x11-toolkits/p5-Pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Pango
PORTVERSION= 1.223
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:XAOC
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index fa69e9c4f821..d5a61e1b9c56 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Prima
PORTVERSION= 1.31
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5 graphics
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -15,7 +16,7 @@ MAINTAINER= dmitry@karasik.eu.org
COMMENT= An extensible Perl toolkit for multi-platform GUI development
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 3372c2fddd00..b8233873a33b 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-Autoscroll
PORTVERSION= 1.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index 054f8b03e49d..09488fa741e8 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-ColourChooser
PORTVERSION= 1.52
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index ceb12bfee041..cf6f29bc6916 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-Contrib
PORTVERSION= 0.07
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5 tk
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-CursorControl/Makefile b/x11-toolkits/p5-Tk-CursorControl/Makefile
index 28245e41e83b..73ce1faf33ad 100644
--- a/x11-toolkits/p5-Tk-CursorControl/Makefile
+++ b/x11-toolkits/p5-Tk-CursorControl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Tk-CursorControl
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index e42c9b36612e..f06b41e0d60b 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-DKW
PORTVERSION= 0.03
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5 tk
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 4f0301c52904..2657d8d9e88a 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Tk-Date
PORTVERSION= 0.44
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index 8e70ea29159c..a6c386e332aa 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-DynaTabFrame
PORTVERSION= 0.23
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5 tk
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index c8d602e2a0e4..8f6e771f95a2 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-Enscript
PORTVERSION= 1.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 6899f3636ac4..cecabd295405 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -6,7 +6,7 @@
PORTNAME= Tk-FileDialog
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile
index 9f9908acd5c3..a22c1bd3991f 100644
--- a/x11-toolkits/p5-Tk-FontDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FontDialog/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-FontDialog
PORTVERSION= 0.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5 tk
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 7823c56cd042..d772f4d582e2 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-GBARR
PORTVERSION= 2.08
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 553ef04b3e38..7103cc6026e7 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-Getopt
PORTVERSION= 0.50
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index d53b6761ef67..3ace29610040 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-HistEntry
PORTVERSION= 0.43
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index 03a97edab4eb..078cfda0ac89 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-JComboBox
PORTVERSION= 1.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits perl5 tk
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index e3e39b860292..aa746b500dd5 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-ResizeButton
PORTVERSION= 0.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Role-Dialog/Makefile b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
index 31df5a6545e4..e7ed6ad9ad71 100644
--- a/x11-toolkits/p5-Tk-Role-Dialog/Makefile
+++ b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Tk-Role-Dialog
PORTVERSION= 1.112.380
+PORTREVISION= 1
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index 8b2ccdede62c..3821346a988c 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-Splashscreen
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 29f5c3551c37..635b9f6b65b6 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-TableMatrix
PORTVERSION= 1.23
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index 7d761fd89d43..ddc49d9d8804 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tk-ToolBar
PORTVERSION= 0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 64ca82e65087..099d506d7fa1 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Tk
PORTVERSION= 804.030
+PORTREVISION= 1
CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -15,7 +16,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= A re-port of a perl5 interface to Tk8.4
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
OPTIONS_DEFINE= XFT
XFT_DESC= Client-side fonts via libXft (experimental)
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
index a7621f25dced..af4298eb9b53 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Wx-Perl-ProcessStream
PORTVERSION= 0.27
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index 232dd698eef2..4fa789f14d14 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Wx
PORTVERSION= 0.97
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index cfc0786d7d1d..98a5fcbd92ca 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pango
PORTVERSION= 1.28.4
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index fbba2a59270d..ba08cc950ea6 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pangomm
PORTVERSION= 2.28.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index a9a9b387f368..202002aa2739 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pangoxsl
PORTVERSION= 1.6.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= SF/pangopdf/${PORTNAME}/${PORTVERSION}
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 939727cf0050..2cf54c99b6b5 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= paragui
PORTVERSION= 1.1.8
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index c2293a1d4779..39e5611082be 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= paragui
PORTVERSION= 1.0.4
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile
index 7c20648cfb29..d6ba46fbb58e 100644
--- a/x11-toolkits/phat/Makefile
+++ b/x11-toolkits/phat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phat
PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR= phat
diff --git a/x11-toolkits/pure-gtk/Makefile b/x11-toolkits/pure-gtk/Makefile
index 939092685144..8652a89ab0cf 100644
--- a/x11-toolkits/pure-gtk/Makefile
+++ b/x11-toolkits/pure-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pure-gtk
PORTVERSION= 0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MAINTAINER= lichray@gmail.com
diff --git a/x11-toolkits/py-SciParam/Makefile b/x11-toolkits/py-SciParam/Makefile
index 28e214f4162d..53bf31b1d767 100644
--- a/x11-toolkits/py-SciParam/Makefile
+++ b/x11-toolkits/py-SciParam/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SciParam
PORTVERSION= 1.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.intevation.de/great-er/sciparam/ \
http://ftp.intevation.de/great-er/sciparam/ \
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index d267aa3829c8..ea9b1900b242 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fltk
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
#MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${DISTNAME}
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 29a8ff2d6ffa..bdd7346a9cd1 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 6cea8e1711cb..a619455d62e6 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 4da9cb42bc7d..a970ec8855fa 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome
PORTVERSION= 2.28.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index dce5dbf53662..802db2844480 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk
PORTVERSION= 0.6.11
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 53d07082d7a4..e3c6a10d92cf 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.24.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 26c3bc6f68e7..d0d1b200206d 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index f7f09178d1f4..9d2a768d97b7 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtksourceview
PORTVERSION= 2.10.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 4de3590b049c..52f9fc3e4994 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gui
PORTVERSION= 1.7.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits python
MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python_gui/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index df18781852b6..ff7b6ad64db1 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kiwi
PORTVERSION= 1.9.29
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= http://download.gnome.org/sources/${PORTNAME}/1.9/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile
index 9afd459c0f75..d83240db4479 100644
--- a/x11-toolkits/py-pyqwt/Makefile
+++ b/x11-toolkits/py-pyqwt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pyqwt
PORTVERSION= 5.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits python
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 924b9b3528c0..d5a4490fccc1 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qt
PORTVERSION= 3.18.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= x11-toolkits python
MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/ \
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 769d44392a42..9e62ab332546 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -6,6 +6,7 @@
PORTNAME= gui
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 7a6ab1201fc8..4a3585726018 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sexy
PORTVERSION= 0.1.9
-PORTREVISION= 5
+PORTREVISION= 6
DISTVERSIONPREFIX= python-
CATEGORIES= x11-toolkits python
MASTER_SITES= http://releases.chipx86.com/libsexy/sexy-python/ CENKES
diff --git a/x11-toolkits/py-traitsbackendwx/Makefile b/x11-toolkits/py-traitsbackendwx/Makefile
index b95be3ee0729..7a69180f8e9d 100644
--- a/x11-toolkits/py-traitsbackendwx/Makefile
+++ b/x11-toolkits/py-traitsbackendwx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= traitsbackendwx
PORTVERSION= 3.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-traitsgui/Makefile b/x11-toolkits/py-traitsgui/Makefile
index c902171ee743..54fb59c55510 100644
--- a/x11-toolkits/py-traitsgui/Makefile
+++ b/x11-toolkits/py-traitsgui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= traitsgui
PORTVERSION= 3.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index 24a2ed1028cf..82fa27c484f5 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.5 2010/09/30 09:15:43 kwm Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 700f5312c9ca..cb6ca2abd74b 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxPython
PORTVERSION= 2.4.2.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wxPython26-common/Makefile b/x11-toolkits/py-wxPython26-common/Makefile
index ff585f15e618..48c771641520 100644
--- a/x11-toolkits/py-wxPython26-common/Makefile
+++ b/x11-toolkits/py-wxPython26-common/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 5
+PORTREVISION= 6
WITH_COMMON_ONLY= yes
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 6d431dec2d52..038714ce26b7 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxPython
PORTVERSION= 2.6.3.3
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wxPython28-common/Makefile b/x11-toolkits/py-wxPython28-common/Makefile
index 67943e58a280..f9e86e1abe1b 100644
--- a/x11-toolkits/py-wxPython28-common/Makefile
+++ b/x11-toolkits/py-wxPython28-common/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
WITH_COMMON_ONLY= yes
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 6d6bcacaad96..4c0fd5de7fe2 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxPython
PORTVERSION= 2.8.12.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index db3b8070b897..bd1fc047dc78 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qscintilla
PORTVERSION= 1.7.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/QScintilla1/ \
http://ns.ael.ru/~fluffy.khv/pyqt/QScintilla1/
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 5478936d1de6..172864af376b 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qt
PORTVERSION= 3.3.8
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
DISTNAME= qt-x11-free-${PORTVERSION}
@@ -20,7 +20,7 @@ COMMENT= Multiplatform C++ application framework
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
EXTRA_PATCHES= ${PATCHDIR}/0081-format-string-fixes.diff
@@ -110,7 +110,8 @@ CONFIGURE_ARGS+=-disable-opengl
.if ${PORT_OPTIONS:MCUPS}
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
-CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
+.elif defined(WITHOUT_CUPS)
+CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
.else
CUPS=
.endif
diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp
index c7f38b818d3f..11917c55197b 100644
--- a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp
+++ b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp
@@ -1,6 +1,14 @@
--- src/kernel/qpngio.cpp.orig 2007-02-02 15:01:15.000000000 +0100
-+++ src/kernel/qpngio.cpp 2010-03-28 14:00:46.000000000 +0200
-@@ -159,7 +159,7 @@
++++ src/kernel/qpngio.cpp 2012-04-27 10:52:06.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include "qiodevice.h"
+
+ #include <png.h>
++#include <pngpriv.h>
+
+
+ #ifdef Q_OS_TEMP
+@@ -159,7 +160,7 @@
image.setColor( i, qRgba(c,c,c,0xff) );
}
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
@@ -9,7 +17,7 @@
if (g < ncols) {
image.setAlphaBuffer(TRUE);
image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +187,7 @@
+@@ -187,7 +188,7 @@
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
@@ -18,3 +26,39 @@
)
);
i++;
+@@ -284,7 +285,7 @@
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ iio->setStatus(-4);
+ return;
+@@ -469,7 +470,7 @@
+ return FALSE;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return FALSE;
+ }
+@@ -1030,7 +1031,7 @@
+ return -1;
+ }
+
+- if (setjmp((png_ptr)->jmpbuf)) {
++ if (setjmp(png_jmpbuf((png_ptr)))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ image = 0;
+ return -1;
+@@ -1057,7 +1058,7 @@
+
+ if ( !png_ptr ) return 0;
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ image = 0;
+ state = MovieStart;
diff --git a/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp b/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp
new file mode 100644
index 000000000000..18993718fbbc
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp
@@ -0,0 +1,10 @@
+--- tools/qvfb/qanimationwriter.cpp.orig 2007-01-11 14:39:56.000000000 +0100
++++ tools/qvfb/qanimationwriter.cpp 2012-04-27 11:57:18.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <qfile.h>
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <netinet/in.h> // for htonl
+
+ class QAnimationWriterData {
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 9da4ad0afb53..2ce5f8e689d2 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -8,13 +8,14 @@
PORTNAME= gui
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11-toolkits
PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt graphical user interface library
-LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index 78f4260dd89a..539a754a8e27 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qwt
PORTVERSION= 4.2.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= SF
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index 26238059e407..fc4cb55d297b 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qwt
PORTVERSION= 5.2.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel
MASTER_SITES= SF
PKGNAMESUFFIX= -designerplugin
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index bc340c19b821..a1084b4c4ada 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qwt
PORTVERSION= 5.2.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index 1fffee1bf3b5..bbea19803fcb 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qwt
PORTVERSION= 6.0.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel
MASTER_SITES= SF
PKGNAMESUFFIX= -designerplugin
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 0ac2c3b42ac6..b6b575911566 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qwt
PORTVERSION= 6.0.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 8a145df4ead0..4d5415fa0c2c 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rep-gtk2
PORTVERSION= 0.90.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://download.tuxfamily.org/librep/rep-gtk/
diff --git a/x11-toolkits/ruby-fox16/Makefile b/x11-toolkits/ruby-fox16/Makefile
index c03c518cf682..28816a9e533d 100644
--- a/x11-toolkits/ruby-fox16/Makefile
+++ b/x11-toolkits/ruby-fox16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fox
PORTVERSION= 1.6.19
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits ruby
MASTER_SITES= RF
MASTER_SITE_SUBDIR= fxruby
@@ -19,7 +19,7 @@ MAINTAINER= lercordeiro@gmail.com
COMMENT= Ruby extension module to use FOX 1.6, aka FXRuby
LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
fxscintilla.23:${PORTSDIR}/x11-toolkits/fxscintilla
diff --git a/x11-toolkits/ruby-goocanvas/Makefile b/x11-toolkits/ruby-goocanvas/Makefile
index 40cb1baf135a..aad5bfb52d6a 100644
--- a/x11-toolkits/ruby-goocanvas/Makefile
+++ b/x11-toolkits/ruby-goocanvas/Makefile
@@ -7,6 +7,7 @@
PORTNAME= goocanvas
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 6c47e8007ce1..ca76491f4471 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-gtksourceview2/Makefile b/x11-toolkits/ruby-gtksourceview2/Makefile
index 26f06b983607..38784517d564 100644
--- a/x11-toolkits/ruby-gtksourceview2/Makefile
+++ b/x11-toolkits/ruby-gtksourceview2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtksourceview2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index d81a18146b12..b8a6cfe65637 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pango
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile
index d41a248c778d..e22fb8542f70 100644
--- a/x11-toolkits/ruby-poppler/Makefile
+++ b/x11-toolkits/ruby-poppler/Makefile
@@ -7,6 +7,7 @@
PORTNAME= poppler
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/ruby-vte/Makefile b/x11-toolkits/ruby-vte/Makefile
index 7bcae870b6aa..dc83bbb591d4 100644
--- a/x11-toolkits/ruby-vte/Makefile
+++ b/x11-toolkits/ruby-vte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vte
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11-toolkits/sakura/Makefile b/x11-toolkits/sakura/Makefile
index b4e94165d2e6..9ab7b4a47696 100644
--- a/x11-toolkits/sakura/Makefile
+++ b/x11-toolkits/sakura/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sakura
PORTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= http://www.pleyades.net/david/projects/sakura/
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 4a653f160e8d..738ab84c5dd6 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scintilla
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= scite${PORTVERSION:S/.//g}
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index 2d183d919bcf..ccd411ef7e97 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl_pango
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= SF/sdlpango/SDL_Pango/${PORTVERSION}
DISTNAME= SDL_Pango-${PORTVERSION}
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 313e62cb0cdb..7c8280e06e66 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SoQt
PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \
ftp://ftp.coin3d.org/pub/coin/src/all/
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index a9a445f7472b..5df2fd386257 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= swt
DISTVERSION= 3.7.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel java
MASTER_SITES= ECLIPSE
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 89af558d26cf..5926f1b6d4fe 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= swt
DISTVERSION= 3.5.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel java
#MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/
diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index 81341dcb4e58..5a2009660923 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= termit
PORTVERSION= 2.9.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= http://cloud.github.com/downloads/nonstop/termit/
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 09512a49b84d..6ccefdb77ba2 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -8,7 +8,7 @@
PORTNAME= unique
PORTVERSION= 1.1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 38ce5c96c3e5..ab2bdf1834fc 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vdk
PORTVERSION= 2.5.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}lib/VDK%20for%20both%20Linux%20and%20Windows%20%28this%20is%20the%20new%20version%29/VDKLIB%20%28C%2B%2B%20wrapper%20for%20GTK%2B%29
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 6f9a1d3c7679..2589e86d0fe6 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vdkbuilder
PORTVERSION= 2.5.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF
DISTNAME= ${PORTNAME}2-${PORTVERSION}
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 149251245e6d..f565468147c5 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vte
PORTVERSION= 0.26.2
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile
index f732b571913e..30836b7efacf 100644
--- a/x11-toolkits/wxd/Makefile
+++ b/x11-toolkits/wxd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wxd
PORTVERSION= 0.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits devel
MASTER_SITES= SF/${PORTNAME}/wxD/${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile
index 8115938871b2..169558e79dd3 100644
--- a/x11-toolkits/wxgtk24-contrib/Makefile
+++ b/x11-toolkits/wxgtk24-contrib/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 12
+PORTREVISION= 13
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit contributed libraries
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 571d7e23c828..336f4176d2c6 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.4.2
-PORTREVISION?= 20
+PORTREVISION?= 21
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp b/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp
new file mode 100644
index 000000000000..9c0bd30beb19
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-common-imagpng.cpp
@@ -0,0 +1,44 @@
+--- src/common/imagpng.cpp.orig 2003-09-21 13:31:39.000000000 +0200
++++ src/common/imagpng.cpp 2012-05-06 07:07:48.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "png.h"
++#include "pngpriv.h"
+ #include "wx/filefn.h"
+ #include "wx/wfstream.h"
+ #include "wx/intl.h"
+@@ -127,7 +128,7 @@
+ #ifdef USE_FAR_KEYWORD
+ {
+ jmp_buf jmpbuf;
+- png_memcpy(jmpbuf,info->jmpbuf,sizeof(jmp_buf));
++ png_memcpy(jmpbuf,png_jmpbuf(info),sizeof(jmp_buf));
+ longjmp(jmpbuf, 1);
+ }
+ #else
+@@ -167,13 +168,13 @@
+ image->Destroy();
+
+ png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING,
+- (voidp) NULL,
++ NULL,
+ (png_error_ptr) NULL,
+ (png_error_ptr) NULL );
+ if (!png_ptr)
+ goto error_nolines;
+
+- png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning);
++ png_set_error_fn(png_ptr, NULL, wx_png_error, wx_png_warning);
+
+ // NB: please see the comment near wxPNGInfoStruct declaration for
+ // explanation why this line is mandatory
+@@ -349,7 +350,7 @@
+ return FALSE;
+ }
+
+- png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning);
++ png_set_error_fn(png_ptr, NULL, wx_png_error, wx_png_warning);
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index f5eee7e03819..a5a5da26419a 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.6.4
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
@@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\
jpeg.11:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2\
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp
new file mode 100644
index 000000000000..82ef39ee5b90
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-common-imagpng.cpp
@@ -0,0 +1,11 @@
+--- src/common/imagpng.cpp.orig 2007-03-20 16:50:01.000000000 +0100
++++ src/common/imagpng.cpp 2012-05-06 07:15:11.000000000 +0200
+@@ -528,7 +528,7 @@
+ png_structp png_ptr = png_create_read_struct
+ (
+ PNG_LIBPNG_VER_STRING,
+- (voidp) NULL,
++ NULL,
+ wx_png_error,
+ wx_png_warning
+ );
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 09c87ab6fcd8..fb13a4e44e0c 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.8.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
@@ -16,7 +16,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\
jpeg.11:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 0bb2d5eacfbb..a101fc6abaa5 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.9.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/${PORTVERSION}
PKGNAMESUFFIX= gtk2
@@ -16,7 +16,7 @@ DISTNAME= wxWidgets-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png\
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\
jpeg.11:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 271aa17fbe49..541322ac14b1 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -7,20 +7,22 @@
PORTNAME= XmHTML
PORTVERSION= 1.1.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits www
MASTER_SITES= ${MASTER_SITE_NETBSD}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Motif widget set for displaying HTML 3.2 documents
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_AUTOTOOLS= libtool:env
USE_MOTIF= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_XORG= xmu
+CFLAGS+= -I${LOCALBASE}/include/libpng15
do-configure:
@${DO_NADA}
diff --git a/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c b/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c
new file mode 100644
index 000000000000..5bbffea2ef9e
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c
@@ -0,0 +1,28 @@
+--- lib/common/readPNG.c.orig 1998-11-16 23:56:19.000000000 +0100
++++ lib/common/readPNG.c 2012-05-26 14:16:45.000000000 +0200
+@@ -82,6 +82,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+ #include <math.h> /* required for full alpha channel processing */
+ #endif
+@@ -132,7 +133,7 @@
+
+ _XmHTMLWarning(__WFUNC__(NULL, "png_error"), XMHTML_MSG_121, "png",
+ ib->file, msg);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /*****
+@@ -232,7 +233,7 @@
+ return((XmHTMLRawImageData*)NULL);
+ }
+ /* now set error handler */
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ /*
+ * PNG signalled an error. Destroy image data, free any allocated
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 767fb0ac83e8..f4fb56f4caeb 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -7,6 +7,7 @@
PORTNAME= afterstep
PORTVERSION= 2.2.11
+PORTREVISION= 1
CATEGORIES= x11-wm afterstep
MASTER_SITES= ftp://ftp.afterstep.org/stable/ \
SF/${PORTNAME}/AfterStep/${PORTVERSION}
@@ -19,7 +20,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
execinfo.1:${PORTSDIR}/devel/libexecinfo \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
rplay.1:${PORTSDIR}/audio/rplay \
rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c b/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c
new file mode 100644
index 000000000000..2c5e7660c5bb
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterImage-export.c
@@ -0,0 +1,11 @@
+--- libAfterImage/export.c.orig 2010-09-23 22:52:15.000000000 +0200
++++ libAfterImage/export.c 2012-05-06 07:25:17.000000000 +0200
+@@ -496,7 +496,7 @@
+ png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+ if ( png_ptr != NULL )
+ if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ info_ptr = NULL ;
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c b/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c
new file mode 100644
index 000000000000..bef85880f392
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterImage-import.c
@@ -0,0 +1,19 @@
+--- libAfterImage/import.c.orig 2010-09-23 22:57:57.000000000 +0200
++++ libAfterImage/import.c 2012-05-06 09:30:26.000000000 +0200
+@@ -40,6 +40,7 @@
+ # else
+ # include <png.h>
+ # endif
++# include <pngpriv.h>
+ #else
+ # include <setjmp.h>
+ # ifdef HAVE_JPEG
+@@ -1251,7 +1252,7 @@
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+- if ( !setjmp (png_ptr->jmpbuf))
++ if ( !setjmp (png_jmpbuf(png_ptr)))
+ {
+ ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index c8a158248b32..e6d8559050a5 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= awesome
PORTVERSION= 3.4.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 667b7682ab10..afedc37c4b6b 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= awesome2
PORTVERSION= 2.3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/
DISTNAME= awesome-${PORTVERSION}
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index 9511b0dec93f..a93cdb8ab3e8 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbconf
PORTVERSION= 1.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MASTER_SITES= SF
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index 6236c1181275..897da3de1c6b 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blwm
PORTVERSION= 1.0.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm portuguese
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index bee5d5715260..86d039b30b63 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ccsm
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index 264505139c0a..d0661789a4c0 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clementine
PORTVERSION= 0.0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= SF/${PORTNAME}/Source/${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index b7d21d7facb1..14bdb1429942 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compiz-plugins-extra
PORTVERSION= 0.8.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index bf59fa27cb07..048d0172e2bf 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compiz-plugins-main
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 47637c6ae37b..b8fcfb770d4e 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compiz-plugins-unsupported
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 46c742922f14..4e6411842250 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -7,14 +7,14 @@
PORTNAME= compiz
PORTVERSION= 0.8.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Compiz Composite/Window Manager
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
gtop-2.0.7:${PORTSDIR}/devel/libgtop \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
RUN_DEPENDS= glxinfo:${PORTSDIR}/graphics/mesa-demos \
@@ -83,7 +83,7 @@ DESKTOP_ENTRIES= "Compiz Manager" \
false
post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng14|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
+ @${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
${WRKSRC}/configure
post-install:
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index d98993f6c849..6d328c0dde36 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compizconfig-backend-gconf
PORTVERSION= 0.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index cdb69a4eb6b5..acf412768a98 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compizconfig-python
PORTVERSION= 0.8.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 82bfe7b7b1d8..c4f68dda136e 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -7,7 +7,7 @@
PORTNAME= devilspie
PORTVERSION= 0.22
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://www.burtonini.com/computing/
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 1af4b57d959a..cd0ebe677474 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= e16
PORTVERSION= 1.0.10
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION}/
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index db77425bed6b..9c71a26c3f32 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= e16utils
PORTVERSION= 0.16
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-wm enlightenment
MASTER_SITES= SF/enlightenment/e16menuedit/e16menuedit:src1 \
SF/enlightenment/e16keyedit/0.2:src2
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 3e1600e91b69..6d3eb253ff1f 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alarm
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index f2459fab64da..d65bf6f3fd9c 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= calendar
PORTVERSION= 20110129
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 16b99c70fc58..45d6a6bea5a7 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cpu
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index 5887823a990a..09114293386c 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= deskshow
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index dcb5cb0557a7..e958d70d1549 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= diskio
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-drawer/Makefile b/x11-wm/e17-module-drawer/Makefile
index f3e05e3451a1..8163abbca520 100644
--- a/x11-wm/e17-module-drawer/Makefile
+++ b/x11-wm/e17-module-drawer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drawer
PORTVERSION= 20110129
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-efm_nav/Makefile b/x11-wm/e17-module-efm_nav/Makefile
index 9f0a493eefac..1b02b9f54916 100644
--- a/x11-wm/e17-module-efm_nav/Makefile
+++ b/x11-wm/e17-module-efm_nav/Makefile
@@ -7,6 +7,7 @@
PORTNAME= efm_nav
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-efm_path/Makefile b/x11-wm/e17-module-efm_path/Makefile
index 62cc73ecc295..309f3e7e4bec 100644
--- a/x11-wm/e17-module-efm_path/Makefile
+++ b/x11-wm/e17-module-efm_path/Makefile
@@ -7,6 +7,7 @@
PORTNAME= efm_path
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-efm_pathbar/Makefile b/x11-wm/e17-module-efm_pathbar/Makefile
index 03bcf43fb57a..fbbb9f2b1d19 100644
--- a/x11-wm/e17-module-efm_pathbar/Makefile
+++ b/x11-wm/e17-module-efm_pathbar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= efm_pathbar
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-empris/Makefile b/x11-wm/e17-module-empris/Makefile
index 75d9fd75654f..a101c89ef009 100644
--- a/x11-wm/e17-module-empris/Makefile
+++ b/x11-wm/e17-module-empris/Makefile
@@ -7,6 +7,7 @@
PORTNAME= empris
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index 8eb56d2bbf8c..8dc960b69bae 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= itask-ng
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-eooorg/Makefile b/x11-wm/e17-module-eooorg/Makefile
index 6aaf4dfe3434..febc5709d796 100644
--- a/x11-wm/e17-module-eooorg/Makefile
+++ b/x11-wm/e17-module-eooorg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eooorg
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index 3819100d27da..e53af3d1edd7 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -7,6 +7,7 @@
PORTNAME= everything-mpris
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index 1ed28264ea97..1fd884206505 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= everything-pidgin
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index 7650bc4f8aa5..5fddec7a9dfa 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -7,6 +7,7 @@
PORTNAME= everything-places
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index bf25e3dadb93..1dd39aacb5b9 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= everything-wallpaper
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index 0d62138f12b3..9a5be28a4776 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= everything-websearch
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-exebuf/Makefile b/x11-wm/e17-module-exebuf/Makefile
index 05d8d9269562..7f1183d2c327 100644
--- a/x11-wm/e17-module-exebuf/Makefile
+++ b/x11-wm/e17-module-exebuf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= exebuf
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-execwatch/Makefile b/x11-wm/e17-module-execwatch/Makefile
index ba0bee609831..49c76abd8f62 100644
--- a/x11-wm/e17-module-execwatch/Makefile
+++ b/x11-wm/e17-module-execwatch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= execwatch
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index d5c2b5753957..c92088bd6f40 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flame
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index ec09c387e6a7..521ad349038c 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= forecasts
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index eacfd1ccf086..0798c0a32583 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= iiirk
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-itask-ng/Makefile b/x11-wm/e17-module-itask-ng/Makefile
index 8eb56d2bbf8c..8dc960b69bae 100644
--- a/x11-wm/e17-module-itask-ng/Makefile
+++ b/x11-wm/e17-module-itask-ng/Makefile
@@ -7,6 +7,7 @@
PORTNAME= itask-ng
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-itask/Makefile b/x11-wm/e17-module-itask/Makefile
index 4e7cee066c31..c1a48debd42f 100644
--- a/x11-wm/e17-module-itask/Makefile
+++ b/x11-wm/e17-module-itask/Makefile
@@ -7,6 +7,7 @@
PORTNAME= itask
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index b13e4daccce3..7866846c42ac 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -7,6 +7,7 @@
PORTNAME= language
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 18ce0bcadc78..e9105d3ef911 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mail
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index 3b54ba26aaeb..150b5266a356 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mem
PORTVERSION= 20110129
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 8af796b1f877..142ff444b8d1 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= moon
PORTVERSION= 20110129
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index 526eec25b551..60af30aea4e1 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpdule
PORTVERSION= 20110129
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index cb819eca7ddf..ff46bd38bf24 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -7,6 +7,7 @@
PORTNAME= net
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-news/Makefile b/x11-wm/e17-module-news/Makefile
index 5b89127c1eb2..b4edfff58f5a 100644
--- a/x11-wm/e17-module-news/Makefile
+++ b/x11-wm/e17-module-news/Makefile
@@ -7,6 +7,7 @@
PORTNAME= news
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-notification/Makefile b/x11-wm/e17-module-notification/Makefile
index 21c618d37fe2..cabd4f326c3f 100644
--- a/x11-wm/e17-module-notification/Makefile
+++ b/x11-wm/e17-module-notification/Makefile
@@ -7,6 +7,7 @@
PORTNAME= notification
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index c182edbf3ec5..e825d24dc6a4 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -7,6 +7,7 @@
PORTNAME= penguins
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index 268a5df435b2..47264f4b276c 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= photo
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index 9e10444b3e4e..0486749aecc3 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -7,6 +7,7 @@
PORTNAME= places
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-quickaccess/Makefile b/x11-wm/e17-module-quickaccess/Makefile
index 5c78136d2531..6a81c84b1806 100644
--- a/x11-wm/e17-module-quickaccess/Makefile
+++ b/x11-wm/e17-module-quickaccess/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quickaccess
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 0c1489a9875f..d08f690a3540 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rain
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 2c92e6471634..57138a663c62 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= screenshot
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 4831a60f27a7..31ca49f1904e 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= slideshow
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index f4a1aeb8d72d..83f147fe5f95 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snow
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index 8c51d7f7d6f0..c64894b9efe5 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= taskbar
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index d8b38b3124bf..cc519b9d03bb 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tclock
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-tiling/Makefile b/x11-wm/e17-module-tiling/Makefile
index 1d8b65278513..208cf7f03d7d 100644
--- a/x11-wm/e17-module-tiling/Makefile
+++ b/x11-wm/e17-module-tiling/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tiling
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 087e647c7fc4..7f7b2555d7a4 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uptime
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index cf710f877a15..80a23b7875f6 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -7,6 +7,7 @@
PORTNAME= weather
PORTVERSION= 20110129
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
diff --git a/x11-wm/e17-module-winlist-ng/Makefile b/x11-wm/e17-module-winlist-ng/Makefile
index 9bfd8d575f04..13a673892edf 100644
--- a/x11-wm/e17-module-winlist-ng/Makefile
+++ b/x11-wm/e17-module-winlist-ng/Makefile
@@ -7,6 +7,7 @@
PORTNAME= winlist-ng
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index b1f1b37e2ab2..d74f25aa0c22 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -8,6 +8,7 @@
PORTNAME= winselector
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index 882fe63d81c8..52e9dcf91ecb 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wlan
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/modules/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index abe068ec7076..fbf8a4e31943 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ede
PORTVERSION= 1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= SF
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index ee3c8aae1c46..1a30d255fb12 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emerald
PORTVERSION= 0.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile
index 348a46e31dc4..f52e2d6d16bb 100644
--- a/x11-wm/enlightenment-docs/Makefile
+++ b/x11-wm/enlightenment-docs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment-docs
PORTVERSION= 0.16.8.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= SF/enlightenment/e16-docs/${PORTVERSION}
DISTNAME= e16-docs-${PORTVERSION}
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 8b003df59e78..ae1d13e5612c 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.999.55225
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-wm enlightenment
MASTER_SITES= http://download.enlightenment.org/snapshots/2010-12-03/ \
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 2f7fac95cf85..9d5ce47e313e 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epplets
PORTVERSION= 0.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION}
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index e6da7bd86601..d6ba2cb84d82 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxconf
PORTVERSION= 0.9.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://devaux.fabien.free.fr/flux/
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 02a3a81f5b99..2ad6016b91e3 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flwm
PORTVERSION= 1.02
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 8aaeaa62d700..b916307084f2 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm-crystal
PORTVERSION= 3.0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://download.gna.org/fvwm-crystal/${PORTVERSION}/
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index cbf80a7c68d0..14f6729e091b 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.6.5
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -79,7 +80,7 @@ CONFIGURE_ARGS+= --disable-sm
.endif
.if !defined(WITHOUT_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --with-png-includes=${LOCALBASE}/include \
--with-png-library=${LOCALBASE}/lib
.else
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index 4a97eafaf35c..7bd195624221 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcompmgr
PORTVERSION= 0.21
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index f01aecfc8da4..2f427a2ae246 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icewm
PORTVERSION= 1.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}/
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 597c492eb611..bf46294c3d16 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jwm
PORTVERSION= 2.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= SF \
http://joewing.net/programs/jwm/releases/
@@ -15,7 +15,7 @@ MASTER_SITES= SF \
MAINTAINER= admin@mjbrune.org
COMMENT= Joe's Window Manager
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_XORG= xpm
GNU_CONFIGURE= yes
diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index 7e5e4b0ae324..0a998004eba3 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kompmgr
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index bef6c0461084..a3e389b8b2a8 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcompizconfig
PORTVERSION= 0.8.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 6a2ec345a9d4..d32d92d5b757 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= libwraster
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= libwraster from Window Maker
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index d8345400c5b9..c12760898a9c 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxsession
PORTVERSION= 0.4.6.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= SF/lxde/LXSession%20%28session%20manager%29/LXSession%20${PORTVERSION}
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index ca7bf437364c..55fa76d2cbc4 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
PORTNAME= metacity
PORTVERSION= 2.30.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 8d26c9befa28..884f5dcdda06 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mutter
PORTVERSION= 2.31.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index e21836dc39db..e243e8614b0e 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= obconf
PORTVERSION= 2.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MASTER_SITES= http://openbox.org/dist/obconf/
diff --git a/x11-wm/obmenu/Makefile b/x11-wm/obmenu/Makefile
index 856e6926c0a3..7a153616445c 100644
--- a/x11-wm/obmenu/Makefile
+++ b/x11-wm/obmenu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= obmenu
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= SF
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index dfc33ff74bd8..58946046dd8b 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openbox
PORTVERSION= 3.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://openbox.org/dist/openbox/ \
http://dougbarton.us/Downloads/
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 56143e5f72b3..d00d9b68b3d6 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pager
PORTVERSION= 0.90.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://download.tuxfamily.org/sawfishpager/
DISTNAME= sawfish-pager-${PORTVERSION}
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 108aeb8cc454..998efb214053 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pekwm
PORTVERSION= 0.1.14
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://pekwm.org/projects/3/files/
@@ -15,7 +16,7 @@ MAINTAINER= bapt@FreeBSD.org
COMMENT= Light, Unobtrusive, and configurable windowmanager
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
USE_XORG= xft xpm x11
USE_GMAKE= yes
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 80e618754953..a07cb95e04a6 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phluid
PORTVERSION= 0.0.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-wm
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index c5692c2f68b1..e11bf9f7f61c 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -9,7 +9,7 @@
PORTNAME= qlwm
PORTVERSION= 4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.alinden.mynetcologne.de/qlwm/
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 8ef981bdcf3e..b0b59db0b233 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qvwm
PORTVERSION= 1.1.12
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-wm
MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 4c151075b0bb..51559863ba24 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sawfish
PORTVERSION= 1.8.2
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= x11-wm
MASTER_SITES= http://download.tuxfamily.org/sawfish/
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index 20caf9c26494..633439e651f0 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= selectwm
PORTVERSION= 0.4.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-wm
MASTER_SITES= http://ordiluc.net/selectwm/
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index 4110ee8566ad..780ed2228438 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simple-ccsm
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index 7f5f1305eea3..80948b02cf9c 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skippy
PORTVERSION= 0.5.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-wm
MASTER_SITES= http://cdn.thegraveyard.org/releases/skippy/
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index b082ba1955b1..1cddac5889e4 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://dev.gentoo.org/~nixphoeni/ \
${MASTER_SITE_LOCAL}
@@ -36,7 +36,7 @@ OPTIONS= PNG "Enable PNG support" On \
.include <bsd.port.pre.mk>
.if defined(WITH_PNG)
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+= --disable-png
.endif
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index f75c840bff0a..2e3a7ef30521 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-wm
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 80537ade6075..d9985c7edaee 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= windowmaker
PORTVERSION= 0.95.2
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/ \
http://dougbarton.us/Downloads/
@@ -17,7 +17,7 @@ MAINTAINER= dougb@FreeBSD.org
COMMENT?= GNUstep-compliant NeXTstep window manager clone
LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib \
- png:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jbig:${PORTSDIR}/graphics/jbigkit \
tiff:${PORTSDIR}/graphics/tiff
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index ce4def995e47..5fa88a76f3ba 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wmakerconf
PORTVERSION= 2.12
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 580750950908..5a8c654b9a5f 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmanager
PORTVERSION= 0.2.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 7fd558724080..7a2d65718270 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmfs
DISTVERSION= 201104
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://wmfs.info/attachments/download/45/ \
http://cloud.github.com/downloads/xorg62/wmfs/
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 480769ff284d..c08093ff4602 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-desktop
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 982e4359f05a..cb57687b8dea 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-panel
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 78d3f46dce40..24315ca77ede 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-session
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index a1b923049a0b..75d9ce8acc10 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfwm4-${PORTVERSION}
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index e7c2976ea1bc..63776df8be8c 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= SF/desk3d/${PORTNAME}/${PORTVERSION}
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 79a4b9b75a30..4262014a8d6c 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Terminal
PORTVERSION= 0.4.8
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 6dcb0bbd7f97..aa49b22eb110 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltray
PORTVERSION= 0.70
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index bcf994b4ac3d..e3c81d9c495d 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apwal
PORTVERSION= 0.4.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://apwal.free.fr/download/
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 8f4dbcbd49cd..96c16dd571b4 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --disable-mousewheel
.if defined(WITH_BGIMG)
LIB_DEPENDS+= AfterImage.0:${PORTSDIR}/graphics/libafterimage \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
CONFIGURE_ARGS+= --with-afterimage-config --with-png --with-jpeg
.else
diff --git a/x11/avant-window-navigator-gnome/Makefile b/x11/avant-window-navigator-gnome/Makefile
index 089fd097a945..a6dd37302b45 100644
--- a/x11/avant-window-navigator-gnome/Makefile
+++ b/x11/avant-window-navigator-gnome/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
AWN_DESKTOP= gnome
MASTERDIR= ${.CURDIR}/../avant-window-navigator
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 440ba98aca2c..33e4360cf3d5 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avant-window-navigator
PORTVERSION= 0.3.2.1
-PORTREVISION?= 7
+PORTREVISION?= 8
CATEGORIES= x11
MASTER_SITES= http://launchpadlibrarian.net/26374006/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index 5bcf6fe37731..9caca70b5756 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbdock
PORTVERSION= 0.2.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://bbdock.nethence.com/download/
@@ -15,10 +16,11 @@ COMMENT= An application launcher for Blackbox-like window manager
LICENSE= BSD
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_XORG= x11
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
PORTDOCS= README
PLIST_FILES= bin/bbdock
diff --git a/x11/bbdock/files/patch-Slot.cc b/x11/bbdock/files/patch-Slot.cc
new file mode 100644
index 000000000000..5ddeebaad37c
--- /dev/null
+++ b/x11/bbdock/files/patch-Slot.cc
@@ -0,0 +1,10 @@
+--- src/Slot.cc.orig 2011-03-29 21:48:36.000000000 +0200
++++ src/Slot.cc 2012-05-06 10:01:10.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include <string>
+
+ #include "Slot.hh"
++#include "pngpriv.h"
+
+ extern char **environ;
+
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index 30fef53bf759..915a35dcecc9 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbrun
PORTVERSION= 1.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index 4993561ef71f..6eb7818ebab1 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bgrot
PORTVERSION= 1.30
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://www.over-yonder.net/~fullermd/projects/bgrot/ \
http://distfiles.over-yonder.net/bgrot/
diff --git a/x11/bgs/Makefile b/x11/bgs/Makefile
index c84138fb40e6..985d10bf279b 100644
--- a/x11/bgs/Makefile
+++ b/x11/bgs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bgs
PORTVERSION= 0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://s01.de/~gottox/files/bgs/ \
http://laffaye.free.fr/distfiles/
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index d980bf83436a..1db06988181f 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brightside
PORTVERSION= 1.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= LOCAL/marcus
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index e38812ba1e8a..ce57f2d92cdf 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= decurs
PORTVERSION= 0.55.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= http://freebsd.nsu.ru/distfiles/ \
#http://varg.dyndns.org/psi/files/
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 1fee5b40bcb3..2059e93be038 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dgs
PORTVERSION= 0.5.9.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ../old-gnu/dgs
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= A display ghostscript system
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_GHOSTSCRIPT_RUN= yes
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index d58141fb2668..5af1e5bc85eb 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eaglemode
PORTVERSION= 0.82.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Futuristic zoomable user environment
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index 9e7246be5ee1..36aadf6fbae5 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emprint
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11 enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 2adffaa0832d..f837ce4ff083 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= E-Run
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kbyanc
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 31b464868f85..7f980971a629 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES+= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
DISTNAME= Eterm-${PORTVERSION}
diff --git a/x11/evilvte/Makefile b/x11/evilvte/Makefile
index 3d6474bebb4b..e9c4fad1a9a5 100644
--- a/x11/evilvte/Makefile
+++ b/x11/evilvte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= evilvte
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.calno.com/${PORTNAME}/ \
LOCAL/glarkin
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 7791119678fe..4e03ea831f48 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbdesk
PORTVERSION= 1.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
GENTOO/distfiles
@@ -17,7 +17,7 @@ COMMENT= A Fluxbox utility to create and manage icons on the desktop
LICENSE= MIT
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS_DEFINE= IMLIB2 DOCS
OPTIONS_DEFAULT= IMLIB2
diff --git a/x11/fbdesk/files/patch-ImagePNG.cc b/x11/fbdesk/files/patch-ImagePNG.cc
index 40c49462c946..28de77bce3b4 100644
--- a/x11/fbdesk/files/patch-ImagePNG.cc
+++ b/x11/fbdesk/files/patch-ImagePNG.cc
@@ -1,6 +1,14 @@
--- src/FbTk/ImagePNG.cc.orig 2004-09-20 16:04:11.000000000 +0200
-+++ src/FbTk/ImagePNG.cc 2010-03-29 21:44:37.000000000 +0200
-@@ -88,7 +88,7 @@
++++ src/FbTk/ImagePNG.cc 2012-05-06 09:59:07.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "PixmapWithMask.hh"
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <cstdio>
+ #include <iostream>
+ using namespace std;
+@@ -88,7 +89,7 @@
// check header
unsigned char tag[4];
fread(tag, 1, 4, fp);
@@ -9,3 +17,12 @@
fclose(fp);
return 0;
}
+@@ -102,7 +103,7 @@
+ return 0;
+ }
+
+- if (setjmp(png.png()->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png.png()))) {
+ fclose(fp);
+ return 0;
+ }
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 1db38089eaa9..d4a3c36fdfc5 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbpanel
PORTVERSION= 6.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
EXTRACT_SUFX= .tbz2
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index f7a9a3437e31..440c994084b1 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= florence
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/florence/florence/${PORTVERSION}
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index 68ed30591e60..629450cdba65 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbg
PORTVERSION= 0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index bc0bd715c90e..75c3fd585d4c 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcb
PORTVERSION= 0.2.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://freebsd.flatrate.ru/distfiles/ \
http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index 64a5ee3afb8e..0d2d5bdbc0f2 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tasklist
PORTVERSION= 0.10
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4a14618805e1..e5a702086f78 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gdm
PORTVERSION= 2.30.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index ed25ab252486..db13d305d78d 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmrun
PORTVERSION= 0.9.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 17d90546f04b..ad16bdd1887a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-applets
PORTVERSION= 2.32.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 4a5f538058c8..0d47297495b1 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-clipboard-daemon
PORTVERSION= 1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 1762fcc7e830..49049ea98a29 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 26a363f05bef..1d163b2380ad 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-libs
PORTVERSION= 1.4.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES?= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -17,6 +17,7 @@ MAINTAINER?= gnome@FreeBSD.org
COMMENT= Libraries for GNOME, a GNU desktop environment
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
@@ -29,7 +30,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-test-gnome
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \
gnome-doc.1 gnome-dump-metadata.1 gnome-gen-mimedb.1 \
diff --git a/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c
new file mode 100644
index 000000000000..d3c6f8bbcb0d
--- /dev/null
+++ b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c
@@ -0,0 +1,28 @@
+--- gtk-xmhtml/readPNG.c.orig 2002-08-06 23:25:46.000000000 +0200
++++ gtk-xmhtml/readPNG.c 2012-05-11 18:06:35.000000000 +0200
+@@ -158,6 +158,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+ #include <math.h> /* required for full alpha channel processing */
+ #endif
+@@ -208,7 +209,7 @@
+
+ _XmHTMLWarning(__WFUNC__(NULL, "png_error"),
+ "libpng error on image %s: %s", ib->file, msg);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /*****
+@@ -308,7 +309,7 @@
+ return((XmHTMLRawImageData*)NULL);
+ }
+ /* now set error handler */
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ /*
+ * PNG signalled an error. Destroy image data, free any allocated
diff --git a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
index 029d3bfffa9c..8307927f80b6 100644
--- a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
+++ b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
@@ -1,6 +1,23 @@
--- tools/convertrgb/loadpng.c.orig 1998-09-25 17:33:59.000000000 +0200
-+++ tools/convertrgb/loadpng.c 2010-03-29 09:05:19.000000000 +0200
-@@ -161,7 +161,7 @@
++++ tools/convertrgb/loadpng.c 2012-05-09 13:02:52.000000000 +0200
+@@ -3,6 +3,7 @@
+ */
+
+ #include "convertrgb.h"
++#include "pngpriv.h"
+
+ static int transp;
+
+@@ -29,7 +30,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+@@ -161,7 +162,7 @@
return 0;
fread(buf, 1, 8, f);
fclose(f);
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index bc2d84c50678..96b627b3a43f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-panel
PORTVERSION= 2.32.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index e23121595bd5..65dd6f4ef497 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-screensaver
PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 73a300af4c01..fe3650ca17ad 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-session
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index 1fcc595ae40c..f32811ab5115 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-swallow
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://interreality.org/~tetron/technology/swallow/
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 46d3e465f79b..64a9b5285f3c 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-terminal
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index ba08fa1f70d7..d46aeaac0db4 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -fifth-toe
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 7177cf1c62e0..b7a46f346aae 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gromit
PORTVERSION= 20041213
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index ecaacf1b750d..40aa439d48bb 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.9
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gsynaptics/21527
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index e1bdcf2a0cfb..24dbc9a70004 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-theme-switch
DISTVERSION= 2.0.0rc2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 8471a21f2057..05c0d7521e58 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkchtheme
PORTVERSION= 0.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/
DISTNAME= gtk-chtheme-${PORTVERSION}
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 9821c0e14e41..ac6e93c7379e 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkterm2
PORTVERSION= 0.2.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= SF/gtkterm/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index b1a9885b7a1a..7f1258fbf375 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtstarter
PORTVERSION= 0.4.6.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index bfabce8a8813..3056d9de9ce0 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hotwire-shell
PORTVERSION= 0.721
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index a4e5c8351e4f..9059f71c7ebf 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= i3lock
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://i3wm.org/${PORTNAME}/ \
http://mirror.4bit.ws/ \
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index a515250dde6f..f4cd83883bfd 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= idesk
PORTVERSION= 0.7.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index b74de86ba811..ae1e5b018500 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipager
PORTVERSION= 1.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= http://useperl.ru/ipager/src/
DISTNAME= ipager-${PORTVERSION}
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index e8abf6c96d0d..da7449dac8ff 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-baseapps
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 5d96b80d0131..6603742f86f8 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7cf42be57ca7..33adda3825d8 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE_kde} \
${MASTER_SITE_LOCAL} \
@@ -32,7 +33,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
kactivities.6:${PORTSDIR}/x11/kactivities
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index e5fafc95e85c..112ebf5fe4a1 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 7b5f8dbd161b..c492210337f1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 04fac5d2f209..4748829a0ab1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -23,7 +24,7 @@ LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
avahi-core.7:${PORTSDIR}/net/avahi-app \
enchant.1:${PORTSDIR}/textproc/enchant \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
hal.1:${PORTSDIR}/sysutils/hal \
qca.2:${PORTSDIR}/devel/qca \
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 64457395bc70..9accb6a433df 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keybinder
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://kaizer.se/publicfiles/${PORTNAME}/
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index 6cce05b1f974..30ca0ef5aab4 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keyboardcast
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://desrt.mcmaster.ca/code/keyboardcast/
diff --git a/x11/keynav/Makefile b/x11/keynav/Makefile
index 5ff5349f757c..e552da45f036 100644
--- a/x11/keynav/Makefile
+++ b/x11/keynav/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keynav
DISTVERSION= 0.20110708.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://semicomplete.googlecode.com/files/
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index 41432131a9e6..911b615d1228 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kgamma
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 9a600741d19e..18cc1e686181 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -6,6 +6,7 @@
PORTNAME= konsole
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index efb42fb413f8..b04328a2c801 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libexo
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= exo-${PORTVERSION}
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 7ab8954814ff..81aba7b86dfb 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libfm
PORTVERSION= 0.1.17
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 07c4f50bba55..68eb99010b16 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnome-java
PORTVERSION= 2.12.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 12c4878055f5..f22b01f77c9b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnome
PORTVERSION= 2.32.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 9aac3868fb29..5e79cd673c30 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomekbd
PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 18b94006f9dc..0611dc1f1ab4 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.0.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 gnome
MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6f44f03afaf5..ea3ebbc43199 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.30.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 59938edff7ef..8729cac23d12 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxfce4menu
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= libxfce4ui-${PORTVERSION}
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index ee4538c267ce..94dc5d5380f8 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lxpanel
PORTVERSION= 0.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index a50363b83472..627f7498fa3d 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -7,7 +7,7 @@
PORTNAME= menu-cache
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index c2211f54f3b4..844ea3aa9aea 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metalock
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= BERLIOS GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index 44c7d07db9ff..6ef2d0310303 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metisse
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/metisse/
@@ -17,12 +18,13 @@ LICENSE= GPLv3
CONFLICTS= fvwm-1.* fvwm-2.5.*
-LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo
+LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo \
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts
MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
diff --git a/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c b/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c
new file mode 100644
index 000000000000..908412dbccbd
--- /dev/null
+++ b/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c
@@ -0,0 +1,10 @@
+--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 13:52:20.000000000 +0100
++++ fvwm-insitu/libs/PictureImageLoader.c 2012-05-22 07:28:06.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include "Fgdk-pixbuf.h"
+ #include "FRenderInit.h"
+ #include "FImage.h"
++#include "pngpriv.h"
+
+ /* ---------------------------- local definitions -------------------------- */
+ #define FIMAGE_CMD_ARGS Display *dpy, Window win, char *path, \
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index c586aff642eb..4421f8c87ccf 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mlterm
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 52140a9fa251..f4d006588aaa 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrxvt-devel
PORTVERSION= 0.5.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION}
DISTNAME= mrxvt-${PORTVERSION}
@@ -75,7 +75,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
.if defined(WITHOUT_PNG) || defined(WITHOUT_BACKGROUND)
CONFIGURE_ARGS+= --disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_TRANSPARENCY)
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 29e819775fe7..f579ed3f278c 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrxvt
PORTVERSION= 0.4.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}
EXTRACT_SUFX= .tgz
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tabbed version of rxvt
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= mrxvt-0.5.*
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 64f23c5b6f89..33b5fdff0153 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= SF/multignometerm/multignometerm/mgt-${PORTVERSION}
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index e378ecaad987..da977006768c 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nvidia-settings
PORTVERSION= 295.40
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
ftp://download1.nvidia.com/XFree86/nvidia-settings/
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 3a9d38c6af4d..dc9e8e11fbb8 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs
PORTVERSION= 2.0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index ce6563bcb309..de18cfdd5288 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs2
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/ \
http://download2.berlios.de/segfaultskde/ \
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index b0a20511c527..dd774ac12a11 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= peeper
PORTVERSION= 0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= http://peeper.sourceforge.net/
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 9ccc4bb7d238..640728450fdb 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -7,6 +7,7 @@
PORTNAME= plasma-scriptengine-python
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index b64df6f3419a..6332f82fb75f 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -7,6 +7,7 @@
PORTNAME= plasma-scriptengine-ruby
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index cbaad3d02c2c..5d11254b7a70 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= powershell
PORTVERSION= 0.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 3dd0e2bd5748..3cba32608da1 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= opengl
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11 devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 460a7198e560..3ce4299a4712 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qimageblitz
PORTVERSION= 0.0.6
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}
diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile
index 025f56393b59..4f06486ad20d 100644
--- a/x11/qt4-graphicssystems-opengl/Makefile
+++ b/x11/qt4-graphicssystems-opengl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graphicssystems
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -opengl
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index ef8f2ff8274e..211dafb87341 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,6 +8,7 @@
PORTNAME= inputmethods
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 8c733042cc92..b049e02f321f 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,6 +8,7 @@
PORTNAME= opengl
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 9b1a9fbf3328..7a83ed5050f3 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-wallpaper
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/rox/Wallpaper/${PORTVERSION}
DISTNAME= Wallpaper-${PORTVERSION}
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index 40bec7fde214..57fc69741b10 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= roxbg
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 deskutils
MASTER_SITES= http://vvelox.net/programs/unix/x11/
EXTRACT_SUFX=
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 8b4877aa88ff..9553aa28b2a1 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= roxterm
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 4eaaf8ea14b6..6a1923d12d8a 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rsibreak
DISTVERSION= 0.11-beta1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/files/
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 204fba5bcf52..0dff622f1d27 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rsibreak
PORTVERSION= 0.8.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/files/
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 3b3af817c80f..b63ada9ade19 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rxvt-unicode
PORTVERSION= 9.15
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
MASTER_SITE_SUBDIR= . Attic
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index fb69117e0e05..20a5a59dcda2 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silo
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= http://doublef.nm.ru/silo/sources/
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 8d03e273653c..623947f1a70b 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simdock
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index dad85ffdf93a..2aefc3f073ff 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sisctrl
PORTVERSION= 0.0.20051202
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://www.winischhofer.net/sis/
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 639148312d0b..6534ffa3d36a 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slim
PORTVERSION= 1.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
http://depot.fsck.ch/mirror/distfiles/
@@ -17,7 +17,7 @@ MAINTAINER= henry.hu.sh@gmail.com
COMMENT= Graphical login manager for X11, derived from Login.app
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2 \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/x11/slim/files/patch-png.c b/x11/slim/files/patch-png.c
new file mode 100644
index 000000000000..06b60c641b5b
--- /dev/null
+++ b/x11/slim/files/patch-png.c
@@ -0,0 +1,11 @@
+--- png.c.orig 2010-07-08 07:04:10.000000000 +0200
++++ png.c 2012-05-06 10:02:42.000000000 +0200
+@@ -57,7 +57,7 @@
+ return(0);
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ fclose(infile);
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index e261b0a81505..d60e928af2c1 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stjerm
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://stjerm-terminal.googlecode.com/files/
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index fe714b83c845..c847317057ae 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= terminator
PORTVERSION= 0.96
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 python
MASTER_SITES= http://launchpadlibrarian.net/80778747/ \
http://hur.st/mirror/terminator/
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 69cb3e727859..a7e9eb239a8d 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tilda
PORTVERSION= 0.9.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index e14394084f4e..78d88bb258d8 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tint2
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/x11/trayer-srg/Makefile b/x11/trayer-srg/Makefile
index 273cd2223260..4ed276714f05 100644
--- a/x11/trayer-srg/Makefile
+++ b/x11/trayer-srg/Makefile
@@ -8,6 +8,7 @@
PORTNAME= trayer
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= -srg
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index fe8052231053..d21546808e77 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= trayer
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/t/trayer
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 3d1a1a708933..70bf9a9ab8b2 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wbar
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index 6331894396df..bc26552290e2 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wbarconf
PORTVERSION= 0.7.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.ihku.biz/wbarconf/
DISTNAME= wbarconf-${PORTVERSION}
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index a18d2b2296b8..87362af9bd1d 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wdm
PORTVERSION= 1.28
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/:wdm \
http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index a00538cfcd11..37fdbcf8e6ad 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmblob
PORTVERSION= 1.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.dockapps.org/files/155/541/
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index d02a3613a960..461d586b9c8f 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmcliphist
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://linux.nawebu.cz/wmcliphist/ \
${MASTER_SITE_LOCAL}
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 7f996fac43d2..91f57eccadac 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wmdrawer
PORTVERSION= 0.10.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 windowmaker
MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
http://wikitest.freebsd.org/wiki/common/:pixmap
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 88309bb5c81c..8ddaa007ee99 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= workrave
PORTVERSION= 1.9.4
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index 685a0ce830e6..a83fdd2602e5 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -8,14 +8,14 @@
PORTNAME= xautomation
PORTVERSION= 1.03
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://hoopajoo.net/static/projects/
MAINTAINER= ports@FreeBSD.org
COMMENT= Control X from the command line for scripts
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_XORG= xtst
GNU_CONFIGURE= yes
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index f6d5aa870fb3..7e5f3b2b1bc2 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcursorgen
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -14,7 +15,7 @@ COMMENT= Create an X cursor file from a collection of PNG images
LICENSE= MIT
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
XORG_CAT= app
USE_XORG= x11 xcursor xextproto
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 0fe05cef53a6..4f0f170c6fc7 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 12b48478788e..8657ccfb646e 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-conf
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfconf-${PORTVERSION}
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 776f948b8e49..88f55663306b 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index dba4da194015..5b23c0264290 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/xfce4-screenshooter/${PORTVERSION:R}
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 45b992d63078..6dae3857a993 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 8db32274825f..eec56f090232 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= verve-plugin
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 8a7a95a1255c..60d740e95846 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://www.ibh.de/~ellguth/develop/
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 2f47427204d6..5af1162b2b0e 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 1fa0e55b2ad8..fc9eb40680cd 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xloadimage
PORTVERSION= 4.1.17
+PORTREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/:x11 \
${MASTER_SITE_DEBIAN_POOL}
@@ -18,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X11 Image Loading Utility
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
LICENCE= MIT
diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile
index 4a4611afe9d8..c471a7ef1302 100644
--- a/x11/xorg-edit/Makefile
+++ b/x11/xorg-edit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-edit
PORTVERSION= 07.08.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 1a4f40cc9024..984bccbf7235 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xpra
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index 610895bf458d..7f7afc08829e 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xscreensaver-gnome-hacks
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= gnome@FreeBSD.org
COMMENT= Screensaver modules for use with xscreensaver and gnome-screensaver
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 360dd0d4601a..a6f6e12623f6 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= xscreensaver-gnome
PORTVERSION= 5.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 862716328ee2..23801873862e 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xscreensaver-kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3f4af317f7f0..2ca6f780d664 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.15
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 3c9c2baf3ab3..e2c453a9fa21 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xvattr
PORTVERSION= 1.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ \
http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 412de469b62b..fa07270b9b8b 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.9.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index cb0b8d598803..5e91e661bfc6 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.8.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 kde
MASTER_SITES= BERLIOS
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index 122133e6f331..27c1f8174586 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yalias
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://offog.org/files/ \
ftp://ftp.i-scream.org/pub/offog.org/files/ \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 2588c6cd4597..b3843967b838 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= yelp
PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 1705efbc3bea..273742fdd6a6 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zenity
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2