diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-14 10:15:04 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-14 10:15:04 +0000 |
commit | 60d1a83c2a113150cedbc43ff12a7375144f741a (patch) | |
tree | 627649ff7699a289d5d78c11bf8d105881402ca8 /editors | |
parent | Update MASTER_SITES (diff) |
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
Notes
Notes:
svn path=/head/; revision=386312
Diffstat (limited to 'editors')
-rw-r--r-- | editors/abiword-docs/Makefile | 3 | ||||
-rw-r--r-- | editors/abiword/Makefile | 3 | ||||
-rw-r--r-- | editors/beav/Makefile | 2 | ||||
-rw-r--r-- | editors/calligra-l10n/files/bsd.l10n.mk | 3 | ||||
-rw-r--r-- | editors/calligra/Makefile | 3 | ||||
-rw-r--r-- | editors/emacs/Makefile | 5 | ||||
-rw-r--r-- | editors/gobby/Makefile | 2 | ||||
-rw-r--r-- | editors/jove/Makefile | 3 | ||||
-rw-r--r-- | editors/lazarus/Makefile | 2 | ||||
-rw-r--r-- | editors/leafpad/Makefile | 1 | ||||
-rw-r--r-- | editors/nano-devel/Makefile | 2 | ||||
-rw-r--r-- | editors/nedit/Makefile | 3 | ||||
-rw-r--r-- | editors/psgml/Makefile | 3 | ||||
-rw-r--r-- | editors/spe/Makefile | 3 | ||||
-rw-r--r-- | editors/sted/Makefile | 3 | ||||
-rw-r--r-- | editors/tamago/Makefile | 6 | ||||
-rw-r--r-- | editors/thoteditor/Makefile | 1 | ||||
-rw-r--r-- | editors/uzap/Makefile | 3 | ||||
-rw-r--r-- | editors/yasnippet/Makefile | 2 |
19 files changed, 19 insertions, 34 deletions
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile index d6b2580e49d4..e410a6e3e515 100644 --- a/editors/abiword-docs/Makefile +++ b/editors/abiword-docs/Makefile @@ -5,8 +5,7 @@ PORTNAME= abiword-docs PORTVERSION= 2.8.6 CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ -MASTER_SITE_SUBDIR= abiword +MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord MAINTAINER= gnome@FreeBSD.org diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index d7f4ffe96f4f..3a021d4aa323 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -6,8 +6,7 @@ PORTNAME= abiword PORTVERSION= 2.8.6 PORTREVISION= 10 CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ -MASTER_SITE_SUBDIR= abiword +MASTER_SITES= http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/ DIST_SUBDIR= AbiWord MAINTAINER= gnome@FreeBSD.org diff --git a/editors/beav/Makefile b/editors/beav/Makefile index c5dceca31f1a..e4a82a1d6faf 100644 --- a/editors/beav/Makefile +++ b/editors/beav/Makefile @@ -5,7 +5,7 @@ PORTNAME= beav PORTVERSION= 1.40.18 PORTREVISION= 3 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} +MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION:R}.orig PATCH_SITES= ${MASTER_SITES} diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk index c65cd75d431b..a49aed2fbfcd 100644 --- a/editors/calligra-l10n/files/bsd.l10n.mk +++ b/editors/calligra-l10n/files/bsd.l10n.mk @@ -1,6 +1,5 @@ .if defined(CALLIGRA_L10N) -MASTER_SITES?= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR?= ${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n/ +MASTER_SITES?= KDE/${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n PKGNAMEPREFIX= ${CALLIGRA_L10N:S/@/_/}- DISTNAME= ${PORTNAME}-${CALLIGRA_L10N}-${PORTVERSION} DIST_SUBDIR= KDE/calligra-l10n diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index bd05c62ee01b..6e82b3ba127f 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -4,8 +4,7 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} PORTREVISION= 15 CATEGORIES= editors kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 5f81dbb5dc5e..b7b2af541979 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -5,8 +5,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} PORTEPOCH= 3 CATEGORIES= editors ipv6 -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GNU PKGNAMESUFFIX?= 24 PATCH_SITE_SUBDIR+= ashish @@ -86,7 +85,7 @@ OPTIONS_SUB= SOURCES CANNA_CONFIGURE_ON= --with-canna \ --with-canna-includes=${LOCALBASE}/include \ --with-canna-libraries=${LOCALBASE}/lib -CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} +CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL CANNA_PATCHFILES= emacs24.4canna-20141030.diff.gz CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile index 802867b4c335..619364de9c1e 100644 --- a/editors/gobby/Makefile +++ b/editors/gobby/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.4.13 PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://releases.0x539.de/gobby/ \ - LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/} + LOCAL/sbz MAINTAINER= sbz@FreeBSD.org COMMENT= Free collaborative editor diff --git a/editors/jove/Makefile b/editors/jove/Makefile index b1b69b0eb11b..d72566c0c860 100644 --- a/editors/jove/Makefile +++ b/editors/jove/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 4.16 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= simon/:local + LOCAL/simon MAINTAINER= ports@FreeBSD.org COMMENT= Jonathan's Own Version of Emacs diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 8a57428341e5..68f91dca2e88 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -7,7 +7,7 @@ DISTVERSIONSUFFIX= -0 PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ - ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} + LOCAL/acm/freepascal DIST_SUBDIR= freepascal MAINTAINER?= freebsd-fpc@FreeBSD.org diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile index 06c5c03af96e..5841aba7650f 100644 --- a/editors/leafpad/Makefile +++ b/editors/leafpad/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.8.18.1 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= SAVANNAH -MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jgh@FreeBSD.org COMMENT= GTK+ based simple text editor diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile index 23a5fde99261..cb22ce66b7c2 100644 --- a/editors/nano-devel/Makefile +++ b/editors/nano-devel/Makefile @@ -4,7 +4,7 @@ PORTNAME= nano PORTVERSION= 2.3.6 CATEGORIES= editors MASTER_SITES= http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \ - ${MASTER_SITE_GNU} + GNU PKGNAMESUFFIX= -devel diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 801c5095a2ac..70e4504a7cd4 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -6,9 +6,8 @@ PORTVERSION= 5.6 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://people.freebsd.org/~deischen/distfiles/ \ - ${MASTER_SITE_SOURCEFORGE} \ + SF/${PORTNAME}/${PORTNAME}-source \ ftp://ftp.nluug.nl/pub/editors/NEdit/contrib/misc/ -MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-source DISTFILES= nedit-5.6a-src.tar.gz nedit.app-defaults EXTRACT_ONLY= nedit-5.6a-src.tar.gz diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index 73517e24fd24..97b5b8aa56bb 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -8,8 +8,7 @@ CATEGORIES= editors elisp MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${EMACS_PORT_NAME} -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= hrs +PATCH_SITES= LOCAL/hrs PATCHFILES= psgml-symbol-conflict-050503.diff.gz MAINTAINER= hrs@FreeBSD.org diff --git a/editors/spe/Makefile b/editors/spe/Makefile index c9a25e43dfa6..67bba79b86e1 100644 --- a/editors/spe/Makefile +++ b/editors/spe/Makefile @@ -5,8 +5,7 @@ PORTNAME= SPE PORTVERSION= 0.8.4.h PORTREVISION= 8 CATEGORIES= editors devel python -MASTER_SITES= ${MASTER_SITE_BERLIOS} -MASTER_SITE_SUBDIR= python +MASTER_SITES= SF/python DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-wx2.6.1.0 MAINTAINER= nivit@FreeBSD.org diff --git a/editors/sted/Makefile b/editors/sted/Makefile index 668282339727..406e8e69ca56 100644 --- a/editors/sted/Makefile +++ b/editors/sted/Makefile @@ -4,8 +4,7 @@ PORTNAME= sted PORTVERSION= 0.2.2 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= gabor +MASTER_SITES= LOCAL/gabor MAINTAINER= ports@FreeBSD.org COMMENT= Simple/Small/Stupid Text Editor diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 79f2078839be..890c5cf6655d 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -5,13 +5,11 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 PORTREVISION= 13 CATEGORIES= editors elisp -MASTER_SITES= ${MASTER_SITE_DEBIAN} -MASTER_SITE_SUBDIR= pool/main/e/egg +MASTER_SITES= DEBIAN/pool/main/e/egg PKGNAMESUFFIX= -${EMACS_PORT_NAME} DISTNAME= egg_4.0.6+0.20041122cvs.orig -PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \ - ${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,} +PATCH_SITES= DEBIAN/pool/main/e/egg LOCAL/nork PATCHFILES= egg_4.0.6+0.20041122cvs-19.diff.gz PATCH_DIST_STRIP= -p1 diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile index 23a3acacf658..258c2f4500a8 100644 --- a/editors/thoteditor/Makefile +++ b/editors/thoteditor/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 3 CATEGORIES= editors www MASTER_SITES= ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \ ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/ -MASTER_SITE_SUBDIR= apps/editors/X/thot DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile index 26c1ded9e20f..f7d243808e68 100644 --- a/editors/uzap/Makefile +++ b/editors/uzap/Makefile @@ -4,8 +4,7 @@ PORTNAME= uzap PORTVERSION= 1.0 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= joerg +MASTER_SITES= LOCAL/joerg DISTNAME= ${PORTNAME} MAINTAINER= joerg@FreeBSD.org diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile index 44541e42bcae..9122cbb40ee6 100644 --- a/editors/yasnippet/Makefile +++ b/editors/yasnippet/Makefile @@ -4,7 +4,7 @@ PORTNAME= yasnippet PORTVERSION= 0.6.1c PORTREVISION= 10 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ yasnippet-doc-${PORTVERSION}${EXTRACT_SUFX} |