PERFORCE change 123635 for review
Gabor Kovesdan
gabor at FreeBSD.org
Tue Jul 17 11:11:58 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123635
Change 123635 by gabor at gabor_server on 2007/07/17 11:11:03
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/CHANGES#9 integrate
.. //depot/projects/soc2006/gabor_destdir/GIDs#10 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#11 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.php.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#33 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.qt.mk#1 branch
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#10 integrate
.. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/processonelog#3 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#9 integrate
Differences ...
==== //depot/projects/soc2006/gabor_destdir/CHANGES#9 (text+ko) ====
@@ -10,6 +10,14 @@
All ports committers are allowed to commit to this file.
+20070712:
+AUTHOR: maho at FreeBSD.org
+
+ * Add knob USE_FORTRAN for ports which uses FORTRAN. All ports uses
+ FORTRAN compiler should use this knob. Usages are: USE_FORTRAN=yes
+ (default;gfortran42), USE_FROTRAN=ifc (Intel FORTRAN compiler)
+ and USE_FORTRAN=g77 (/usr/bin/f77 or g77-34).
+
20070701:
AUTHOR: portmgr at FreeBSD.org
The following change was made to the ports infrastructure:
@@ -1358,4 +1366,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.73 2007/07/01 15:09:37 pav Exp $
+$FreeBSD: ports/CHANGES,v 1.74 2007/07/12 01:57:09 maho Exp $
==== //depot/projects/soc2006/gabor_destdir/GIDs#10 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.44 2007/06/30 06:49:17 sat Exp $
+$FreeBSD: ports/GIDs,v 1.45 2007/07/13 06:40:50 marcus Exp $
# Please keep this file sorted by GID!
smmsp:*:25:
bind:*:53:
@@ -102,7 +102,7 @@
qtss:*:554:
ircdru:*:555:
messagebus:*:556:
-realtime:*:557:
+pulse-rt:*:557:
avahi:*:558:
tacacs:*:559:
distcc:*:561:
==== //depot/projects/soc2006/gabor_destdir/MOVED#11 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1400 2007/06/30 19:52:38 miwi Exp $
+# $FreeBSD: ports/MOVED,v 1.1426 2007/07/16 17:04:58 nobutaka Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -944,7 +944,6 @@
archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed
net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category
multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better
-editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location
editors/openoffice-1.1-gr|editors/openoffice-1.1-el|2004-03-20|correct ISO code
print/rubber|textproc/rubber|2004-03-22|remove duplicate port
print/libgnomeprint20||2004-03-23|removed obsolete port
@@ -2487,11 +2486,7 @@
x11-themes/e17-theme-blue_default||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-carbon||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-detour||2006-11-01|Has expired: doesn't work with recent e17
-x11-themes/e17-theme-gant||2006-11-01|Has expired: doesn't work with recent e17
-x11-themes/e17-theme-japan2007||2006-11-01|Has expired: doesn't work with recent e17
-x11-themes/e17-theme-milky||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-neptun||2006-11-01|Has expired: doesn't work with recent e17
-x11-themes/e17-theme-simply_white||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-winter||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-mclaren||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-grey||2006-11-01|Has expired: doesn't work with recent e17
@@ -3081,3 +3076,28 @@
mail/mimp|mail/horde-mimp|2007-06-21|Port renamed for consistency
mail/turba|mail/horde-turba|2007-06-21|Port renamed for consistency
security/jeta|security/horde-jeta|2007-06-21|Port renamed for consistency
+graphics/digikamimageplugins|graphics/digikam|2007-07-02|Projects merged
+ftp/lukemftp|ftp/tnftp|2007-07-02|Vendor name change
+net/obnc||2007-07-03|Removed: A new version of this port is available from base system.
+databases/p5-DBD-RAM||2007-07-03|Has expired: Only works on 4.x
+databases/p5-DBD-File||2007-07-03|Has expired: Only usable on 4.x
+databases/p5-DBI-137|databases/p5-DBI|2007-07-03|Only useful for 4.x
+multimedia/libdivxencore||2007-07-04|Obsolete port
+multimedia/libdivxdecore||2007-07-04|Obsolete port
+multimedia/libdivxdecore-devel||2007-07-04|Obsolete port
+multimedia/handbrake-gtk2||2007-07-04|Obsolete, getting old to keep unsupport version around
+audio/amarokFS||2007-07-04|Removed
+net/rrdtool|databases/rrdtool|2007-07-05|Move to better category
+sysutils/cd-write||2007-07-06|Obsolete port
+net/rubygems-rrdtool|databases/rubygems-rrdtool|2007-07-08|Chase move of databases/rrdtool
+net/rrdman|databases/rrdman|2007-07-08|Chase move of databases/rrdtool
+net/py-rrdpipe|databases/py-rrdpipe|2007-07-08|Chase move of databases/rrdtool
+net/php5-rrdtool|databases/php5-rrdtool|2007-07-08|Chase move of databases/rrdtool
+textproc/ruby-spreadsheet-excel|textproc/rubygem-spreadsheet-excel|2007-07-09|Port updated in rubygem version
+net/gnet-glib2|net/gnet2|2007-07-09|Functionality merged into gnet2
+www/lynx-ssl|www/lynx|2007-07-10|SSL enabled by default in www/lynx
+net-p2p/py-bittorrent-devel|net-p2p/py-bittorent|2007-07-10|Non-devel port have newer version
+net-p2p/py-bittorrent-core-devel|net-p2p/py-bittorent-core|2007-07-10|Non-devel port have newer version
+devel/libslang2-devel||2007-07-11|Non-devel port have newer version
+graphics/hpoj||2007-07-14|Expired: project discontinued, please switch to print/hplip
+net/jffnms|net-mgmt/jffnms|2007-07-14|move to net-mgmt/jffnms
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.65 2007/05/27 17:43:21 anray Exp $
+# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.67 2007/07/16 18:05:18 nobutaka Exp $
#
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
@@ -7,6 +7,8 @@
Emacs_Include= bsd.emacs.mk
Emacs_Include_MAINTAINER= ports at FreeBSD.org
+EMACS_PORT_NAME?= emacs22
+
#
# This file for ports which depend on emacs family.
# Define EMACS_PORT_NAME variable before bsd.port.[pre.]mk
@@ -102,7 +104,7 @@
EMACS_MAJOR_VER= 21
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR= ${PORTSDIR}/editors/emacs
+EMACS_PORTSDIR= ${PORTSDIR}/editors/emacs21
EMACS_COMMON_PORT= NO
EMACS_HAS_MULE= YES
EMACS_NO_SUBDIRSEL= NO
@@ -115,6 +117,23 @@
# Emacs-22.x
.elif (${EMACS_PORT_NAME} == "emacs22")
EMACS_NAME= emacs
+EMACS_VER= 22.1
+EMACS_MAJOR_VER= 22
+EMACS_LIBDIR?= share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
+EMACS_PORTSDIR= ${PORTSDIR}/editors/emacs
+EMACS_COMMON_PORT= NO
+EMACS_HAS_MULE= YES
+EMACS_NO_SUBDIRSEL= NO
+.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+
+# Emacs-22.x (development version)
+.elif (${EMACS_PORT_NAME} == "emacs-devel")
+EMACS_NAME= emacs
EMACS_VER= 22.0.99
EMACS_MAJOR_VER= 22
EMACS_LIBDIR?= share/${EMACS_NAME}
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#4 (text+ko) ====
@@ -9,16 +9,29 @@
# If your port needs a specific version of GCC, you can easily specify
# that with the "USE_GCC=" statement. If you need a certain minimal version,
# but don't care if about the upperversion, just the + sign behind
-# the version.
+# the version. Note that the Fortran compiler is specified with the
+# USE_FORTRAN knob.
#
# For example:
# USE_GCC= 3.3 # port requires GCC 3.3 to build with.
# USE_GCC= 3.4+ # port requires GCC 3.4 or later to build with.
#
+# If your port needs a Fortran compiler, please specify that with the
+# USE_FORTRAN= knob. Here is the list of options for that knob:
+#
+# USE_FORTRAN= yes # use gfortran42 (/lang/gcc42)
+# USE_FORTRAN= gfortran42
+# USE_FORTRAN= g77 # use g77-34 (lang/gcc34; FreeBSD>=7)
+# # or system f77 (/usr/bin/f77; FreeBSD<=6)
+# USE_FORTRAN= ifort # use the Intel compiler (lang/ifc)
+#
+# Due to object file incompatiblity between Fortran compilers, we strongly
+# recommend to use only one of them on any system.
+#
# If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging.
#
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.12 2007/05/19 22:06:14 pav Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.13 2007/07/12 01:57:10 maho Exp $
#
GCC_Include_MAINTAINER= gerald at FreeBSD.org
@@ -51,8 +64,43 @@
#
#
+# bsd.gcc.mk can also be used only for FC, F77 settings; in this case we
+# do not define USE_GCC.
+#
+
+.if defined (USE_FORTRAN)
+# gfortran42 from lang/gcc42 is the default for now.
+. if ${USE_FORTRAN} == yes || ${USE_FORTRAN} == gfortran42
+BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+FC:= gfortran42
+F77:= gfortran42
+. endif
+
+# Intel Fortran compiler from lang/ifc.
+. if ${USE_FORTRAN} == ifort
+BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
+FC:= ${LOCALBASE}/intel_fc_80/bin/ifort
+F77:= ${LOCALBASE}/intel_fc_80/bin/ifort
+. endif
+
+# In some case we want to use g77 from lang/gcc34 (FreeBSD>=7) or f77
+# (FreeBSD<=6).
+. if ${USE_FORTRAN} == g77
+. if (${OSVERSION} > 700000)
+BUILD_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34
+FC:= g77-34
+F77:= g77-34
+.else
+F77:= f77
+FC:= f77
+. endif
+. endif
+
+MAKE_ENV+= F77="${F77}" FC="${FC}"
+.endif
+
+.if defined(USE_GCC)
# See if we can use a later version
-#
_USE_GCC:= ${USE_GCC:S/+//}
.if ${USE_GCC} != ${_USE_GCC}
_GCC_ORLATER:= true
@@ -127,44 +175,27 @@
#
# Determine if the installed OS already has this GCCVERSION, and if not
-# then set BUILD_DEPENDS, CC, CXX, F77, and FC.
+# then set BUILD_DEPENDS, CC, and CXX.
#
.for v in ${GCCVERSIONS}
. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
. if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
-# If Fortran support is requested, regardless of the value of USE_GCC
-# we use lang/gcc42 which is the first release which features the new
-# Fortran frontend and has Fortran enabled by default.
-. if defined(WITH_FORTRAN)
-V:= 42
-_GCC_BUILD_DEPENDS:= gcc42
-_GCC_PORT_DEPENDS:= gfortran${V}
-.else
V:= ${_GCCVERSION_${v}_V:S/.//}
_GCC_BUILD_DEPENDS:= gcc${V}
_GCC_PORT_DEPENDS:= gcc${V}
-. endif
CC:= gcc${V}
CXX:= g++${V}
-# Up to GCC 4.0, we had g77, g77-33, g77-34, and the like. Starting
-# with GCC 4.0, we have gfortran, gfortran40, gfortran41, and the like.
-. if ${_USE_GCC} < 4.0
-F77:= g77-${V}
-FC:= ${F77}
-. else
-FC:= gfortran${V}
-F77:= ${FC}
-. endif
. endif
. endif
.endfor
.undef V
+
.if defined(_GCC_BUILD_DEPENDS)
BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
.endif
-MAKE_ENV+= CC="${CC}" CXX="${CXX}" F77="${F77}" FC="${FC}"
+MAKE_ENV+= CC="${CC}" CXX="${CXX}"
test-gcc:
@echo USE_GCC=${USE_GCC}
@@ -184,3 +215,4 @@
.endfor
@echo Using GCC version ${_USE_GCC}
@echo CC:${CC} - CXX:${CXX} - F77:${F77} - FC:${FC} - BUILD_DEPENDS:${BUILD_DEPENDS}
+.endif
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#6 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.72 2007/04/19 17:07:59 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.74 2007/07/16 10:12:03 lofi Exp $
#
# Please view me with 4 column tabs!
@@ -12,11 +12,9 @@
# This section contains the USE_ definitions.
# XXX: Write HAVE_ definitions sometime.
-# QT_COMPONENTS - Triggers individual Qt4 component port dependencies. Possible
-# values: See _QT_COMPONENTS_ALL below. Only works if USE_QT_VER is set
-# to 4.
# USE_QT_VER - Says that the port uses the Qt toolkit. Possible values:
# 3, 4; each specify the major version of Qt to use.
+# Note: 4 is handled by bsd.qt.mk.
# USE_KDELIBS_VER - Says that the port uses KDE libraries. Possible values:
# 3 specifies the major version of KDE to use.
# This implies USE_QT of the appropriate version.
@@ -104,7 +102,7 @@
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
-KDE_VERSION= 3.5.6
+KDE_VERSION= 3.5.7
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}
@@ -136,88 +134,6 @@
QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
.endif # !defined(QT_NONSTANDARD)
-.elif ${USE_QT_VER} == 4
-
-# Qt 4.x common stuff
-QT_PREFIX?= ${LOCALBASE}
-MOC?= ${QT_PREFIX}/bin/moc-qt4
-UIC?= ${QT_PREFIX}/bin/uic-qt4
-QMAKE?= ${QT_PREFIX}/bin/qmake-qt4
-QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
-
-QTCPPFLAGS?=
-QTCGFLIBS?=
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
- --with-qt-libraries=${QT_PREFIX}/lib \
- --with-extra-libs=${LOCALBASE}/lib \
- --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
- QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
-MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
-
-QT4_VERSION= 4.2.3
-
-_QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \
- codecs-tw corelib designer doc gui iconengines \
- imageformats inputmethods assistantclient \
- linguist moc network opengl pixeltool porting \
- qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
- uic uic3 xml
-
-accessible_DEPENDS= accessibility/qt4-acessible
-assistant_DEPENDS= devel/qt4-assistant
-codecs-cn_DEPENDS= chinese/qt4-codecs-cn
-codecs-jp_DEPENDS= japanese/qt4-codecs-jp
-codecs-kr_DEPENDS= korean/qt4-codecs-kr
-codecs-tw_DEPENDS= chinese/qt4-codecs-tw
-corelib_DEPENDS= devel/qt4-corelib
-designer_DEPENDS= devel/qt4-designer
-doc_DEPENDS= misc/qt4-doc
-gui_DEPENDS= x11-toolkits/qt4-gui
-iconengines_DEPENDS= graphics/qt4-iconengines
-imageformats_DEPENDS= graphics/qt4-imageformats
-inputmethods_DEPENDS= x11/qt4-inputmethods
-assistantclient_DEPENDS=devel/qt4-libqtassistantclient
-assistantclient_NAME= libQtAssistantClient
-linguist_DEPENDS= devel/qt4-linguist
-moc_DEPENDS= devel/qt4-moc
-network_DEPENDS= net/qt4-network
-opengl_DEPENDS= x11/qt4-opengl
-pixeltool_DEPENDS= graphics/qt4-pixeltool
-porting_DEPENDS= devel/qt4-porting
-qmake_DEPENDS= devel/qmake4
-qmake_QT4_PREFIX= # empty
-qt3support_DEPENDS= devel/qt4-qt3support
-qtconfig_DEPENDS= devel/qtconfig
-qtestlib_DEPENDS= devel/qt4-qtestlib
-qvfb_DEPENDS= devel/qt4-qvfb
-rcc_DEPENDS= devel/qt4-rcc
-sql_DEPENDS= databases/qt4-sql
-svg_DEPENDS= graphics/qt4-svg
-uic_DEPENDS= devel/qt4-uic
-uic3_DEPENDS= devel/qt4-uic3
-xml_DEPENDS= textproc/qt4-xml
-
-.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?= qt4-
-${ext}_QT4_VERSION?= ${QT4_VERSION}
-${ext}_NAME?= ${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-.else
-IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
-.else
-BUILD_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+= qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-.endif
-
.else
IGNORE= cannot install: unsupported value of USE_QT_VER
.endif # defined(USE_QT_VER)
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.php.mk#4 (text+ko) ====
@@ -7,7 +7,7 @@
# Please send all suggested changes to the maintainer instead of committing
# them to CVS yourself.
#
-# $FreeBSD: ports/Mk/bsd.php.mk,v 1.41 2007/03/08 07:17:32 ale Exp $
+# $FreeBSD: ports/Mk/bsd.php.mk,v 1.42 2007/07/09 18:37:35 ale Exp $
#
# Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk.
# If the port requires a predefined set of PHP extensions, they can be
@@ -233,10 +233,10 @@
# Extensions
.if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes"
# non-version specific components
-_USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \
+_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dbase \
exif fileinfo fribidi ftp gd gettext gmp \
hash iconv imap interbase json ldap mbstring mcrypt \
- mhash mssql mysql ncurses odbc \
+ memcache mhash mssql mysql ncurses odbc \
openssl pcntl pcre pdf pgsql posix \
pspell radius readline recode session shmop snmp \
sockets sybase_ct sysvmsg sysvsem sysvshm \
@@ -248,6 +248,7 @@
simplexml soap spl sqlite tidy xmlreader xmlwriter xsl
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
+bitset_DEPENDS= math/pecl-bitset
bz2_DEPENDS= archivers/php${PHP_VER}-bz2
calendar_DEPENDS= misc/php${PHP_VER}-calendar
crack_DEPENDS= security/php${PHP_VER}-crack
@@ -278,6 +279,7 @@
mcal_DEPENDS= misc/php${PHP_VER}-mcal
mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt
mcve_DEPENDS= devel/php${PHP_VER}-mcve
+memcache_DEPENDS= databases/pecl-memcache
mhash_DEPENDS= security/php${PHP_VER}-mhash
ming_DEPENDS= graphics/php${PHP_VER}-ming
mnogosearch_DEPENDS= www/php${PHP_VER}-mnogosearch
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#33 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.573 2007/06/29 14:09:39 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.575 2007/07/16 10:12:03 lofi Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -1486,10 +1486,14 @@
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.endif
-.if defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
.include "${PORTSDIR}/Mk/bsd.kde.mk"
.endif
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
@@ -1645,7 +1649,7 @@
CONFIGURE_ENV+= MAKE=${GMAKE}
.endif
-.if defined(USE_GCC)
+.if defined(USE_GCC) || defined(USE_FORTRAN)
.include "${PORTSDIR}/Mk/bsd.gcc.mk"
.endif
@@ -1976,6 +1980,10 @@
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
.endif
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
.if defined(USE_SCONS)
.include "${PORTSDIR}/Mk/bsd.scons.mk"
.endif
==== //depot/projects/soc2006/gabor_destdir/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.160 2007/04/04 12:52:04 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.162 2007/07/15 09:39:05 stas Exp $
#
.if !defined(Ruby_Include)
@@ -162,7 +162,7 @@
.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
RUBY_RELVERSION= 1.8.6
-RUBY_PORTREVISION= 0
+RUBY_PORTREVISION= 2
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#10 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.422 2007/06/26 11:39:12 edwin Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.424 2007/07/12 22:50:04 edwin Exp $
#
# Where to put distfiles that don't have any other master site
@@ -641,102 +641,91 @@
.if !defined(IGNORE_MASTER_SITE_KDE)
MASTER_SITE_KDE+= \
+ ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
http://ftp.scarlet.be/pub/kde/%SUBDIR%/ \
http://mirrors.isc.org/pub/kde/%SUBDIR%/ \
ftp://ftp.gtlib.cc.gatech.edu/pub/kde/%SUBDIR%/ \
+ ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.kde.org/%SUBDIR%/ \
http://ftp.gtlib.cc.gatech.edu/pub/kde/%SUBDIR%/ \
ftp://ftp.oregonstate.edu/pub/kde/%SUBDIR%/ \
- ftp://ftp.eu.uu.net/pub/kde/%SUBDIR%/ \
- ftp://ftp.tiscali.nl/pub/mirrors/kde/%SUBDIR%/ \
- http://ftp.tiscali.nl/kde/%SUBDIR%/ \
- ftp://ftp.du.se/pub/mirrors/kde/%SUBDIR%/ \
- http://ftp.du.se/pub/mirrors/kde/%SUBDIR%/ \
ftp://ftp.solnet.ch/mirror/KDE/%SUBDIR%/ \
- ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/%SUBDIR%/ \
- http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
- http://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
- http://kde.mirrors.hoobly.com/%SUBDIR%/ \
- ftp://ftp.informatik.uni-hamburg.de/pub/soft/X/contrib/kde/%SUBDIR%/ \
- ftp://ftp.rediris.es/mirror/kde/pub/kde/%SUBDIR%/ \
- http://sunsite.rediris.es/mirror/kde/pub/kde/%SUBDIR%/ \
- ftp://ftp.mirrors.net.ar/pub/kde/%SUBDIR%/ \
- ftp://ftp.man.szczecin.pl/pub/kde/%SUBDIR%/ \
ftp://gd.tuwien.ac.at/kde/%SUBDIR%/ \
http://gd.tuwien.ac.at/kde/%SUBDIR%/ \
- ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.kde.org/%SUBDIR%/ \
+ ftp://kde.mirrors.tds.net/pub/kde/%SUBDIR%/ \
+ http://kde.mirrors.tds.net/pub/kde/%SUBDIR%/ \
+ ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/%SUBDIR%/ \
http://mirrors.dotsrc.org/kde/%SUBDIR%/ \
ftp://mirrors.dotsrc.org/kde/%SUBDIR%/ \
- ftp://mirrors.ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
+ ftp://ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
http://ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
- ftp://ftp.roedu.net/pub/mirrors/ftp.kde.org/%SUBDIR%/ \
+ http://kambing.vlsm.org/kde/%SUBDIR%/ \
+ http://mirrors.evolva.ro/kdeftp/%SUBDIR%/ \
+ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/%SUBDIR%/ \
ftp://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
- ftp://ftp.fh-heilbronn.de/pub/mirrors/kde/%SUBDIR%/ \
http://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
+ ftp://ftp.tu-chemnitz.de/pub/X11/kde/%SUBDIR%/ \
ftp://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
http://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
+ ftp://sunsite.icm.edu.pl/pub/unix/kde/%SUBDIR%/ \
http://sunsite.icm.edu.pl/pub/unix/kde/%SUBDIR%/ \
- ftp://mirror.switch.ch/mirror/kde/%SUBDIR%/ \
- http://mirror.switch.ch/ftp/mirror/kde/%SUBDIR%/ \
ftp://ftp.sunet.se/pub/kde/%SUBDIR%/ \
http://ftp.sunet.se/pub/kde/%SUBDIR%/ \
- ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/%SUBDIR%/ \
- ftp://ftp.dataplus.se/pub/linux/kde/%SUBDIR%/ \
- ftp://ftp.duth.gr/pub/kde/%SUBDIR%/ \
- http://ftp.duth.gr/pub/kde/%SUBDIR%/ \
ftp://ftp.unina.it/pub/Linux/kde/%SUBDIR%/ \
http://ftp.unina.it/pub/Linux/kde/%SUBDIR%/ \
+ ftp://ftp.belnet.be/packages/kde/%SUBDIR%/ \
ftp://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
- ftp://ftp.kde.org.yu/kde/%SUBDIR%/ \
- http://ftp.kde.org.yu/kde/%SUBDIR%/ \
- ftp://ftp.belnet.be/packages/kde/%SUBDIR%/ \
http://ftp.belnet.be/packages/kde/%SUBDIR%/ \
ftp://ftp.lip6.fr/pub/X11/kde/%SUBDIR%/ \
http://www-ftp.lip6.fr/pub/X11/kde/%SUBDIR%/ \
- ftp://ftp.tu-chemnitz.de/pub/X11/kde/%SUBDIR%/ \
- ftp://ftp.uvsq.fr/pub/X11/kde/%SUBDIR%/ \
ftp://ftp.rhnet.is/pub/kde/%SUBDIR%/ \
http://ftp.rhnet.is/pub/kde/%SUBDIR%/ \
+ http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
ftp://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
http://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
- http://download.mirror.ac.uk/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
ftp://kde.paralax.org/kde/%SUBDIR%/ \
ftp://ftp.cronyx.ru/pub/mirror/kde/%SUBDIR%/ \
- ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/%SUBDIR%/ \
ftp://linux.cis.nctu.edu.tw/X/wm/kde/%SUBDIR%/ \
ftp://ftp.na.kde.org/pub/kde/%SUBDIR%/ \
- http://ftp.sun.ac.za/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
+ ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/%SUBDIR%/ \
ftp://ftp.estpak.ee/pub/kde/%SUBDIR%/ \
- ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
- ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
+ ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/%SUBDIR%/ \
+ http://www.qtopia.org.cn/ftp/mirror/ftp.kde.org/%SUBDIR%/ \
+ ftp://ftp.qtopia.org.cn/mirror/ftp.kde.org/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/X11/kde/%SUBDIR%/ \
http://ftp.ntua.gr/pub/X11/kde/%SUBDIR%/ \
ftp://ftp.hol.gr/pub/mirror/kde/%SUBDIR%/ \
http://ftp.hol.gr/mirror/kde/%SUBDIR%/ \
- ftp://ftp.pbone.net/mirror/ftp.kde.org/pub/kde/%SUBDIR%/ \
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/%SUBDIR%/ \
http://ftp.heanet.ie/mirrors/ftp.kde.org/%SUBDIR%/ \
- ftp://linux3.cc.ntu.edu.tw/pub/kde/%SUBDIR%/ \
- http://linux3.cc.ntu.edu.tw/pub/kde/%SUBDIR%/ \
ftp://mi.mirror.garr.it/pub/mirrors/KDE/%SUBDIR%/ \
http://mi.mirror.garr.it/mirrors/KDE/%SUBDIR%/ \
- ftp://ftp.iway.fr/pub/kde/%SUBDIR%/ \
ftp://ftp.kddlabs.co.jp/pub/X11/kde/%SUBDIR%/ \
http://ftp.kddlabs.co.jp/pub/X11/kde/%SUBDIR%/ \
+ ftp://ftp.informatik.uni-hamburg.de/pub/soft/X/contrib/kde/%SUBDIR%/ \
ftp://ftp.no.kde.org/pub/kde/%SUBDIR%/ \
ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/%SUBDIR%/ \
http://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
ftp://ftp.planetmirror.com/pub/kde/%SUBDIR%/ \
+ http://public.planetmirror.com/pub/kde/%SUBDIR%/ \
ftp://ftp.ussg.iu.edu/pub/kde/%SUBDIR%/ \
http://ftp.ussg.iu.edu/kde/%SUBDIR%/ \
+ ftp://mirror.pacific.net.au/kde/%SUBDIR%/ \
+ http://mirror.pacific.net.au/kde/%SUBDIR%/ \
+ ftp://ftp.sayclub.com/pub/X/KDE/%SUBDIR%/ \
+ http://ftp.sayclub.com/pub/X/KDE/%SUBDIR%/ \
ftp://carroll.aset.psu.edu/pub/kde/%SUBDIR%/ \
- ftp://chernabog.cc.vt.edu/pub/projects/kde/%SUBDIR%/ \
- http://chernabog.cc.vt.edu/pub/projects/kde/%SUBDIR%/ \
http://mirror.cc.columbia.edu/pub/software/kde/%SUBDIR%/ \
+ ftp://fr2.rpmfind.net/linux/KDE/%SUBDIR%/ \
+ http://fr2.rpmfind.net/linux/KDE/%SUBDIR%/ \
+ ftp://ftp.chg.ru/pub/kde/%SUBDIR%/ \
http://ftp.chg.ru/pub/kde/%SUBDIR%/ \
+ ftp://ftp.mirrorservice.org/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
+ ftp://ftp.xcp.kiev.ua/ftp.kde.org/%SUBDIR%/ \
+ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
+ http://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/kde/&,}
.endif
@@ -1424,6 +1413,7 @@
ftp://ftp.mirrorservice.org/sites/ftp.x.org/pub/%SUBDIR%/ \
ftp://sunsite.uio.no/pub/X11/%SUBDIR%/ \
http://xorg.freedesktop.org/%SUBDIR%/ \
+ http://xorg.freedesktop.org/releases/%SUBDIR%/ \
ftp://ftp.x.org/pub/%SUBDIR%/
.endif
==== //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/processonelog#3 (text+ko) ====
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.23 2007/02/14 08:24:23 linimon Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.24 2007/07/02 10:22:47 linimon Exp $
#
# Read a single errorlogfile and output a line of the format
# $filename|$portname|$affected|$logsize|$dir|$maintainer|\
@@ -71,7 +71,7 @@
reason="new_compiler_error"; tag="newgcc"
elif bzgrep -qE '(syntax error before|ISO C\+\+ forbids|friend declaration|no matching function for call to|.main. must return .int.|invalid conversion from|cannot be used as a macro name as it is an operator in C\+\+|is not a member of type|after previous specification in|no class template named|because worst conversion for the former|better than worst conversion|no match for.*operator|no match for call to|undeclared in namespace|is used as a type, but is not|error: array bound forbidden|error: class definition|error: expected constructor|error: there are no arguments|error:.*cast.*loses precision|ISO C\+\+ does not support)' $1; then
reason="bad_C++_code"; tag="badc++"
-elif bzgrep -qE 'error: (array type has incomplete element type|extra qualification .* on member|invalid cast from type .* to type|invalid lvalue in (assignment|decrement|increment|unary)|invalid storage class for function|static declaration of.*follows non-static declaration|two or more data types in declaration specifiers|.* was not declared in this scope)' $1; then
+elif bzgrep -qE 'error: (array type has incomplete element type|conflicts with new declaration|expected.*before .class|expected primary expression|extra qualification .* on member|.*has incomplete type|invalid cast from type .* to type|invalid lvalue in (assignment|decrement|increment|unary)|invalid storage class for function|lvalue required as (increment operator|left operand)|.*should have been declared inside|static declaration of.*follows non-static declaration|two or more data types in declaration specifiers|.* was not declared in this scope)' $1; then
reason="gcc4_error"; tag="gcc4"
elif bzgrep -qE '(/usr/libexec/elf/ld: cannot find|undefined reference to|cannot open -l.*: No such file)' $1; then
reason="linker_error"; tag="ld"
@@ -86,7 +86,7 @@
elif bzgrep -qE "(.s: Assembler messages:|Cannot (determine .* target|find the byte order) for this architecture|^cc1: bad value.*for -mcpu.*switch|could not read symbols: File in wrong format|[Ee]rror: [Uu]nknown opcode|error.*Unsupported architecture|ENDIAN must be defined 0 or 1|failed to merge target-specific data|(file not recognized|failed to set dynamic section sizes): File format not recognized|impossible register constraint|inconsistent operand constraints in an .asm|Invalid configuration.*unknown.*machine.*unknown not recognized|invalid lvalue in asm statement|is only for.*, and you are running|not a valid 64 bit base/index expression|relocation R_X86_64_32.*can not be used when making a shared object|relocation truncated to fit: |shminit failed: Function not implemented|The target cpu, .*, is not currently supported.|This architecture seems to be neither big endian nor little endian|unknown register name|Unable to correct byte order|Unsupported platform, sorry|won
't run on this architecture)" $1; then
reason="arch"; tag="arch"
-elif bzgrep -qE "autoconf(.*): (not found|No such file or directory)" $1; then
+elif bzgrep -qE "autoconf([0-9\-\.]*): (not found|No such file or directory)" $1; then
reason="autoconf"; tag="autoconf"
elif bzgrep -q "autoheader: not found" $1; then
reason="autoheader"; tag="autoheader"
@@ -109,6 +109,8 @@
reason="fetch"; tag="fetch"
elif bzgrep -qE "(pnohang: killing make checksum|fetch: transfer timed out)" $1; then
reason="fetch_timeout"; tag="fetch-timeout"
+elif bzgrep -qE "(f77: not found|f77:No such file or directory|Unable to find a fortran compiler)" $1; then
+ reason="f77"; tag="f77"
elif bzgrep -q "See <URL:http://gcc.gnu.org/bugs.html> for instructions." $1; then
reason="gcc_bug"; tag="gcc-bug"
elif bzgrep -qE "(Run-time system build failed for some reason|tar: Error opening archive: Failed to open.*No such file or directory)" $1; then
@@ -153,6 +155,8 @@
# types of errors, and thus need to be evaluated after all the specific
# cases.
+elif bzgrep -qE 'cc1.*warnings being treated as errors' $1; then
+ reason="compiler_error"; tag="cc"
elif bzgrep -q 'tar: Error exit delayed from previous errors' $1; then
reason="install_error"; tag="install"
elif bzgrep -q "Cannot stat: " $1; then
==== //depot/projects/soc2006/gabor_destdir/UPDATING#9 (text+ko) ====
@@ -6,6 +6,50 @@
time you update your ports collection, before attempting any port
upgrades.
+20070716:
+ AFFECTS: users of editors/emacs
+ AUTHOR: nobutaka at FreeBSD.org
+
+ editors/emacs port is upgraded to 22.1.
+ Since this is a major upgrade, all installed elisp ports should be
+ reinstalled.
+
+ Please add EMACS_PORT_NAME=emacs22 to /etc/make.conf and
+ upgrade Emacs and related ports with:
+
+ # portupgrade -fr emacs
+
+ If you want to keep using Emacs 21.3, please add EMACS_PORT_NAME=emacs21
+ to /etc/make.conf and reinstall Emacs from editors/emacs21 port:
+
+ # portupgrade -f -o editors/emacs21 emacs
+
+20070713:
+ AFFECTS: users of audio/pulseaudio
+ AUTHOR: gnome at FreeBSD.org
+
+ The realtime group (default GID of 557) has been renamed pulse-rt to keep
+ in sync with the pulseaudio distribution. If you are upgrading from a
+ previous version of pulseaudio, you will need to modify /etc/group and
+ change the name of the group with ID 557 to ``pulse-rt''.
+
+20070706:
+ AFFECTS: users of www/gallery
+ AUTHOR: freebsd-ports at varju.ca
+
+ The default install location has changed from
+ ${PREFIX}/www/data/gallery to ${PREFIX}/www/gallery.
+
+20070704:
+ AFFECTS: users of x11/kdebase3
+ AUTHOR: kde at freebsd.org
+
+ The media kioslave now mounts all filesystems that support charset conversion
+ with charset conversion turned on, set to the locale from the user's
+ environment (LANG). If you are using a customized kernel configuration, make
+ sure all *_iconv kernel modules are available. At the time of writing, these
+ are cd9660_iconv, udf_iconv, msdosfs_iconv and ntfs_iconv.
+
20070614:
AFFECTS: users of www/oscommerce
AUTHOR: vlad at vlad.uz.ua
@@ -5383,4 +5427,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.519 2007/06/14 21:56:23 pav Exp $
+$FreeBSD: ports/UPDATING,v 1.524 2007/07/16 17:08:58 nobutaka Exp $
More information about the p4-projects
mailing list