summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/beast/Makefile2
-rw-r--r--audio/easytag-devel/Makefile10
-rw-r--r--audio/easytag-devel/distinfo6
-rw-r--r--audio/easytag-devel/pkg-descr2
-rw-r--r--audio/easytag-devel/pkg-plist1
-rw-r--r--audio/easytag/Makefile35
-rw-r--r--audio/easytag/distinfo6
-rw-r--r--audio/easytag/pkg-descr10
-rw-r--r--audio/easytag/pkg-plist17
-rw-r--r--audio/gnomoradio/Makefile2
-rw-r--r--audio/solfege/Makefile11
-rw-r--r--audio/solfege/distinfo6
-rw-r--r--audio/solfege/pkg-plist22
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--devel/pharmacy/Makefile10
-rw-r--r--devel/pharmacy/distinfo6
-rw-r--r--devel/pharmacy/pkg-descr3
-rw-r--r--devel/pharmacy/pkg-plist6
-rw-r--r--games/gnmm/files/patch-gnmm.cc11
-rw-r--r--games/gnomememoryblocks/Makefile1
-rw-r--r--games/wesnoth/Makefile4
-rw-r--r--games/wesnoth/distinfo6
-rw-r--r--games/wesnoth/pkg-plist8
-rw-r--r--japanese/stardict2-dict-ja/Makefile2
-rw-r--r--misc/pybliographer/Makefile2
-rw-r--r--multimedia/gmencoder/Makefile4
-rw-r--r--multimedia/gnome-subtitles/Makefile5
-rw-r--r--multimedia/gnome-subtitles/distinfo6
-rw-r--r--multimedia/gnome-subtitles/pkg-descr6
-rw-r--r--multimedia/gnome-subtitles/pkg-plist10
-rw-r--r--multimedia/kino/Makefile4
-rw-r--r--multimedia/kino/distinfo6
-rw-r--r--multimedia/kino/pkg-plist1
-rw-r--r--multimedia/xmps/Makefile2
-rw-r--r--net/liferea/Makefile4
-rw-r--r--net/liferea/distinfo6
-rw-r--r--textproc/meld/Makefile1
-rw-r--r--www/kazehakase/Makefile4
38 files changed, 158 insertions, 92 deletions
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 4d4e42c8b..c5352c62d 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beast
PORTVERSION= 0.6.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= ftp://beast.gtk.org/pub/beast/v0.6/ \
http://beast.gtk.org/beast-ftp/v0.6/
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 51905d152..f98de06e7 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= easytag
-PORTVERSION= 2.1
-PORTREVISION= 2
+PORTVERSION= 2.1.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -39,4 +39,10 @@ CONFIGURE_ARGS+= --enable-wavpack
CONFIGURE_ARGS+= --disable-wavpack
.endif
+.if defined(WITHOUT_ID3V23)
+CONFIGURE_ARGS+= --disable-id3v23
+.else
+LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag
+.endif
+
.include <bsd.port.mk>
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index efbf60955..c2f281205 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (easytag-2.1.tar.bz2) = a585cb9e400ba460ec1801856ea5e90f
-SHA256 (easytag-2.1.tar.bz2) = 8903771d33795d0e65c2ee6e7f09709c280cc1ae5878c20a201d7a4b06ff57e5
-SIZE (easytag-2.1.tar.bz2) = 2924032
+MD5 (easytag-2.1.2.tar.bz2) = 4b741e8ddf809d989a012d20a5a969aa
+SHA256 (easytag-2.1.2.tar.bz2) = 921d3a4011d91eedbe3b4c7a99d13dba8f1c79f13b9048154a30e86bdb7a43d1
+SIZE (easytag-2.1.2.tar.bz2) = 2954397
diff --git a/audio/easytag-devel/pkg-descr b/audio/easytag-devel/pkg-descr
index 2f70e57be..49c4fd9c9 100644
--- a/audio/easytag-devel/pkg-descr
+++ b/audio/easytag-devel/pkg-descr
@@ -1,8 +1,6 @@
EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, Ogg
Vorbis, MusePack and Monkey's Audio files.
-The big new feature of this development version is GTK2 support.
-
Features:
- Auto tagging: parse filename and directory to complete automatically the
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index a3a61dbe8..3e9cc30ba 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -10,6 +10,7 @@ share/locale/de/LC_MESSAGES/easytag.mo
share/locale/el/LC_MESSAGES/easytag.mo
share/locale/es/LC_MESSAGES/easytag.mo
share/locale/fr/LC_MESSAGES/easytag.mo
+share/locale/he/LC_MESSAGES/easytag.mo
share/locale/hu/LC_MESSAGES/easytag.mo
share/locale/it/LC_MESSAGES/easytag.mo
share/locale/ja/LC_MESSAGES/easytag.mo
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index f9d7b6e97..b4377f93d 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,34 +1,41 @@
-# ex:ts=8
-# New ports collection makefile for: easytag
-# Date created: May 17, 2001
-# Whom: ijliao
+# New ports collection makefile for: easytag-devel
+# Date created: 15 Feb 2005
+# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= easytag
-PORTVERSION= 1.1
-PORTREVISION= 5
+PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= wxs@atarininja.org
-COMMENT= Tag editor for MP3 and OGG files
+MAINTAINER= novel@FreeBSD.org
+COMMENT= GTK2 Tag editor for MP3 and OGG files
-LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
- vorbis.4:${PORTSDIR}/audio/libvorbis \
- FLAC.7:${PORTSDIR}/audio/flac
+LIB_DEPENDS= id3:${PORTSDIR}/audio/id3lib \
+ vorbis:${PORTSDIR}/audio/libvorbis \
+ FLAC:${PORTSDIR}/audio/flac \
+ mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
MAN1= easytag.1
CONFLICTS= easytag-devel-[0-9]*
USE_BZIP2= yes
+USE_XLIB= yes
USE_GETTEXT= yes
-USE_GNOME= gtk12
+USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CONFIG_SHELL="${SH}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
LDFLAGS="-L${LOCALBASE}/lib"
+.if defined(WITH_WAVPACK)
+LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
+CONFIGURE_ARGS+= --enable-wavpack
+.else
+CONFIGURE_ARGS+= --disable-wavpack
+.endif
+
.include <bsd.port.mk>
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index ccf842286..efbf60955 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,3 +1,3 @@
-MD5 (easytag-1.1.tar.bz2) = c334c286f649a12e6bd0d3a4e4ac60c4
-SHA256 (easytag-1.1.tar.bz2) = 47bada1fc6a919abbb9061580dce19984a651f5d3e9a1f2e1f0cdcc6e3938fbc
-SIZE (easytag-1.1.tar.bz2) = 1112302
+MD5 (easytag-2.1.tar.bz2) = a585cb9e400ba460ec1801856ea5e90f
+SHA256 (easytag-2.1.tar.bz2) = 8903771d33795d0e65c2ee6e7f09709c280cc1ae5878c20a201d7a4b06ff57e5
+SIZE (easytag-2.1.tar.bz2) = 2924032
diff --git a/audio/easytag/pkg-descr b/audio/easytag/pkg-descr
index d6b8601ca..2f70e57be 100644
--- a/audio/easytag/pkg-descr
+++ b/audio/easytag/pkg-descr
@@ -1,12 +1,14 @@
EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, Ogg
Vorbis, MusePack and Monkey's Audio files.
+The big new feature of this development version is GTK2 support.
+
Features:
- Auto tagging: parse filename and directory to complete automatically the
-fields (using masks),
+ fields (using masks),
- Ability to rename files from the tag (using masks) or by loading a text
-file,
+ file,
- Process selected files of the selected directory,
- Ability to browse subdirectories,
- Recursion for tagging, removing, renaming, saving...,
@@ -15,10 +17,10 @@ file,
- Auto completion of the date if a partial is entered,
- Undo and redo last changes,
- Ability to process fields of tag and file name (convert letters into
-uppercase, downcase, ...),
+ uppercase, downcase, ...),
- CDDB support (from http protocol),
- A playlist generator window,
- French, German, Russian, Dutch, Hungarian, Swedish, Italian, Japanese,
-Ukrainian, Czech, Spanish, Polish and Romanian translation languages,
+ Ukrainian, Czech, Spanish, Polish and Romanian translations
WWW: http://easytag.sourceforge.net
diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist
index 9a49db16d..a3a61dbe8 100644
--- a/audio/easytag/pkg-plist
+++ b/audio/easytag/pkg-plist
@@ -1,10 +1,13 @@
bin/easytag
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/EasyTAG_logo.xpm
share/applications/easytag.desktop
+share/easytag/ChangeLog
+share/easytag/EasyTAG_logo.xpm
+share/pixmaps/EasyTAG.xpm
+share/locale/bg/LC_MESSAGES/easytag.mo
share/locale/cs/LC_MESSAGES/easytag.mo
share/locale/da/LC_MESSAGES/easytag.mo
share/locale/de/LC_MESSAGES/easytag.mo
+share/locale/el/LC_MESSAGES/easytag.mo
share/locale/es/LC_MESSAGES/easytag.mo
share/locale/fr/LC_MESSAGES/easytag.mo
share/locale/hu/LC_MESSAGES/easytag.mo
@@ -12,12 +15,12 @@ share/locale/it/LC_MESSAGES/easytag.mo
share/locale/ja/LC_MESSAGES/easytag.mo
share/locale/nl/LC_MESSAGES/easytag.mo
share/locale/pl/LC_MESSAGES/easytag.mo
+share/locale/pt_BR/LC_MESSAGES/easytag.mo
share/locale/ro/LC_MESSAGES/easytag.mo
share/locale/ru/LC_MESSAGES/easytag.mo
share/locale/sv/LC_MESSAGES/easytag.mo
share/locale/uk/LC_MESSAGES/easytag.mo
-share/pixmaps/EasyTAG.xpm
-@dirrmtry share/apps/Multimedia
-@dirrmtry share/apps
-@dirrmtry share/gnome
-@dirrm %%DATADIR%%
+share/locale/zh_CN/LC_MESSAGES/easytag.mo
+@dirrm share/easytag
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 9a5070ffd..288c3e451 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomoradio
PORTVERSION= 0.15.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 863408879..6dc9da329 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -4,15 +4,14 @@
# Whom: ijliao
#
# $FreeBSD$
-# $MCom: ports/audio/solfege/Makefile,v 1.4 2007/06/29 22:55:02 mezz Exp $
+# $MCom: ports/audio/solfege/Makefile,v 1.5 2007/07/23 16:29:56 mezz Exp $
#
PORTNAME= solfege
-PORTVERSION= 3.8.1
+PORTVERSION= 3.9.0
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMESUFFIX= -nosound
MAINTAINER= ports@FreeBSD.org
@@ -54,6 +53,10 @@ post-patch:
@${RM} ${WRKSRC}/lesson-files/bin/csound-play-harmonic-interval.sh.orig
@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
${REINPLACE_CMD} -e 's|/usr/bin/python|${SETENV} python|g'
+.for file in lessonfile_editor.py.in run-solfege.py.in
+ @${REINPLACE_CMD} -e 's|share", "solfege|share", "gnome", "solfege|g' \
+ ${WRKSRC}/${file}
+.endfor
@${REINPLACE_CMD} -e 's|type=sequencer-device|type=fake-synth|g ; \
s|/usr/bin|${LOCALBASE}/bin|g' ${WRKSRC}/default.config
@${REINPLACE_CMD} -e 's|(datadir)/locale|(prefix)/share/locale|g' \
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index c5029a4f4..778cff924 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.8.1.tar.gz) = 885e23715073f652a6a96a5b7ea2d36e
-SHA256 (solfege-3.8.1.tar.gz) = ab8f35ddae577696b415ea450cbaa26b94aab9d73867192ad5cc82a836b889f6
-SIZE (solfege-3.8.1.tar.gz) = 2395107
+MD5 (solfege-3.9.0.tar.gz) = bff86e7f7adce3bf6c42235ecc3efe81
+SHA256 (solfege-3.9.0.tar.gz) = 19bb0b2b107d2d6e3008d3067241ad0f2ce4b7d797b4b7c0744669c47bb7951a
+SIZE (solfege-3.9.0.tar.gz) = 2428917
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 1d4dfd5d1..6ce4a9732 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -141,6 +141,7 @@ share/solfege/help/C/chord.html
share/solfege/help/C/compareintervals-module.html
share/solfege/help/C/dictation-module.html
share/solfege/help/C/dictation.html
+share/solfege/help/C/ear-training-test-printout-editor.html
share/solfege/help/C/elembuilder-module.html
share/solfege/help/C/elembuilder.html
share/solfege/help/C/extending-solfege.html
@@ -191,8 +192,8 @@ share/solfege/help/C/ly/theory-intervals-seconds.png
share/solfege/help/C/ly/theory-intervals-sevenths.png
share/solfege/help/C/ly/theory-intervals-sixths.png
share/solfege/help/C/ly/theory-intervals-thirds.png
+share/solfege/help/C/melodicinterval-module.html
share/solfege/help/C/melodicinterval.html
-share/solfege/help/C/melodicintervals-module.html
share/solfege/help/C/midi-instrument-names.html
share/solfege/help/C/music-theory.html
share/solfege/help/C/nameinterval-module.html
@@ -223,6 +224,7 @@ share/solfege/help/fr/chord.html
share/solfege/help/fr/compareintervals-module.html
share/solfege/help/fr/dictation-module.html
share/solfege/help/fr/dictation.html
+share/solfege/help/fr/ear-training-test-printout-editor.html
share/solfege/help/fr/elembuilder-module.html
share/solfege/help/fr/elembuilder.html
share/solfege/help/fr/extending-solfege.html
@@ -257,8 +259,8 @@ share/solfege/help/fr/idtone.html
share/solfege/help/fr/index.html
share/solfege/help/fr/inverting-intervals.html
share/solfege/help/fr/lesson-files.html
+share/solfege/help/fr/melodicinterval-module.html
share/solfege/help/fr/melodicinterval.html
-share/solfege/help/fr/melodicintervals-module.html
share/solfege/help/fr/midi-instrument-names.html
share/solfege/help/fr/music-theory.html
share/solfege/help/fr/nameinterval-module.html
@@ -289,6 +291,7 @@ share/solfege/help/no/chord.html
share/solfege/help/no/compareintervals-module.html
share/solfege/help/no/dictation-module.html
share/solfege/help/no/dictation.html
+share/solfege/help/no/ear-training-test-printout-editor.html
share/solfege/help/no/elembuilder-module.html
share/solfege/help/no/elembuilder.html
share/solfege/help/no/extending-solfege.html
@@ -323,8 +326,8 @@ share/solfege/help/no/idtone.html
share/solfege/help/no/index.html
share/solfege/help/no/inverting-intervals.html
share/solfege/help/no/lesson-files.html
+share/solfege/help/no/melodicinterval-module.html
share/solfege/help/no/melodicinterval.html
-share/solfege/help/no/melodicintervals-module.html
share/solfege/help/no/midi-instrument-names.html
share/solfege/help/no/music-theory.html
share/solfege/help/no/nameinterval-module.html
@@ -355,6 +358,7 @@ share/solfege/help/pt_BR/chord.html
share/solfege/help/pt_BR/compareintervals-module.html
share/solfege/help/pt_BR/dictation-module.html
share/solfege/help/pt_BR/dictation.html
+share/solfege/help/pt_BR/ear-training-test-printout-editor.html
share/solfege/help/pt_BR/elembuilder-module.html
share/solfege/help/pt_BR/elembuilder.html
share/solfege/help/pt_BR/extending-solfege.html
@@ -388,8 +392,8 @@ share/solfege/help/pt_BR/idtone.html
share/solfege/help/pt_BR/index.html
share/solfege/help/pt_BR/inverting-intervals.html
share/solfege/help/pt_BR/lesson-files.html
+share/solfege/help/pt_BR/melodicinterval-module.html
share/solfege/help/pt_BR/melodicinterval.html
-share/solfege/help/pt_BR/melodicintervals-module.html
share/solfege/help/pt_BR/midi-instrument-names.html
share/solfege/help/pt_BR/music-theory.html
share/solfege/help/pt_BR/nameinterval-module.html
@@ -420,6 +424,7 @@ share/solfege/help/tr/chord.html
share/solfege/help/tr/compareintervals-module.html
share/solfege/help/tr/dictation-module.html
share/solfege/help/tr/dictation.html
+share/solfege/help/tr/ear-training-test-printout-editor.html
share/solfege/help/tr/elembuilder-module.html
share/solfege/help/tr/elembuilder.html
share/solfege/help/tr/extending-solfege.html
@@ -454,8 +459,8 @@ share/solfege/help/tr/idtone.html
share/solfege/help/tr/index.html
share/solfege/help/tr/inverting-intervals.html
share/solfege/help/tr/lesson-files.html
+share/solfege/help/tr/melodicinterval-module.html
share/solfege/help/tr/melodicinterval.html
-share/solfege/help/tr/melodicintervals-module.html
share/solfege/help/tr/midi-instrument-names.html
share/solfege/help/tr/music-theory.html
share/solfege/help/tr/nameinterval-module.html
@@ -805,6 +810,7 @@ share/solfege/mpd/requests.py
share/solfege/mpd/track.py
share/solfege/solfege.gtkrc
share/solfege/soundcard/__init__.py
+share/solfege/soundcard/exporter.py
share/solfege/soundcard/fakesynth.py
share/solfege/soundcard/midifilesynth.py
share/solfege/soundcard/oss_common.py
@@ -814,6 +820,7 @@ share/solfege/soundcard/solfege_c_midi.py
share/solfege/soundcard/soundcardexceptions.py
share/solfege/soundcard/synth_common.py
share/solfege/soundcard/winsynth.py
+share/solfege/src/ElementTree.py
share/solfege/src/__init__.py
share/solfege/src/abstract.py
share/solfege/src/app.py
@@ -830,7 +837,7 @@ share/solfege/src/docviewer.py
share/solfege/src/elembuilder.py
share/solfege/src/example.py
share/solfege/src/exceptiondialog.py
-share/solfege/src/gethomedir.py
+share/solfege/src/filesystem.py
share/solfege/src/gpath.py
share/solfege/src/gu.py
share/solfege/src/harmonicinterval.py
@@ -856,6 +863,7 @@ share/solfege/src/nameinterval.py
share/solfege/src/notenamespinbutton.py
share/solfege/src/osutils.py
share/solfege/src/pmwiki.py
+share/solfege/src/practisesheetdlg.py
share/solfege/src/reportbug.py
share/solfege/src/reportlib.py
share/solfege/src/rhythm.py
@@ -869,6 +877,7 @@ share/solfege/src/specialwidgets.py
share/solfege/src/statistics.py
share/solfege/src/statisticsviewer.py
share/solfege/src/stock.py
+share/solfege/src/testlib.py
share/solfege/src/tracebackwindow.py
share/solfege/src/trainingsetdlg.py
share/solfege/src/tree.py
@@ -876,6 +885,7 @@ share/solfege/src/tuner.py
share/solfege/src/twelvetone.py
share/solfege/src/utils.py
share/solfege/src/uuid.py
+share/solfege/src/winreg.py
share/solfege/src/xrandom.py
share/solfege/themes/svg/chord-voicing.svg
share/solfege/themes/svg/chord.svg
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 7a20daab0..65e916cb5 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= miwi@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= A sound editor for the GNOME/GTK 2.0 desktop
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index fd42fc221..cc9e93fd0 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -6,18 +6,18 @@
#
PORTNAME= pharmacy
-PORTVERSION= 0.2.1a
-PORTREVISION= 4
+PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= thomas@goodking.ca
COMMENT= GNOME frontend for CVS
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPCFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/pharmacy/distinfo b/devel/pharmacy/distinfo
index f46af98b9..2a08d48bc 100644
--- a/devel/pharmacy/distinfo
+++ b/devel/pharmacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (pharmacy-0.2.1a.tar.gz) = dd49e2f019e10bbc0540fb1fb06f35eb
-SHA256 (pharmacy-0.2.1a.tar.gz) = 4f3870f8a8919dc565e9cdbdb8304a0d02d50a1dcbe48ac2a6f887d99fda210e
-SIZE (pharmacy-0.2.1a.tar.gz) = 294946
+MD5 (pharmacy-0.3.tar.gz) = 4fed3c8df18556aaaa43aa8028119b56
+SHA256 (pharmacy-0.3.tar.gz) = 5ee9851cdc2ac323e4947a8378d6e552c4c91befdca2cec4e256e2e0f8c7c51f
+SIZE (pharmacy-0.3.tar.gz) = 323461
diff --git a/devel/pharmacy/pkg-descr b/devel/pharmacy/pkg-descr
index cfad1f99d..c80c40ec6 100644
--- a/devel/pharmacy/pkg-descr
+++ b/devel/pharmacy/pkg-descr
@@ -3,6 +3,3 @@ Currently, it provides a limited user interface to CVS
commands and a "console" for the lazy power-user.
WWW: http://pharmacy.sourceforge.net/
-
-- Chris D. Faulhaber
-jedgar@fxp.org
diff --git a/devel/pharmacy/pkg-plist b/devel/pharmacy/pkg-plist
index 848c8bccf..ccc8c6cbf 100644
--- a/devel/pharmacy/pkg-plist
+++ b/devel/pharmacy/pkg-plist
@@ -1,5 +1,5 @@
bin/pharmacy
-share/gnome/apps/Applications/pharmacy.desktop
+share/apps/Development/pharmacy.desktop
share/gnome/help/pharmacy/C/apx1.html
share/gnome/help/pharmacy/C/checkout.html
share/gnome/help/pharmacy/C/console.html
@@ -14,6 +14,10 @@ share/gnome/help/pharmacy/C/web.html
share/pixmaps/pharmacy.png
share/locale/de/LC_MESSAGES/pharmacy.mo
share/locale/fr/LC_MESSAGES/pharmacy.mo
+share/locale/it/LC_MESSAGES/pharmacy.mo
+share/locale/ja/LC_MESSAGES/pharmacy.mo
share/locale/ko/LC_MESSAGES/pharmacy.mo
+share/locale/pt_BR/LC_MESSAGES/pharmacy.mo
+share/locale/ru/LC_MESSAGES/pharmacy.mo
@dirrm share/gnome/help/pharmacy/C
@dirrm share/gnome/help/pharmacy
diff --git a/games/gnmm/files/patch-gnmm.cc b/games/gnmm/files/patch-gnmm.cc
new file mode 100644
index 000000000..9e971192f
--- /dev/null
+++ b/games/gnmm/files/patch-gnmm.cc
@@ -0,0 +1,11 @@
+--- src/gnmm.cc.orig 2007-08-02 14:24:29.000000000 +0200
++++ src/gnmm.cc 2007-08-02 14:24:52.000000000 +0200
+@@ -177,7 +177,7 @@
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
+ return;
+
+- int id = (int)data;
++ intptr_t id = (intptr_t)data;
+
+ if (id>=10) pref_black_level = id-10;
+ else pref_white_level = id;
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index d5a6594f4..03981b28c 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -18,6 +18,7 @@ COMMENT= Memory Blocks game for GNOME
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 053c18cd0..a2915a655 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= wesnoth
-PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.wesnoth.org/files/
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index aa06cd927..ba8b3e152 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.2.5.tar.bz2) = 40e00ac97680fb69499191c30f130774
-SHA256 (wesnoth-1.2.5.tar.bz2) = 8e1bcab7165bd5eaf8c1d2eef0fce03a8c81daf885983dc0fda68998100e8cd0
-SIZE (wesnoth-1.2.5.tar.bz2) = 68758427
+MD5 (wesnoth-1.2.6.tar.bz2) = accb3d5e3c4423324a17755571ac9204
+SHA256 (wesnoth-1.2.6.tar.bz2) = 43499b99cfa06fd6966d5756cd756eab672d30a605a20da6bc4441126aca28ee
+SIZE (wesnoth-1.2.6.tar.bz2) = 68854174
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index d5054a347..ba8a2e35a 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -4878,6 +4878,14 @@ share/locale/zh_CN/LC_MESSAGES/wesnoth.mo
%%DATADIR%%/images/units/human-outlaws/trapper-attack3.png
%%DATADIR%%/images/units/human-outlaws/trapper-bow-defend.png
%%DATADIR%%/images/units/human-outlaws/trapper-defend.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-1.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-2.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-3.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-4.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-5.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-6.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-7.png
+%%DATADIR%%/images/units/human-outlaws/trapper-die-8.png
%%DATADIR%%/images/units/human-outlaws/trapper.png
%%DATADIR%%/images/units/merfolk/diviner-defend.png
%%DATADIR%%/images/units/merfolk/diviner-magic1.png
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index 21921acaa..e771586c0 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -6,7 +6,7 @@
PORTNAME= stardict2-dict-ja
PORTVERSION= 2.4.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index c6fe2098c..91234a6c1 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
USE_GNOME= glib12 gnomehack gnomeprefix
USE_PYTHON= yes
-USE_X_PREFIX= yes
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 65f23eddc..e9539e076 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -16,8 +16,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Gmencoder is Gnome2 front-end to mplayer/mencoder
-BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer
-RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer
+BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder
+RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index d496f0896..5a8f411ef 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnome-subtitles
-PORTVERSION= 0.5.1
+PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,10 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
USE_GMAKE= yes
USE_GNOME= gnomeprefix gtksharp20 gnomesharp20 gnomedocutils
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-subtitles.schemas
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/gnome-subtitles/distinfo b/multimedia/gnome-subtitles/distinfo
index e78d5814c..a38ee3a3a 100644
--- a/multimedia/gnome-subtitles/distinfo
+++ b/multimedia/gnome-subtitles/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-subtitles-0.5.1.tar.gz) = 313fabeb42f4bf117c851d2af9eda437
-SHA256 (gnome-subtitles-0.5.1.tar.gz) = 1aa0d521eebced2e5288cb1fd2762dc36267a84681388016ead6cb48fe7c9692
-SIZE (gnome-subtitles-0.5.1.tar.gz) = 445167
+MD5 (gnome-subtitles-0.6.tar.gz) = a4d605feef7ba6a614dfd1e054c1139a
+SHA256 (gnome-subtitles-0.6.tar.gz) = b0c41c9111b0d9615f77dff1d5166c3c15adf2f4822090e72e3b9eb2e7b59c62
+SIZE (gnome-subtitles-0.6.tar.gz) = 502874
diff --git a/multimedia/gnome-subtitles/pkg-descr b/multimedia/gnome-subtitles/pkg-descr
index 62eb1537b..19b176b3a 100644
--- a/multimedia/gnome-subtitles/pkg-descr
+++ b/multimedia/gnome-subtitles/pkg-descr
@@ -1,5 +1,5 @@
-Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports
-the most common text-based subtitle formats and allows for subtitle
-editing, conversion and synchronization.
+Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the
+most common text-based subtitle formats and allows for subtitle editing,
+translation and synchronization.
WWW: http://gnome-subtitles.sourceforge.net
diff --git a/multimedia/gnome-subtitles/pkg-plist b/multimedia/gnome-subtitles/pkg-plist
index 4ada75621..cd2271379 100644
--- a/multimedia/gnome-subtitles/pkg-plist
+++ b/multimedia/gnome-subtitles/pkg-plist
@@ -4,10 +4,20 @@ lib/gnome-subtitles/sublib.dll
share/applications/gnome-subtitles.desktop
share/gnome/help/gnome-subtitles/C/legal.xml
share/gnome/help/gnome-subtitles/C/gnome-subtitles.xml
+share/gnome/help/gnome-subtitles/ca/gnome-subtitles.xml
+share/gnome/help/gnome-subtitles/sv/gnome-subtitles.xml
share/omf/gnome-subtitles/gnome-subtitles-C.omf
+share/omf/gnome-subtitles/gnome-subtitles-ca.omf
+share/omf/gnome-subtitles/gnome-subtitles-sv.omf
share/pixmaps/gnome-subtitles.png
+share/locale/ca/LC_MESSAGES/gnome-subtitles.mo
+share/locale/es/LC_MESSAGES/gnome-subtitles.mo
+share/locale/sv/LC_MESSAGES/gnome-subtitles.mo
+share/locale/dz/LC_MESSAGES/gnome-subtitles.mo
@dirrmtry lib/gnome-subtitles
@dirrmtry share/omf/gnome-subtitles
@dirrmtry share/gnome/help/gnome-subtitles/C
+@dirrmtry share/gnome/help/gnome-subtitles/sv
+@dirrmtry share/gnome/help/gnome-subtitles/ca
@dirrmtry share/gnome/help/gnome-subtitles
@dirrmtry locale
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index d1a62f2ed..ceb076a36 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kino
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ COMMENT= A DV non-linear video editor
LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv \
Magick.10:${PORTSDIR}/graphics/ImageMagick \
samplerate.1:${PORTSDIR}/audio/libsamplerate
-RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \
+RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \
mplex:${PORTSDIR}/multimedia/mjpegtools
OPTIONS= QUICKTIME "With Quicktime support" off \
diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo
index 49c0982c9..11aa25ec2 100644
--- a/multimedia/kino/distinfo
+++ b/multimedia/kino/distinfo
@@ -1,3 +1,3 @@
-MD5 (kino-1.1.0.tar.gz) = c0b238d361b191c487c2e25ff2cc4acf
-SHA256 (kino-1.1.0.tar.gz) = 40caa7b9c4efa1fefc01a1770abbf9170a90720fff269fb7a96fc2f553cf2506
-SIZE (kino-1.1.0.tar.gz) = 10623140
+MD5 (kino-1.1.1.tar.gz) = 9aebc3ab965fba24021ba522c031e5ef
+SHA256 (kino-1.1.1.tar.gz) = 396b963436f8845d42981da9762d932186f09572980f3381fb246084a5236a89
+SIZE (kino-1.1.1.tar.gz) = 10623154
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index 361e899b3..6551fcc72 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -382,6 +382,7 @@ share/kino/lumas/matrix_snake_toplefthorizontal.png
share/kino/lumas/none.png
share/kino/lumas/symmetric_clock.png
share/pixmaps/kino.png
+share/locale/ca/LC_MESSAGES/kino.mo
share/locale/cs/LC_MESSAGES/kino.mo
share/locale/da/LC_MESSAGES/kino.mo
share/locale/de/LC_MESSAGES/kino.mo
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index bb7dd9a29..16fa13fe9 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: xmps
+# New ports collection makefile for: XMPS
# Date created: 15 June 2000
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 962c88327..7441cfb9d 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= liferea
-PORTVERSION= 1.2.20
-PORTREVISION= 2
+PORTVERSION= 1.2.21
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= liferea
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 9b12a23d9..08d653ae6 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.2.20.tar.gz) = 5dac90821ee2091642b8da95cf886774
-SHA256 (liferea-1.2.20.tar.gz) = 708270e8c7b20ee32715028446b1f726d6eec79a02a50f7423bd7974cfd5d92c
-SIZE (liferea-1.2.20.tar.gz) = 1496651
+MD5 (liferea-1.2.21.tar.gz) = bba90868b63a9738e2c3d0e14135f6f2
+SHA256 (liferea-1.2.21.tar.gz) = 3af4a60ae0fdacf3b4af09ab2aff39ef98349d3625df5f9fca72fedc14d301aa
+SIZE (liferea-1.2.21.tar.gz) = 1499356
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index b4be8d051..021d7d465 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,6 +7,7 @@
PORTNAME= meld
PORTVERSION= 1.1.5.1
+PORTREVISION= 1
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R:R}
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index cde4709e8..699c6595d 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,12 +3,12 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/www/kazehakase/Makefile,v 1.6 2007/08/07 03:31:38 mezz Exp $
#
PORTNAME= kazehakase
PORTVERSION= 0.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= ${PORTNAME}/24791