From ddd409c98abe6dc5224ebdffeb22041e698e5c55 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 13 Mar 2006 19:31:50 +0000 Subject: Change the MASTER_SITE_SUBDIR from: sources/${PORTNAME}/${PORTVERSION:R} To: sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} That way you don't have to tweak :R or :R:R if there has four any third point release. Half of them have been tested. Suggested by: bland git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5906 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/ORBit2/Makefile | 4 ++-- devel/bug-buddy/Makefile | 4 ++-- devel/bugbuddy/Makefile | 4 ++-- devel/gconf2/Makefile | 4 ++-- devel/glade3/Makefile | 4 ++-- devel/glib20/Makefile | 6 +++--- devel/glibmm/Makefile | 4 ++-- devel/gnome-vfs/Makefile | 4 ++-- devel/gnomevfs2/Makefile | 4 ++-- devel/libbonobo/Makefile | 4 ++-- devel/libgsf/Makefile | 4 ++-- devel/libgtop2/Makefile | 4 ++-- devel/libsoup/Makefile | 4 ++-- devel/libsoup22/Makefile | 4 ++-- devel/py-gobject/Makefile | 4 ++-- devel/py-orbit2/Makefile | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) (limited to 'devel') diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 2e079182f..ac9791370 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,7 +3,7 @@ # Whom: Chia-liang Kao # # $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.46 2006/02/24 05:54:31 marcus Exp $ +# $MCom: ports/devel/ORBit2/Makefile,v 1.47 2006/02/24 20:43:27 marcus Exp $ # PORTNAME= ORBit2 @@ -11,7 +11,7 @@ PORTVERSION= 2.13.3 PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index c130bbc01..b54e44625 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/bugbuddy/Makefile,v 1.26 2006/03/12 22:32:27 mezz Exp $ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.27 2006/03/13 06:33:52 mezz Exp $ # PORTNAME= bugbuddy PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index c130bbc01..b54e44625 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/bugbuddy/Makefile,v 1.26 2006/03/12 22:32:27 mezz Exp $ +# $MCom: ports/devel/bugbuddy/Makefile,v 1.27 2006/03/13 06:33:52 mezz Exp $ # PORTNAME= bugbuddy PORTVERSION= 2.14.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 14d128f36..2bb093761 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.68 2006/03/02 20:31:34 mezz Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.69 2006/03/13 06:33:52 mezz Exp $ # PORTNAME= gconf2 @@ -11,7 +11,7 @@ PORTVERSION= 2.13.5 PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index b0a71cd8f..8a14ce991 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast # # $FreeBSD$ -# $MCom: ports/devel/glade3/Makefile,v 1.7 2006/03/02 20:31:34 mezz Exp $ +# $MCom: ports/devel/glade3/Makefile,v 1.8 2006/03/13 06:33:53 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:R} +MASTER_SITE_SUBDIR= sources/glade-3/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= glade-3-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index a3e77b23c..075263feb 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,19 +3,19 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.71 2006/03/07 20:08:51 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.72 2006/03/13 06:33:53 mezz Exp $ # PORTNAME= glib PORTVERSION= 2.10.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \ - ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:R}/ \ + ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ \ 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:R} +MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 4111b9cbc..0abf2e9b2 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,14 +3,14 @@ # Whom: Adam Weinberger # # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.27 2006/03/02 18:22:44 mezz Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.28 2006/03/09 00:20:14 marcus Exp $ # PORTNAME= glibmm PORTVERSION= 2.10.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 719947718..b9e58ce8a 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,14 +3,14 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.132 2006/03/02 20:31:34 mezz Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.133 2006/03/13 06:33:53 mezz Exp $ # PORTNAME= gnomevfs2 PORTVERSION= 2.13.92 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 719947718..b9e58ce8a 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,14 +3,14 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.132 2006/03/02 20:31:34 mezz Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.133 2006/03/13 06:33:53 mezz Exp $ # PORTNAME= gnomevfs2 PORTVERSION= 2.13.92 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index ac657dbd0..51331ad92 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,14 +3,14 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.41 2006/03/07 20:04:33 marcus Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.42 2006/03/13 06:33:53 mezz Exp $ # PORTNAME= libbonobo PORTVERSION= 2.13.93 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 97d19f7bf..9a75e7434 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.19 2006/03/05 21:26:55 marcus 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:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 3e095b391..d1918e88a 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/libgtop2/Makefile,v 1.63 2006/03/02 20:31:35 mezz Exp $ +# $MCom: ports/devel/libgtop2/Makefile,v 1.64 2006/03/13 06:33:54 mezz Exp $ # PORTNAME= libgtop2 PORTVERSION= 2.13.92 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 42182d343..b98863509 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.32 2006/03/04 20:29:39 marcus Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.33 2006/03/13 06:33:54 mezz Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.91 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index 42182d343..b98863509 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.32 2006/03/04 20:29:39 marcus Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.33 2006/03/13 06:33:54 mezz Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.91 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index 6a7840548..e73158ce4 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.2 2006/02/24 18:33:38 marcus Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.3 2006/03/13 06:33:54 mezz Exp $ PORTNAME= gobject PORTVERSION= 2.9.1 PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pygobject-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile index 93464f5d2..c9dc53f7d 100644 --- a/devel/py-orbit2/Makefile +++ b/devel/py-orbit2/Makefile @@ -3,13 +3,13 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/devel/py-orbit2/Makefile,v 1.8 2006/03/12 23:37:44 marcus Exp $ +# $MCom: ports/devel/py-orbit2/Makefile,v 1.9 2006/03/13 06:33:54 mezz Exp $ PORTNAME= orbit PORTVERSION= 2.14.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:R} +MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyorbit-${PORTVERSION} DIST_SUBDIR= gnome2 -- cgit v1.2.3