summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gstreamer.mk4
-rw-r--r--astro/celestia/Makefile3
-rw-r--r--astro/celestia/files/patch-src_celestia_glutmain.cpp2
-rw-r--r--audio/cantus/Makefile2
-rw-r--r--audio/easytag-devel/files/patch-src_picture.c2
-rw-r--r--audio/extace/files/patch-src::color_win.c2
-rw-r--r--audio/glame/files/patch-Makefile.in2
-rw-r--r--audio/glame/files/patch-src::plugins::audio_io_oss.c2
-rw-r--r--chinese/oxim/Makefile26
-rw-r--r--chinese/oxim/files/patch-Makefile.in4
-rw-r--r--chinese/oxim/files/patch-configure15
-rw-r--r--chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in13
-rw-r--r--chinese/oxim/pkg-plist1
-rw-r--r--chinese/xttmgr/Makefile2
-rw-r--r--comms/efax-gtk/Makefile5
-rw-r--r--databases/gnome-db/files/patch-components::Makefile.in2
-rw-r--r--databases/gnome-db/files/patch-configure2
-rw-r--r--databases/gnome-db/files/patch-doc::C::reference::Makefile.in2
-rw-r--r--databases/gnome-db/files/patch-idl::Makefile.in2
-rw-r--r--databases/libgda/files/patch-aa2
-rw-r--r--databases/libgda/files/patch-configure2
-rw-r--r--databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in2
-rw-r--r--databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in2
-rw-r--r--databases/libgda/files/patch-tools::gda-buildserver.in2
-rw-r--r--databases/libgda/files/patch-tools::templates::Makefile.in2
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c2
-rw-r--r--databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c2
-rw-r--r--deskutils/gdeskcal-skins/Makefile2
-rw-r--r--devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in2
-rw-r--r--devel/bonobo/files/patch-po::Makefile.in.in2
-rw-r--r--devel/dbus-glib/Makefile2
-rw-r--r--devel/dbus/Makefile2
-rw-r--r--devel/dbus/files/dbus.in2
-rw-r--r--devel/gconf/files/patch-backends::bdb-backend.c2
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c4
-rw-r--r--devel/maketool/Makefile2
-rw-r--r--devel/oaf/files/patch-aa2
-rw-r--r--devel/oaf/files/patch-configure2
-rw-r--r--devel/oaf/files/patch-liboaf::oaf-fork-server.c2
-rw-r--r--devel/oaf/files/patch-ltmain.sh2
-rw-r--r--devel/p5-Net-DBus/pkg-plist2
-rw-r--r--devel/py-dbus/Makefile2
-rw-r--r--devel/sge/Makefile2
-rw-r--r--editors/elvis/Makefile2
-rw-r--r--emulators/mupen64-sdlinput/Makefile2
-rw-r--r--finance/gnucash/Makefile6
-rw-r--r--finance/gnucash/files/patch-lib::srfi::srfi-8.scm2
-rw-r--r--finance/mybudget/Makefile4
-rw-r--r--ftp/pureadmin/Makefile2
-rw-r--r--ftp/wzdftpd/files/wzdftpd.sh.in2
-rw-r--r--ftp/wzdftpd/pkg-plist2
-rw-r--r--games/gnomesudoku/Makefile4
-rw-r--r--graphics/gimpshop/files/patch-gimptool-2.0.in2
-rw-r--r--graphics/poppler-qt/Makefile4
-rw-r--r--graphics/sdl_ttf/files/patch-aa2
-rw-r--r--graphics/vertex/files/patch-vmahelp.c2
-rw-r--r--graphics/xpdf/Makefile2
-rw-r--r--irc/xchat-mircryption/Makefile4
-rw-r--r--japanese/scim-anthy/Makefile9
-rw-r--r--japanese/scim-anthy/distinfo6
-rw-r--r--japanese/scim-anthy/files/patch-configure21
-rw-r--r--japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp13
-rw-r--r--japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp12
-rw-r--r--japanese/scim-uim/files/extra-patch-4-stable10
-rw-r--r--japanese/uim-anthy/Makefile2
-rw-r--r--japanese/uim-canna/Makefile2
-rw-r--r--japanese/uim-prime/Makefile2
-rwxr-xr-xjava/eclipse/files/eclipse.in2
-rw-r--r--java/eclipse/scripts/pre-patch2
-rw-r--r--java/jdk13/files/patch-InetAddressImpl.c4
-rw-r--r--java/jdk13/files/patch-_pth.h2
-rw-r--r--java/jdk13/files/patch-adlc.make2
-rw-r--r--java/jdk13/files/patch-bytecodes.hpp2
-rw-r--r--java/jdk13/files/patch-common::Defs-bsd.gmk2
-rw-r--r--java/jdk13/files/patch-gcc.make2
-rw-r--r--java/jdk13/files/patch-gcc30.make2
-rw-r--r--java/jdk13/files/patch-gcc31.make2
-rw-r--r--java/jdk13/files/patch-gcc32.make2
-rw-r--r--java/jdk13/files/patch-iomgr.c2
-rw-r--r--java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java2
-rw-r--r--java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties2
-rw-r--r--java/jdk13/files/patch-javai_md.c2
-rw-r--r--java/jdk13/files/patch-monitor_md.c2
-rw-r--r--java/jdk13/files/patch-mutex.hpp2
-rw-r--r--java/jdk13/files/patch-nsCOMPtr.h2
-rw-r--r--java/jdk13/files/patch-os_bsd.hpp2
-rw-r--r--java/jdk13/files/patch-os_linux.cpp2
-rw-r--r--java/jdk13/files/patch-os_linux.hpp2
-rw-r--r--java/jdk13/files/patch-scavenge.hpp2
-rw-r--r--java/jdk13/files/patch-shared.hpp2
-rw-r--r--java/jdk13/files/patch-t2kScalerContext.cpp2
-rw-r--r--java/jdk13/files/patch-vm.make2
-rwxr-xr-xjava/jdk13/scripts/check_wrkdir_links.sh2
-rw-r--r--java/jdk15/files/patch-control::common::Defs-bsd.gmk2
-rw-r--r--java/jdk15/files/patch-deploy::common::Defs-bsd.gmk2
-rw-r--r--java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp2
-rw-r--r--java/jdk15/files/patch-deploy::jvm_exec::java_vm.c2
-rw-r--r--java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp2
-rw-r--r--java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp2
-rw-r--r--java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp2
-rw-r--r--java/jdk15/files/patch-j2se::awt::canvas.c2
-rw-r--r--java/jdk15/files/patch-j2se::common::Defs-bsd.gmk2
-rw-r--r--java/jdk15/files/patch-j2se::font::t1.c2
-rw-r--r--java/jdk15/files/patch-j2se::instrument::Makefile2
-rw-r--r--java/jdk15/files/patch-j2se::io::io_util.h2
-rw-r--r--java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c2
-rw-r--r--java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c2
-rw-r--r--java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh2
-rw-r--r--java/jdk15/files/patch-j2se::xawt::XWindow.c2
-rw-r--r--java/jdk15/files/patch-vm::os_bsd.cpp2
-rw-r--r--java/jdk15/files/pkg-deinstall.in2
-rw-r--r--java/jdk15/files/pkg-install.in2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/guppi/files/patch-Makefile.in2
-rw-r--r--math/guppi/files/patch-configure2
-rw-r--r--math/guppi/files/patch-ltmain.sh2
-rw-r--r--math/guppi/files/patch-po::Makefile.in.in2
-rw-r--r--misc/gnomehier/Makefile4
-rw-r--r--misc/xfce4-artwork/Makefile2
-rw-r--r--multimedia/bmpx/Makefile1
-rw-r--r--multimedia/gxine/Makefile1
-rw-r--r--multimedia/ogmrip/Makefile13
-rw-r--r--multimedia/ogmrip/distinfo6
-rw-r--r--multimedia/ogmrip/files/patch-amd6458
-rw-r--r--multimedia/ogmrip/files/patch-configure23
-rw-r--r--multimedia/ogmrip/files/patch-fix_audio_overhead24
-rw-r--r--multimedia/ogmrip/files/patch-gmsgfmt11
-rw-r--r--multimedia/ogmrip/pkg-plist55
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/xfce4-media/Makefile4
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile3
-rw-r--r--net-im/gaim/Makefile2
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--print/freetype2/Makefile2
-rw-r--r--print/freetype2/files/patch-builds::unix::configure2
-rw-r--r--print/gnome-print/files/patch-ab2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--science/gramps/Makefile6
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/gpass/Makefile2
-rw-r--r--security/gtkpasman/Makefile2
-rw-r--r--sysutils/conky/pkg-plist2
-rw-r--r--sysutils/gupsc/files/patch-Makefile.in2
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-plist2
-rw-r--r--sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c2
-rw-r--r--textproc/gnome-doc-utils/Makefile2
-rw-r--r--textproc/openvanilla-modules/Makefile1
-rw-r--r--textproc/scim-input-pad/Makefile2
-rw-r--r--textproc/scim-table-imengine/files/scim-make-table.sh18
-rw-r--r--textproc/scim-table-imengine/pkg-plist1
-rw-r--r--textproc/scim/Makefile2
-rw-r--r--www/adblock/distinfo3
-rw-r--r--www/bugmenot/Makefile6
-rw-r--r--www/bugmenot/distinfo6
-rw-r--r--www/gtkhtml/files/patch-components::http-storage-module::Makefile.in2
-rw-r--r--www/gtkhtml/files/patch-doc::Makefile.in2
-rw-r--r--www/gtkhtml/files/patch-po::Makefile.in.in2
-rw-r--r--www/mozex/Makefile.xpi2
-rw-r--r--www/openvrml/files/lookat.sh.in2
-rw-r--r--www/plugger/pkg-install2
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server/Makefile2
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile2
-rw-r--r--x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist2
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-themes/gnome-icons/Makefile1
-rw-r--r--x11-themes/icon-naming-utils/Makefile2
-rw-r--r--x11-toolkits/gtk20/files/patch-ak4
-rw-r--r--x11-toolkits/gtkscintilla/files/patch-aa2
-rw-r--r--x11-toolkits/gtkscintilla/files/patch-ab2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/py-gnome/files/patch-configure2
-rw-r--r--x11-toolkits/py-gnome/files/patch-pygtk::configure2
-rw-r--r--x11-toolkits/swt31/Makefile2
-rw-r--r--x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h2
-rw-r--r--x11-wm/icewm/Makefile5
-rw-r--r--x11/gdm/files/gdm.in4
-rw-r--r--x11/gnome-libs/files/patch-aa2
-rw-r--r--x11/gnome-libs/files/patch-bb2
-rw-r--r--x11/gnome-libs/files/patch-bg2
-rw-r--r--x11/gnome-libs/files/patch-bi2
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in2
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in2
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in2
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in2
-rw-r--r--x11/gnome-libs/files/patch-libart_lgpl::configure2
-rw-r--r--x11/gnome-libs/files/patch-po::Makefile.in.in2
-rw-r--r--x11/xfce4-clipman-plugin/pkg-plist2
189 files changed, 426 insertions, 296 deletions
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 42ebc1b5d..167f74746 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -6,8 +6,8 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# Date: 4 Oct 2004
#
-# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.18 2006/05/16 01:43:00 ahze Exp $
-# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.36 2006/07/17 00:00:00 ahze Exp $
+# $FreeBSD$
+# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.37 2006/07/22 19:25:49 ahze Exp $
.if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 8a43f34b5..c66cb682b 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -2,11 +2,12 @@
# Date created: 2002-05-17
# Whom: trevor
#
-# $FreeBSD: ports/astro/celestia/Makefile,v 1.32 2006/09/15 08:17:05 linimon Exp $
+# $FreeBSD$
#
PORTNAME= celestia
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= celestia
diff --git a/astro/celestia/files/patch-src_celestia_glutmain.cpp b/astro/celestia/files/patch-src_celestia_glutmain.cpp
index c7028c780..fa8ce5866 100644
--- a/astro/celestia/files/patch-src_celestia_glutmain.cpp
+++ b/astro/celestia/files/patch-src_celestia_glutmain.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/astro/celestia/files/patch-src_celestia_glutmain.cpp,v 1.3 2004/03/17 23:08:20 trevor Exp $
+$FreeBSD$
--- src/celestia/glutmain.cpp.orig Sat Nov 2 23:20:19 2002
+++ src/celestia/glutmain.cpp Tue Mar 16 12:47:46 2004
diff --git a/audio/cantus/Makefile b/audio/cantus/Makefile
index 26afe430e..f7157e6f4 100644
--- a/audio/cantus/Makefile
+++ b/audio/cantus/Makefile
@@ -2,7 +2,7 @@
# Date created: 22 May 2003
# Whom: old@old.com.ua
#
-# $FreeBSD: ports/audio/cantus/Makefile,v 1.6 2006/03/07 08:25:43 ade Exp $
+# $FreeBSD$
#
PORTNAME= cantus
diff --git a/audio/easytag-devel/files/patch-src_picture.c b/audio/easytag-devel/files/patch-src_picture.c
index d6829c8f0..ac96606aa 100644
--- a/audio/easytag-devel/files/patch-src_picture.c
+++ b/audio/easytag-devel/files/patch-src_picture.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/audio/easytag-devel/files/patch-src_picture.c,v 1.1 2005/12/23 20:51:29 vs Exp $
+$FreeBSD$
--- src/picture.c.orig
+++ src/picture.c
diff --git a/audio/extace/files/patch-src::color_win.c b/audio/extace/files/patch-src::color_win.c
index bce1bbef4..08be78990 100644
--- a/audio/extace/files/patch-src::color_win.c
+++ b/audio/extace/files/patch-src::color_win.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/audio/extace/files/patch-src::color_win.c,v 1.2 2003/06/04 20:58:33 adamw Exp $
+$FreeBSD$
--- src/color_win.c.orig Wed Feb 26 01:22:19 2003
+++ src/color_win.c Fri May 23 18:26:18 2003
diff --git a/audio/glame/files/patch-Makefile.in b/audio/glame/files/patch-Makefile.in
index a2931ae76..e7bcd4fae 100644
--- a/audio/glame/files/patch-Makefile.in
+++ b/audio/glame/files/patch-Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/audio/glame/files/patch-Makefile.in,v 1.3 2004/12/11 18:26:00 krion Exp $
+$FreeBSD$
--- Makefile.in.orig Fri Oct 29 03:53:30 2004
+++ Makefile.in Fri Oct 29 21:29:55 2004
diff --git a/audio/glame/files/patch-src::plugins::audio_io_oss.c b/audio/glame/files/patch-src::plugins::audio_io_oss.c
index 448eef265..f59657bd3 100644
--- a/audio/glame/files/patch-src::plugins::audio_io_oss.c
+++ b/audio/glame/files/patch-src::plugins::audio_io_oss.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/audio/glame/files/patch-src::plugins::audio_io_oss.c,v 1.1 2003/07/01 12:34:21 sobomax Exp $
+$FreeBSD$
--- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1
+++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 6657abb07..e68a71d26 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oxim
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese textproc
MASTER_SITES= ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
@@ -23,10 +23,12 @@ RUN_DEPENDS= zh-fireflyttf>=0:${PORTSDIR}/chinese/fireflyttf
OPTIONS= GTK2 "Enable GTK2 input method module" On \
CHEWING "Enable Chewing input module" On \
- UNICODE "Enable Unicode input module" On
+ UNICODE "Enable Unicode input module" On \
+ SETUP "Enable GUI Setup Tool" On
USE_GCC= 3.2+
USE_ICONV= yes
+USE_XLIB= yes
USE_GNOME=
GNU_CONFIGURE= yes
@@ -39,8 +41,7 @@ CONFIGURE_ARGS+=--disable-bimsphone-module \
--disable-static \
--with-conf-dir=${TARGETDIR}/etc/${PORTNAME}
# oxim requires qinputcontextplugin.h which only exists in Debian package
-CONFIGURE_ARGS+=--disable-qt-immodule \
- --disable-setup-tool
+CONFIGURE_ARGS+=--disable-qt-immodule
.include <bsd.port.pre.mk>
@@ -74,6 +75,23 @@ CONFIGURE_ARGS+= --disable-unicode-module
PLIST_SUB+= UNICODE="@comment "
.endif
+.if !defined(WITHOUT_SETUP)
+BUILD_DEPENDS+= qmake:${PORTSDIR}/devel/qmake
+
+CONFIGURE_ARGS+= --enable-setup-tool
+PLIST_SUB+= SETUP=""
+
+USE_QT_VER= 3
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+
+QMAKESPEC?= freebsd-g++
+CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" QTDIR="${QT_PREFIX}"
+MAKE_ARGS+= LOCALBASE="${LOCALBASE}" MAKE="${MAKE}" QMAKESPEC="${QMAKESPEC}"
+.else
+CONFIGURE_ARGS+= --disable-setup-tool
+PLIST_SUB+= SETUP="@comment "
+.endif
+
# TODO WITHOUT_NLS knob
#.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/chinese/oxim/files/patch-Makefile.in b/chinese/oxim/files/patch-Makefile.in
index a2ae28c47..94090972a 100644
--- a/chinese/oxim/files/patch-Makefile.in
+++ b/chinese/oxim/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Sep 8 05:15:45 2006
-+++ Makefile.in Fri Sep 8 05:16:05 2006
+--- ./Makefile.in.orig Fri Sep 22 17:20:10 2006
++++ ./Makefile.in Mon Oct 9 09:38:36 2006
@@ -672,8 +672,6 @@
diff --git a/chinese/oxim/files/patch-configure b/chinese/oxim/files/patch-configure
new file mode 100644
index 000000000..96ee88181
--- /dev/null
+++ b/chinese/oxim/files/patch-configure
@@ -0,0 +1,15 @@
+--- ./configure.orig Fri Sep 22 17:19:58 2006
++++ ./configure Mon Oct 9 09:38:36 2006
+@@ -29055,9 +29055,9 @@
+
+ echo "$as_me:$LINENO: checking for qmake" >&5
+ echo $ECHO_N "checking for qmake... $ECHO_C" >&6
+- if test -f ${qt_dir}/bin/qmake ; then
+- echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5
+-echo "${ECHO_T}${qt_dir}/bin/qmake" >&6
++ if test -f ${LOCALBASE}/bin/qmake ; then
++ echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5
++echo "${ECHO_T}${LOCALBASE}/bin/qmake" >&6
+ have_qmake="yes"
+ else
+ echo "$as_me:$LINENO: result: not found!" >&5
diff --git a/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in b/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in
new file mode 100644
index 000000000..a4613597a
--- /dev/null
+++ b/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in
@@ -0,0 +1,13 @@
+--- ./src/util/oxim-setup/Makefile.in.orig Fri Sep 22 17:20:09 2006
++++ ./src/util/oxim-setup/Makefile.in Mon Oct 9 09:39:52 2006
+@@ -474,8 +474,8 @@
+ @ENABLE_SETUP_TOOL_TRUE@ main.cpp
+
+ @ENABLE_SETUP_TOOL_TRUE@oxim-setup: oxim-setup.pro
+-@ENABLE_SETUP_TOOL_TRUE@ $(QTDIR)/bin/qmake oxim-setup.pro -o Makefile.qt
+-@ENABLE_SETUP_TOOL_TRUE@ QTDIR=$(QTDIR) make -f Makefile.qt
++@ENABLE_SETUP_TOOL_TRUE@ QMAKESPEC=$(QMAKESPEC) $(LOCALBASE)/bin/qmake oxim-setup.pro -o Makefile.qt
++@ENABLE_SETUP_TOOL_TRUE@ QTDIR=$(QTDIR) $(MAKE) -f Makefile.qt
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist
index 5c994b419..a9c86ec27 100644
--- a/chinese/oxim/pkg-plist
+++ b/chinese/oxim/pkg-plist
@@ -1,5 +1,6 @@
bin/oxim
bin/oxim-conv
+%%SETUP%%bin/oxim-setup
bin/oxim2tab
etc/oxim/locale.list
etc/oxim/oxim.conf
diff --git a/chinese/xttmgr/Makefile b/chinese/xttmgr/Makefile
index 0eb4ae2c7..6a8e64775 100644
--- a/chinese/xttmgr/Makefile
+++ b/chinese/xttmgr/Makefile
@@ -2,7 +2,7 @@
# Date created: 13 Oct 2001
# Whom: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
#
-# $FreeBSD: ports/chinese/xttmgr/Makefile,v 1.5 2005/07/25 21:58:10 linimon Exp $
+# $FreeBSD$
#
PORTNAME= xttmgr
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 55f2f2a28..8c3ff31a1 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -2,11 +2,12 @@
# Whom: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
# Date Created: 2004-02-29 10:33:43
#
-# $FreeBSD: ports/comms/efax-gtk/Makefile,v 1.25 2006/09/12 05:06:21 rafan Exp $
+# $FreeBSD$
#
PORTNAME= efax-gtk
PORTVERSION= 3.0.11
+PORTREVISION= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT= GUI front end for the efax fax program
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
RUN_DEPENDS= ggv:${PORTSDIR}/print/ggv \
- ${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript-gnu
+ gs:${PORTSDIR}/print/ghostscript-gnu
USE_GNOME= gtk20
USE_X_PREFIX= yes
diff --git a/databases/gnome-db/files/patch-components::Makefile.in b/databases/gnome-db/files/patch-components::Makefile.in
index f35a82030..2591b8378 100644
--- a/databases/gnome-db/files/patch-components::Makefile.in
+++ b/databases/gnome-db/files/patch-components::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/gnome-db/files/patch-components::Makefile.in,v 1.1 2002/01/23 15:22:40 sobomax Exp $
+$FreeBSD$
--- components/Makefile.in 2002/01/22 13:14:51 1.1
+++ components/Makefile.in 2002/01/22 13:15:50
diff --git a/databases/gnome-db/files/patch-configure b/databases/gnome-db/files/patch-configure
index 2ac9d22ca..d3acccbb8 100644
--- a/databases/gnome-db/files/patch-configure
+++ b/databases/gnome-db/files/patch-configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/gnome-db/files/patch-configure,v 1.9 2004/06/27 17:32:30 marcus Exp $
+$FreeBSD$
--- configure.orig Mon Apr 15 15:30:28 2002
+++ configure Wed May 1 11:51:50 2002
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
index e9d7761d2..b9c8dda0e 100644
--- a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/gnome-db/files/patch-doc::C::reference::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $
+$FreeBSD$
--- doc/C/reference/Makefile.in 2002/05/01 08:49:53 1.1
+++ doc/C/reference/Makefile.in 2002/05/01 08:50:40
diff --git a/databases/gnome-db/files/patch-idl::Makefile.in b/databases/gnome-db/files/patch-idl::Makefile.in
index 46e2a008e..da60a4cfb 100644
--- a/databases/gnome-db/files/patch-idl::Makefile.in
+++ b/databases/gnome-db/files/patch-idl::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/gnome-db/files/patch-idl::Makefile.in,v 1.1 2001/07/26 14:13:05 sobomax Exp $
+$FreeBSD$
--- idl/Makefile.in 2001/07/26 14:06:24 1.1
+++ idl/Makefile.in 2001/07/26 14:06:37
diff --git a/databases/libgda/files/patch-aa b/databases/libgda/files/patch-aa
index aa77c2716..8f9cc8fb4 100644
--- a/databases/libgda/files/patch-aa
+++ b/databases/libgda/files/patch-aa
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-aa,v 1.5 2001/11/21 11:23:50 sobomax Exp $
+$FreeBSD$
--- Makefile.in.orig Wed Nov 21 10:29:52 2001
+++ Makefile.in Wed Nov 21 10:30:19 2001
diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure
index 04235bcc1..948849e89 100644
--- a/databases/libgda/files/patch-configure
+++ b/databases/libgda/files/patch-configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-configure,v 1.5 2002/05/01 20:23:00 sobomax Exp $
+$FreeBSD$
--- configure 2002/05/01 08:18:05 1.1
+++ configure 2002/05/01 08:19:03
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
index fe1e15733..463f043f9 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $
+$FreeBSD$
--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
+++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
index 4661dcd44..25b6b1ddc 100644
--- a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $
+$FreeBSD$
--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
+++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
diff --git a/databases/libgda/files/patch-tools::gda-buildserver.in b/databases/libgda/files/patch-tools::gda-buildserver.in
index f61d47a02..fa75e2dcc 100644
--- a/databases/libgda/files/patch-tools::gda-buildserver.in
+++ b/databases/libgda/files/patch-tools::gda-buildserver.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-tools::gda-buildserver.in,v 1.1 2001/08/06 10:56:39 sobomax Exp $
+$FreeBSD$
--- tools/gda-buildserver.in 2001/08/06 08:16:41 1.1
+++ tools/gda-buildserver.in 2001/08/06 08:16:54
diff --git a/databases/libgda/files/patch-tools::templates::Makefile.in b/databases/libgda/files/patch-tools::templates::Makefile.in
index 670d43b7f..2ca62bfb5 100644
--- a/databases/libgda/files/patch-tools::templates::Makefile.in
+++ b/databases/libgda/files/patch-tools::templates::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgda/files/patch-tools::templates::Makefile.in,v 1.1 2001/08/06 10:56:39 sobomax Exp $
+$FreeBSD$
--- tools/templates/Makefile.in 2001/08/06 08:15:18 1.1
+++ tools/templates/Makefile.in 2001/08/06 08:15:53
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
index b65e65483..44a477103 100644
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c,v 1.3 2005/11/10 16:03:00 vs Exp $
+$FreeBSD$
--- libgnomedb/gnome-db-find-dialog.c.orig
+++ libgnomedb/gnome-db-find-dialog.c
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
index bad3174cc..607e5da74 100644
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c,v 1.1 2005/11/10 16:03:00 vs Exp $
+$FreeBSD$
--- libgnomedb/gnome-db-sql-console.c.orig
+++ libgnomedb/gnome-db-sql-console.c
diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile
index 3d297bf58..6663ad85e 100644
--- a/deskutils/gdeskcal-skins/Makefile
+++ b/deskutils/gdeskcal-skins/Makefile
@@ -30,7 +30,7 @@ DISTFILES= gnometheme.tar.gz \
MAINTAINER= ports@FreeBSD.org
COMMENT= Skins for gdeskcal
-RUN_DEPENDS= ${LOCALBASE}/bin/gdeskcal:${PORTSDIR}/deskutils/gdeskcal
+RUN_DEPENDS= gdeskcal:${PORTSDIR}/deskutils/gdeskcal
USE_PYTHON= yes
USE_XLIB= yes
diff --git a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
index 9743cad67..5fc3fc20b 100644
--- a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
+++ b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in,v 1.2 2002/05/02 14:09:08 sobomax Exp $
+$FreeBSD$
--- components/audio-ulaw/doc/C/Makefile.in 2002/05/01 01:17:50 1.1
+++ components/audio-ulaw/doc/C/Makefile.in 2002/05/02 14:07:25
diff --git a/devel/bonobo/files/patch-po::Makefile.in.in b/devel/bonobo/files/patch-po::Makefile.in.in
index f9c3c943c..2d1ff382a 100644
--- a/devel/bonobo/files/patch-po::Makefile.in.in
+++ b/devel/bonobo/files/patch-po::Makefile.in.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/bonobo/files/patch-po::Makefile.in.in,v 1.1 2001/08/21 14:09:52 sobomax Exp $
+$FreeBSD$
--- po/Makefile.in.in.orig Tue Jul 3 19:44:24 2001
+++ po/Makefile.in.in Tue Jul 3 19:51:42 2001
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 672fe71d4..8644bd1c0 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -2,7 +2,7 @@
# Date Created: 07 October 2006
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+# $FreeBSD$
#
PORTNAME= dbus
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 13dfa8945..36e513b7c 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -2,7 +2,7 @@
# Date Created: 22 June 2004
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+# $FreeBSD$
#
PORTNAME= dbus
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index e05be9718..61638229f 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.8 2006/06/10 19:03:48 marcus Exp $
+# $FreeBSD$
#
# PROVIDE: dbus
# REQUIRE: DAEMON
diff --git a/devel/gconf/files/patch-backends::bdb-backend.c b/devel/gconf/files/patch-backends::bdb-backend.c
index a26a977ff..bb839b4e4 100644
--- a/devel/gconf/files/patch-backends::bdb-backend.c
+++ b/devel/gconf/files/patch-backends::bdb-backend.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/gconf/files/patch-backends::bdb-backend.c,v 1.1 2001/08/03 07:17:43 sobomax Exp $
+$FreeBSD$
--- backends/bdb-backend.c 2001/08/02 17:59:13 1.1
+++ backends/bdb-backend.c 2001/08/02 18:03:23
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index 2d16e6d54..e94c19bf6 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,6 +1,6 @@
-$FreeBSD: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.6 2006/04/30 00:46:48 marcus Exp $
- $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $
+$FreeBSD$
+ $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.18 2006/05/04 05:40:28 marcus Exp $
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index cecddc823..a29bb93c0 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -2,7 +2,7 @@
# Date created: 2002-10-15
# Whom: trevor
#
-# $FreeBSD: ports/devel/maketool/Makefile,v 1.13 2006/08/16 15:23:40 shaun Exp $
+# $FreeBSD$
#
PORTNAME= maketool
diff --git a/devel/oaf/files/patch-aa b/devel/oaf/files/patch-aa
index eaa677845..e0caa8a8e 100644
--- a/devel/oaf/files/patch-aa
+++ b/devel/oaf/files/patch-aa
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/oaf/files/patch-aa,v 1.2 2002/07/11 17:15:58 sobomax Exp $
+$FreeBSD$
--- Makefile.in.orig Fri Jul 5 11:27:26 2002
+++ Makefile.in Fri Jul 5 11:28:17 2002
diff --git a/devel/oaf/files/patch-configure b/devel/oaf/files/patch-configure
index 476ec79c1..51b6045b1 100644
--- a/devel/oaf/files/patch-configure
+++ b/devel/oaf/files/patch-configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/oaf/files/patch-configure,v 1.1 2001/09/25 15:27:04 sobomax Exp $
+$FreeBSD$
--- configure 2001/09/25 15:22:02 1.1
+++ configure 2001/09/25 15:22:25
diff --git a/devel/oaf/files/patch-liboaf::oaf-fork-server.c b/devel/oaf/files/patch-liboaf::oaf-fork-server.c
index 0245167c1..fc1ebd446 100644
--- a/devel/oaf/files/patch-liboaf::oaf-fork-server.c
+++ b/devel/oaf/files/patch-liboaf::oaf-fork-server.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/oaf/files/patch-liboaf::oaf-fork-server.c,v 1.3 2002/02/14 01:51:13 sobomax Exp $
+$FreeBSD$
--- liboaf/oaf-fork-server.c 2002/02/14 01:44:13 1.1
+++ liboaf/oaf-fork-server.c 2002/02/14 01:44:39
diff --git a/devel/oaf/files/patch-ltmain.sh b/devel/oaf/files/patch-ltmain.sh
index 02a763c2c..98cb05e4d 100644
--- a/devel/oaf/files/patch-ltmain.sh
+++ b/devel/oaf/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
-$FreeBSD: ports/devel/oaf/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:58 sobomax Exp $
+$FreeBSD$
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
diff --git a/devel/p5-Net-DBus/pkg-plist b/devel/p5-Net-DBus/pkg-plist
index 6b6d4832f..5af10a0e7 100644
--- a/devel/p5-Net-DBus/pkg-plist
+++ b/devel/p5-Net-DBus/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/devel/p5-Net-DBus/pkg-plist,v 1.6 2006/07/19 10:32:34 novel Exp $
+@comment $FreeBSD$
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DBus/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DBus/DBus.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DBus/DBus.so
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 0da622f0a..c62b17945 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -2,7 +2,7 @@
# Date Created: 25 July 2004
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/devel/dbus/Makefile,v 1.52 2006/06/14 05:03:44 marcus Exp $
+# $FreeBSD$
#
PORTNAME= dbus
diff --git a/devel/sge/Makefile b/devel/sge/Makefile
index 44a69f46f..f2673b557 100644
--- a/devel/sge/Makefile
+++ b/devel/sge/Makefile
@@ -2,7 +2,7 @@
# Date created: 30 July 2006
# Whom: Jona Joachim <walkingshadow@grummel.net>
#
-# $FreeBSD: ports/devel/sge/Makefile,v 1.3 2006/09/20 11:20:41 stas Exp $
+# $FreeBSD$
#
PORTNAME= sge
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 5c7d876cf..73a2a3842 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -2,7 +2,7 @@
# Date created: 1999-09-01
# Whom: Christian Weisgerber <naddy@unix-ag.uni-kl.de>
#
-# $FreeBSD: ports/editors/elvis/Makefile,v 1.12 2006/05/07 10:55:31 edwin Exp $
+# $FreeBSD$
#
PORTNAME= elvis
diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index ac3b5de77..0a3c129b1 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -2,7 +2,7 @@
# Date created: 12.Aug 2004
# Whom: dirk.meyer@dinoex.sub.org
#
-# $FreeBSD: ports/emulators/mupen64-sdlinput/Makefile,v 1.3 2006/09/20 11:20:46 stas Exp $
+# $FreeBSD$
#
PORTNAME= mupen64
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index c0fdddc8b..1bc6f25cd 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,12 +3,12 @@
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
-# $MCom: ports/finance/gnucash/Makefile,v 1.4 2006/08/19 19:06:17 mezz Exp $
+# $MCom: ports/finance/gnucash/Makefile,v 1.5 2006/09/10 19:08:39 ahze Exp $
#
PORTNAME= gnucash
PORTVERSION= 1.8.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= finance gnome
MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \
${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ COMMENT= Quicken-like money and finance manager
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \
guppi.16:${PORTSDIR}/math/guppi \
popt.0:${PORTSDIR}/devel/popt \
- ofx.2:${PORTSDIR}/finance/libofx \
+ ofx.3:${PORTSDIR}/finance/libofx \
gw-standard.0:${PORTSDIR}/devel/g-wrap
RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile \
${SITE_PERL}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
diff --git a/finance/gnucash/files/patch-lib::srfi::srfi-8.scm b/finance/gnucash/files/patch-lib::srfi::srfi-8.scm
index 043115aa5..703cdba87 100644
--- a/finance/gnucash/files/patch-lib::srfi::srfi-8.scm
+++ b/finance/gnucash/files/patch-lib::srfi::srfi-8.scm
@@ -1,5 +1,5 @@
-$FreeBSD: ports/finance/gnucash/files/patch-lib::srfi::srfi-8.scm,v 1.2 2002/08/18 07:40:20 sobomax Exp $
+$FreeBSD$
--- lib/srfi/srfi-8.scm.orig Tue Jun 25 23:53:35 2002
+++ lib/srfi/srfi-8.scm Sat Aug 17 22:34:33 2002
diff --git a/finance/mybudget/Makefile b/finance/mybudget/Makefile
index ef11b3c04..5eea46bc9 100644
--- a/finance/mybudget/Makefile
+++ b/finance/mybudget/Makefile
@@ -2,12 +2,12 @@
# Date created: 2004 05 July
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
-# $FreeBSD: ports/finance/mybudget/Makefile,v 1.3 2005/03/12 10:53:45 marcus Exp $
+# $FreeBSD$
#
PORTNAME= myBudget
PORTVERSION= 0.60
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= finance gnome
MASTER_SITES= http://www.abisource.com/~msevior/
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 83d397700..086d5179b 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -3,7 +3,7 @@
# Date created: Mar 4, 2005
# Whom: ijliao
#
-# $FreeBSD: ports/ftp/pureadmin/Makefile,v 1.8 2006/05/07 11:09:21 edwin Exp $
+# $FreeBSD$
#
PORTNAME= pureadmin
diff --git a/ftp/wzdftpd/files/wzdftpd.sh.in b/ftp/wzdftpd/files/wzdftpd.sh.in
index 940ec3bbe..25a14fc94 100644
--- a/ftp/wzdftpd/files/wzdftpd.sh.in
+++ b/ftp/wzdftpd/files/wzdftpd.sh.in
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop wzdftpd
-# $FreeBSD: ports/ftp/wzdftpd/files/wzdftpd.sh.in,v 1.1 2006/05/31 15:19:27 novel Exp $
+# $FreeBSD$
# PROVIDE: wzdftpd
# REQUIRE: DAEMON
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index b334bdef2..683441772 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/ftp/wzdftpd/pkg-plist,v 1.18 2006/05/31 15:19:27 novel Exp $
+@comment $FreeBSD$
bin/siteconfig
bin/siteuptime
bin/sitewho
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index f877a3306..b0c583aa2 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -2,12 +2,12 @@
# Date created: 2005-09-12
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
-# $FreeBSD: ports/games/gnomesudoku/Makefile,v 1.8 2006/07/26 20:15:28 tg Exp $
+# $FreeBSD$
#
PORTNAME= gnomesudoku
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnome-sudoku
diff --git a/graphics/gimpshop/files/patch-gimptool-2.0.in b/graphics/gimpshop/files/patch-gimptool-2.0.in
index a92b9926d..bb5c013c5 100644
--- a/graphics/gimpshop/files/patch-gimptool-2.0.in
+++ b/graphics/gimpshop/files/patch-gimptool-2.0.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/graphics/gimpshop/files/patch-gimptool-2.0.in,v 1.3 2006/02/22 04:11:45 marcus Exp $
+$FreeBSD$
--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
+++ gimptool-2.0.in Fri May 17 20:46:18 2002
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index 17ddb0f71..ce10d5cf3 100644
--- a/graphics/poppler-qt/Makefile
+++ b/graphics/poppler-qt/Makefile
@@ -2,8 +2,8 @@
# Date created: 2006-01-12
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/graphics/poppler-qt/Makefile,v 1.1 2006/04/30 00:47:20 marcus Exp $
-# $MCom: ports/graphics/poppler-qt/Makefile,v 1.6 2006/04/12 17:10:20 ahze Exp $
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-qt/Makefile,v 1.8 2006/09/30 04:47:08 ahze Exp $
PORTREVISION= 0
PKGNAMESUFFIX= -qt
diff --git a/graphics/sdl_ttf/files/patch-aa b/graphics/sdl_ttf/files/patch-aa
index 536b746bf..95d4ef7aa 100644
--- a/graphics/sdl_ttf/files/patch-aa
+++ b/graphics/sdl_ttf/files/patch-aa
@@ -1,5 +1,5 @@
-$FreeBSD: ports/graphics/sdl_ttf/files/patch-aa,v 1.3 2006/09/20 11:21:42 stas Exp $
+$FreeBSD$
--- Makefile.in.orig
+++ Makefile.in
diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c
index ef9250038..63dc6bb58 100644
--- a/graphics/vertex/files/patch-vmahelp.c
+++ b/graphics/vertex/files/patch-vmahelp.c
@@ -1,5 +1,5 @@
-$FreeBSD: ports/graphics/vertex/files/patch-vmahelp.c,v 1.2 2003/10/24 20:08:06 krion Exp $
+$FreeBSD$
--- vertex/vmahelp.c 2001/10/05 17:31:12 1.1
+++ vertex/vmahelp.c 2001/10/05 17:33:21
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 36f8456f4..b8131dd84 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -2,7 +2,7 @@
# Date created: 02 Feb 1996
# Whom: chuckr@glue.umd.edu
#
-# $FreeBSD: ports/graphics/xpdf/Makefile,v 1.74 2006/05/02 02:21:49 ahze Exp $
+# $FreeBSD$
#
PORTNAME= xpdf
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 785cbb8a7..0bcc05fa3 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -3,10 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/irc/xchat-mircryption/Makefile,v 1.1 2006/10/04 22:27:49 ahze Exp $
+#
PORTNAME= mircryption
DISTVERSION= 1.1.27
+PORTREVISION= 1
CATEGORIES= irc security
MASTER_SITES= http://mircryption.sourceforge.net/Downloads/
PKGNAMEPREFIX= xchat-
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 15af63937..fc4427707 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= scim-anthy
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/21166
+MASTER_SITE_SUBDIR=scim-imengine/21967
MAINTAINER= ume@FreeBSD.org
COMMENT= SCIM IMEngine module using Anthy
@@ -32,10 +32,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
- LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}"
+IGNORE= does not build on FreeBSD < 5.x
.else
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/japanese/scim-anthy/distinfo b/japanese/scim-anthy/distinfo
index b7c937a8d..117f156f2 100644
--- a/japanese/scim-anthy/distinfo
+++ b/japanese/scim-anthy/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-anthy-1.2.0.tar.gz) = ce8d4ff0c8e96413d343e2d80daba3ee
-SHA256 (scim-anthy-1.2.0.tar.gz) = 786eece2d342ab8b66575c927d8741e202d3091daa1947c3bd2e14a02745d228
-SIZE (scim-anthy-1.2.0.tar.gz) = 643320
+MD5 (scim-anthy-1.2.1.tar.gz) = e66e4b85de97fa421d79893d226aeb44
+SHA256 (scim-anthy-1.2.1.tar.gz) = 4732dba156b38f9c7f2171dc16118a79bfc6f50e99dbe4efb3b24e731bbe8fe2
+SIZE (scim-anthy-1.2.1.tar.gz) = 643824
diff --git a/japanese/scim-anthy/files/patch-configure b/japanese/scim-anthy/files/patch-configure
deleted file mode 100644
index e682e4936..000000000
--- a/japanese/scim-anthy/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig Wed Dec 28 19:20:36 2005
-+++ configure Wed Dec 28 19:23:38 2005
-@@ -465,7 +465,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_ANTHY_MAJOR_VERSION SCIM_ANTHY_MINOR_VERSION SCIM_ANTHY_MICRO_VERSION SCIM_ANTHY_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir ANTHY_LIBS ANTHY_CFLAGS GTK2_CFLAGS GTK2_LIBS SCIM_BUILD_HELPER_TRUE SCIM_BUILD_HELPER_FALSE SCIM_BUILD_HELPER SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_ANTHY_DATADIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_ANTHY_MAJOR_VERSION SCIM_ANTHY_MINOR_VERSION SCIM_ANTHY_MICRO_VERSION SCIM_ANTHY_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS LIBTOOL_EXPORT_OPTIONS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir ANTHY_LIBS ANTHY_CFLAGS GTK2_CFLAGS GTK2_LIBS SCIM_BUILD_HELPER_TRUE SCIM_BUILD_HELPER_FALSE SCIM_BUILD_HELPER SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_ANTHY_DATADIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -31723,6 +31723,7 @@
- s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
- s,@LIBADD_DL@,$LIBADD_DL,;t t
- s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-+s,@LIBTOOL_EXPORT_OPTIONS@,$LIBTOOL_EXPORT_OPTIONS,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@SCIM_CFLAGS@,$SCIM_CFLAGS,;t t
diff --git a/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp b/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp
deleted file mode 100644
index 5a324cd82..000000000
--- a/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/scim_anthy_key2kana.cpp
-diff -u src/scim_anthy_key2kana.cpp.orig src/scim_anthy_key2kana.cpp
---- src/scim_anthy_key2kana.cpp.orig Tue Jul 11 11:22:08 2006
-+++ src/scim_anthy_key2kana.cpp Mon Sep 4 01:45:58 2006
-@@ -23,6 +23,8 @@
- #include "scim_anthy_imengine.h"
- #include "scim_anthy_utils.h"
-
-+#include <wctype.h>
-+
- using namespace scim_anthy;
-
- Key2KanaConvertor::Key2KanaConvertor (AnthyInstance & anthy,
diff --git a/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp b/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp
deleted file mode 100644
index 489d1e2bd..000000000
--- a/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/scim_anthy_utils.cpp
-diff -u src/scim_anthy_utils.cpp.orig src/scim_anthy_utils.cpp
---- src/scim_anthy_utils.cpp.orig Thu Jul 7 17:24:45 2005
-+++ src/scim_anthy_utils.cpp Thu Jul 21 16:54:04 2005
-@@ -17,6 +17,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <unistd.h>
- #include <sys/wait.h>
-
- #include "scim_anthy_utils.h"
diff --git a/japanese/scim-uim/files/extra-patch-4-stable b/japanese/scim-uim/files/extra-patch-4-stable
new file mode 100644
index 000000000..13cb124a4
--- /dev/null
+++ b/japanese/scim-uim/files/extra-patch-4-stable
@@ -0,0 +1,10 @@
+--- src/scim_uim_imengine.cpp.orig Thu Nov 11 20:27:26 2004
++++ src/scim_uim_imengine.cpp Thu Nov 11 20:28:09 2004
+@@ -36,6 +36,7 @@
+
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
++#include <cstdio>
+
+ #define scim_module_init uim_LTX_scim_module_init
+ #define scim_module_exit uim_LTX_scim_module_exit
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index ea7bdffa8..6120cb33c 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -2,7 +2,7 @@
# Date created: 31 August 2003
# Whom: MANTANI Nobutaka <nobutaka@FreeBSD.org>
#
-# $FreeBSD: ports/japanese/uim-anthy/Makefile,v 1.5 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
#
CATEGORIES= japanese
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index 2b5e3585a..2b9906700 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -2,7 +2,7 @@
# Date created: 31 August 2003
# Whom: MANTANI Nobutaka <nobutaka@FreeBSD.org>
#
-# $FreeBSD: ports/japanese/uim-canna/Makefile,v 1.7 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
#
CATEGORIES= japanese
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
index d78a807e2..156995a6c 100644
--- a/japanese/uim-prime/Makefile
+++ b/japanese/uim-prime/Makefile
@@ -2,7 +2,7 @@
# Date created: 31 August 2003
# Whom: MANTANI Nobutaka <nobutaka@FreeBSD.org>
#
-# $FreeBSD: ports/japanese/uim-prime/Makefile,v 1.7 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
#
CATEGORIES= japanese
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index e88d25feb..91873ea14 100755
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -4,7 +4,7 @@
#
# See: http://www.eclipse.org
#
-# $FreeBSD: ports/java/eclipse/files/eclipse.in,v 1.6 2005/10/18 02:42:04 hq Exp $
+# $FreeBSD$
#
DEFAULT_JAVA_HOME=%%PREFIX%%
diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch
index 86f68221e..fdc249b6a 100644
--- a/java/eclipse/scripts/pre-patch
+++ b/java/eclipse/scripts/pre-patch
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/java/eclipse/scripts/pre-patch,v 1.1 2005/07/31 05:26:15 nork Exp $
+# $FreeBSD$
copy_file()
{
diff --git a/java/jdk13/files/patch-InetAddressImpl.c b/java/jdk13/files/patch-InetAddressImpl.c
index beedd6f6d..0c043a04a 100644
--- a/java/jdk13/files/patch-InetAddressImpl.c
+++ b/java/jdk13/files/patch-InetAddressImpl.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-InetAddressImpl.c,v 1.4 2006/07/19 22:34:45 glewis Exp $
+$FreeBSD$
--- ../src/solaris/native/java/net/InetAddressImpl.c.orig Wed Jul 19 01:28:19 2006
+++ ../src/solaris/native/java/net/InetAddressImpl.c Wed Jul 19 10:59:54 2006
@@ -94,4 +94,4 @@ $FreeBSD: ports/java/jdk13/files/patch-InetAddressImpl.c,v 1.4 2006/07/19 22:34:
+ defined(__NetBSD__) || defined(__OpenBSD__)
#if defined(LIBC_SCCS) && !defined(lint)
- static const char rcsid[] = "$Id: patch-InetAddressImpl.c,v 1.1 2006-08-01 03:56:56 mezz Exp $";
+ static const char rcsid[] = "$Id: patch-InetAddressImpl.c,v 1.2 2006-10-10 20:22:13 mezz Exp $";
diff --git a/java/jdk13/files/patch-_pth.h b/java/jdk13/files/patch-_pth.h
index 8d9c345d7..850957f85 100644
--- a/java/jdk13/files/patch-_pth.h
+++ b/java/jdk13/files/patch-_pth.h
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-_pth.h,v 1.1 2004/11/28 05:29:25 glewis Exp $
+$FreeBSD$
--- ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h 11 Jul 2001 21:45:07 -0000 1.1.1.1
+++ ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-adlc.make b/java/jdk13/files/patch-adlc.make
index 2ef4e3cdc..ad02fde2c 100644
--- a/java/jdk13/files/patch-adlc.make
+++ b/java/jdk13/files/patch-adlc.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-adlc.make,v 1.1 2004/11/27 05:48:46 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/adlc.make 14 Jan 2002 12:49:49 -0000 1.2
+++ ../../hotspot1.3.1/build/linux/makefiles/adlc.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-bytecodes.hpp b/java/jdk13/files/patch-bytecodes.hpp
index c0439ee26..003ab81d3 100644
--- a/java/jdk13/files/patch-bytecodes.hpp
+++ b/java/jdk13/files/patch-bytecodes.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-bytecodes.hpp,v 1.1 2004/12/07 20:23:40 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp 11 Jul 2001 21:33:21 -0000 1.1.1.1
+++ ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk
index fe0567e82..67e497d01 100644
--- a/java/jdk13/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk13/files/patch-common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-common::Defs-bsd.gmk,v 1.7 2004/08/10 20:28:44 glewis Exp $
+$FreeBSD$
--- common/Defs-bsd.gmk.orig Thu Dec 18 22:33:22 2003
+++ common/Defs-bsd.gmk Thu Dec 18 22:36:46 2003
diff --git a/java/jdk13/files/patch-gcc.make b/java/jdk13/files/patch-gcc.make
index 96034a7c0..daba5a107 100644
--- a/java/jdk13/files/patch-gcc.make
+++ b/java/jdk13/files/patch-gcc.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-gcc.make,v 1.1 2004/11/27 05:48:23 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/gcc.make 23 Apr 2003 18:04:37 -0000 1.6
+++ ../../hotspot1.3.1/build/linux/makefiles/gcc.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-gcc30.make b/java/jdk13/files/patch-gcc30.make
index adae79fba..bd0657f46 100644
--- a/java/jdk13/files/patch-gcc30.make
+++ b/java/jdk13/files/patch-gcc30.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-gcc30.make,v 1.1 2004/11/27 05:48:23 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 12 Jul 2002 08:25:58 -0000 1.3
+++ ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-gcc31.make b/java/jdk13/files/patch-gcc31.make
index 192c4e260..33d411015 100644
--- a/java/jdk13/files/patch-gcc31.make
+++ b/java/jdk13/files/patch-gcc31.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-gcc31.make,v 1.1 2004/11/27 05:48:23 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 14 Jul 2002 00:07:59 -0000 1.1
+++ ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-gcc32.make b/java/jdk13/files/patch-gcc32.make
index 1079c0a32..408740c50 100644
--- a/java/jdk13/files/patch-gcc32.make
+++ b/java/jdk13/files/patch-gcc32.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-gcc32.make,v 1.1 2004/11/27 05:48:23 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 16 Sep 2002 06:21:28 -0000 1.1
+++ ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-iomgr.c b/java/jdk13/files/patch-iomgr.c
index e9ff40297..a94c957ab 100644
--- a/java/jdk13/files/patch-iomgr.c
+++ b/java/jdk13/files/patch-iomgr.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-iomgr.c,v 1.1 2003/05/06 06:11:02 glewis Exp $
+$FreeBSD$
--- ../src/solaris/hpi/green_threads/src/iomgr.c Thu Mar 13 13:55:24 2003
+++ ../src/solaris/hpi/green_threads/src/iomgr.c Thu Mar 13 13:55:53 2003
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java b/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java
index 371a9d1d0..d5379adf6 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java
+++ b/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java,v 1.2 2005/04/28 20:08:01 glewis Exp $
+$FreeBSD$
--- ../src/share/classes/sun/tools/jar/Main.java 11 Jul 2001 21:39:05 -0000 1.1.1.1
+++ ../src/share/classes/sun/tools/jar/Main.java 27 Apr 2005 05:07:30 -0000
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties b/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties
index edf8ff6a4..c94b5c82f 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties
+++ b/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties,v 1.2 2005/04/28 20:08:01 glewis Exp $
+$FreeBSD$
--- ../src/share/classes/sun/tools/jar/resources/jar.properties 11 Jul 2001 21:39:05 -0000 1.1.1.1
+++ ../src/share/classes/sun/tools/jar/resources/jar.properties 27 Apr 2005 05:07:52 -0000
diff --git a/java/jdk13/files/patch-javai_md.c b/java/jdk13/files/patch-javai_md.c
index 6b96669df..5a70733cc 100644
--- a/java/jdk13/files/patch-javai_md.c
+++ b/java/jdk13/files/patch-javai_md.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-javai_md.c,v 1.1 2004/01/19 19:28:40 glewis Exp $
+$FreeBSD$
--- ../src/solaris/javavm/runtime/javai_md.c 24 Jul 2003 07:06:56 -0000 1.7
+++ ../src/solaris/javavm/runtime/javai_md.c 15 Jan 2004 07:37:23 -0000
diff --git a/java/jdk13/files/patch-monitor_md.c b/java/jdk13/files/patch-monitor_md.c
index 2a697045e..b47390878 100644
--- a/java/jdk13/files/patch-monitor_md.c
+++ b/java/jdk13/files/patch-monitor_md.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-monitor_md.c,v 1.1 2004/11/28 05:29:25 glewis Exp $
+$FreeBSD$
--- ../src/solaris/hpi/native_threads/src/monitor_md.c 11 Jul 2001 21:42:33 -0000 1.1.1.1
+++ ../src/solaris/hpi/native_threads/src/monitor_md.c 22 Nov 2004 17:19:50 -0000
diff --git a/java/jdk13/files/patch-mutex.hpp b/java/jdk13/files/patch-mutex.hpp
index 7f00ab674..af669fc01 100644
--- a/java/jdk13/files/patch-mutex.hpp
+++ b/java/jdk13/files/patch-mutex.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-mutex.hpp,v 1.1 2004/11/27 05:44:12 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 17 Aug 2001 22:56:19 -0000 1.1.1.2
+++ ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-nsCOMPtr.h b/java/jdk13/files/patch-nsCOMPtr.h
index 0c5429557..8c629a684 100644
--- a/java/jdk13/files/patch-nsCOMPtr.h
+++ b/java/jdk13/files/patch-nsCOMPtr.h
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-nsCOMPtr.h,v 1.1 2004/08/31 19:52:25 glewis Exp $
+$FreeBSD$
--- ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h 11 Jul 2001 21:45:15 -0000 1.1.1.1
+++ ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h 30 Aug 2004 06:21:43 -0000
diff --git a/java/jdk13/files/patch-os_bsd.hpp b/java/jdk13/files/patch-os_bsd.hpp
index c88a5608d..26609b5d8 100644
--- a/java/jdk13/files/patch-os_bsd.hpp
+++ b/java/jdk13/files/patch-os_bsd.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-os_bsd.hpp,v 1.1 2004/11/28 05:29:25 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 16 Jan 2002 18:46:39 -0000 1.2
+++ ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-os_linux.cpp b/java/jdk13/files/patch-os_linux.cpp
index 7a53977eb..91bce2047 100644
--- a/java/jdk13/files/patch-os_linux.cpp
+++ b/java/jdk13/files/patch-os_linux.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-os_linux.cpp,v 1.1 2004/01/20 19:53:55 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp.orig Tue Jan 20 10:49:50 2004
+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp Tue Jan 20 10:50:14 2004
diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp
index 696952f18..f21e6129b 100644
--- a/java/jdk13/files/patch-os_linux.hpp
+++ b/java/jdk13/files/patch-os_linux.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-os_linux.hpp,v 1.1 2004/11/28 05:29:25 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 5 Jun 2002 05:27:47 -0000 1.4
+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-scavenge.hpp b/java/jdk13/files/patch-scavenge.hpp
index c67f2bc92..406384ae7 100644
--- a/java/jdk13/files/patch-scavenge.hpp
+++ b/java/jdk13/files/patch-scavenge.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-scavenge.hpp,v 1.1 2004/11/27 05:44:12 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 11 Jul 2001 21:33:24 -0000 1.1.1.1
+++ ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-shared.hpp b/java/jdk13/files/patch-shared.hpp
index 0973d2f15..d7211f301 100644
--- a/java/jdk13/files/patch-shared.hpp
+++ b/java/jdk13/files/patch-shared.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-shared.hpp,v 1.1 2004/12/07 20:23:40 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp 11 Jul 2001 21:33:22 -0000 1.1.1.1
+++ ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/files/patch-t2kScalerContext.cpp b/java/jdk13/files/patch-t2kScalerContext.cpp
index c15104d1f..53034bc3b 100644
--- a/java/jdk13/files/patch-t2kScalerContext.cpp
+++ b/java/jdk13/files/patch-t2kScalerContext.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-t2kScalerContext.cpp,v 1.1 2004/08/10 20:30:30 glewis Exp $
+$FreeBSD$
--- ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp 12 Jul 2001 21:54:30 -0000 1.2
+++ ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp 10 Aug 2004 14:29:24 -0000
diff --git a/java/jdk13/files/patch-vm.make b/java/jdk13/files/patch-vm.make
index 16df0ae86..79a99183f 100644
--- a/java/jdk13/files/patch-vm.make
+++ b/java/jdk13/files/patch-vm.make
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk13/files/patch-vm.make,v 1.3 2004/11/27 05:48:46 glewis Exp $
+$FreeBSD$
--- ../../hotspot1.3.1/build/linux/makefiles/vm.make 23 Jul 2004 18:17:54 -0000 1.7
+++ ../../hotspot1.3.1/build/linux/makefiles/vm.make 22 Nov 2004 17:19:42 -0000
diff --git a/java/jdk13/scripts/check_wrkdir_links.sh b/java/jdk13/scripts/check_wrkdir_links.sh
index bf39f3ec7..bc09f1939 100755
--- a/java/jdk13/scripts/check_wrkdir_links.sh
+++ b/java/jdk13/scripts/check_wrkdir_links.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/java/jdk13/scripts/check_wrkdir_links.sh,v 1.1 2003/08/22 17:07:08 glewis Exp $
+# $FreeBSD$
WRKDIRPREFIX=$1
LINUXBASE=$2
diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
index 2690cb8cd..e5701664b 100644
--- a/java/jdk15/files/patch-control::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-control::common::Defs-bsd.gmk,v 1.2 2005/01/20 08:41:13 phantom Exp $
+$FreeBSD$
--- ../../control/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:01:40 2005
+++ ../../control/make/common/Defs-bsd.gmk Thu Jan 13 02:01:54 2005
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
index c15ed4cb1..a864ac0ef 100644
--- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk,v 1.4 2006/04/07 03:27:34 glewis Exp $
+$FreeBSD$
--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006
+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006
diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
index 3eee15710..78d8d2588 100644
--- a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
+++ b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
--- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig Tue Oct 19 15:04:42 2004
+++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp Thu Jul 6 17:09:36 2006
diff --git a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
index f49e18e89..fd5b16551 100644
--- a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
+++ b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
--- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig Thu Jul 6 17:10:12 2006
+++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c Thu Jul 6 17:10:12 2006
diff --git a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
index 6ae176a01..6a44c9ce8 100644
--- a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
+++ b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
--- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig Thu Jun 15 18:08:03 2006
+++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp Thu Jul 6 17:10:37 2006
diff --git a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
index 7db9d325f..866fd9ace 100644
--- a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
+++ b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp,v 1.1 2006/06/16 21:26:38 glewis Exp $
+$FreeBSD$
--- ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp.orig Thu Jun 15 17:58:02 2006
+++ ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp Thu Jun 15 17:59:02 2006
diff --git a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
index 143bbc3de..794d795d0 100644
--- a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
+++ b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp,v 1.1 2006/06/16 21:29:53 glewis Exp $
+$FreeBSD$
--- ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp.orig Thu Jun 15 17:58:02 2006
+++ ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Jun 15 17:59:19 2006
diff --git a/java/jdk15/files/patch-j2se::awt::canvas.c b/java/jdk15/files/patch-j2se::awt::canvas.c
index 3891153c3..cf69af4aa 100644
--- a/java/jdk15/files/patch-j2se::awt::canvas.c
+++ b/java/jdk15/files/patch-j2se::awt::canvas.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::awt::canvas.c,v 1.1 2006/04/25 20:10:19 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/solaris/native/sun/awt/canvas.c 10 Jan 2005 15:09:40 -0000 1.2
+++ ../../j2se/src/solaris/native/sun/awt/canvas.c 19 Apr 2006 22:21:51 -0000
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
index c3db15f3c..5fe62075f 100644
--- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk,v 1.2 2005/09/20 20:00:08 glewis Exp $
+$FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005
+++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005
diff --git a/java/jdk15/files/patch-j2se::font::t1.c b/java/jdk15/files/patch-j2se::font::t1.c
index 80e2aa17e..7cb654bf7 100644
--- a/java/jdk15/files/patch-j2se::font::t1.c
+++ b/java/jdk15/files/patch-j2se::font::t1.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::font::t1.c,v 1.1 2006/08/01 18:38:25 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig Tue Oct 19 15:00:39 2004
+++ ../../j2se/src/share/native/sun/font/t2k/t1.c Tue Jul 18 21:42:18 2006
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile
index ad378e8a2..8934bfc11 100644
--- a/java/jdk15/files/patch-j2se::instrument::Makefile
+++ b/java/jdk15/files/patch-j2se::instrument::Makefile
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::instrument::Makefile,v 1.3 2006/04/07 03:27:34 glewis Exp $
+$FreeBSD$
--- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h
index 7a57b60c1..0230858c0 100644
--- a/java/jdk15/files/patch-j2se::io::io_util.h
+++ b/java/jdk15/files/patch-j2se::io::io_util.h
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::io::io_util.h,v 1.1 2006/09/09 02:10:02 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/share/native/java/io/io_util.h 8 Nov 2004 22:27:35 -0000 1.1.1.1
+++ ../../j2se/src/share/native/java/io/io_util.h 7 Sep 2006 19:40:19 -0000
diff --git a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
index d92edf05e..64f8f4ebd 100644
--- a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
+++ b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c,v 1.1 2006/06/16 21:28:08 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig Tue Oct 19 15:02:09 2004
+++ ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c Thu Jun 15 17:58:34 2006
diff --git a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
index eb2bacd82..8dea374d1 100644
--- a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
+++ b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c,v 1.1 2006/07/18 23:20:26 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig Fri Jul 7 10:47:18 2006
+++ ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c Fri Jul 7 14:48:06 2006
diff --git a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
index 2802a33b9..fd6137cab 100644
--- a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
+++ b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh,v 1.1 2005/04/08 18:29:29 glewis Exp $
+$FreeBSD$
--- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1
+++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000
diff --git a/java/jdk15/files/patch-j2se::xawt::XWindow.c b/java/jdk15/files/patch-j2se::xawt::XWindow.c
index 107de522b..6060511e8 100644
--- a/java/jdk15/files/patch-j2se::xawt::XWindow.c
+++ b/java/jdk15/files/patch-j2se::xawt::XWindow.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::xawt::XWindow.c,v 1.1 2006/04/25 20:10:19 glewis Exp $
+$FreeBSD$
--- ../../j2se/src/solaris/native/sun/xawt/XWindow.c 8 Nov 2004 22:27:40 -0000 1.1.1.1
+++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c 19 Apr 2006 22:21:51 -0000
diff --git a/java/jdk15/files/patch-vm::os_bsd.cpp b/java/jdk15/files/patch-vm::os_bsd.cpp
index 6d1762d17..25bd71db8 100644
--- a/java/jdk15/files/patch-vm::os_bsd.cpp
+++ b/java/jdk15/files/patch-vm::os_bsd.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-vm::os_bsd.cpp,v 1.3 2005/09/20 20:00:08 glewis Exp $
+$FreeBSD$
--- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Jan 27 17:54:28 2004
+++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jan 27 17:55:21 2004
diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in
index e290f2a08..167d5bd28 100644
--- a/java/jdk15/files/pkg-deinstall.in
+++ b/java/jdk15/files/pkg-deinstall.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/java/jdk15/files/pkg-deinstall.in,v 1.1 2005/11/23 10:12:33 glewis Exp $
+# $FreeBSD$
# Set up a standard path
PATH=/usr/bin:/bin
diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in
index 6f5fa178b..c5f4a70db 100644
--- a/java/jdk15/files/pkg-install.in
+++ b/java/jdk15/files/pkg-install.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/java/jdk15/files/pkg-install.in,v 1.6 2005/11/23 21:16:56 glewis Exp $
+# $FreeBSD$
# System preference location
JRE_HOME=%%JRE_HOME%%
diff --git a/math/geg/Makefile b/math/geg/Makefile
index d0c349659..43b852485 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -2,7 +2,7 @@
# Date created: 8 Aug 1998
# Whom: rom
#
-# $FreeBSD: ports/math/geg/Makefile,v 1.28 2006/03/07 08:26:49 ade Exp $
+# $FreeBSD$
#
PORTNAME= geg
diff --git a/math/guppi/files/patch-Makefile.in b/math/guppi/files/patch-Makefile.in
index 755f3510c..de132b24b 100644
--- a/math/guppi/files/patch-Makefile.in
+++ b/math/guppi/files/patch-Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/math/guppi/files/patch-Makefile.in,v 1.4 2002/07/11 17:16:00 sobomax Exp $
+$FreeBSD$
--- Makefile.in.orig Thu Jul 11 04:03:22 2002
+++ Makefile.in Thu Jul 11 04:04:37 2002
diff --git a/math/guppi/files/patch-configure b/math/guppi/files/patch-configure
index 502653ff7..6892d3b7c 100644
--- a/math/guppi/files/patch-configure
+++ b/math/guppi/files/patch-configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/math/guppi/files/patch-configure,v 1.4 2002/03/14 14:24:24 sobomax Exp $
+$FreeBSD$
--- configure.orig Thu Mar 14 15:27:59 2002
+++ configure Thu Mar 14 15:30:18 2002
diff --git a/math/guppi/files/patch-ltmain.sh b/math/guppi/files/patch-ltmain.sh
index 9f946f76f..98cb05e4d 100644
--- a/math/guppi/files/patch-ltmain.sh
+++ b/math/guppi/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
-$FreeBSD: ports/math/guppi/files/patch-ltmain.sh,v 1.4 2001/12/20 06:19:00 sobomax Exp $
+$FreeBSD$
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
diff --git a/math/guppi/files/patch-po::Makefile.in.in b/math/guppi/files/patch-po::Makefile.in.in
index df19992ee..2f04784a6 100644
--- a/math/guppi/files/patch-po::Makefile.in.in
+++ b/math/guppi/files/patch-po::Makefile.in.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/math/guppi/files/patch-po::Makefile.in.in,v 1.1 2001/10/23 13:36:38 sobomax Exp $
+$FreeBSD$
--- po/Makefile.in.in 2001/10/23 11:34:52 1.1
+++ po/Makefile.in.in 2001/10/23 11:35:09
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index ab6a844e9..59dfa5736 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -2,8 +2,8 @@
# Date created: 2 July 2002
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
-# $FreeBSD: ports/misc/gnomehier/Makefile,v 1.34 2006/04/30 00:46:57 marcus Exp $
-# $MCom: ports/misc/gnomehier/Makefile,v 1.11 2006/03/14 03:05:32 marcus Exp $
+# $FreeBSD$
+# $MCom: ports/misc/gnomehier/Makefile,v 1.13 2006/07/17 20:31:50 marcus Exp $
#
# !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
diff --git a/misc/xfce4-artwork/Makefile b/misc/xfce4-artwork/Makefile
index 893e8450e..bf64642f2 100644
--- a/misc/xfce4-artwork/Makefile
+++ b/misc/xfce4-artwork/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= demon@FreeBSD.org
COMMENT= Additional artwork for the XFce4 desktop environment
-RUN_DEPENDS= ${LOCALBASE}/bin/xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop
+RUN_DEPENDS= xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 016107ea3..abe3d0c31 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bmpx
PORTVERSION= 0.32.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://files.beep-media-player.org/releases/0.30/
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 122b374f0..4192a690b 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -24,6 +24,7 @@ USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib"
CONFIGURE_ARGS= --mandir=${PREFIX}/man
+CFLAGS= -O2 -fno-strict-aliasing -pipe
INSTALLS_ICONS= yes
MANLANG= "" de
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 94c29c9c7..7e8eb3037 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= ogmrip
-PORTVERSION= 0.9.0
-PORTREVISION= 4
+DISTVERSION= 0.10.0-rc4
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +19,8 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \
oggenc:${PORTSDIR}/audio/vorbis-tools \
ogmmerge:${PORTSDIR}/multimedia/ogmtools \
lame:${PORTSDIR}/audio/lame \
- gocr:${PORTSDIR}/graphics/gocr
+ gocr:${PORTSDIR}/graphics/gocr \
+ gsed:${PORTSDIR}/textproc/gsed
RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \
oggenc:${PORTSDIR}/audio/vorbis-tools \
ogmmerge:${PORTSDIR}/multimedia/ogmtools \
@@ -29,14 +30,16 @@ LIB_DEPENDS= xvidcore:${PORTSDIR}/multimedia/xvid \
dvdread:${PORTSDIR}/multimedia/libdvdread \
enchant:${PORTSDIR}/textproc/enchant
-USE_GNOME= gnomehack gnomeprefix gtk20 glib20 gconf2 libglade2
+USE_LDCONFIG= yes
+USE_GETTEXT= yes
+USE_GNOME= gnomehack gnomeprefix gtk20 glib20 gconf2 libglade2 intlhack
GNU_CONFIGURE= yes
USE_XLIB= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
GCONF_SCHEMAS= ogmrip.schemas
CONFIGURE_ARGS= --sharedstatedir=${PREFIX}/libdata
+GMAKE_ENV+= GMSGFMT=${localbase}/bin/msgfmt
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-maintainer-mode --enable-devel-mode
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index 406b2833a..689eb3706 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.9.0.tar.gz) = 4884da2f0011c9da86306b19b2d7d310
-SHA256 (ogmrip-0.9.0.tar.gz) = 2c6a39c4a54cf8c3cdb8b31df8efa002b2e955efb1890608d25b980af86d378a
-SIZE (ogmrip-0.9.0.tar.gz) = 565778
+MD5 (ogmrip-0.10.0-rc4.tar.gz) = d0d78301644e996b40d782702d413d7a
+SHA256 (ogmrip-0.10.0-rc4.tar.gz) = 4bc6b04a59463a1c8fd99ed42aead4600b1b9c05f785c3e9afcd9b64e948ed17
+SIZE (ogmrip-0.10.0-rc4.tar.gz) = 622444
diff --git a/multimedia/ogmrip/files/patch-amd64 b/multimedia/ogmrip/files/patch-amd64
new file mode 100644
index 000000000..811e3ccd2
--- /dev/null
+++ b/multimedia/ogmrip/files/patch-amd64
@@ -0,0 +1,58 @@
+* Fix compilation on amd64
+* Fix compilation with mplayer < 1.0pre8
+
+Index: libogmrip/ogmrip-backend.c
+===================================================================
+--- libogmrip/ogmrip-backend.c (rĂŠvision 843)
++++ libogmrip/ogmrip-backend.c (copie de travail)
+@@ -406,8 +406,7 @@
+ gdouble
+ ogmrip_backend_dvdcpy_watch (OGMJobExec *exec, const gchar *buffer, OGMRipVideo *video)
+ {
+- size_t bytes, total;
+- guint percent;
++ guint bytes, total, percent;
+
+ if (sscanf (buffer, "%u/%u blocks written (%u%%)", &bytes, &total, &percent) == 3)
+ return percent / 100.;
+@@ -1378,8 +1377,12 @@
+ GPtrArray *argv;
+
+ const gchar *device;
+- gint vid, sstep;
++ gint vid;
+
++#if MPLAYER_PRE >= 8
++ gint sstep;
++#endif
++
+ g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);
+
+ title = ogmrip_codec_get_input (OGMRIP_CODEC (video));
+Index: dvdcpy/dvdcpy.c
+===================================================================
+--- dvdcpy/dvdcpy.c (rĂŠvision 843)
++++ dvdcpy/dvdcpy.c (copie de travail)
+@@ -286,11 +286,11 @@
+ }
+
+ current_size += count;
+- fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size);
++ fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
+ fflush (stdout);
+ }
+
+- fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size);
++ fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size);
+ fflush (stdout);
+
+ return size;
+@@ -801,7 +801,7 @@
+
+ if (total_size > get_space_left (output))
+ {
+- fprintf (stderr, "Error: Not enough space left on device (%d bytes needed)\n", total_size);
++ fprintf (stderr, "Error: Not enough space left on device (%zd bytes needed)\n", total_size);
+ ifoClose (vmg_file);
+ DVDClose (reader);
+ return EXIT_FAILURE;
diff --git a/multimedia/ogmrip/files/patch-configure b/multimedia/ogmrip/files/patch-configure
deleted file mode 100644
index ed0e32311..000000000
--- a/multimedia/ogmrip/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig Tue Jun 28 08:16:09 2005
-+++ configure Sun May 21 14:20:18 2006
-@@ -20713,11 +20713,6 @@
- fi
-
- fi
--if ! "$SED_PROG" --version 2> /dev/null | head -n 1 | grep -q "GNU sed"; then
-- { { echo "$as_me:$LINENO: error: Unable to GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&5
--echo "$as_me: error: Unable to GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
-
- GTK_REQUIRED=2.6.0
-@@ -21304,7 +21299,7 @@
-
-
- if $MPLAYER_PROG | grep -q "MPlayer [0-1]\.[0-9]\+pre[0-9]\+.*"; then
-- MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [0-1]\.[0-9]\+pre\([0-9]\+\).*%\1%'`
-+ MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [0-1]\.[0-9]pre\([0-9]\).*%\1%'`
-
- cat >>confdefs.h <<_ACEOF
- #define MPLAYER_PRE $MPLAYER_PRE
diff --git a/multimedia/ogmrip/files/patch-fix_audio_overhead b/multimedia/ogmrip/files/patch-fix_audio_overhead
new file mode 100644
index 000000000..e19e0eef3
--- /dev/null
+++ b/multimedia/ogmrip/files/patch-fix_audio_overhead
@@ -0,0 +1,24 @@
+Fix audio overhead
+
+Index: libogmrip/ogmrip-container.c
+===================================================================
+--- libogmrip/ogmrip-container.c (rĂŠvision 843)
++++ libogmrip/ogmrip-container.c (copie de travail)
+@@ -563,12 +563,15 @@
+ ogmrip_container_get_audio_overhead (OGMRipContainer *container, OGMRipContainerChild *child)
+ {
+ glong length;
+- gint samples_per_frame, bitrate = 0;
++ gint samples_per_frame, sample_rate;
++ guint numerator, denominator;
+
+ length = ogmrip_codec_get_length (child->codec, NULL);
++ sample_rate = ogmrip_audio_get_sample_rate (OGMRIP_AUDIO (child->codec));
+ samples_per_frame = ogmrip_audio_get_samples_per_frame (OGMRIP_AUDIO (child->codec));
++ ogmrip_codec_get_framerate (OGMRIP_CODEC (child->codec), &numerator, &denominator);
+
+- return (gint64) length * bitrate * container->priv->overhead / (gdouble) samples_per_frame;
++ return (gint64) length * sample_rate * denominator * container->priv->overhead / (gdouble) (samples_per_frame * numerator);
+ }
+
+ static gint64
diff --git a/multimedia/ogmrip/files/patch-gmsgfmt b/multimedia/ogmrip/files/patch-gmsgfmt
new file mode 100644
index 000000000..8c4a56e44
--- /dev/null
+++ b/multimedia/ogmrip/files/patch-gmsgfmt
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Mon Oct 9 23:40:17 2006
++++ po/Makefile.in.in Mon Oct 9 23:40:31 2006
+@@ -44,7 +44,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+
+-GMSGFMT = @GMSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
+ MSGFMT = @MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index 766c14514..5f9adbbd4 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -3,7 +3,14 @@ bin/dvdcpy
bin/ogmrip
bin/srttool
bin/subp2pgm
-include/ogmdvd.h
+include/ogmdvd/ogmdvd.h
+include/ogmdvd/ogmdvd-audio-chooser.h
+include/ogmdvd/ogmdvd-chapter-list.h
+include/ogmdvd/ogmdvd-drive-chooser.h
+include/ogmdvd/ogmdvd-drive-dialog.h
+include/ogmdvd/ogmdvd-gtk.h
+include/ogmdvd/ogmdvd-subtitle-chooser.h
+include/ogmdvd/ogmdvd-title-chooser.h
include/ogmrip/ogmrip-acopy.h
include/ogmrip/ogmrip-audio.h
include/ogmrip/ogmrip-avi.h
@@ -12,11 +19,15 @@ include/ogmrip/ogmrip-container.h
include/ogmrip/ogmrip-dvdcpy.h
include/ogmrip/ogmrip-lavc.h
%%MKV_SUPPORT%%include/ogmrip/ogmrip-mkv.h
+include/ogmrip/ogmrip-chapters.h
+include/ogmrip/ogmrip-fs.h
+include/ogmrip/ogmrip-init.h
include/ogmrip/ogmrip-mp3.h
+include/ogmrip/ogmrip-mp4.h
+include/ogmrip/ogmrip-theora.h
include/ogmrip/ogmrip-ogg.h
include/ogmrip/ogmrip-srt.h
include/ogmrip/ogmrip-subp.h
-include/ogmrip/ogmrip-tools.h
include/ogmrip/ogmrip-video.h
include/ogmrip/ogmrip-vobsub.h
include/ogmrip/ogmrip-vorbis.h
@@ -24,31 +35,35 @@ include/ogmrip/ogmrip-wav.h
%%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h
include/ogmrip/ogmrip-xvid.h
include/ogmrip/ogmrip.h
-include/ogmspawn/ogmsp-bin.h
-include/ogmspawn/ogmsp-container.h
-include/ogmspawn/ogmsp-enums.h
-include/ogmspawn/ogmsp-exec.h
-include/ogmspawn/ogmsp-list.h
-include/ogmspawn/ogmsp-marshal.h
-include/ogmspawn/ogmsp-pipeline.h
-include/ogmspawn/ogmsp-queue.h
-include/ogmspawn/ogmsp-spawn.h
-include/ogmspawn/ogmspawn.h
+include/ogmjob/ogmjob-bin.h
+include/ogmjob/ogmjob-container.h
+include/ogmjob/ogmjob-enums.h
+include/ogmjob/ogmjob-exec.h
+include/ogmjob/ogmjob-list.h
+include/ogmjob/ogmjob-marshal.h
+include/ogmjob/ogmjob-pipeline.h
+include/ogmjob/ogmjob-queue.h
+include/ogmjob/ogmjob-spawn.h
+include/ogmjob/ogmjob.h
lib/libogmdvd.a
lib/libogmdvd.la
lib/libogmdvd.so
lib/libogmdvd.so.0
+lib/libogmdvd-gtk.a
+lib/libogmdvd-gtk.la
+lib/libogmdvd-gtk.so
+lib/libogmdvd-gtk.so.0
lib/libogmrip.a
lib/libogmrip.la
lib/libogmrip.so
lib/libogmrip.so.0
-lib/libogmspawn.a
-lib/libogmspawn.la
-lib/libogmspawn.so
-lib/libogmspawn.so.0
+lib/libogmjob.a
+lib/libogmjob.la
+lib/libogmjob.so
+lib/libogmjob.so.0
libdata/pkgconfig/ogmdvd.pc
libdata/pkgconfig/ogmrip.pc
-libdata/pkgconfig/ogmspawn.pc
+libdata/pkgconfig/ogmjob.pc
share/gnome/applications/ogmrip.desktop
share/gnome/ogmrip/ogmrip-crop.glade
share/gnome/ogmrip/ogmrip-main.glade
@@ -57,7 +72,11 @@ share/gnome/ogmrip/ogmrip-pref.glade
share/gnome/ogmrip/ogmrip-progress.glade
share/gnome/ogmrip/ogmrip-spell.glade
share/gnome/ogmrip/ogmrip-ui.xml
+share/gnome/ogmrip/ogmrip.xml
+share/gnome/ogmrip/ogmrip.xsd
+share/gnome/ogmrip/xml.xsd
share/gnome/pixmaps/ogmrip.png
@dirrm share/gnome/ogmrip
-@dirrm include/ogmspawn
@dirrm include/ogmrip
+@dirrm include/ogmjob
+@dirrm include/ogmdvd
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index a95f44950..b4d52e8e0 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -2,7 +2,7 @@
# Date created: 17 Oct 2002
# Whom: Hendrik Scholz <hendrik@scholz.net>
#
-# $FreeBSD: ports/multimedia/totem/Makefile,v 1.68 2006/04/29 23:03:00 ahze Exp $
+# $FreeBSD$
#
PORTNAME= totem
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index f321d5821..762a59923 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -2,12 +2,12 @@
# Date created: 23 October 2004
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
-# $FreeBSD: ports/multimedia/xfce4-media/Makefile,v 1.14 2006/08/16 12:32:26 itetcu Exp $
+# $FreeBSD$
#
PORTNAME= xfce4-media
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/
DISTNAME= xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index e71daab35..b4b29f178 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -2,11 +2,12 @@
# Date created: 2004/05/10
# Whom: Zahemszky, Gábor <Gabor@Zahemszky.HU>
#
-# $FreeBSD: ports/multimedia/xfce4-xmms-plugin/Makefile,v 1.9 2006/03/16 10:33:33 pav Exp $
+# $FreeBSD$
#
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= multimedia audio xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/ \
http://download2.berlios.de/xfce-goodies/
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 74a0ffdaf..72ebf1f0d 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -2,7 +2,7 @@
# Date created: 26 Mar 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
-# $FreeBSD: ports/net-im/gaim/Makefile,v 1.188 2006/07/18 20:47:59 marcus Exp $
+# $FreeBSD$
#
PORTNAME= gaim
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 6af3f9689..e745a6c99 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -2,7 +2,7 @@
# Date created: 23 August 1999
# Whom: Alex Varju <varju@webct.com>
#
-# $FreeBSD: ports/palm/jpilot/Makefile,v 1.57 2006/09/29 20:59:59 pav Exp $
+# $FreeBSD$
#
# "?=" and "+=" are for including this Makefile from japanese/jpilot
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index fcc90f13f..79ff67ce1 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -2,7 +2,7 @@
# Date created: January 24, 1998
# Whom: jseger@FreeBSD.org
#
-# $FreeBSD: ports/print/freetype2/Makefile,v 1.72 2006/05/16 05:07:44 mezz Exp $
+# $FreeBSD$
#
PORTNAME= freetype2
diff --git a/print/freetype2/files/patch-builds::unix::configure b/print/freetype2/files/patch-builds::unix::configure
index f9bc13eef..5717ae75f 100644
--- a/print/freetype2/files/patch-builds::unix::configure
+++ b/print/freetype2/files/patch-builds::unix::configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/print/freetype2/files/patch-builds::unix::configure,v 1.3 2005/03/10 00:52:03 marcus Exp $
+$FreeBSD$
--- builds/unix/configure.orig Mon Apr 22 19:50:27 2002
+++ builds/unix/configure Fri Jun 21 15:48:06 2002
diff --git a/print/gnome-print/files/patch-ab b/print/gnome-print/files/patch-ab
index 888002e63..f4479734a 100644
--- a/print/gnome-print/files/patch-ab
+++ b/print/gnome-print/files/patch-ab
@@ -1,5 +1,5 @@
-$FreeBSD: ports/print/gnome-print/files/patch-ab,v 1.4 2001/10/09 07:31:12 sobomax Exp $
+$FreeBSD$
--- Makefile.in.orig Fri Oct 5 11:37:00 2001
+++ Makefile.in Fri Oct 5 11:40:45 2001
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 7444d6fa8..77804d185 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -2,7 +2,7 @@
# Date created: 7 June 2003
# Whom: James Earl <jdearl@telus.net>
#
-# $FreeBSD: ports/print/xfce4-print/Makefile,v 1.39 2006/05/13 01:03:16 edwin Exp $
+# $FreeBSD$
#
PORTNAME= xfce4-print
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index a8f7a597d..e269666fe 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -3,10 +3,12 @@
# Whom: Andreas Fehlner <fehlner@gmx.de>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/science/gramps/Makefile,v 1.1 2006/09/30 15:18:02 ahze Exp $
+#
PORTNAME= gramps
PORTVERSION= 2.0.11
+PORTREVISION= 1
CATEGORIES= science gnome python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gramps
@@ -17,7 +19,7 @@ COMMENT= A GTK/GNOME-based genealogy program written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
${PYTHON_LIBDIR}/site-packages/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 1f3940855..8165fcb44 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -2,7 +2,7 @@
# Date Created: 08 December 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/security/gnome-keyring/Makefile,v 1.22 2006/05/28 15:22:11 pav Exp $
+# $FreeBSD$
#
PORTNAME= gnome-keyring
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 9730933b5..ada98217f 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpass
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security gnome
MASTER_SITES= http://projects.netlab.jp/gpass/release/
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 32a944d8d..299e82cc7 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -2,7 +2,7 @@
# Date created: 25 Aug 2004
# Whom: Philippe Rocques
#
-# $FreeBSD: ports/security/gtkpasman/Makefile,v 1.7 2006/08/19 03:31:48 rafan Exp $
+# $FreeBSD$
#
PORTNAME= gtkpasman
diff --git a/sysutils/conky/pkg-plist b/sysutils/conky/pkg-plist
index b84c16ce3..b9484c49c 100644
--- a/sysutils/conky/pkg-plist
+++ b/sysutils/conky/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/sysutils/conky/pkg-plist,v 1.1 2005/08/31 07:45:52 novel Exp $
+@comment $FreeBSD$
bin/conky
%%EXAMPLESDIR%%/conkyrc.sample
@dirrm %%EXAMPLESDIR%%
diff --git a/sysutils/gupsc/files/patch-Makefile.in b/sysutils/gupsc/files/patch-Makefile.in
index 4929a3fe6..5e904ee15 100644
--- a/sysutils/gupsc/files/patch-Makefile.in
+++ b/sysutils/gupsc/files/patch-Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/sysutils/gupsc/files/patch-Makefile.in,v 1.1 2002/05/13 12:50:41 sobomax Exp $
+$FreeBSD$
--- Makefile.in 2002/05/13 12:37:29 1.1
+++ Makefile.in 2002/05/13 12:37:39
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index a0dc7ad70..dcae11303 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/sysutils/xfce4-fsguard-plugin/pkg-plist,v 1.3 2006/03/16 10:34:10 pav Exp $
+@comment $FreeBSD$
lib/xfce4/panel-plugins/libfsguard.a
lib/xfce4/panel-plugins/libfsguard.la
lib/xfce4/panel-plugins/libfsguard.so
diff --git a/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c b/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c
index 541a0677c..f8221bbea 100644
--- a/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c
+++ b/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c,v 1.1 2004/01/10 17:36:28 petef Exp $
+$FreeBSD$
--- panel-plugin/showdesktop.c.orig Wed Nov 5 12:06:04 2003
+++ panel-plugin/showdesktop.c Sat Jan 10 11:21:40 2004
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 1de5b81d8..2891a5584 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -2,7 +2,7 @@
# Date created: 11 November 2004
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
-# $FreeBSD: ports/textproc/gnome-doc-utils/Makefile,v 1.10 2006/05/28 15:41:17 pav Exp $
+# $FreeBSD$
#
PORTNAME= gnome-doc-utils
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 56e8e43d8..46d655752 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openvanilla-modules
PORTVERSION= 0.7.2.b20060214
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.csie.org/~llwang/ \
http://www.infor.org/~llwang/
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index fc7c0b88b..f8ab33c6e 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
-MAINTAINER= chinsan.tw@gmail.com
+MAINTAINER= chinsan@FreeBSD.org
COMMENT= SCIM add-on to input various symbols with on-screen pad
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
diff --git a/textproc/scim-table-imengine/files/scim-make-table.sh b/textproc/scim-table-imengine/files/scim-make-table.sh
new file mode 100644
index 000000000..5eea729c0
--- /dev/null
+++ b/textproc/scim-table-imengine/files/scim-make-table.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cat <<EOF
+************************************************************
+** N O T E **
+************************************************************
+
+This is NOT a working scim-make-table. Due to the limitation
+on your system, scim-make-table cannot be compiled. So you
+cannot build binary im tables on this system.
+
+However, the scim-tables im engine is available, i.e. You
+still have the chance to use table-based input methods for
+scim. You can let someone build a tgz package for
+{zh,ja,ko}-scim-tables port on a 5.x system and then install
+it on your system.
+EOF
+exit 2
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index 4f7a8aa58..b93d72c42 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -33,7 +33,6 @@ share/locale/pa/LC_MESSAGES/scim-tables.mo
%%SKIM%%@dirrmtry share/apps/skim
%%SKIM%%@dirrmtry share/config.kcfg
%%SKIM%%@dirrmtry share/services/skimconfiguredialog
-%%SKIM%%@cwd %%X11BASE%%
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
@dirrmtry share/locale/zh_TW/LC_MESSAGES
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 257e1fda8..4de2ac4be 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -2,7 +2,7 @@
# Date created: 20 May 2004
# Whom: Jie Gao <gaoj@cpsc.ucalgary.ca>
#
-# $FreeBSD: ports/textproc/scim/Makefile,v 1.19 2006/05/13 04:24:49 edwin Exp $
+# $FreeBSD$
#
PORTNAME= scim
diff --git a/www/adblock/distinfo b/www/adblock/distinfo
new file mode 100644
index 000000000..e505c2d04
--- /dev/null
+++ b/www/adblock/distinfo
@@ -0,0 +1,3 @@
+MD5 (adblock-0.5.d/adblock-0.5-dev.xpi) = bf938b034e2439e3e137cb892906afb8
+SHA256 (adblock-0.5.d/adblock-0.5-dev.xpi) = 097e55e8579bea31c7821ebefb74a9ef56068b6b0b437f3580c3a18d38fc5563
+SIZE (adblock-0.5.d/adblock-0.5-dev.xpi) = 72084
diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile
index a17416969..97cde4c64 100644
--- a/www/bugmenot/Makefile
+++ b/www/bugmenot/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= bugmenot
-PORTVERSION= 0.8
-PORTREVISION= 3
+PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://extensions.roachfiend.com/
DISTNAME= ${PORTNAME}
-DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_1
+DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${PORTREVISION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= ${GECKO} extension to bypass compulsory web registration
diff --git a/www/bugmenot/distinfo b/www/bugmenot/distinfo
index 826716723..b5874e6ad 100644
--- a/www/bugmenot/distinfo
+++ b/www/bugmenot/distinfo
@@ -1,3 +1,3 @@
-MD5 (bugmenot-0.8_1/bugmenot.xpi) = 13d767e11d5fc41711e61ff5e564493b
-SHA256 (bugmenot-0.8_1/bugmenot.xpi) = 36da3653f59a20c5894f35621bdc49fdb739c4d3b6dc52f9a1e6792349a82125
-SIZE (bugmenot-0.8_1/bugmenot.xpi) = 24375
+MD5 (bugmenot-1.3_1/bugmenot.xpi) = f446463062b623004db61563eab815c2
+SHA256 (bugmenot-1.3_1/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
+SIZE (bugmenot-1.3_1/bugmenot.xpi) = 19249
diff --git a/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in
index b5f87a508..6f238102e 100644
--- a/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in
+++ b/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in,v 1.1 2002/01/25 11:06:45 sobomax Exp $
+$FreeBSD$
--- components/http-storage-module/Makefile.in 2002/01/22 14:05:48 1.1
+++ components/http-storage-module/Makefile.in 2002/01/22 14:06:05
diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in
index 217fb2f8f..575490af8 100644
--- a/www/gtkhtml/files/patch-doc::Makefile.in
+++ b/www/gtkhtml/files/patch-doc::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/www/gtkhtml/files/patch-doc::Makefile.in,v 1.1 2002/05/01 20:23:01 sobomax Exp $
+$FreeBSD$
--- doc/Makefile.in 2002/05/01 09:15:00 1.1
+++ doc/Makefile.in 2002/05/01 09:16:10
diff --git a/www/gtkhtml/files/patch-po::Makefile.in.in b/www/gtkhtml/files/patch-po::Makefile.in.in
index 2dd71f15f..42f683d3e 100644
--- a/www/gtkhtml/files/patch-po::Makefile.in.in
+++ b/www/gtkhtml/files/patch-po::Makefile.in.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/www/gtkhtml/files/patch-po::Makefile.in.in,v 1.1 2002/03/25 20:16:20 sobomax Exp $
+$FreeBSD$
--- po/Makefile.in.in 2002/03/25 14:35:10 1.1
+++ po/Makefile.in.in 2002/03/25 14:35:35
diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi
index 34b4e176d..434c9d0eb 100644
--- a/www/mozex/Makefile.xpi
+++ b/www/mozex/Makefile.xpi
@@ -1,7 +1,7 @@
# Date created: Sun Oct 26, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
#
-# $FreeBSD: ports/www/mozex/Makefile.xpi,v 1.6 2006/09/06 06:45:01 thierry Exp $
+# $FreeBSD$
#
USE_GECKO= seamonkey mozilla
diff --git a/www/openvrml/files/lookat.sh.in b/www/openvrml/files/lookat.sh.in
index 0f60203f5..0f3d2f823 100644
--- a/www/openvrml/files/lookat.sh.in
+++ b/www/openvrml/files/lookat.sh.in
@@ -1,4 +1,4 @@
#! /bin/sh
-# $FreeBSD: ports/www/openvrml/files/lookat.sh.in,v 1.1 2005/07/26 13:39:59 thierry Exp $
+# $FreeBSD$
LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1
diff --git a/www/plugger/pkg-install b/www/plugger/pkg-install
index d96aa16b2..45d4b45eb 100644
--- a/www/plugger/pkg-install
+++ b/www/plugger/pkg-install
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/www/plugger/pkg-install,v 1.3 2005/05/04 14:53:54 pav Exp $
+# $FreeBSD$
[ $# != 2 ] && exit 1
PKGNAME=$1
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 103c4cd35..68cf583fc 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -2,7 +2,7 @@
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
-# $FreeBSD: ports/x11-servers/XFree86-4-NestServer/Makefile,v 1.33 2006/08/26 04:09:21 lesi Exp $
+# $FreeBSD$
#
PORTNAME= NestServer
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index a5e5bc15f..849acd257 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -2,7 +2,7 @@
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
-# $FreeBSD: ports/x11-servers/XFree86-4-PrintServer/Makefile,v 1.32 2006/08/26 04:09:21 lesi Exp $
+# $FreeBSD$
#
PORTNAME= PrintServer
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 6dec26f65..dc2fc573b 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -2,7 +2,7 @@
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
-# $FreeBSD: ports/x11-servers/XFree86-4-Server/Makefile,v 1.171 2006/08/26 04:09:21 lesi Exp $
+# $FreeBSD$
#
PORTNAME= Server
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 73556b51d..a124b1632 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -2,7 +2,7 @@
# Date created: 10 Oct 1999
# Whom: taguchi@tohoku.iij.ad.jp
#
-# $FreeBSD: ports/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile,v 1.34 2006/08/26 04:09:21 lesi Exp $
+# $FreeBSD$
#
PORTNAME= VirtualFramebufferServer
diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
index 10079de6e..5af20966b 100644
--- a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
+++ b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
@@ -1,4 +1,4 @@
-# $FreeBSD: ports/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist,v 1.3 2005/05/04 01:28:30 anholt Exp $
+# $FreeBSD$
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index d402358ab..a8201dbe3 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -2,7 +2,7 @@
# Date created: 7 May 2004
# Whom: anholt@FreeBSD.org
#
-# $FreeBSD: ports/x11-servers/xorg-server/Makefile,v 1.39 2006/08/25 21:52:48 lesi Exp $
+# $FreeBSD$
#
PORTNAME= xorg-server
diff --git a/x11-themes/gnome-icons/Makefile b/x11-themes/gnome-icons/Makefile
index 416f5b336..0c3df8dfc 100644
--- a/x11-themes/gnome-icons/Makefile
+++ b/x11-themes/gnome-icons/Makefile
@@ -11,6 +11,7 @@
PORTNAME= gnome-icons
PORTVERSION= 20060914
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index 49cc91221..945105845 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -2,7 +2,7 @@
# Date created: 2005-11-05
# Whom: Phillip Neumann <pneumann@gmail.com>
#
-# $FreeBSD: ports/x11-themes/icon-naming-utils/Makefile,v 1.6 2006/04/30 21:07:39 pav Exp $
+# $FreeBSD$
#
PORTNAME= icon-naming-utils
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index 3e30b6eef..68434d58d 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
-$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.9 2006/03/15 05:50:51 marcus Exp $
- $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $
+$FreeBSD$
+ $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.18 2006/05/06 08:50:38 marcus Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa
index a59cdd5c5..3bc361620 100644
--- a/x11-toolkits/gtkscintilla/files/patch-aa
+++ b/x11-toolkits/gtkscintilla/files/patch-aa
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11-toolkits/gtkscintilla/files/patch-aa,v 1.7 2004/02/10 13:55:42 arved Exp $
+$FreeBSD$
--- Makefile.orig Fri Feb 8 10:15:02 2002
+++ Makefile Mon Feb 11 15:03:03 2002
diff --git a/x11-toolkits/gtkscintilla/files/patch-ab b/x11-toolkits/gtkscintilla/files/patch-ab
index 133f1d305..1f149e701 100644
--- a/x11-toolkits/gtkscintilla/files/patch-ab
+++ b/x11-toolkits/gtkscintilla/files/patch-ab
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11-toolkits/gtkscintilla/files/patch-ab,v 1.3 2001/06/07 09:11:06 sobomax Exp $
+$FreeBSD$
--- gtkscintilla.c.orig Mon May 14 11:45:35 2001
+++ gtkscintilla.c Tue May 15 15:30:16 2001
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 07abd376d..c172f6792 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -2,8 +2,8 @@
# Date created: 12 April 2002
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
-# $FreeBSD: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.45 2006/05/15 22:23:03 mezz Exp $
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.56 2006/07/21 20:47:04 mezz Exp $
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.57 2006/09/10 00:51:18 mezz Exp $
#
PORTNAME= libgnomeprintui
diff --git a/x11-toolkits/py-gnome/files/patch-configure b/x11-toolkits/py-gnome/files/patch-configure
index bc84c6f05..7865ce50d 100644
--- a/x11-toolkits/py-gnome/files/patch-configure
+++ b/x11-toolkits/py-gnome/files/patch-configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11-toolkits/py-gnome/files/patch-configure,v 1.1 2002/07/14 13:39:15 sobomax Exp $
+$FreeBSD$
--- configure.orig Thu Jan 3 15:20:36 2002
+++ configure Sun Jul 14 15:25:29 2002
diff --git a/x11-toolkits/py-gnome/files/patch-pygtk::configure b/x11-toolkits/py-gnome/files/patch-pygtk::configure
index 4326edc43..d3a68b8ef 100644
--- a/x11-toolkits/py-gnome/files/patch-pygtk::configure
+++ b/x11-toolkits/py-gnome/files/patch-pygtk::configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11-toolkits/py-gnome/files/patch-pygtk::configure,v 1.2 2002/08/28 18:02:42 sobomax Exp $
+$FreeBSD$
--- pygtk/configure.orig Sat Aug 24 10:37:08 2002
+++ pygtk/configure Wed Aug 28 20:20:53 2002
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index 8838085e9..cd97ff2f9 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -2,7 +2,7 @@
# Date created: 2005-12-15
# Whom: past@ebs.gr
#
-# $FreeBSD: ports/x11-toolkits/swt31/Makefile,v 1.4 2006/05/13 05:00:38 edwin Exp $
+# $FreeBSD$
#
PORTNAME= swt
diff --git a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
index c3095fd58..f0fd474d8 100644
--- a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
+++ b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h,v 1.3 2003/11/09 19:23:40 fjoe Exp $
+$FreeBSD$
--- include/wx/wxchar.h.orig Sun Sep 15 21:19:48 2002
+++ include/wx/wxchar.h Sat Oct 26 18:06:12 2002
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index caf2bb68e..6224b250a 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -9,10 +9,9 @@ PORTNAME= icewm
PORTVERSION= 1.2.28
PORTREVISION= 1
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= alepulver@FreeBSD.org
COMMENT= Window Manager designed for speed, usability and consistency
USE_X_PREFIX= yes
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index ebae1dea1..fd930a799 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
-# $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.1 2006/04/30 00:47:09 marcus Exp $
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $
+# $FreeBSD$
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.7 2006/05/04 05:49:20 marcus Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1435605d5..1af3d26ce 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-aa,v 1.19 2002/04/29 17:05:43 sobomax Exp $
+$FreeBSD$
--- configure.orig Mon Apr 29 12:07:59 2002
+++ configure Mon Apr 29 12:08:54 2002
diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb
index 0a96addd3..a1daaf14f 100644
--- a/x11/gnome-libs/files/patch-bb
+++ b/x11/gnome-libs/files/patch-bb
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-bb,v 1.5 2002/01/15 16:12:51 sobomax Exp $
+$FreeBSD$
--- gtk-xmhtml/Makefile.in.orig Mon Jan 14 12:02:33 2002
+++ gtk-xmhtml/Makefile.in Mon Jan 14 12:03:13 2002
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index f3d3a8204..401724e01 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-bg,v 1.14 2002/04/06 17:31:17 sobomax Exp $
+$FreeBSD$
--- zvt/Makefile.in.orig Sat Apr 6 19:22:07 2002
+++ zvt/Makefile.in Sat Apr 6 19:23:02 2002
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index 118d96017..dd39ef04d 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-bi,v 1.8 2002/07/11 17:16:10 sobomax Exp $
+$FreeBSD$
--- libart_lgpl/Makefile.in.orig Sun Jun 23 11:41:23 2002
+++ libart_lgpl/Makefile.in Sun Jun 23 11:42:23 2002
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
index 87dd1864b..b98c52953 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in,v 1.1 2002/05/01 20:23:03 sobomax Exp $
+$FreeBSD$
--- devel-docs/gnome/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnome/Makefile.in 2002/05/01 01:50:40
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
index 9d73eed89..9266154be 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in,v 1.1 2002/05/01 20:23:03 sobomax Exp $
+$FreeBSD$
--- devel-docs/gnomeui/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnomeui/Makefile.in 2002/05/01 01:50:55
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
index 4e796f268..e7cc10f89 100644
--- a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in,v 1.1 2002/05/01 20:23:03 sobomax Exp $
+$FreeBSD$
--- devel-docs/gnorba/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/gnorba/Makefile.in 2002/05/01 01:51:15
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
index 7a5fcd93b..c03007ea3 100644
--- a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in,v 1.1 2002/05/01 20:23:03 sobomax Exp $
+$FreeBSD$
--- devel-docs/zvt/Makefile.in 2002/05/01 01:47:18 1.1
+++ devel-docs/zvt/Makefile.in 2002/05/01 01:51:06
diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure
index f6a4ba2a6..2ee4ceb2e 100644
--- a/x11/gnome-libs/files/patch-libart_lgpl::configure
+++ b/x11/gnome-libs/files/patch-libart_lgpl::configure
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-libart_lgpl::configure,v 1.1 2002/04/29 17:05:43 sobomax Exp $
+$FreeBSD$
--- libart_lgpl/configure 2002/04/29 09:45:17 1.1
+++ libart_lgpl/configure 2002/04/29 09:45:37
diff --git a/x11/gnome-libs/files/patch-po::Makefile.in.in b/x11/gnome-libs/files/patch-po::Makefile.in.in
index a4dfe9dfc..68b6a8c98 100644
--- a/x11/gnome-libs/files/patch-po::Makefile.in.in
+++ b/x11/gnome-libs/files/patch-po::Makefile.in.in
@@ -1,5 +1,5 @@
-$FreeBSD: ports/x11/gnome-libs/files/patch-po::Makefile.in.in,v 1.1 2002/01/15 16:12:51 sobomax Exp $
+$FreeBSD$
--- po/Makefile.in.in 2002/01/14 11:02:35 1.1
+++ po/Makefile.in.in 2002/01/14 11:02:49
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index 9e591ccae..4681d7132 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/x11/xfce4-clipman-plugin/pkg-plist,v 1.4 2006/02/23 10:39:59 ade Exp $
+@comment $FreeBSD$
lib/xfce4/panel-plugins/libclipman.a
lib/xfce4/panel-plugins/libclipman.la
lib/xfce4/panel-plugins/libclipman.so