From ad279fac1f4979d1d9bab17b1a3cedc2c2e74a35 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 1 Aug 2008 12:32:35 +0000 Subject: [PATCH] - Reorganize Makefile to only download distfiles relevant to enabled OPTIONS - Update WWW PR: ports/126081 Submitted by: Pedro F. Giffuni Approved by: Takeshi MUTOH (maintainer) --- lang/squeak-dev/Makefile | 18 +++++++++--------- lang/squeak-dev/pkg-descr | 2 +- lang/squeak/Makefile | 18 +++++++++--------- lang/squeak/pkg-descr | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile index f8df8a991db7..b46d32213b6e 100644 --- a/lang/squeak-dev/Makefile +++ b/lang/squeak-dev/Makefile @@ -17,17 +17,15 @@ MASTER_SITES= http://www.squeakvm.org/unix/release/ \ ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ - http://www.squeakland.org/installers/ \ - http://www.squeakland.jp/plugin/installers/ \ - http://squeak.610t.org/patches/ -DISTFILES= Squeak-${VMVERSION}.src.tar.gz \ + http://www.squeakland.org/installers/:plugin \ + http://www.squeakland.jp/plugin/installers/:jpplugin \ + http://squeak.610t.org/patches/:ximpatch +DISTFILES= Squeak-${VMVERSION}.src${EXTRACT_SUFX} \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \ - SqueakPlugin.zip \ SqueakV3.sources.gz \ - ${XIM_PATCH} \ - ${JAPANESE_PLUGIN_IMAGE} -EXTRACT_ONLY= Squeak-${VMVERSION}.src.tar.gz + ${JAPANESE_PLUGIN_IMAGE}:jpplugin +EXTRACT_ONLY= Squeak-${VMVERSION}.src${EXTRACT_SUFX} ################################################## MAINTAINER= mutoh@openedu.org @@ -53,7 +51,7 @@ OPTIONS+= XIM "XIM support (Implies X)" off .include ################################################## -XIM_PATCH= SqueakImmX11Plugin3a.tar.gz +XIM_PATCH= SqueakImmX11Plugin3a${EXTRACT_SUFX} PLUGIN_IMAGE= SqueakPlugin.zip JAPANESE_PLUGIN_IMAGE= SqueakPlugin2005J.zip @@ -101,6 +99,7 @@ CONFIGURE_ARGS+= --without-rfb CONFIGURE_ARGS+= --without-npsqueak PLIST_NPSQUEAK= "@comment feature not wanted - " .else +DISTFILES+= SqueakPlugin.zip:plugin WITH_NPSQUEAK= yes PLIST_NPSQUEAK= FILES_TO_GZIP+= SqueakPlugin.image @@ -131,6 +130,7 @@ PLIST_FFI= "@comment feature not wanted - " .endif .if defined(WITH_XIM) +DISTFILES+= ${XIM_PATCH}:ximpatch PLIST_XIM= WITH_X= yes USE_ICONV= yes diff --git a/lang/squeak-dev/pkg-descr b/lang/squeak-dev/pkg-descr index c451fd6794a0..ed6e32cc57aa 100644 --- a/lang/squeak-dev/pkg-descr +++ b/lang/squeak-dev/pkg-descr @@ -21,4 +21,4 @@ Squeak comes under an open source license, meaning that you can download and use it for free. WWW: http://www.squeak.org/ (Squeak project) - http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak) + http://www.squeakvm.org/unix/ (Unix Squeak) diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index f8df8a991db7..b46d32213b6e 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -17,17 +17,15 @@ MASTER_SITES= http://www.squeakvm.org/unix/release/ \ ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/ \ ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \ - http://www.squeakland.org/installers/ \ - http://www.squeakland.jp/plugin/installers/ \ - http://squeak.610t.org/patches/ -DISTFILES= Squeak-${VMVERSION}.src.tar.gz \ + http://www.squeakland.org/installers/:plugin \ + http://www.squeakland.jp/plugin/installers/:jpplugin \ + http://squeak.610t.org/patches/:ximpatch +DISTFILES= Squeak-${VMVERSION}.src${EXTRACT_SUFX} \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \ Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \ - SqueakPlugin.zip \ SqueakV3.sources.gz \ - ${XIM_PATCH} \ - ${JAPANESE_PLUGIN_IMAGE} -EXTRACT_ONLY= Squeak-${VMVERSION}.src.tar.gz + ${JAPANESE_PLUGIN_IMAGE}:jpplugin +EXTRACT_ONLY= Squeak-${VMVERSION}.src${EXTRACT_SUFX} ################################################## MAINTAINER= mutoh@openedu.org @@ -53,7 +51,7 @@ OPTIONS+= XIM "XIM support (Implies X)" off .include ################################################## -XIM_PATCH= SqueakImmX11Plugin3a.tar.gz +XIM_PATCH= SqueakImmX11Plugin3a${EXTRACT_SUFX} PLUGIN_IMAGE= SqueakPlugin.zip JAPANESE_PLUGIN_IMAGE= SqueakPlugin2005J.zip @@ -101,6 +99,7 @@ CONFIGURE_ARGS+= --without-rfb CONFIGURE_ARGS+= --without-npsqueak PLIST_NPSQUEAK= "@comment feature not wanted - " .else +DISTFILES+= SqueakPlugin.zip:plugin WITH_NPSQUEAK= yes PLIST_NPSQUEAK= FILES_TO_GZIP+= SqueakPlugin.image @@ -131,6 +130,7 @@ PLIST_FFI= "@comment feature not wanted - " .endif .if defined(WITH_XIM) +DISTFILES+= ${XIM_PATCH}:ximpatch PLIST_XIM= WITH_X= yes USE_ICONV= yes diff --git a/lang/squeak/pkg-descr b/lang/squeak/pkg-descr index c451fd6794a0..ed6e32cc57aa 100644 --- a/lang/squeak/pkg-descr +++ b/lang/squeak/pkg-descr @@ -21,4 +21,4 @@ Squeak comes under an open source license, meaning that you can download and use it for free. WWW: http://www.squeak.org/ (Squeak project) - http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak) + http://www.squeakvm.org/unix/ (Unix Squeak)