From d99139db682a0df94e851093755c66cef28610fd Mon Sep 17 00:00:00 2001 From: bland Date: Thu, 13 Apr 2006 07:57:40 +0000 Subject: Correct suboptimal regexp I suggested to mezz. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6065 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/fast-user-switch-applet/Makefile | 4 ++-- x11/gdm/Makefile | 4 ++-- x11/gnome-applets/Makefile | 4 ++-- x11/gnome-desktop/Makefile | 4 ++-- x11/gnome-menus/Makefile | 4 ++-- x11/gnome-panel/Makefile | 4 ++-- x11/gnome-screensaver/Makefile | 4 ++-- x11/gnome-session/Makefile | 4 ++-- x11/gnome-terminal/Makefile | 4 ++-- x11/gnomeapplets2/Makefile | 4 ++-- x11/gnomedesktop/Makefile | 4 ++-- x11/gnomepanel/Makefile | 4 ++-- x11/gnomesession/Makefile | 4 ++-- x11/gnometerminal/Makefile | 4 ++-- x11/libgnome/Makefile | 4 ++-- x11/libgnomemm26/Makefile | 4 ++-- x11/yelp/Makefile | 4 ++-- x11/zenity/Makefile | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) (limited to 'x11') 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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 # # $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 -- cgit v1.2.3