From d72353c225a0cff8478c442d745a54e4630671fc Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 14 May 2015 10:15:04 +0000 Subject: MASTER_SITES cleanup. - Replace ${MASTER_SITE_FOO} with FOO. - Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9% of the time.) - Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and no hint of what it should be was present. - Fix some logic. - And generally, make things more simple and easy to understand. While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and SAMBA macros. Also, replace some EXTRACT_SUFX occurences with USES=tar:*. Checked by: make fetch-urlall-list With hat: portmgr Sponsored by: Absolight --- x11-wm/afterstep-stable/Makefile | 3 +-- x11-wm/afterstep/Makefile | 3 +-- x11-wm/euclid-wm/Makefile | 2 +- x11-wm/fluxbox/Makefile | 4 ++-- x11-wm/libdockapp/Makefile | 3 +-- x11-wm/libwraster/Makefile | 3 +-- x11-wm/olvwm/Makefile | 7 ++----- x11-wm/ratpoison/Makefile | 4 +--- x11-wm/tvtwm/Makefile | 3 +-- x11-wm/windowmaker/Makefile | 3 +-- x11-wm/wmanager/Makefile | 2 +- 11 files changed, 13 insertions(+), 24 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 2ef214c69d00..aa4476b1bd15 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -5,8 +5,7 @@ PORTNAME= afterstep PORTVERSION= 2.2.12 PORTREVISION= 4 CATEGORIES= x11-wm afterstep -MASTER_SITES= ${MASTER_SITE_AFTERSTEP} -MASTER_SITE_SUBDIR= stable +MASTER_SITES= AFTERSTEP/stable DISTNAME= AfterStep-${PORTVERSION} MAINTAINER= glewis@FreeBSD.org diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index 522d29508325..e078f7ad2904 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -5,8 +5,7 @@ PORTNAME= afterstep PORTVERSION= 1.0 PORTREVISION= 4 CATEGORIES= x11-wm afterstep -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= dinoex +MASTER_SITES= LOCAL/dinoex DISTNAME= AfterStep-${PORTVERSION} PKGNAMESUFFIX= 1${PKGNAMESUFFIX2} diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile index 17115941bcf5..d974a66fdfd7 100644 --- a/x11-wm/euclid-wm/Makefile +++ b/x11-wm/euclid-wm/Makefile @@ -4,7 +4,7 @@ PORTNAME= euclid-wm PORTVERSION= 0.4.3 CATEGORIES= x11-wm #MASTER_SITES= http://euclid-wm.googlecode.com/files/ -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE MAINTAINER= anastmag@gmail.com COMMENT= Minimalist, tiling window manager for X11 diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index d02eb217d6f1..169e9f38f788 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-debug .if ${PORT_OPTIONS:MDOCHTML} # http://fluxbox.org/docbook/en/tarballs/ -MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \ +MASTER_SITES+= LOCAL/mezz:html \ http://people.freebsd.org/~mezz/distfiles/:html DISTFILES+= fb-doc-mfhtml-${DOCSVERSION}.tgz:html EXTRACT_ONLY+= fb-doc-mfhtml-${DOCSVERSION}.tgz @@ -55,7 +55,7 @@ PLIST_SUB+= DOCHTML="@comment " .if ${PORT_OPTIONS:MPDFDOCS} # http://fluxbox.org/docbook/en/pdf/ -MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \ +MASTER_SITES+= LOCAL/mezz:pdf \ http://people.freebsd.org/~mezz/distfiles/:pdf DISTFILES+= fluxbook-${DOCSVERSION}.pdf:pdf PLIST_SUB+= DOCPDF="" diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile index a9947005500e..d7a745817cc6 100644 --- a/x11-wm/libdockapp/Makefile +++ b/x11-wm/libdockapp/Makefile @@ -5,8 +5,7 @@ PORTNAME= libdockapp PORTVERSION= 0.6.2 PORTREVISION= 4 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= xride +MASTER_SITES= LOCAL/xride MAINTAINER= xride@FreeBSD.org COMMENT= Standard library for Window Maker dock apps diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile index d02e1e73e914..e0b341138c2c 100644 --- a/x11-wm/libwraster/Makefile +++ b/x11-wm/libwraster/Makefile @@ -4,8 +4,7 @@ PORTNAME= libwraster PORTVERSION= 0.95.6 PORTREVISION= 4 CATEGORIES= x11-wm windowmaker -MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/ -MASTER_SITE_SUBDIR= source/release +MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} MAINTAINER= hrs@FreeBSD.org diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile index 5327a92f69da..5433da5ef51f 100644 --- a/x11-wm/olvwm/Makefile +++ b/x11-wm/olvwm/Makefile @@ -6,12 +6,9 @@ PORTVERSION= 4.2 PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.x.org/R5contrib/ \ - ${MASTER_SITE_XCONTRIB} \ + XCONTRIB/window_managers \ http://komquats.com/distfiles/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= cy - -MASTER_SITE_SUBDIR= window_managers + LOCAL/cy DISTNAME= ${PORTNAME}4 PATCH_SITES= ${MASTER_SITES} diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile index a4c461fe487a..fbd7ff538558 100644 --- a/x11-wm/ratpoison/Makefile +++ b/x11-wm/ratpoison/Makefile @@ -4,9 +4,7 @@ PORTNAME= ratpoison PORTVERSION= 1.4.6 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ - http://mirror.4bit.ws/ -MASTER_SITE_SUBDIR= ratpoison +MASTER_SITES= SAVANNAH http://mirror.4bit.ws/ MAINTAINER= dhn@FreeBSD.org COMMENT= Simple window manager with no fat library dependencies diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index 7fda7a857fd4..7b2abbf49d55 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -5,8 +5,7 @@ PORTNAME= tvtwm PORTVERSION= pl11 PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= window_managers +MASTER_SITES= XCONTRIB/window_managers DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= ports@FreeBSD.org diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 6d757a0a4429..42c55596db3b 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -5,8 +5,7 @@ PORTNAME= windowmaker PORTVERSION= 0.95.6 PORTREVISION= 4 CATEGORIES= x11-wm windowmaker -MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/ -MASTER_SITE_SUBDIR= source/release +MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} MAINTAINER= hrs@FreeBSD.org diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile index 042a0fb66230..693f6585016d 100644 --- a/x11-wm/wmanager/Makefile +++ b/x11-wm/wmanager/Makefile @@ -5,7 +5,7 @@ PORTNAME= wmanager PORTVERSION= 0.2.1 PORTREVISION= 13 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} +MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org -- cgit