From 7afb4e64a449ab94c5ebf6e5d37f424a588118b7 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 15 May 2002 18:05:18 +0000 Subject: [PATCH] kill some MASTER_SITE_SUBDIR --- x11/gnome/applets/Makefile | 5 ++--- x11/gnome/controlcenter/Makefile | 5 ++--- x11/gnome/core/Makefile | 5 ++--- x11/gnome/libs/Makefile | 5 ++--- x11/gnome/mime-data/Makefile | 5 ++--- x11/gnome/oaf/Makefile | 5 ++--- x11/gnome/users-guide/Makefile | 5 ++--- x11/gnome/vfs/Makefile | 5 ++--- x11/gtk-engines/Makefile | 5 ++--- x11/gtop/Makefile | 5 ++--- x11/mouseclock/Makefile | 5 ++--- x11/p5-Gtk/Makefile | 5 ++--- x11/p5-Tk/Makefile | 5 ++--- x11/py-Gtk/Makefile | 5 ++--- x11/ratpoison/Makefile | 6 ++---- x11/rclock/Makefile | 5 ++--- x11/rdesktop/Makefile | 5 ++--- x11/rep-gtk/Makefile | 5 ++--- x11/sawfish/Makefile | 5 ++--- x11/tk/8.0/Makefile | 5 ++--- x11/tk/8.3/Makefile | 5 ++--- x11/tktable/Makefile | 5 ++--- x11/treewm/Makefile | 5 ++--- x11/tvtwm/Makefile | 5 ++--- x11/unclutter/Makefile | 5 ++--- x11/xautolock/Makefile | 5 ++--- x11/xdtm/Makefile | 5 ++--- x11/xfce/Makefile | 5 ++--- x11/xfedor/Makefile | 5 ++--- x11/xforms/Makefile | 10 +++++----- x11/xfstt/Makefile | 5 ++--- x11/xgrab/Makefile | 5 ++--- x11/xlockmore/Makefile | 5 ++--- x11/xpostitPlus/Makefile | 5 ++--- x11/xsnow/Makefile | 5 ++--- x11/xtermset/Makefile | 5 ++--- x11/xwit/Makefile | 5 ++--- x11/xzoom/Makefile | 5 ++--- 38 files changed, 79 insertions(+), 117 deletions(-) diff --git a/x11/gnome/applets/Makefile b/x11/gnome/applets/Makefile index 99b115827ab..da0e7168248 100644 --- a/x11/gnome/applets/Makefile +++ b/x11/gnome/applets/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2002/03/02 15:45:50 nino Exp $ +# $OpenBSD: Makefile,v 1.13 2002/05/15 18:05:19 espie Exp $ COMMENT= "applets for use with the GNOME panel" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-applets +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-applets/} EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= panel_applet::x11/gnome/core \ diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile index 94903c61f8d..da1f2cf166f 100644 --- a/x11/gnome/controlcenter/Makefile +++ b/x11/gnome/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2002/03/23 06:24:49 brad Exp $ +# $OpenBSD: Makefile,v 1.16 2002/05/15 18:05:19 espie Exp $ COMMENT= "GNOME control center" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/control-center +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/control-center/} EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= gdk_pixbuf::graphics/gdk-pixbuf \ diff --git a/x11/gnome/core/Makefile b/x11/gnome/core/Makefile index 81fe1ed0d3a..9ad308fdc23 100644 --- a/x11/gnome/core/Makefile +++ b/x11/gnome/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2002/04/04 03:53:27 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.14 2002/05/15 18:05:19 espie Exp $ COMMENT= "core GNOME system" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-core +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-core/} EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= glade.4,glade-gnome::devel/libglade,gnome \ diff --git a/x11/gnome/libs/Makefile b/x11/gnome/libs/Makefile index 9f188d0e1b9..69c36e3f549 100644 --- a/x11/gnome/libs/Makefile +++ b/x11/gnome/libs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2002/04/19 14:43:36 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.15 2002/05/15 18:05:18 espie Exp $ COMMENT= "libraries for the GNOME project" @@ -8,8 +8,7 @@ NEED_VERSION= 1.504 HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-libs +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-libs/} PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \ diff --git a/x11/gnome/mime-data/Makefile b/x11/gnome/mime-data/Makefile index 158939faa24..d2e89759e20 100644 --- a/x11/gnome/mime-data/Makefile +++ b/x11/gnome/mime-data/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/02/15 19:12:21 nino Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/15 18:05:18 espie Exp $ COMMENT= "MIME and Application database for GNOME" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-mime-data +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-mime-data/} EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu diff --git a/x11/gnome/oaf/Makefile b/x11/gnome/oaf/Makefile index 59485acdbe3..91c382ee364 100644 --- a/x11/gnome/oaf/Makefile +++ b/x11/gnome/oaf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/02/15 19:20:07 nino Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 18:05:18 espie Exp $ COMMENT= "Object Activation Framework for GNOME" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/oaf +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/oaf/} EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= ORBit.5,IIOP,ORBitCosNaming,ORBitutil::devel/ORBit \ diff --git a/x11/gnome/users-guide/Makefile b/x11/gnome/users-guide/Makefile index cf20181aabc..6f4d39b8fdf 100644 --- a/x11/gnome/users-guide/Makefile +++ b/x11/gnome/users-guide/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/10/07 20:55:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 18:05:19 espie Exp $ V= 1.2 DISTNAME= users-guide-${V} @@ -10,8 +10,7 @@ NEED_VERSION= 1.455 HOMEPAGE= http://www.gnome.org MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/users-guide +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/users-guide/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/gnome/vfs/Makefile b/x11/gnome/vfs/Makefile index 7322db4390f..69114270fad 100644 --- a/x11/gnome/vfs/Makefile +++ b/x11/gnome/vfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2002/04/04 03:53:27 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.14 2002/05/15 18:05:18 espie Exp $ COMMENT= "GNOME Virtual File System" @@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnome.org/ MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-vfs +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-vfs/} LIB_DEPENDS= gnome.36::x11/gnome/libs \ xml.9::textproc/libxml1 \ diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile index e9bb81fba83..60077e7ab7d 100644 --- a/x11/gtk-engines/Makefile +++ b/x11/gtk-engines/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/10/07 20:55:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 18:05:19 espie Exp $ COMMENT= "sample theme engines for GTK+ provided with GNOME" V= 0.12 @@ -8,8 +8,7 @@ NEED_VERSION= 1.473 HOMEPAGE= http://www.gnome.org MAINTAINER= Nils Nordman -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gtk-engines +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gtk-engines/} PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \ ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \ diff --git a/x11/gtop/Makefile b/x11/gtop/Makefile index 77d587890a2..c0b3d730c9b 100644 --- a/x11/gtop/Makefile +++ b/x11/gtop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/10/24 12:48:53 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 18:05:19 espie Exp $ COMMENT= "GNOME version of top" V= 1.0.13 @@ -8,8 +8,7 @@ NEED_VERSION= 1.473 MAINTAINER= Nils Nordman HOMEPAGE= http://www.gnome.org -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gtop +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gtop/} PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \ diff --git a/x11/mouseclock/Makefile b/x11/mouseclock/Makefile index 00c7e4f56ef..5c74fa316c7 100644 --- a/x11/mouseclock/Makefile +++ b/x11/mouseclock/Makefile @@ -3,7 +3,7 @@ # Date created: May 19 1998 # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.15 2002/03/21 21:25:55 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2002/05/15 18:05:19 espie Exp $ # COMMENT= "display the current time using the X11 root cursor" @@ -11,8 +11,7 @@ COMMENT= "display the current time using the X11 root cursor" DISTNAME= mouseclock-1.0 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/clocks +MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/clocks/} # License: GPL PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/p5-Gtk/Makefile b/x11/p5-Gtk/Makefile index 406a7704b22..e28c11e978a 100644 --- a/x11/p5-Gtk/Makefile +++ b/x11/p5-Gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/04/19 14:57:03 jcs Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 18:05:19 espie Exp $ COMMENT= "set of modules to use Gtk+ libraries from Perl" @@ -17,8 +17,7 @@ PERMIT_DISTFILES_FTP= Yes HOMEPAGE= http://www.gtkperl.org/ -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Gtk +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Gtk/} MAINTAINER= Joshua Stein diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index b2d080a22d6..cf12d06a263 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2002/04/21 11:05:46 shell Exp $ +# $OpenBSD: Makefile,v 1.13 2002/05/15 18:05:19 espie Exp $ COMMENT= "Tk 8.0 bindings for Perl" COMMENT-demo= "demonstrate the features of ptk" @@ -12,8 +12,7 @@ NEED_VERSION= 1.524 MAINTAINER= Shell Hung -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Tk +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} BUILD_DEPENDS= ::www/p5-HTML-Parser RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/x11/py-Gtk/Makefile b/x11/py-Gtk/Makefile index 7b613248d5b..5f2bc7dfa7b 100644 --- a/x11/py-Gtk/Makefile +++ b/x11/py-Gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/04/17 20:30:46 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/15 18:05:19 espie Exp $ COMMENT= "Gtk bindings for Python" COMMENT-gnome= "Gtk and Gnome bindings for Python" @@ -13,8 +13,7 @@ DISTNAME= gnome-python-${V} CATEGORIES= x11 devel NEED_VERSION= 1.504 -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gnome-python +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-python/} HOMEPAGE= http://www.daa.com.au/~james/gnome/ diff --git a/x11/ratpoison/Makefile b/x11/ratpoison/Makefile index 16bc011fb34..0f1382c69f8 100644 --- a/x11/ratpoison/Makefile +++ b/x11/ratpoison/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.2 2002/05/08 02:13:34 lebel Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 18:05:19 espie Exp $ COMMENT= "minimal wm based on GNU screen" DISTNAME= ratpoison-1.1.0 CATEGORIES= x11 NEED_VERSION= 1.525 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ratpoison/} \ http://openbsd.rutgers.edu/ -MASTER_SITE_SUBDIR= ratpoison - HOMEPAGE= http://ratpoison.sourceforge.net/ MAINTAINER= William Yodlowsky diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile index 5e25cf9846f..3db91580407 100644 --- a/x11/rclock/Makefile +++ b/x11/rclock/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2001/09/28 06:02:15 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.12 2002/05/15 18:05:19 espie Exp $ COMMENT= "analog clock for X11 w/appoint. reminder and mail notif" @@ -8,8 +8,7 @@ CATEGORIES= x11 NEED_VERSION= 1.402 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \ ftp://mason.primenet.com.au/pub/rxvt/ \ - ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/terms + ${MASTER_SITE_SUNSITE:=X11/terms/} MAINTAINER= Angelos D. Keromytis diff --git a/x11/rdesktop/Makefile b/x11/rdesktop/Makefile index be5e870bc86..492ed648a99 100644 --- a/x11/rdesktop/Makefile +++ b/x11/rdesktop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/03/21 02:07:30 jcs Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 18:05:19 espie Exp $ COMMENT= "open source client for Windows Terminal Server" @@ -14,8 +14,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes HOMEPAGE= http://www.rdesktop.org/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= rdesktop +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} MASTER_SITES0= http://bibl4.oru.se/projects/rdesktop/ PATCHFILES= rdesktop-unified-patch${PATCHLEVEL:S/./-/g}.bz2:0 diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile index a26b6ba9cfc..44e3661cdb0 100644 --- a/x11/rep-gtk/Makefile +++ b/x11/rep-gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/10/09 15:27:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 18:05:19 espie Exp $ # Original from: John Harper COMMENT= "GTK+ binding for librep Lisp environment" @@ -7,8 +7,7 @@ VERSION= 0.15 DISTNAME= rep-gtk-${VERSION} CATEGORIES= x11 NEED_VERSION= 1.402 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= rep-gtk +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rep-gtk/} HOMEPAGE= http://rep-gtk.sourceforge.net/ diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile index 61c95f473c5..92a34716601 100644 --- a/x11/sawfish/Makefile +++ b/x11/sawfish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/11/10 15:00:53 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 18:05:19 espie Exp $ COMMENT= "extensible window manager" @@ -6,8 +6,7 @@ VERSION= 0.36 DISTNAME= sawfish-${VERSION} CATEGORIES= x11 NEED_VERSION= 1.489 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= sawmill +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sawmill/} HOMEPAGE= http://sawmill.sourceforge.net/ diff --git a/x11/tk/8.0/Makefile b/x11/tk/8.0/Makefile index ff4855cbe34..ad580658930 100644 --- a/x11/tk/8.0/Makefile +++ b/x11/tk/8.0/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2001/10/26 06:57:12 kevlo Exp $ +# $OpenBSD: Makefile,v 1.14 2002/05/15 18:05:19 espie Exp $ # $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $ COMMENT= "graphical toolkit for Tcl" @@ -7,8 +7,7 @@ DISTNAME= tk8.0.5 PKGNAME= tk-8.0.5 CATEGORIES= x11 x11/tk NEED_VERSION= 1.482 -MASTER_SITES= ${MASTER_SITE_TCLTK} -MASTER_SITE_SUBDIR= tcl8_0 +MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_0/} HOMEPAGE= http://dev.scriptics.com/software/tcltk/ diff --git a/x11/tk/8.3/Makefile b/x11/tk/8.3/Makefile index d9e7fd61add..03111d0c2c7 100644 --- a/x11/tk/8.3/Makefile +++ b/x11/tk/8.3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2001/10/26 06:52:51 kevlo Exp $ +# $OpenBSD: Makefile,v 1.15 2002/05/15 18:05:19 espie Exp $ COMMENT= "graphical toolkit for Tcl" @@ -6,8 +6,7 @@ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 CATEGORIES= x11 x11/tk NEED_VERSION= 1.482 -MASTER_SITES= ${MASTER_SITE_TCLTK} -MASTER_SITE_SUBDIR= tcl8_3 +MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_3/} HOMEPAGE= http://dev.scriptics.com/software/tcltk/ diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile index b3dc3eb1950..2d7b82f297c 100644 --- a/x11/tktable/Makefile +++ b/x11/tktable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/11/10 15:00:53 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 18:05:19 espie Exp $ COMMENT= "tk extension" @@ -16,8 +16,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tktable +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tktable/} BUILD_DEPENDS= ::x11/tk/8.3 diff --git a/x11/treewm/Makefile b/x11/treewm/Makefile index af5d7594110..4c97ebbd04e 100644 --- a/x11/treewm/Makefile +++ b/x11/treewm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/05/10 11:49:12 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 18:05:19 espie Exp $ COMMENT= "tree window manager" DISTNAME= treewm-0.4.2 @@ -6,9 +6,8 @@ DISTFILES= treewm_0.4.2.tar.gz CATEGORIES= x11 NEED_VERSION= 1.525 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=treewm/} \ http://openbsd.rutgers.edu/ -MASTER_SITE_SUBDIR= treewm HOMEPAGE= http://treewm.sourceforge.net/ diff --git a/x11/tvtwm/Makefile b/x11/tvtwm/Makefile index 29a6c2e18be..bbf355db52c 100644 --- a/x11/tvtwm/Makefile +++ b/x11/tvtwm/Makefile @@ -4,7 +4,7 @@ # Whom: gpalmer # # $FreeBSD: ports/x11-wm/tvtwm/Makefile,v 1.17 1999/08/31 06:53:15 mharo Exp $ -# $OpenBSD: Makefile,v 1.12 2002/03/21 21:25:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2002/05/15 18:05:19 espie Exp $ COMMENT= "twm with a virtual desktop" @@ -21,8 +21,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= window_managers +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=window_managers/} WRKDIST= ${WRKDIR}/tvtwm diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile index aeccbcbc8c3..51fdd6ca5db 100644 --- a/x11/unclutter/Makefile +++ b/x11/unclutter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 21:25:56 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 18:05:19 espie Exp $ COMMENT= "hides idle X11 cursor" @@ -7,8 +7,7 @@ CATEGORIES= x11 NEED_VERSION= 1.515 MAINTAINER= Brian J. Kifiak -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= utilities +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} EXTRACT_SUFX= .tar.Z PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile index 7d980561cef..3ef6f5c4acd 100644 --- a/x11/xautolock/Makefile +++ b/x11/xautolock/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2002/03/19 19:45:15 matthieu Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 18:05:19 espie Exp $ DISTNAME= xautolock-2.1 EXTRACT_SUFX= .tgz CATEGORIES= x11 NEED_VERSION= 1.511 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/screensavers +MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/screensavers/} COMMENT= fire up programs in case of user inactivity under X HOMEPAGE= http://freshmeat.net/projects/xautolock/ diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile index 1c9737ce81c..ea5337384a7 100644 --- a/x11/xdtm/Makefile +++ b/x11/xdtm/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2002/03/21 21:25:56 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2002/05/15 18:05:19 espie Exp $ COMMENT= "Desktop Manager: a graphical shell for X11" DISTNAME= xdtm-2.5.8 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= applications +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 1f1d6c8931d..82fd8c9ee82 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2002/03/24 01:20:39 brad Exp $ +# $OpenBSD: Makefile,v 1.17 2002/05/15 18:05:19 espie Exp $ COMMENT= "CDE like desktop with Gtk" DISTNAME= xfce-3.8.14 CATEGORIES= x11 NEED_VERSION= 1.500 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xfce +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xfce/} HOMEPAGE= http://www.xfce.org/ diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile index 57747d44933..b040cc3c833 100644 --- a/x11/xfedor/Makefile +++ b/x11/xfedor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2002/03/21 21:25:56 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2002/05/15 18:05:19 espie Exp $ # ATTENTION: It does not work in > 256 color modes, please fix # it if you can. @@ -7,8 +7,7 @@ COMMENT= ".bdf, .xbm, .xpm mouse cursor editor" DISTNAME= xfedor-5.0.1 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/fonts +MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index 0fd8428ce9f..417e1e67772 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2002/05/03 16:20:19 brad Exp $ +# $OpenBSD: Makefile,v 1.19 2002/05/15 18:05:19 espie Exp $ COMMENT= "GUI toolkit for X11" @@ -10,10 +10,10 @@ DISTNAME= bxform-088 PKGNAME= xforms-0.88 CATEGORIES= x11 NEED_VERSION= 1.522 -MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/%SUBDIR%/ \ - ftp://ftp.fu-berlin.de/unix/X11/gui/xforms/%SUBDIR%/ \ - ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/%SUBDIR%/ -MASTER_SITE_SUBDIR= openBSD-${XFORMS_ARCH} +MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/$S/ \ + ftp://ftp.fu-berlin.de/unix/X11/gui/xforms/$S/ \ + ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/$S/ +S= openBSD-${XFORMS_ARCH} EXTRACT_SUFX= .tgz DIST_SUBDIR= xforms/${MASTER_SITE_SUBDIR} diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index d5e9d63c562..f6840b8b0fa 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2002/05/15 18:05:20 espie Exp $ # $FreeBSD Id: Makefile,v 1.2 1999/06/28 02:22:43 billf Exp $ # @@ -7,8 +7,7 @@ COMMENT= "TrueType font server for X11" DISTNAME= xfstt-1.1 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/fonts +MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/} MAINTAINER= Jason Ish diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index fddccc324be..88663f852f8 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -3,7 +3,7 @@ # Date created: 25 January 1998 # Whom: Angelos # -# $OpenBSD: Makefile,v 1.16 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2002/05/15 18:05:20 espie Exp $ # COMMENT= "X11 image grabber" @@ -12,8 +12,7 @@ DISTNAME= xgrabsc.2_41 PKGNAME= xgrab-2.41 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= applications +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} EXTRACT_SUFX= .tar.Z # License: BSD diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index b9cfad120b0..e904df9eb76 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 18:05:20 espie Exp $ DISTNAME= xlockmore-4.08.2 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= applications +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} MAINTAINER= Todd T. Fries diff --git a/x11/xpostitPlus/Makefile b/x11/xpostitPlus/Makefile index 34bdd39ecef..f078c58a121 100644 --- a/x11/xpostitPlus/Makefile +++ b/x11/xpostitPlus/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2002/05/15 18:05:20 espie Exp $ COMMENT= "PostIt (R) messages onto your X11 screen" DISTNAME= XPostitPlus-2.3 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= office +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile index 023821bbfdd..d6c23d4779f 100644 --- a/x11/xsnow/Makefile +++ b/x11/xsnow/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.9 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 18:05:20 espie Exp $ COMMENT= "snowy and Santa-y desktop" DISTNAME= xsnow-1.40 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= games +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/} EXTRACT_SUFX= .tar.Z PERMIT_PACKAGE_CDROM= "vague license" diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile index 4d5907eeb64..bfb16b61bf9 100644 --- a/x11/xtermset/Makefile +++ b/x11/xtermset/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/07/09 17:11:58 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 18:05:20 espie Exp $ COMMENT= "dynamically change some settings of an xterm" @@ -15,8 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= clts +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clts/} USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile index cd0f9767ed5..e17559d6399 100644 --- a/x11/xwit/Makefile +++ b/x11/xwit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 18:05:20 espie Exp $ COMMENT= "X11 window interface tool" @@ -13,8 +13,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= utilities +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} USE_X11= Yes CONFIGURE_STYLE= imake diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile index 0bc61a4f5e7..3360a153fa2 100644 --- a/x11/xzoom/Makefile +++ b/x11/xzoom/Makefile @@ -3,7 +3,7 @@ # Date created: December 21, 1997 # Whom: Don Schmidt # -# $OpenBSD: Makefile,v 1.9 2002/03/21 21:25:57 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 18:05:20 espie Exp $ # COMMENT= "magnify, rotate, mirror the image on the X11 screen" @@ -11,8 +11,7 @@ COMMENT= "magnify, rotate, mirror the image on the X11 screen" DISTNAME= xzoom-0.3 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= libs/X +MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/} EXTRACT_SUFX= .tgz PERMIT_PACKAGE_CDROM= Yes