summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbland <bland@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-13 15:57:40 +0800
committerbland <bland@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-13 15:57:40 +0800
commitd99139db682a0df94e851093755c66cef28610fd (patch)
tree3dfdbe2c6550fa83387058ca35c9030d5c509a82
parent4f2c31a251e43cd91b295e9aef7fba0b7b140980 (diff)
downloadmarcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar.gz
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar.bz2
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar.lz
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar.xz
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.tar.zst
marcuscom-ports-d99139db682a0df94e851093755c66cef28610fd.zip
Correct suboptimal regexp I suggested to mezz.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6065 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--accessibility/at-spi/Makefile4
-rw-r--r--accessibility/atk/Makefile4
-rw-r--r--accessibility/dasher/Makefile4
-rw-r--r--accessibility/gail/Makefile4
-rw-r--r--accessibility/gnopernicus/Makefile4
-rw-r--r--accessibility/gok/Makefile4
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/fileroller/Makefile4
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gnomemedia2/Makefile4
-rw-r--r--audio/goobox/Makefile4
-rw-r--r--audio/sound-juicer/Makefile4
-rw-r--r--databases/evolution-data-server/Makefile4
-rw-r--r--deskutils/deskbar-applet/Makefile4
-rw-r--r--deskutils/evolution-jescs/Makefile4
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnomeutils2/Makefile4
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/bug-buddy/Makefile4
-rw-r--r--devel/bugbuddy/Makefile4
-rw-r--r--devel/gconf2/Makefile4
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/glade3/Makefile4
-rw-r--r--devel/glib20/Makefile6
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfsmm/Makefile4
-rw-r--r--devel/gnomevfs2/Makefile4
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libgsf/Makefile4
-rw-r--r--devel/libgtop2/Makefile4
-rw-r--r--devel/libsoup/Makefile4
-rw-r--r--devel/libsoup22/Makefile4
-rw-r--r--devel/py-gobject/Makefile4
-rw-r--r--devel/py-orbit2/Makefile4
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--games/atomix/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnomegames2/Makefile4
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvasmm26/Makefile4
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--mail/evolution-exchange/Makefile4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--misc/gnome-icon-theme/Makefile4
-rw-r--r--misc/gnome-user-docs/Makefile4
-rw-r--r--misc/gnomeuserdocs2/Makefile4
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gnomenettool/Makefile4
-rw-r--r--net/vino/Makefile4
-rw-r--r--security/gnome-keyring-manager/Makefile4
-rw-r--r--security/gnomekeyringmanager/Makefile4
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-tools/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile4
-rw-r--r--sysutils/gnomesystemmonitor/Makefile4
-rw-r--r--sysutils/gnomesystemtools/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--textproc/libxml++26/Makefile4
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/evolution-webcal/Makefile4
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gtkhtml38/Makefile4
-rw-r--r--x11-fm/nautilus/Makefile4
-rw-r--r--x11-fm/nautilus2/Makefile4
-rw-r--r--x11-themes/gnome-backgrounds/Makefile4
-rw-r--r--x11-themes/gnome-themes/Makefile4
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/gtksourceview/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile4
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-wm/metacity/Makefile4
-rw-r--r--x11/fast-user-switch-applet/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-menus/Makefile4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-screensaver/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnomeapplets2/Makefile4
-rw-r--r--x11/gnomedesktop/Makefile4
-rw-r--r--x11/gnomepanel/Makefile4
-rw-r--r--x11/gnomesession/Makefile4
-rw-r--r--x11/gnometerminal/Makefile4
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/yelp/Makefile4
-rw-r--r--x11/zenity/Makefile4
101 files changed, 202 insertions, 202 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index f9fb4e888..f8a0909c3 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.41 2006/03/13 19:31:35 mezz Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.42 2006/03/31 22:51:52 marcus Exp $
#
PORTNAME= at-spi
PORTVERSION= 1.7.7
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 70a6de71c..4ec71ab1f 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atk/Makefile,v 1.66 2006/03/13 21:48:06 mezz Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.67 2006/03/31 22:37:11 marcus Exp $
#
PORTNAME= atk
PORTVERSION= 1.11.4
CATEGORIES= accessibility devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index e0991e1d2..737fa3222 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,7 +3,7 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.32 2006/03/17 23:47:26 mezz Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.33 2006/04/02 17:52:52 marcus Exp $
#
PORTNAME= dasher
@@ -11,7 +11,7 @@ PORTVERSION= 4.0.2
PORTEPOCH= 1
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= lewiz@compsoc.man.ac.uk
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 31a43a180..f00cb89f5 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/accessibility/gail/Makefile,v 1.42 2006/03/13 23:42:59 mezz Exp $
#
PORTNAME= gail
PORTVERSION= 1.8.11
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 765c77ed5..d6721984b 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.73 2006/03/13 19:31:35 mezz Exp $
+# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.74 2006/04/10 17:42:34 mezz Exp $
#
PORTNAME= gnopernicus
PORTVERSION= 1.0.4
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 3a9ef810e..dfbbe6ae8 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.62 2006/03/13 19:31:36 mezz Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.63 2006/03/13 22:16:50 mezz Exp $
PORTNAME= gok
PORTVERSION= 1.0.7
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 3e0a2ad78..436377aae 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,7 +3,7 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/fileroller/Makefile,v 1.92 2006/04/11 01:01:32 ahze Exp $
+# $MCom: ports/archivers/fileroller/Makefile,v 1.93 2006/04/11 01:03:42 marcus Exp $
#
PORTNAME= fileroller
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 3e0a2ad78..436377aae 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -3,7 +3,7 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/fileroller/Makefile,v 1.92 2006/04/11 01:01:32 ahze Exp $
+# $MCom: ports/archivers/fileroller/Makefile,v 1.93 2006/04/11 01:03:42 marcus Exp $
#
PORTNAME= fileroller
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 2a56afa52..29a3fe7ff 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomemedia2/Makefile,v 1.93 2006/03/13 06:12:40 mezz Exp $
+# $MCom: ports/audio/gnomemedia2/Makefile,v 1.94 2006/03/13 19:31:36 mezz Exp $
#
PORTNAME= gnomemedia2
PORTVERSION= 2.14.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 2a56afa52..29a3fe7ff 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomemedia2/Makefile,v 1.93 2006/03/13 06:12:40 mezz Exp $
+# $MCom: ports/audio/gnomemedia2/Makefile,v 1.94 2006/03/13 19:31:36 mezz Exp $
#
PORTNAME= gnomemedia2
PORTVERSION= 2.14.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 417f30075..3cb77ca1a 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/goobox/Makefile,v 1.13 2006/03/13 19:31:36 mezz Exp $
+# $MCom: ports/audio/goobox/Makefile,v 1.14 2006/04/03 00:54:37 mezz Exp $
#
PORTNAME= goobox
@@ -11,7 +11,7 @@ PORTVERSION= 0.9.93
PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index ead17a75d..9053fed9c 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.46 2006/04/04 03:44:01 marcus Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.47 2006/04/10 16:38:54 mezz Exp $
#
PORTNAME= sound-juicer
PORTVERSION= 2.14.2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e80e1a98b..0aafed507 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.81 2006/03/13 23:16:25 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.82 2006/04/10 21:18:09 marcus Exp $
#
PORTNAME= evolution-data-server
PORTVERSION= 1.6.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index a494d6482..584a52aa3 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,14 +3,14 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.21 2006/03/14 05:31:13 mezz Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.22 2006/04/10 17:54:12 mezz Exp $
#
PORTNAME= deskbar-applet
PORTVERSION= 2.14.1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 93b0581b7..db51d8874 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.7 2006/03/13 19:31:37 mezz Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.8 2006/04/09 23:28:35 marcus Exp $
#
PORTNAME= jescs
PORTVERSION= 2.5.3
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 10119de93..332526fe8 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.87 2006/03/13 19:31:37 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.88 2006/03/13 20:48:58 marcus Exp $
#
PORTNAME= gnomeutils2
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 10119de93..332526fe8 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.87 2006/03/13 19:31:37 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.88 2006/03/13 20:48:58 marcus Exp $
#
PORTNAME= gnomeutils2
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 1a9b8b158..93669fc2b 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.22 2006/03/13 06:36:42 marcus Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.23 2006/03/13 19:31:38 mezz Exp $
#
PORTNAME= gucharmap
PORTVERSION= 1.6.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 352fe5e02..3aaf71bc4 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,14 +3,14 @@
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
-# $MCom: ports/devel/ORBit2/Makefile,v 1.48 2006/03/13 19:31:38 mezz Exp $
+# $MCom: ports/devel/ORBit2/Makefile,v 1.49 2006/03/14 22:55:46 marcus Exp $
#
PORTNAME= ORBit2
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index b54e44625..906c40d7a 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bugbuddy/Makefile,v 1.27 2006/03/13 06:33:52 mezz Exp $
+# $MCom: ports/devel/bugbuddy/Makefile,v 1.28 2006/03/13 19:31:38 mezz Exp $
#
PORTNAME= bugbuddy
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index b54e44625..906c40d7a 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bugbuddy/Makefile,v 1.27 2006/03/13 06:33:52 mezz Exp $
+# $MCom: ports/devel/bugbuddy/Makefile,v 1.28 2006/03/13 19:31:38 mezz Exp $
#
PORTNAME= bugbuddy
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 08f8fa788..649df3d3c 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.70 2006/03/13 19:31:38 mezz Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.71 2006/03/18 17:29:29 ahze Exp $
#
PORTNAME= gconf2
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 00add497e..57533fa6a 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.7 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.9 2006/03/16 20:02:13 marcus Exp $
#
PORTNAME= gconfmm
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 8a14ce991..5204ae4c4 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade3/Makefile,v 1.8 2006/03/13 06:33:53 mezz Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.9 2006/03/13 19:31:38 mezz Exp $
#
PORTNAME= glade3
@@ -11,7 +11,7 @@ PORTVERSION= 2.91.0
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/glade-3/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/glade-3/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= glade-3-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 8318d7622..b441fb3ab 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,19 +3,19 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.73 2006/03/13 19:31:39 mezz Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.74 2006/04/07 18:17:49 ahze Exp $
#
PORTNAME= glib
PORTVERSION= 2.10.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \
- ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ \
+ ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 0abf2e9b2..b97aa64fe 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.28 2006/03/09 00:20:14 marcus Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.29 2006/03/13 19:31:39 mezz Exp $
#
PORTNAME= glibmm
PORTVERSION= 2.10.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index cb965d1d5..de840441e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.134 2006/03/13 19:31:39 mezz Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.135 2006/03/13 20:41:08 marcus Exp $
#
PORTNAME= gnomevfs2
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index f33b07d76..6cd299d9d 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.14 2005/10/14 20:39:56 adamw Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.16 2006/03/16 20:10:29 marcus Exp $
#
PORTNAME= gnome-vfsmm
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index cb965d1d5..de840441e 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.134 2006/03/13 19:31:39 mezz Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.135 2006/03/13 20:41:08 marcus Exp $
#
PORTNAME= gnomevfs2
PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 180137685..5aabb144c 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.43 2006/03/13 19:31:39 mezz Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.44 2006/03/14 15:55:35 marcus Exp $
#
PORTNAME= libbonobo
PORTVERSION= 2.14.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 9a75e7434..5915e5d3a 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf/Makefile,v 1.19 2006/03/05 21:26:55 marcus Exp $
+# $MCom: ports/devel/libgsf/Makefile,v 1.20 2006/03/13 19:31:39 mezz Exp $
#
PORTNAME= libgsf
@@ -11,7 +11,7 @@ PORTVERSION= 1.14.0
PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index fdb427a30..b3e882c55 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop2/Makefile,v 1.67 2006/03/14 07:26:28 marcus Exp $
+# $MCom: ports/devel/libgtop2/Makefile,v 1.68 2006/04/10 19:39:57 marcus Exp $
#
PORTNAME= libgtop2
PORTVERSION= 2.14.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4e0c1c755..353ff2c8d 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.34 2006/03/13 19:31:40 mezz Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.35 2006/04/10 19:56:37 ahze Exp $
#
PORTNAME= libsoup
PORTVERSION= 2.2.92
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 4e0c1c755..353ff2c8d 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.34 2006/03/13 19:31:40 mezz Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.35 2006/04/10 19:56:37 ahze Exp $
#
PORTNAME= libsoup
PORTVERSION= 2.2.92
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 34417a3c8..f11585ed9 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,13 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/py-gobject/Makefile,v 1.5 2006/03/13 22:01:32 mezz Exp $
+# $MCom: ports/devel/py-gobject/Makefile,v 1.6 2006/04/12 05:50:34 marcus Exp $
PORTNAME= gobject
PORTVERSION= 2.10.1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygobject-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index c9dc53f7d..d265d5d18 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -3,13 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/py-orbit2/Makefile,v 1.9 2006/03/13 06:33:54 mezz Exp $
+# $MCom: ports/devel/py-orbit2/Makefile,v 1.10 2006/03/13 19:31:40 mezz Exp $
PORTNAME= orbit
PORTVERSION= 2.14.0
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyorbit-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 879762410..0cc7c60b8 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.31 2006/03/16 19:17:00 marcus Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.32 2006/04/10 17:34:42 mezz Exp $
#
PORTNAME= gedit
PORTVERSION= 2.14.2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 1256da44d..0f9002595 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -3,14 +3,14 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/atomix/Makefile,v 1.7 2006/03/13 19:31:41 mezz Exp $
+# $MCom: ports/games/atomix/Makefile,v 1.8 2006/04/12 22:09:10 marcus Exp $
#
PORTNAME= atomix
PORTVERSION= 2.14.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 489be859a..3f6e13342 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2/Makefile,v 1.109 2006/03/16 17:31:51 marcus Exp $
+# $MCom: ports/games/gnomegames2/Makefile,v 1.110 2006/04/10 07:05:14 marcus Exp $
#
PORTNAME= gnomegames2
PORTVERSION= 2.14.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 489be859a..3f6e13342 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2/Makefile,v 1.109 2006/03/16 17:31:51 marcus Exp $
+# $MCom: ports/games/gnomegames2/Makefile,v 1.110 2006/04/10 07:05:14 marcus Exp $
#
PORTNAME= gnomegames2
PORTVERSION= 2.14.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 262728528..d0d5bdcd8 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.27 2006/03/13 21:55:29 mezz Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.28 2006/04/11 00:56:21 ahze Exp $
#
PORTNAME= eog
PORTVERSION= 2.14.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 11d947748..d6e95695b 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.55 2006/03/13 19:31:41 mezz Exp $
+# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.56 2006/03/13 20:44:40 marcus Exp $
#
PORTNAME= libgnomecanvas
PORTVERSION= 2.14.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index c6a84829b..6686e26f0 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.9 2005/09/07 18:37:21 marcus Exp $
+# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.11 2006/03/16 19:40:18 marcus Exp $
#
PORTNAME= libgnomecanvasmm
PORTVERSION= 2.14.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index d5858ad5e..c9f962336 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.96 2006/03/30 15:13:32 ahze Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.97 2006/04/01 20:31:22 marcus Exp $
#
PORTNAME= librsvg2
PORTVERSION= 2.14.3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index e1745c359..a1a7e4388 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.57 2006/03/17 20:36:59 mezz Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.58 2006/04/10 22:09:59 marcus Exp $
#
PORTNAME= evolution-exchange
PORTVERSION= 2.6.1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= kiesel@schlund.de
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index e3003a040..c8eccd0eb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.96 2006/03/14 00:12:32 marcus Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.97 2006/04/10 21:48:46 marcus Exp $
#
PORTNAME= evolution
PORTVERSION= 2.6.1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index ad1635f5f..0cfaa897a 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.72 2006/03/13 19:31:42 mezz Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.73 2006/03/14 23:25:20 marcus Exp $
#
PORTNAME= gnome-icon-theme
PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 8fc4a170a..e8a301eb9 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.23 2006/04/10 06:56:39 marcus Exp $
+# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.24 2006/04/11 01:31:10 marcus Exp $
#
PORTNAME= gnomeuserdocs2
PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index 8fc4a170a..e8a301eb9 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.23 2006/04/10 06:56:39 marcus Exp $
+# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.24 2006/04/11 01:31:10 marcus Exp $
#
PORTNAME= gnomeuserdocs2
PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 08bdf8392..7f17eec05 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -9,7 +9,7 @@ PORTNAME= totem
PORTVERSION= 1.4.0
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER?= hendrik@scholz.net
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 46d32931c..3cdef8521 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnomenettool/Makefile,v 1.20 2006/03/16 19:26:48 marcus Exp $
+# $MCom: ports/net/gnomenettool/Makefile,v 1.21 2006/04/10 17:02:59 mezz Exp $
#
PORTNAME= gnomenettool
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-nettool-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile
index 46d32931c..3cdef8521 100644
--- a/net/gnomenettool/Makefile
+++ b/net/gnomenettool/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnomenettool/Makefile,v 1.20 2006/03/16 19:26:48 marcus Exp $
+# $MCom: ports/net/gnomenettool/Makefile,v 1.21 2006/04/10 17:02:59 mezz Exp $
#
PORTNAME= gnomenettool
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-nettool-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 2d1a1e0d2..25f3e1ccf 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,14 +3,14 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.26 2006/03/13 06:55:51 mezz Exp $
+# $MCom: ports/net/vino/Makefile,v 1.27 2006/03/13 19:31:43 mezz Exp $
#
PORTNAME= vino
PORTVERSION= 2.13.5
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 79a4f8397..ec3b60c3c 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.17 2006/03/13 06:59:12 mezz Exp $
+# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.18 2006/03/13 19:31:43 mezz Exp $
#
PORTNAME= gnomekeyringmanager
PORTVERSION= 2.14.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-keyring-manager-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 79a4f8397..ec3b60c3c 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.17 2006/03/13 06:59:12 mezz Exp $
+# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.18 2006/03/13 19:31:43 mezz Exp $
#
PORTNAME= gnomekeyringmanager
PORTVERSION= 2.14.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-keyring-manager-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 2aefbef51..056c83cb3 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.47 2006/03/13 07:04:33 mezz Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.48 2006/03/13 19:31:43 mezz Exp $
#
PORTNAME= gconf-editor
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index f447f6c46..d1e2cf269 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.106 2006/04/10 18:06:41 mezz Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.107 2006/04/10 21:36:24 mezz Exp $
#
PORTNAME= gnomecontrolcenter2
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 7bd5cd87f..a3784b3ee 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.64 2006/03/13 21:04:57 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.65 2006/04/10 19:43:03 marcus Exp $
#
PORTNAME= gnomesystemmonitor
PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 5013895df..099b8c39a 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.38 2006/03/13 19:31:44 mezz Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.39 2006/03/14 01:26:08 marcus Exp $
#
PORTNAME= gnomesystemtools
PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index f447f6c46..d1e2cf269 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.106 2006/04/10 18:06:41 mezz Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.107 2006/04/10 21:36:24 mezz Exp $
#
PORTNAME= gnomecontrolcenter2
@@ -11,7 +11,7 @@ PORTVERSION= 2.14.1
PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 7bd5cd87f..a3784b3ee 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.64 2006/03/13 21:04:57 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.65 2006/04/10 19:43:03 marcus Exp $
#
PORTNAME= gnomesystemmonitor
PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 5013895df..099b8c39a 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.38 2006/03/13 19:31:44 mezz Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.39 2006/03/14 01:26:08 marcus Exp $
#
PORTNAME= gnomesystemtools
PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index fe40cb7cd..3e10cea40 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.94 2006/03/15 17:24:49 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.95 2006/04/10 17:46:22 mezz Exp $
#
PORTNAME= nautilus-cd-burner
PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 0d5bf4e7a..0b1347f2a 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,14 +4,14 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/libxml++26/Makefile,v 1.11 2006/03/13 19:31:45 mezz Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.12 2006/03/13 22:27:57 marcus Exp $
#
PORTNAME= libxml++
PORTVERSION= 2.14.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= bland@FreeBSD.org
COMMENT= XML API for C++
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 2217e0204..6b2b54b66 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.69 2006/03/13 19:31:45 mezz Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.70 2006/04/12 06:41:18 marcus Exp $
#
PORTNAME= epiphany
PORTVERSION= 2.14.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= -extensions
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 8ffdb98a8..96d0636db 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.110 2006/04/11 00:56:27 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.111 2006/04/12 06:20:33 marcus Exp $
#
PORTNAME= epiphany
PORTVERSION= 2.14.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 0ee0e2310..ceb8ab593 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,14 +3,14 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.34 2006/03/13 07:09:46 mezz Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.35 2006/03/13 19:31:45 mezz Exp $
#
PORTNAME= webcal
PORTVERSION= 2.5.90
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 990d93325..77c496729 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.75 2006/03/13 22:55:37 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.76 2006/04/10 20:45:41 marcus Exp $
#
PORTNAME= gtkhtml3
PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 990d93325..77c496729 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.75 2006/03/13 22:55:37 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.76 2006/04/10 20:45:41 marcus Exp $
#
PORTNAME= gtkhtml3
PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 80480199f..dfcde5dc9 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,14 +3,14 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.103 2006/03/13 19:31:48 mezz Exp $
+# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.104 2006/04/11 00:53:27 ahze Exp $
#
PORTNAME= nautilus2
PORTVERSION= 2.14.1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= nautilus-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 80480199f..dfcde5dc9 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,14 +3,14 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.103 2006/03/13 19:31:48 mezz Exp $
+# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.104 2006/04/11 00:53:27 ahze Exp $
#
PORTNAME= nautilus2
PORTVERSION= 2.14.1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= nautilus-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index ba53c1bed..190d496c5 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.18 2006/03/13 21:44:02 mezz Exp $
+# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.19 2006/04/11 23:32:29 ahze Exp $
#
PORTNAME= gnome-backgrounds
PORTVERSION= 2.14.1
CATEGORIES= x11-themes graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 2100afbed..311082b07 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.83 2006/03/13 19:31:48 mezz Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.84 2006/03/13 22:06:31 mezz Exp $
#
PORTNAME= gnome-themes
PORTVERSION= 2.14.0
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index b6f60f3a7..50d786045 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,14 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.33 2006/03/13 19:31:49 mezz Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.34 2006/04/11 00:35:39 ahze Exp $
#
PORTNAME= eel
PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 9ad7e20db..83d145add 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.35 2006/03/13 19:31:49 mezz Exp $
+# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.36 2006/04/10 11:32:46 ahze Exp $
#
PORTNAME= gtksourceview
PORTVERSION= 1.6.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 9ad7e20db..83d145add 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.35 2006/03/13 19:31:49 mezz Exp $
+# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.36 2006/04/10 11:32:46 ahze Exp $
#
PORTNAME= gtksourceview
PORTVERSION= 1.6.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 57fdd91c6..f362e158d 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.41 2006/03/13 19:31:49 mezz Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.42 2006/03/14 23:04:32 marcus Exp $
#
PORTNAME= libbonoboui
PORTVERSION= 2.14.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 3f2f6f2c1..e3195d555 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,13 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.77 2006/03/13 19:31:49 mezz Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.78 2006/04/11 01:23:50 marcus Exp $
PORTNAME= libgnomeui
PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index d50b6f6c1..d84d0338e 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.7 2006/03/16 20:21:56 marcus Exp $
#
PORTNAME= libgnomeuimm
PORTVERSION= 2.14.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 4b0c19037..e374c4328 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.68 2006/03/13 21:22:34 mezz Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.69 2006/04/10 16:42:03 mezz Exp $
#
PORTNAME= libwnck
PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index b93b690c3..b2e05873e 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,14 +3,14 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.36 2006/03/31 06:21:25 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.37 2006/04/12 17:44:15 mezz Exp $
#
PORTNAME= gtk
PORTVERSION= 2.8.6
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtk-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 44ad27d4c..59f4c6fce 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.45 2006/03/13 19:31:50 mezz Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.46 2006/03/17 02:18:59 mezz Exp $
#
PORTNAME= vte
PORTVERSION= 0.12.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 711bbb071..e63d66d69 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,14 +3,14 @@
# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/metacity/Makefile,v 1.75 2006/03/14 00:29:12 mezz Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.76 2006/04/10 22:20:30 marcus Exp $
#
PORTNAME= metacity
PORTVERSION= 2.14.2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 1f5b9b923..b465dd3cf 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,13 +3,13 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.10 2006/03/14 01:04:42 marcus Exp $
+# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.11 2006/04/11 01:06:23 marcus Exp $
PORTNAME= fast-user-switch-applet
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4d73cbdcd..59ff70738 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.25 2006/04/10 21:37:33 mezz Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.26 2006/04/12 06:03:00 marcus Exp $
#
PORTNAME= gdm
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 44081b1ce..2726c06d1 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.109 2006/03/13 19:31:46 mezz Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.110 2006/04/10 17:20:41 mezz Exp $
#
PORTNAME= gnomeapplets2
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index e37b6ba91..6d5ccc641 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomedesktop/Makefile,v 1.88 2006/04/10 16:59:06 mezz Exp $
+# $MCom: ports/x11/gnomedesktop/Makefile,v 1.89 2006/04/11 23:29:08 ahze Exp $
#
PORTNAME= gnomedesktop
PORTVERSION= 2.14.1.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 297262417..4102c4f57 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.26 2006/03/13 07:23:14 mezz Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.27 2006/03/13 19:31:46 mezz Exp $
#
PORTNAME= gnome-menus
PORTVERSION= 2.13.5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e290859e4..04f594816 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomepanel/Makefile,v 1.126 2006/03/14 00:13:00 marcus Exp $
+# $MCom: ports/x11/gnomepanel/Makefile,v 1.127 2006/04/10 16:17:19 ahze Exp $
#
PORTNAME= gnomepanel
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 83a7c16fa..b66b83cf9 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.34 2006/03/27 23:06:45 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.35 2006/04/10 19:47:57 marcus Exp $
#
PORTNAME= gnome-screensaver
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 111a6dea1..1aa0aa74e 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomesession/Makefile,v 1.79 2006/04/02 21:02:18 marcus Exp $
+# $MCom: ports/x11/gnomesession/Makefile,v 1.80 2006/04/10 13:10:49 ahze Exp $
#
PORTNAME= gnomesession
@@ -12,7 +12,7 @@ CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
-MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} \
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
adamw/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 31e47a473..eba765b0b 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnometerminal/Makefile,v 1.67 2006/04/02 22:45:26 marcus Exp $
+# $MCom: ports/x11/gnometerminal/Makefile,v 1.68 2006/04/09 16:13:53 ahze Exp $
#
PORTNAME= gnometerminal
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 44081b1ce..2726c06d1 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.109 2006/03/13 19:31:46 mezz Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.110 2006/04/10 17:20:41 mezz Exp $
#
PORTNAME= gnomeapplets2
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index e37b6ba91..6d5ccc641 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomedesktop/Makefile,v 1.88 2006/04/10 16:59:06 mezz Exp $
+# $MCom: ports/x11/gnomedesktop/Makefile,v 1.89 2006/04/11 23:29:08 ahze Exp $
#
PORTNAME= gnomedesktop
PORTVERSION= 2.14.1.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index e290859e4..04f594816 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomepanel/Makefile,v 1.126 2006/03/14 00:13:00 marcus Exp $
+# $MCom: ports/x11/gnomepanel/Makefile,v 1.127 2006/04/10 16:17:19 ahze Exp $
#
PORTNAME= gnomepanel
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 111a6dea1..1aa0aa74e 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomesession/Makefile,v 1.79 2006/04/02 21:02:18 marcus Exp $
+# $MCom: ports/x11/gnomesession/Makefile,v 1.80 2006/04/10 13:10:49 ahze Exp $
#
PORTNAME= gnomesession
@@ -12,7 +12,7 @@ CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
-MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} \
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
adamw/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 31e47a473..eba765b0b 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnometerminal/Makefile,v 1.67 2006/04/02 22:45:26 marcus Exp $
+# $MCom: ports/x11/gnometerminal/Makefile,v 1.68 2006/04/09 16:13:53 ahze Exp $
#
PORTNAME= gnometerminal
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 9ef983556..1eff64c13 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,14 +3,14 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.76 2006/04/12 21:58:41 marcus Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.77 2006/04/12 22:09:54 marcus Exp $
#
PORTNAME= libgnome
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index b8e91293e..5297c441f 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD: ports/x11/libgnomemm26/Makefile,v 1.20 2006/02/23 10:39:57 ade Exp $
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.7 2006/03/16 19:23:31 marcus Exp $
#
PORTNAME= libgnomemm
PORTVERSION= 2.14.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 0b74d6929..c03d53668 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.85 2006/03/13 19:31:48 mezz Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.86 2006/04/10 04:10:47 mezz Exp $
#
PORTNAME= yelp
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 1ee00f64f..617ef2a1a 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,14 +3,14 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.57 2006/03/13 21:19:16 mezz Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.58 2006/04/10 22:27:57 marcus Exp $
#
PORTNAME= zenity
PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org