diff options
| author | jlam <jlam@pkgsrc.org> | 2001-09-27 20:27:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-09-27 20:27:32 +0000 |
| commit | 0312b354c0bf1dbe27e66082d54d7d2e24ab107f (patch) | |
| tree | 0ba9173abaede90790813c6ef3d8cb9c1a8f93f2 /x11/swing | |
| parent | e34e9c5b2766369054c5bb1e5b7675a8bbdc60c2 (diff) | |
| download | pkgsrc-0312b354c0bf1dbe27e66082d54d7d2e24ab107f.tar.gz | |
Sun moved the distfiles, so fix the pre-fetch and do-fetch targets. Also
add a check for the distfile before descending into the urlget directory
and making urlget. This fixes the problem with abusing BUILD_DEPENDS to
ensure that urlget is installed prior to fetching the distfiles, noted in
pkg/13410 by Bernd Ernesti <bernd@arresum.inka.de>.
Diffstat (limited to 'x11/swing')
| -rw-r--r-- | x11/swing/Makefile | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/x11/swing/Makefile b/x11/swing/Makefile index 0211f33e103..6b5f4fade5b 100644 --- a/x11/swing/Makefile +++ b/x11/swing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/04/05 19:27:42 jwise Exp $ +# $NetBSD: Makefile,v 1.15 2001/09/27 20:27:33 jlam Exp $ DISTNAME= swing1_1_1 PKGNAME= swing-1.1.1 @@ -10,12 +10,12 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.javasoft.com/products/jfc/ COMMENT= Sun's Java Foundation Classes (the Swing UI toolkit), version 1.1.1 -BUILD_DEPENDS+= urlget-1.3:../../www/urlget +BUILD_DEPENDS+= urlget>=1.3:../../www/urlget RESTRICTED= "Read license before redistributing the Java(tm) Foundation Classes" -NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} LICENSE= sun-swing-license @@ -37,23 +37,29 @@ ROOT_GROUP?= wheel .include "../../mk/bsd.prefs.mk" TEMPDIR?= /tmp -TEMPFILE!=echo ${TEMPDIR}/swing.location.$$$$ +TEMPFILE!= echo ${TEMPDIR}/swing.location.$$$$ +URLGET?= ${LOCALBASE}/bin/urlget pre-fetch: - ${MAKE} install-depends DEPENDS= + @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ + if [ ! -x ${URLGET} ]; then \ + ${MAKE} install-depends DEPENDS=; \ + fi; \ + fi do-fetch: - -if [ ! -f ${DISTDIR}/${DISTFILES} ] ; then \ - ${LOCALBASE}/bin/urlget -p http://www.javasoft.com/Download3 \ - referer=http://www.javasoft.com/products/jfc/download.html \ - protocol="FTP Download" \ - download-name=swing1_1_1.zip \ - config-file=swing111.config \ - platform=zip \ - domain-checked= \ - > ${TEMPFILE} ; \ - ${FETCH_CMD} -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} `${GREP} ftp:// ${TEMPFILE} | \ - ${SED} -e 's|.*\(ftp://.*.zip\).*|\1|'` ; \ + -@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ] ; then \ + ${URLGET} -p http://java.sun.com/Download3 \ + referer= \ + protocol="FTP Download" \ + download-name=${DISTNAME}${EXTRACT_SUFX} \ + config-file=swing111.config \ + platform=zip \ + domain-checked= \ + > ${TEMPFILE}; \ + ${FETCH_CMD} -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \ + `${GREP} ftp:// ${TEMPFILE} | \ + ${SED} -e 's|.*\(ftp://.*.zip\).*|\1|'`; \ fi do-install: |