USE_SIZE is a NOP! [petef@FreeBSD.org: cvs commit: ports/news/slrn Makefile distinfo pkg-plist]

Kris Kennaway kris at obsecurity.org
Wed Mar 10 17:44:07 PST 2004


I don't mean to pick on Pete here, but I've had to repeat this comment
a number of times recently, and it appears the message isn't sinking
in:

  ** USE_SIZE is not used by anything, and the behaviour you're **
  ** looking for is now the default!                            **

USE_SIZE was used temporarily when the 'record distfile size in
distinfo' feature was first introduced, and was quickly removed in
favour of the current situation where the default is to record size
information in the distinfo file, and this behaviour is controlled
by:

# NO_SIZE                       - Don't record size data in distinfo, needed
#                                 when the master site does not report file
#                                 sizes, or when multiple valid versions of
#                                 a distfile, having different sizes, exist.

# DISABLE_SIZE    - Do not check the size of a distfile even if the SIZE field
#                             has been specified in distinfo.  This is useful
#                             when using an alternate FETCH_CMD.

Note in particular:

> grep USE_SIZE bsd.port.mk
>

If you don't want a distfile size to be recorded in the distinfo file
(e.g. because the MASTER_SITE is broken and doesn't report the data),
then use NO_SIZE in the port.

DISABLE_SIZE is a user control knob to disable the distfile size
checking, mostly useful on old FreeBSD versions which didn't have
fetch(1) support for this, for people who don't want to use fetch(1),
and perhaps in some situations where there is an incorrect size
recorded in the distinfo.

I hope this clarifies the situation.

Kris

----- Forwarded message from Pete Fritchman <petef at FreeBSD.org> -----

X-Original-To: kkenn at localhost
Delivered-To: kkenn at localhost.obsecurity.org
Delivered-To: kris at freebsd.org
Delivered-To: ports-committers at freebsd.org
From: Pete Fritchman <petef at FreeBSD.org>
Date: Wed, 10 Mar 2004 17:19:08 -0800 (PST)
To: ports-committers at FreeBSD.org, cvs-ports at FreeBSD.org,
	cvs-all at FreeBSD.org
Subject: cvs commit: ports/news/slrn Makefile distinfo pkg-plist
X-FreeBSD-CVS-Branch: HEAD
Precedence: bulk
X-Loop: FreeBSD.ORG
X-UIDL: 9B@!!7ZJ"!P`b"!UP="!
X-Bogosity: No, tests=bogofilter, spamicity=0.000000, version=0.16.4

petef       2004/03/10 17:19:08 PST

  FreeBSD ports repository

  Modified files:
    news/slrn            Makefile distinfo pkg-plist 
  Log:
  - add slrn-0.9.8.0-ranges2.diff [0]
  - use %%DOCSDIR%%, USE_SIZE [0]
  - portlint [0]
  - bump PORTREVISION [0]
  - make gettext optional, add WITHOUT_NLS [1]
  
  PR:             62867 [0]
  Submitted by:   obraun [0], Phil Pennock <pdp at nl.demon.net> [1]
  
  Revision  Changes    Path
  1.39      +18 -7     ports/news/slrn/Makefile
http://cvsweb.FreeBSD.org/ports/news/slrn/Makefile.diff?r1=1.38&r2=1.39
| ===================================================================
| RCS file: /usr/local/www/cvsroot/FreeBSD/ports/news/slrn/Makefile,v
| retrieving revision 1.38
| retrieving revision 1.39
| diff -u -p -r1.38 -r1.39
| --- ports/news/slrn/Makefile	2004/02/04 04:36:21	1.38
| +++ ports/news/slrn/Makefile	2004/03/11 01:19:08	1.39
| @@ -2,12 +2,12 @@
|  # Date created:        28 March 1997
|  # Whom:                Carey Jones <mcj at acquiesce.org>
|  #
| -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/news/slrn/Makefile,v 1.38 2004/02/04 04:36:21 marcus Exp $
| +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/news/slrn/Makefile,v 1.39 2004/03/11 01:19:08 petef Exp $
|  #
|  
|  PORTNAME=	slrn
|  PORTVERSION=	0.9.8.0
| -PORTREVISION=	2
| +PORTREVISION=	3
|  CATEGORIES=	news ipv6
|  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
|  		ftp://ftp.rge.com/pub/usenet/readers/unix/slrn/ \
| @@ -15,24 +15,35 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
|  		ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \
|  		ftp://ftp.ntua.gr/pub/lang/slang/slrn/ \
|  		ftp://ftp.plig.org/pub/slrn/
| -		
|  MASTER_SITE_SUBDIR=	${PORTNAME}
|  
| +PATCH_SITES=	http://slrn.sourceforge.net/patches/
| +PATCHFILES=	slrn-0.9.8.0-ranges2.diff
| +PATCH_DIST_STRIP=	-p1
| +
|  MAINTAINER=	petef at FreeBSD.org
|  COMMENT=	SLang-based newsreader
|  
|  LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
|  		iconv.3:${PORTSDIR}/converters/libiconv
|  
| +USE_SIZE=	yes
|  USE_BZIP2=	yes
| -USE_GETTEXT=	yes
|  USE_GMAKE=	yes
|  USE_REINPLACE=	yes
|  
| +.if defined(WITHOUT_NLS)
| +CONFIGURE_ARGS+=	--disable-nls
| +PLIST_SUB+=	NLS="@comment "
| +.else
| +USE_GETTEXT=	yes
| +PLIST_SUB+=	NLS=""
| +.endif
| +
|  GNU_CONFIGURE=	yes
| -CONFIGURE_ARGS=	--enable-ipv6 --disable-inews --with-slrnpull \
| -		--with-libiconv-prefix=${LOCALBASE}
| -CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
| +CONFIGURE_ARGS+=	--enable-ipv6 --disable-inews --with-slrnpull \
| +			--with-libiconv-prefix=${LOCALBASE}
| +CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
|  
|  .if !defined(WITHOUT_SSL)
|  USE_OPENSSL=	YES
| @@ -44,7 +55,7 @@ ALL_TARGET=	all
|  MAN1=		slrn.1 slrnpull.1
|  
|  .if defined(NOPORTDOCS)
| -MAKE_ENV+=      NOPORTDOCS=yes
| +MAKE_ENV+=	NOPORTDOCS=yes
|  .endif
|  
|  post-patch:
  1.25      +3 -0      ports/news/slrn/distinfo
http://cvsweb.FreeBSD.org/ports/news/slrn/distinfo.diff?r1=1.24&r2=1.25
| ===================================================================
| RCS file: /usr/local/www/cvsroot/FreeBSD/ports/news/slrn/distinfo,v
| retrieving revision 1.24
| retrieving revision 1.25
| diff -u -p -r1.24 -r1.25
| --- ports/news/slrn/distinfo	2003/10/11 17:45:14	1.24
| +++ ports/news/slrn/distinfo	2004/03/11 01:19:08	1.25
| @@ -1 +1,4 @@
|  MD5 (slrn-0.9.8.0.tar.bz2) = 47e9931771114ba192356a0473e9649e
| +SIZE (slrn-0.9.8.0.tar.bz2) = 995881
| +MD5 (slrn-0.9.8.0-ranges2.diff) = c6206596799c2e5186648f76c63515a6
| +SIZE (slrn-0.9.8.0-ranges2.diff) = 615
  1.9       +40 -40    ports/news/slrn/pkg-plist
http://cvsweb.FreeBSD.org/ports/news/slrn/pkg-plist.diff?r1=1.8&r2=1.9
| ===================================================================
| RCS file: /usr/local/www/cvsroot/FreeBSD/ports/news/slrn/pkg-plist,v
| retrieving revision 1.8
| retrieving revision 1.9
| diff -u -p -r1.8 -r1.9
| --- ports/news/slrn/pkg-plist	2003/10/11 17:45:14	1.8
| +++ ports/news/slrn/pkg-plist	2004/03/11 01:19:08	1.9
| @@ -1,43 +1,43 @@
|  bin/slrn
|  bin/slrnpull
| -%%PORTDOCS%%share/doc/slrn/COPYING
| -%%PORTDOCS%%share/doc/slrn/COPYRIGHT
| -%%PORTDOCS%%share/doc/slrn/FAQ
| -%%PORTDOCS%%share/doc/slrn/FIRST_STEPS
| -%%PORTDOCS%%share/doc/slrn/README
| -%%PORTDOCS%%share/doc/slrn/README.GroupLens
| -%%PORTDOCS%%share/doc/slrn/README.SSL
| -%%PORTDOCS%%share/doc/slrn/README.macros
| -%%PORTDOCS%%share/doc/slrn/README.multiuser
| -%%PORTDOCS%%share/doc/slrn/THANKS
| -%%PORTDOCS%%share/doc/slrn/changes.txt
| -%%PORTDOCS%%share/doc/slrn/help.txt
| -%%PORTDOCS%%share/doc/slrn/manual.txt
| -%%PORTDOCS%%share/doc/slrn/score.sl
| -%%PORTDOCS%%share/doc/slrn/score.txt
| -%%PORTDOCS%%share/doc/slrn/slrn-doc.html
| -%%PORTDOCS%%share/doc/slrn/slrn.rc
| -%%PORTDOCS%%share/doc/slrn/slrnfuns.txt
| -%%PORTDOCS%%share/doc/slrn/slrnpull/README
| -%%PORTDOCS%%share/doc/slrn/slrnpull/README.offline
| -%%PORTDOCS%%share/doc/slrn/slrnpull/SETUP
| -%%PORTDOCS%%share/doc/slrn/slrnpull/score
| -%%PORTDOCS%%share/doc/slrn/slrnpull/setgid.txt
| -%%PORTDOCS%%share/doc/slrn/slrnpull/slrn.rc
| -%%PORTDOCS%%share/doc/slrn/slrnpull/slrnpull.conf
| -%%PORTDOCS%%share/doc/slrn/slrnpull/slrnpull.sh
| -share/locale/be/LC_MESSAGES/slrn.mo
| -share/locale/da/LC_MESSAGES/slrn.mo
| -share/locale/de/LC_MESSAGES/slrn.mo
| -share/locale/es/LC_MESSAGES/slrn.mo
| -share/locale/fi/LC_MESSAGES/slrn.mo
| -share/locale/fr/LC_MESSAGES/slrn.mo
| -share/locale/it/LC_MESSAGES/slrn.mo
| -share/locale/ko/LC_MESSAGES/slrn.mo
| -share/locale/nl/LC_MESSAGES/slrn.mo
| -share/locale/pl/LC_MESSAGES/slrn.mo
| -share/locale/ru/LC_MESSAGES/slrn.mo
| -share/locale/tr/LC_MESSAGES/slrn.mo
| +%%PORTDOCS%%%%DOCSDIR%%/COPYING
| +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
| +%%PORTDOCS%%%%DOCSDIR%%/FAQ
| +%%PORTDOCS%%%%DOCSDIR%%/FIRST_STEPS
| +%%PORTDOCS%%%%DOCSDIR%%/README
| +%%PORTDOCS%%%%DOCSDIR%%/README.GroupLens
| +%%PORTDOCS%%%%DOCSDIR%%/README.SSL
| +%%PORTDOCS%%%%DOCSDIR%%/README.macros
| +%%PORTDOCS%%%%DOCSDIR%%/README.multiuser
| +%%PORTDOCS%%%%DOCSDIR%%/THANKS
| +%%PORTDOCS%%%%DOCSDIR%%/changes.txt
| +%%PORTDOCS%%%%DOCSDIR%%/help.txt
| +%%PORTDOCS%%%%DOCSDIR%%/manual.txt
| +%%PORTDOCS%%%%DOCSDIR%%/score.sl
| +%%PORTDOCS%%%%DOCSDIR%%/score.txt
| +%%PORTDOCS%%%%DOCSDIR%%/slrn-doc.html
| +%%PORTDOCS%%%%DOCSDIR%%/slrn.rc
| +%%PORTDOCS%%%%DOCSDIR%%/slrnfuns.txt
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README.offline
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/SETUP
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/score
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/setgid.txt
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrn.rc
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.conf
| +%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.sh
| +%%NLS%%share/locale/be/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/da/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/de/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/es/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/fi/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/fr/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/it/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/ko/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/nl/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/pl/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
| +%%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
|  share/slrn/macros/color.sl
|  share/slrn/macros/gsort.sl
|  share/slrn/macros/ispell.sl
| @@ -54,5 +54,5 @@ share/slrn/macros/varset.sl
|  share/slrn/macros/xcomment.sl
|  @dirrm share/slrn/macros
|  @dirrm share/slrn
| -%%PORTDOCS%%@dirrm share/doc/slrn/slrnpull
| -%%PORTDOCS%%@dirrm share/doc/slrn
| +%%PORTDOCS%%@dirrm %%DOCSDIR%%/slrnpull
| +%%PORTDOCS%%@dirrm %%DOCSDIR%%

----- End forwarded message -----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20040310/1d250708/attachment.bin


More information about the freebsd-ports mailing list