svn commit: r512021 - in head/japanese/anthy: . files

[Jan Beich]

MANTANI Nobutaka <nobutaka at FreeBSD.org> writes:

> -MASTER_SITES=	OSDN/${PORTNAME}/37536
> +MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}

Why not keep using shorthand?

  MASTER_SITES=	DEBIAN

$ distilator japanese/anthy
302 [DISTFILE]  http://cdn.debian.net/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz -> http://cdn-fastly.deb.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
302 [DISTFILE]  http://http.debian.net/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz -> http://cdn-fastly.deb.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.ie.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.it.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.ru.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.nl.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.hr.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.de.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.fr.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.sk.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp2.de.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.hk.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.snt.utwente.nl/pub/linux/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://www.gtlib.gatech.edu/pub/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
301 [WWW]       http://anthy.sourceforge.jp/ -> http://anthy.osdn.jp/
200 [DISTFILE]  ftp://ftp.cz.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.hu.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.pl.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.cl.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.au.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.acc.umu.se/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.jp.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.no.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.uk.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.fi.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.se.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  http://ftp.wa.au.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.ee.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.is.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.bg.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.es.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.us.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
200 [DISTFILE]  ftp://ftp.si.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
404 [DISTFILE]  ftp://ftp.br.debian.org/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz
500 [DISTFILE]  ftp://mirror.symnds.com/debian/pool/main/a/anthy/anthy_0.4.orig.tar.gz (timeout: 5)

> +DISTNAME=	${PORTNAME}_${PORTVERSION}
> +EXTRACT_SUFX=	.orig.tar.gz
[...]
> +WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

One DISTFILES line could replace that but portlint would be more noisy.

$ portlint -C
[...]
WARN: Makefile: use of DISTFILES with single file discouraged. distribution filename should be set by DISTNAME and EXTRACT_SUFX.
WARN: Makefile: DISTFILES/DISTNAME affects WRKSRC. take caution when changing them.

Index: japanese/anthy/Makefile
===================================================================
--- japanese/anthy/Makefile	(revision 512037)
+++ japanese/anthy/Makefile	(working copy)
@@ -5,9 +5,8 @@ PORTNAME=	anthy
 PORTVERSION=	0.4
 PORTEPOCH=	1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.orig.tar.gz
+MASTER_SITES=	DEBIAN
+DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	nobutaka at FreeBSD.org
 COMMENT=	Another Kana-Kanji conversion system
@@ -22,7 +21,6 @@ USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/ja/anthy
 ELISPDIR=	share/emacs/site-lisp/anthy
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
Index: japanese/anthy/pkg-descr
===================================================================
--- japanese/anthy/pkg-descr	(revision 512037)
+++ japanese/anthy/pkg-descr	(working copy)
@@ -5,4 +5,4 @@ Supplemental 2ch BBS terms dictionary which is ins
 is developed by Omaemona 2ch/Linux (DQN) Project.
 (http://omaemona.sourceforge.net/)
 
-WWW: http://anthy.sourceforge.jp/ (Japanese)
+WWW: http://anthy.osdn.jp/ (Japanese)