PERFORCE change 164238 for review
Alejandro Pulver
alepulver at FreeBSD.org
Sat Jun 13 06:34:00 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164238
Change 164238 by alepulver at alepulver_deimos on 2009/06/13 06:33:02
Integrate latest changes from CVS.
Affected files ...
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.perl.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#5 integrate
Differences ...
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.155 2009/04/13 19:05:11 marcus Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.156 2009/06/03 05:15:14 marcus Exp $
# $NetBSD: $
# $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $
#
@@ -365,7 +365,7 @@
libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
libwnck_USE_GNOME_IMPL= gtk20
-vte_LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte
+vte_LIB_DEPENDS= vte.10:${PORTSDIR}/x11-toolkits/vte
vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc
vte_USE_GNOME_IMPL= gtk20
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.80 2008/08/29 11:29:41 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.81 2009/06/11 09:09:28 erwin Exp $
#
# Please view me with 4 column tabs!
@@ -117,11 +117,6 @@
-I${QT_PREFIX}/include -D_GETOPT_H
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \
-L${QT_PREFIX}/lib
-.if defined(PACKAGE_BUILDING)
-TMPDIR?= /tmp
-MAKE_ENV+= TMPDIR="${TMPDIR}"
-CONFIGURE_ENV+= TMPDIR="${TMPDIR}"
-.endif
.if !defined(QT_NONSTANDARD)
CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.84 2009/05/09 19:37:59 makc Exp $
+# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.85 2009/06/03 11:01:50 miwi Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
@@ -49,7 +49,7 @@
# but this could be changed in a future.
#
-KDE4_VERSION= 4.2.3
+KDE4_VERSION= 4.2.4
KDE4_BRANCH?= stable
#
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.18 2009/05/12 13:47:49 bsam Exp $
+# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.22 2009/06/12 18:03:43 bsam Exp $
#
# Please view me with 4 column tabs!
@@ -24,7 +24,7 @@
# (components), covered here.
# OVERRIDE_LINUX_NONBASE_PORTS
# - This specifies a none-default linux infrastructure ports to use.
-# Valid value is "f8" to use Linux Fedora 8 ports.
+# Valid values are "f8" and "f10" to use Linux Fedora [8,10] ports.
# This is an user-only variable. Don't use it in any port,
# it's meant to be used in make.conf.
@@ -43,8 +43,10 @@
. if (${LINUX_OSRELEASE} == "2.6.16") && defined(OVERRIDE_LINUX_NONBASE_PORTS)
. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f8"
LINUX_DIST_SUFFIX= -f8
+. elif ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
+LINUX_DIST_SUFFIX= -f10
. else
-IGNORE= valid value for OVERRIDE_LINUX_NONBASE_PORTS is \"f8\"
+IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\"
. endif
. else
LINUX_DIST_SUFFIX=
@@ -89,122 +91,147 @@
allegro_FILE= ${LINUXBASE}/usr/lib/liballeg-4.0.3.so
allegro_f8_FILE= ${LINUXBASE}/usr/lib/liballeg-4.2.2.so
+allegro_f10_FILE= ${LINUXBASE}/usr/lib/liballeg-4.2.2.so
allegro_DETECT= ${allegro${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
allegro_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-allegro
allegro_DEPENDS= xorglibs
alsalib_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0
alsalib_f8_FILE= ${alsalib_FILE}
+alsalib_f10_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0
alsalib_DETECT= ${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
alsalib_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib
arts_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0
arts_f8_FILE= ${arts_FILE}
+arts_f10_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0
arts_DETECT= ${arts${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
arts_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-arts
aspell_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.0.2
aspell_f8_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4
+aspell_f10_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4
aspell_DETECT= ${aspell${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
aspell_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-aspell
atk_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.901.0
atk_f8_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.2009.1
+atk_f10_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.2409.1
atk_DETECT= ${atk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
atk_PORT= ${PORTSDIR}/accessibility/linux${LINUX_DIST_SUFFIX}-atk
cairo_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.2.3
cairo_f8_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.11.7
+cairo_f10_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.10800.0
cairo_DETECT= ${cairo${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
cairo_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-cairo
cairo_DEPENDS= fontconfig png xorglibs
curl_FILE= ${LINUXBASE}/usr/lib/libcurl.so.3.0.0
curl_f8_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.0
+curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1
curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1
dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1
+dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2
dri_DETECT= ${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-. if ${LINUX_DIST_SUFFIX} == "-f8"
-dri_PORT= ${PORTSDIR}/graphics/linux-f8-dri
-.else
+. if ${LINUX_DIST_SUFFIX} == ""
dri_PORT= ${PORTSDIR}/graphics/linux_dri
-.endif
+. elif ${LINUX_DIST_SUFFIX} == "-f8"
+dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
+. else
+dri_PORT= ${PORTSDIR}/graphics/linux-dri74
+. endif
+dri_DEPENDS= xorglibs
esound_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.36
esound_f8_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.38
+esound_f10_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39
esound_DETECT= ${esound${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
esound_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-esound
esound_DEPENDS= libaudiofile
expat_FILE= ${LINUXBASE}/usr/lib/libexpat.so.0
expat_f8_FILE= ${LINUXBASE}/lib/libexpat.so.1
+expat_f10_FILE= ${LINUXBASE}/lib/libexpat.so.1
expat_DETECT= ${expat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
expat_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-expat
fontconfig_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1
fontconfig_f8_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.2.0
+fontconfig_f10_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.3.0
fontconfig_DETECT= ${fontconfig${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
fontconfig_PORT= ${PORTSDIR}/x11-fonts/linux${LINUX_DIST_SUFFIX}-fontconfig
fontconfig_DEPENDS= expat
freealut_FILE= ${LINUXBASE}/usr/lib/libalut.so.0.1.0
freealut_f8_FILE= ${freealut_FILE}
+freealut_f10_FILE= ${LINUXBASE}/usr/lib/libalut.so.0.1.0
freealut_DETECT= ${freealut${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
freealut_DEPENDS= openal
gdkpixbuf_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
gdkpixbuf_f8_FILE= ${gdkpixbuf_FILE}
+gdkpixbuf_f10_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
gdkpixbuf_DETECT= ${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
gtk_FILE= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0.9.1
gtk_f8_FILE= ${gtk_FILE}
+gtk_f10_FILE= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0.9.1
gtk_DETECT= ${gtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
gtk_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk
gtk_DEPENDS= xorglibs
gtk2_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.600.10
gtk2_f8_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1200.8
+gtk2_f10_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7
gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
gtk2_DEPENDS= atk jpeg png pango tiff xorglibs
hicontheme_FILE= ${LINUXBASE}/usr/share/icons/hicolor
hicontheme_f8_FILE= ${hicontheme_FILE}
+hicontheme_f10_FILE= ${LINUXBASE}/usr/share/icons/hicolor
hicontheme_DETECT= ${hicontheme${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
hicontheme_PORT= ${PORTSDIR}/x11-themes/linux${LINUX_DIST_SUFFIX}-hicolor-icon-theme
imlib_FILE= ${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.13
imlib_f8_FILE= ${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.15
+imlib_f10_FILE= ${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.15
imlib_DETECT= ${imlib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
imlib_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-imlib
jpeg_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
jpeg_f8_FILE= ${jpeg_FILE}
+jpeg_f10_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
jpeg_DETECT= ${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
jpeg_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg
libaudiofile_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
libaudiofile_f8_FILE= ${libaudiofile_FILE}
+libaudiofile_f10_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
libaudiofile_DETECT= ${libaudiofile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libaudiofile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libaudiofile
libg2c_FILE= ${LINUXBASE}/usr/lib/libg2c.so.0.0.0
libg2c_f8_FILE= ${libg2c_FILE}
+libg2c_f10_FILE= ${LINUXBASE}/usr/lib/libg2c.so.0.0.0
libg2c_DETECT= ${libg2c${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libg2c_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-libg2c
libglade_FILE= ${LINUXBASE}/usr/lib/libglade.so.0.4.2
libglade_f8_FILE= ${libglade_FILE}
+libglade_f10_FILE= ${LINUXBASE}/usr/lib/libglade.so.0.4.2
libglade_DETECT= ${libglade${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libglade_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade
libglade2_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
libglade2_f8_FILE= ${libglade2_FILE}
+libglade2_f10_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
libglade2_DETECT= ${libglade2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libglade2_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade2
@@ -213,179 +240,217 @@
libglu_DETECT= ${libglu${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libglu_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libGLU
-# no libidn_FILE
+# no libidn_FILE (there is no libidn port for Fedora 4 distribution)
libidn_f8_FILE= ${LINUXBASE}/usr/lib/libidn.so.11
+# no libidn_f10_FILE (libidn is integrated into linux_base-f10 port)
libidn_DETECT= ${libidn${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libidn_PORT= ${PORTSDIR}/dns/linux${LINUX_DIST_SUFFIX}-libidn
libmng_FILE= ${LINUXBASE}/usr/lib/libmng.so.1.0.0
libmng_f8_FILE= ${libmng_FILE}
+libmng_f10_FILE= ${LINUXBASE}/usr/lib/libmng.so.1.0.0
libmng_DETECT= ${libmng${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libmng_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libmng
libmng_DEPENDS= jpeg
libogg_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.2
libogg_f8_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.3
+libogg_f10_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.3
libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libogg
libsigcpp20_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0
libsigcpp20_f8_FILE= ${libsigcpp20_FILE}
+libsigcpp20_f10_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0
libsigcpp20_DETECT= ${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libsigcpp20_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20
# no libssh2_FILE
libssh2_f8_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1
+libssh2_f10_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1
libssh2_DETECT= ${libssh2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libssh2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libssh2
libssh2_DEPENDS= openssl
libtheora_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.1.0
libtheora_f8_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.2
+libtheora_f10_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.3
libtheora_DETECT= ${libtheora${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libtheora_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libtheora
libvorbis_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.3.0
libvorbis_f8_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
+libvorbis_f10_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
libvorbis_DETECT= ${libvorbis${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libvorbis_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libvorbis
libvorbis_DEPENDS= libogg
libxml_FILE= ${LINUXBASE}/usr/lib/libxml.so.1.8.17
libxml_f8_FILE= ${libxml_FILE}
+libxml_f10_FILE= ${LINUXBASE}/usr/lib/libxml.so.1.8.17
libxml_DETECT= ${libxml${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libxml_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml
libxml2_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.6.19
libxml2_f8_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.2
+libxml2_f10_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.3
libxml2_DETECT= ${libxml2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
libxml2_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml2
mikmod_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.2.0.4
mikmod_f8_FILE= ${mikmod_FILE}
+mikmod_f10_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2
+openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
openmotif_DETECT= ${openmotif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
openmotif_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-openmotif
openmotif_DEPENDS= xorglibs
# no nspr_FILE
nspr_f8_FILE= ${LINUXBASE}/usr/lib/libnspr4.so
+nspr_f10_FILE= ${LINUXBASE}/lib/libnspr4.so
nspr_DETECT= ${nspr${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
nspr_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-nspr
# no nss_FILE
nss_f8_FILE= ${LINUXBASE}/usr/lib/libnss3.so
+nss_f10_FILE= ${LINUXBASE}/lib/libnss3.so
nss_DETECT= ${nss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
nss_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-nss
nss_DEPENDS= nspr sqlite3
openal_FILE= ${LINUXBASE}/usr/lib/libopenal.so.0.0.0
openal_f8_FILE= ${openal_FILE}
+openal_f10_FILE= ${LINUXBASE}/usr/lib/libopenal.so.0.0.0
openal_DETECT= ${openal${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
openal_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal
openal_DEPENDS= alsalib arts esound libaudiofile libvorbis sdl12
openssl_FILE= ${LINUXBASE}/lib/libssl.so.0.9.7f
openssl_f8_FILE= ${LINUXBASE}/lib/libssl.so.0.9.8b
+openssl_f10_FILE= ${LINUXBASE}/lib/libssl.so.0.9.8g
openssl_DETECT= ${openssl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
openssl_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl
pango_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.1001.1
pango_f8_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.1800.4
+pango_f10_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.2203.0
pango_DETECT= ${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
pango_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango
pango_DEPENDS= cairo expat fontconfig xorglibs
png_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.1.2.8
png_f8_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.22.0
+png_f10_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.35.0
png_DETECT= ${png${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
png_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png
png10_FILE= ${LINUXBASE}/usr/lib/libpng.so.2.1.0.18
png10_f8_FILE= ${LINUXBASE}/usr/lib/libpng.so.2.1.0.30
+png10_f10_FILE= ${LINUXBASE}/usr/lib/libpng.so.2.1.0.43
png10_DETECT= ${png10${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
png10_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png10
qt33_FILE= ${LINUXBASE}/usr/lib/qt-3.3/lib/libqt-mt.so.3.3.4
qt33_f8_FILE= ${LINUXBASE}/usr/lib/qt-3.3/lib/libqt-mt.so.3.3.8
+qt33_f10_FILE= ${LINUXBASE}/usr/lib/qt-3.3/lib/libqt-mt.so.3.3.8
qt33_DETECT= ${qt33${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
qt33_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-qt33
qt33_DEPENDS= fontconfig libmng png
sdl12_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.7.3
sdl12_f8_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
+sdl12_f10_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
sdl12_DETECT= ${sdl12${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
sdl12_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-sdl12
sdl12_DEPENDS= xorglibs
sdlimage_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.4
sdlimage_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
+sdlimage_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
sdlimage_DETECT= ${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image
+. if ${LINUX_DIST_SUFFIX} == ""
sdlimage_DEPENDS= sdl12
+. else
+sdlimage_DEPENDS= jpeg png sdl12 tiff
+. endif
sdlmixer_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.4
sdlmixer_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
+sdlmixer_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
sdlmixer_DETECT= ${sdlmixer${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
sdlmixer_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-sdl_mixer
sdlmixer_DEPENDS= sdl12
scimgtk_FILE= ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
scimgtk_f8_FILE= ${scimgtk_FILE}
+scimgtk_f10_FILE= ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
scimgtk_DETECT= ${scimgtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
scimgtk_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-gtk
scimgtk_DEPENDS= gtk2 scimlibs
scimlibs_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8
scimlibs_f8_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8
+scimlibs_f10_FILE= ${LINUXBASE}/usr/lib/libscim-1.0.so.8
scimlibs_DETECT= ${scimlibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
scimlibs_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-libs
scimlibs_DEPENDS= gtk2
# no sqlite3_FILE
sqlite3_f8_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0
+sqlite3_f10_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0
sqlite3_DETECT= ${sqlite3${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
sqlite3_PORT= ${PORTSDIR}/databases/linux${LINUX_DIST_SUFFIX}-sqlite3
# no tcl84_FILE
tcl84_f8_FILE= ${LINUXBASE}/usr/lib/tcl8.4
+# XXX: tcl85!!!
+tcl84_f10_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so
tcl84_DETECT= ${tcl84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
tcl84_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl84
tiff_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.7.1
tiff_f8_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.8.2
+tiff_f10_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.8.2
tiff_DETECT= ${tiff${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
tiff_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-tiff
tiff_DEPENDS= jpeg
# no tk84_FILE
tk84_f8_FILE= ${LINUXBASE}/usr/lib/libtk8.4.so
+# XXX: tk85!!!
+tk84_f10_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so
tk84_DETECT= ${tk84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
tk84_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk84
tk84_DEPENDS= xorglibs
xorglibs_FILE= ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2.0
xorglibs_f8_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
+xorglibs_f10_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
xorglibs_DETECT= ${xorglibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
xorglibs_PORT= ${PORTSDIR}/x11/linux${LINUX_DIST_SUFFIX}-xorg-libs
xorglibs_DEPENDS= fontconfig
ucl_FILE= ${LINUXBASE}/usr/lib/libucl.so.1
ucl_f8_FILE= ${ucl_FILE}
+ucl_f10_FILE= ${LINUXBASE}/usr/lib/libucl.so.1
ucl_DETECT= ${ucl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
ucl_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-ucl
ungif_FILE= ${LINUXBASE}/usr/lib/libgif.so.4.1.3
ungif_f8_FILE= ${ungif_FILE}
+ungif_f10_FILE= ${LINUXBASE}/usr/lib/libgif.so.4.1.3
ungif_DETECT= ${ungif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
ungif_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-ungif
upx_FILE= ${LINUXBASE}/usr/bin/upx
upx_f8_FILE= ${upx_FILE}
+upx_f10_FILE= ${LINUXBASE}/usr/bin/upx
upx_DETECT= ${upx${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
upx_PORT= ${PORTSDIR}/archivers/linux${LINUX_DIST_SUFFIX}-upx
upx_DEPENDS= ucl
@@ -393,6 +458,7 @@
# use the same wabauth for now
webauth_FILE= ${LOCALBASE}/bin/linux-nvu
webauth_f8_FILE= ${webauth_FILE}
+webauth_f10_FILE= ${LOCALBASE}/bin/linux-nvu
webauth_DETECT= ${webauth${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
webauth_PORT= ${PORTSDIR}/www/linux-${WEB_AUTH}
webauth_DEPENDS= gtk2 atk pango fontconfig
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.18 2009/04/09 10:35:10 bsam Exp $
+# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.19 2009/06/01 17:26:07 bsam Exp $
#
# Variables:
@@ -67,13 +67,13 @@
# linux Fedora 8 infrastructure ports should be used with compat.linux.osrelease=2.6.16,
# linux_base-f8 (or greater) port
-. if ${LINUX_DIST_VER} == 8
+. if ${LINUX_DIST_VER} == 8 || ${LINUX_DIST_VER} == 10
# let's check for apropriate compat.linux.osrelease
. if (${LINUX_OSRELEASE} != "2.6.16")
IGNORE= bsd.linux-rpm.mk test failed: the port should be used with compat.linux.osrelease=2.6.16, which is supported at 8-CURRENT and has a limitted support at 7-STABLE
. endif
# let's check if an apropriate linux base port is used
-. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9
+. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10
IGNORE= bsd.linux-rpm.mk test failed: the port should be used with at least linux_base-f8, please read /usr/ports/UPDATING
. endif
# let's check if OVERRIDE_LINUX_NONBASE_PORTS is defined
@@ -95,6 +95,11 @@
../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}.newkey
MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
../updates/${LINUX_DIST_VER}/SRPMS.newkey
+. elif ${LINUX_DIST_VER} == 10
+MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
+ ../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
+ ../updates/${LINUX_DIST_VER}/SRPMS
. else
MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
@@ -161,9 +166,11 @@
_LINUX_BASE_SUFFIX= f8
. elif ${USE_LINUX} == "f9"
_LINUX_BASE_SUFFIX= f9
+. elif ${USE_LINUX} == "f10"
+_LINUX_BASE_SUFFIX= f10
. else
# other linux_base ports do not provide a pkg-plist file
-IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"fc4\", \"fc6\", \"f7\", \"f8\" and \"f9\"
+IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"fc4\", \"fc6\", \"f7\", \"f8\", \"f9\" and \"f10\"
. endif
PLIST?= ${WRKDIR}/.PLIST.linux-rpm
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.perl.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.13 2009/03/28 20:45:06 skv Exp $
+# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.14 2009/06/08 14:56:31 skv Exp $
#
# bsd.perl.mk - Support for Perl-based ports.
#
@@ -19,8 +19,8 @@
# PERL_VERSION - Full version of perl5 (see below for current value).
# PERL_LEVEL - Perl version as an integer of the form MNNNPP, where
# M is major version, N is minor version, and P is
-# the patch level. E.g., PERL_VERSION=5.6.1 would give
-# a PERL_LEVEL of 500601. This can be used in comparisons
+# the patch level. E.g., PERL_VERSION=5.8.1 would give
+# a PERL_LEVEL of 500801. This can be used in comparisons
# to determine if the version of perl is high enough,
# whether a particular dependency is needed, etc.
# PERL_ARCH - Directory name of architecture dependent libraries
@@ -47,7 +47,7 @@
#
# Examples:
# USE_PERL5= yes # port requires any version of Perl5 to build.
-# USE_PERL5= 5.6.0+ # port requires at least Perl 5.6.0 to build.
+# USE_PERL5= 5.8.0+ # port requires at least Perl 5.8.0 to build.
# USE_PERL5= 5.8.2 # port is only usable with Perl 5.8.2.
# USE_PERL5= 5.8.6- # port is only usbale with Perl 5.8.6 or prior.
#
@@ -101,10 +101,8 @@
.if ${PERL_LEVEL} >= 501000
PERL_PORT?= perl5.10
-.elif ${PERL_LEVEL} >= 500800
+.else # ${PERL_LEVEL} < 501000
PERL_PORT?= perl5.8
-.else # ${PERL_LEVEL} < 500800
-PERL_PORT?= perl5.6
.endif
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#5 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.619 2009/05/22 21:57:33 acm Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.623 2009/06/11 09:09:29 erwin Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -308,6 +308,7 @@
# the regular expression.
# USE_GCC - If set, this port requires this version of gcc, either in
# the system or installed from a port.
+# USE_CSTD - Override the default C language standard (gnu89, gnu99)
# USE_GMAKE - If set, this port uses gmake.
# GMAKE - Set to path of GNU make if not in $PATH.
# Default: gmake
@@ -329,8 +330,8 @@
# PERL_VERSION - Full version of perl5 (see below for current value).
# PERL_LEVEL - Perl version as an integer of the form MNNNPP, where
# M is major version, N is minor version, and P is
-# the patch level. E.g., PERL_VERSION=5.6.1 would give
-# a PERL_LEVEL of 500601. This can be used in comparisons
+# the patch level. E.g., PERL_VERSION=5.8.1 would give
+# a PERL_LEVEL of 500801. This can be used in comparisons
# to determine if the version of perl is high enough,
# whether a particular dependency is needed, etc.
# PERL_ARCH - Directory name of architecture dependent libraries
@@ -367,10 +368,9 @@
# new features: 'build', 'run', 'both', implying build,
# runtime, and both build/run dependencies
##
-# USE_IMAKE - If set, this port uses imake. Implies USE_X_PREFIX.
+# USE_IMAKE - If set, this port uses imake.
# XMKMF - Set to path of `xmkmf' if not in $PATH
# Default: xmkmf -a
-# USE_X_PREFIX - If set, this port installs in ${X11BASE}. Implies USE_XLIB.
# USE_XLIB - If set, this port uses the X libraries. In the USE_LINUX
# case the linux X libraries are referenced.
# USE_DISPLAY - If set, this ports requires a (virtual) X11 environment
@@ -551,8 +551,7 @@
# LINUXBASE - Where Linux ports install things.
# Default: /compat/linux
# PREFIX - Where *this* port installs its files.
-# Default: ${X11BASE} if USE_X_PREFIX is set,
-# ${LINUXBASE} if USE_LINUX_PREFIX is set,
+# Default: ${LINUXBASE} if USE_LINUX_PREFIX is set,
# otherwise ${LOCALBASE}
#
# IGNORE_PATH_CHECKS
@@ -1310,6 +1309,19 @@
DOS2UNIX_REGEX?= .*
+# At least KDE needs TMPDIR for the package building,
+# so we're setting it to the known default value.
+.if defined(PACKAGE_BUILDING)
+TMPDIR?= /tmp
+.endif # defined(PACKAGE_BUILDING)
+
+# Respect TMPDIR passed via make.conf or similar and pass it down
+# to configure and make.
+.if defined(TMPDIR)
+MAKE_ENV+= TMPDIR="${TMPDIR}"
+CONFIGURE_ENV+= TMPDIR="${TMPDIR}"
+.endif # defined(TMPDIR)
+
# Start of pre-makefile section.
.if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
@@ -1395,18 +1407,7 @@
SCRIPTDIR?= ${MASTERDIR}/scripts
PKGDIR?= ${MASTERDIR}
-.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) && !defined(USE_XORG)
-USE_X_PREFIX= yes
-.endif
-.if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no"
-.undef USE_X_PREFIX
-.endif
-.if defined(USE_X_PREFIX)
-USE_XLIB= yes
-.endif
-.if defined(USE_X_PREFIX)
-PREFIX?= ${X11BASE}
-.elif defined(USE_LINUX_PREFIX)
+.if defined(USE_LINUX_PREFIX)
PREFIX?= ${LINUXBASE}
NO_MTREE= yes
.else
@@ -1451,10 +1452,8 @@
.if ${PERL_LEVEL} >= 501000
PERL_PORT?= perl5.10
-.elif ${PERL_LEVEL} >= 500800
+.else
PERL_PORT?= perl5.8
-.else
-PERL_PORT?= perl5.6
.endif
SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
@@ -2180,16 +2179,17 @@
.endif
.endif
+.if defined(USE_CSTD)
+CFLAGS:= ${CFLAGS:N-std=*} -std=${USE_CSTD}
+.endif
+
# Multiple make jobs support
.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
_MAKE_JOBS= #
.else
.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
-.if defined(MAKE_JOBS_NUMBER)
+MAKE_JOBS_NUMBER?= `${SYSCTL} -n kern.smp.cpus`
_MAKE_JOBS= -j${MAKE_JOBS_NUMBER}
-.else
-_MAKE_JOBS= -j`${SYSCTL} -n kern.smp.cpus`
-.endif
.if defined(FORCE_MAKE_JOBS)
BUILD_FAIL_MESSAGE+= "You have chosen to use multiple make jobs (parallelization) for all ports. This port was not tested for this setting. Please remove FORCE_MAKE_JOBS and retry the build before reporting the failure to the maintainer."
.endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#4 (text+ko) ====
@@ -1,7 +1,7 @@
# -*- mode: Makefile; tab-width: 4; -*-
# ex: ts=4
#
-# $FreeBSD: ports/Mk/bsd.python.mk,v 1.112 2009/03/24 09:30:21 pav Exp $
+# $FreeBSD: ports/Mk/bsd.python.mk,v 1.113 2009/06/08 22:30:45 miwi Exp $
#
.if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
@@ -83,9 +83,9 @@
#
# PYTHON_DEFAULT_VERSION
# - Version of the default python binary in your ${PATH}, in
-# the format "python2.5". Set this in your /etc/make.conf
+# the format "python2.6". Set this in your /etc/make.conf
# in case you want to use an older version as a default.
-# default: python2.5
+# default: python2.6
#
# PYTHON_WRKSRC - The ${WRKSRC} for your python version. Needed for
# extensions like Tkinter, py-gdbm and py-expat, which
@@ -213,8 +213,8 @@
# specific version of zope.
#
-_PYTHON_PORTBRANCH= 2.5
-_PYTHON_ALLBRANCHES= 2.5 2.6 2.4 2.3 3.0 # preferred first
+_PYTHON_PORTBRANCH= 2.6
+_PYTHON_ALLBRANCHES= 2.6 2.5 2.4 2.3 3.0 # preferred first
_ZOPE_PORTBRANCH= 2.7
_ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2
@@ -379,9 +379,9 @@
# Python-2.6
.elif ${PYTHON_VERSION} == "python2.6"
-PYTHON_PORTVERSION?=2.6.1
+PYTHON_PORTVERSION?=2.6.2
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python26
-PYTHON_REL= 261
+PYTHON_REL= 262
PYTHON_SUFFIX= 26
PYTHON_VER= 2.6
@@ -425,8 +425,8 @@
@${ECHO} "Legal values are:"
@${ECHO} " python2.3"
@${ECHO} " python2.4"
- @${ECHO} " python2.5 (default)"
- @${ECHO} " python2.6"
+ @${ECHO} " python2.5"
+ @${ECHO} " python2.6 (default)"
@${ECHO} " python3.0"
@${FALSE}
.endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#5 (text+ko) ====
@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.179 2009/02/23 00:44:22 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.182 2009/06/12 22:44:56 stas Exp $
#
.if !defined(Ruby_Include)
@@ -172,7 +172,7 @@
RUBY_RELVERSION= 1.8.7
RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
-RUBY_PATCHLEVEL= 72
+RUBY_PATCHLEVEL= 160
. if ${RUBY_PATCHLEVEL} == 0
RUBY_VERSION?= ${RUBY_RELVERSION}
@@ -198,9 +198,9 @@
# Ruby 1.9
#
RUBY_RELVERSION= 1.9.1
-RUBY_PORTREVISION= 1
+RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
-RUBY_PATCHLEVEL= 0
+RUBY_PATCHLEVEL= 129
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#5 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.474 2009/04/10 08:18:57 itetcu Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.476 2009/06/10 16:08:34 amdmi3 Exp $
#
# Where to put distfiles that don't have any other master site
@@ -1165,7 +1165,7 @@
.endif
.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE)
-.for mirror in garr superb-east nchc kent easynews ufpr mesh heanet
+.for mirror in superb-east nchc kent easynews ufpr mesh heanet # garr
MASTER_SITE_SOURCEFORGE+= \
http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/
.endfor
@@ -1472,6 +1472,18 @@
ftp://ftp.x.org/pub/%SUBDIR%/
.endif
+.if !defined(IGNORE_MASTER_SITE_KERNEL_ORG)
+MASTER_SITE_KERNEL_ORG+= \
+ http://kernel.org/pub/%SUBDIR%/ \
+ http://www.us.kernel.org/pub/%SUBDIR%/ \
+ http://www.uk.kernel.org/pub/%SUBDIR%/ \
+ http://www.no.kernel.org/pub/%SUBDIR%/ \
+ http://www.de.kernel.org/pub/%SUBDIR%/ \
+ http://www.it.kernel.org/pub/%SUBDIR%/ \
+ http://www.ru.kernel.org/pub/%SUBDIR%/ \
+ http://www.au.kernel.org/pub/%SUBDIR%/
+.endif
+
# Macro magic
MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED \
More information about the p4-projects
mailing list