kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply the "convention over configuration" principle:

Browse source 
If ${FILESDIR}/getsite.sh exists, then use it to determine the fetch
URL for each of the distfiles for the package.  Otherwise, use
SITE_<file> and MASTER_SITES, in order, to determine the URL for each
distfile.

If the script path differs from ${FILESDIR}/getsite.sh, then set
DYNAMIC_SITE_SCRIPT to the full path to that script.

Remove the need to set DYNAMIC_MASTER_SITES explicitly in the package
Makefile for:

	graphics/ns-cult3d
	wm/sawfish-themes
	www/apache-tomcat55
	www/jakarta-tomcat4
	www/jakarta-tomcat5
This commit is contained in:
jlam 2006-07-27 15:16:44 +00:00
parent a5163ad93e
commit e7af7b2e05
8 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Makefile-example
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile-example,v 1.13 2006/04/09 01:14:52 jlam Exp $
# $NetBSD: Makefile-example,v 1.14 2006/07/27 15:16:44 jlam Exp $
# First paragraph - distfile and binary package data
# DISTNAME PKGNAME PKGREVISION SVR4_PKGNAME CATEGORIES MASTER_SITES
# DYNAMIC_MASTER_SITES MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES
# MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES
DISTNAME= make-3.80
PKGNAME= gmake-3.80 # only to be added if the package name is different from DISTNAME
#PKGREVISION= 2 # should be added/incremented for user-visible changes

3
graphics/ns-cult3d/Makefile
View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.7 2006/05/22 22:22:03 jlam Exp $
# $NetBSD: Makefile,v 1.8 2006/07/27 15:16:44 jlam Exp $
#
DISTNAME= Cult3D_NS4_5.2b1
PKGNAME= ns-cult3d-5.2
CATEGORIES= www graphics
DYNAMIC_MASTER_SITES= YES
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.cult3d.com/

8
mk/fetch/fetch-list.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: fetch-list.mk,v 1.3 2006/07/27 13:51:21 jlam Exp $
# $NetBSD: fetch-list.mk,v 1.4 2006/07/27 15:16:44 jlam Exp $
# Prints out a script to fetch all needed files (no checksumming).
.PHONY: fetch-list
@ -44,7 +44,7 @@ fetch-list-one-pkg:
@location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \
${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...'
. for fetchfile in ${_ALLFILES}
. if defined(DYNAMIC_MASTER_SITES)
. if exists(${DYNAMIC_SITE_SCRIPT})
@(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then \
${ECHO}; \
filesize=`${AWK} ' \
@ -53,7 +53,7 @@ fetch-list-one-pkg:
${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \
${ECHO} '#'; \
${ECHO} '${SH} -s ${fetchfile:T} <<"EOF" |('; \
${CAT} ${FILESDIR}/getsite.sh; \
${CAT} ${DYNAMIC_SITE_SCRIPT}; \
${ECHO} EOF; \
${ECHO} read unsorted_sites; \
${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \
@ -83,7 +83,7 @@ fetch-list-one-pkg:
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} done; \
fi)
. endif # defined(DYNAMIC_MASTER_SITES)
. endif
. endfor
. endif # !empty(_ALLFILES)
.endif # !target(fetch-list-one-pkg)

8
mk/fetch/fetch.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: fetch.mk,v 1.17 2006/07/27 07:41:40 rillig Exp $
# $NetBSD: fetch.mk,v 1.18 2006/07/27 15:16:44 jlam Exp $
_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@ -54,9 +54,11 @@ _ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites
#
# Associate each file to fetch with the correct site(s).
#
.if defined(DYNAMIC_MASTER_SITES)
DYNAMIC_SITE_SCRIPT?= ${FILESDIR}/getsite.sh
DYNAMIC_SITE_CMD?= ${SETENV} PATH=${PATH:Q} ${SH} ${DYNAMIC_SITE_SCRIPT}
.if exists(${DYNAMIC_SITE_SCRIPT})
. for fetchfile in ${_ALLFILES}
SITES_${fetchfile:T:S/=/--/}?= `${SH} ${FILESDIR}/getsite.sh ${fetchfile:T}`
SITES_${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITE_CMD} ${fetchfile:T}`
SITES.${fetchfile:T:S/=/--/}?= ${SITES_${fetchfile:T:S/=/--/}}
. endfor
.endif

3
wm/sawfish-themes/Makefile
View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.12 2006/06/29 21:00:25 joerg Exp $
# $NetBSD: Makefile,v 1.13 2006/07/27 15:16:44 jlam Exp $
DISTNAME= sawfish-themes-0.2
PKGREVISION= 5
CATEGORIES= x11 wm
DYNAMIC_MASTER_SITES= yes
DISTFILES= ${SAWFISH_THEMES}
MAINTAINER= jschauma@NetBSD.org

3
www/apache-tomcat55/Makefile
View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.7 2006/07/22 19:43:55 abs Exp $
# $NetBSD: Makefile,v 1.8 2006/07/27 15:16:44 jlam Exp $
DISTNAME= apache-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
# The list of sites to download is generated by an apache website.
# The getsite.sh script parses the HTML and extracts the urls.
DYNAMIC_MASTER_SITES=1
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://tomcat.apache.org/

3
www/jakarta-tomcat4/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:24 joerg Exp $
# $NetBSD: Makefile,v 1.10 2006/07/27 15:16:44 jlam Exp $
PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@ -7,7 +7,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
# The list of sites to download is generated by a jakarta website.
# The getsite.sh script parses the HTML and extracts the urls.
DYNAMIC_MASTER_SITES=1
MAINTAINER= erh@NetBSD.org
HOMEPAGE= http://jakarta.apache.org/tomcat/

3
www/jakarta-tomcat5/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2006/07/07 03:11:48 minskim Exp $
# $NetBSD: Makefile,v 1.13 2006/07/27 15:16:44 jlam Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@ -6,7 +6,6 @@ PKGREVISION= 3
CATEGORIES= www java
# The list of sites to download is generated by a jakarta website.
# The getsite.sh script parses the HTML and extracts the urls.
DYNAMIC_MASTER_SITES=1
MAINTAINER= erh@NetBSD.org
HOMEPAGE= http://jakarta.apache.org/tomcat/