Date: Fri, 24 Nov 2006 22:08:30 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 110496 for review Message-ID: <200611242208.kAOM8UuN059788@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=110496 Change 110496 by gabor@gabor_server on 2006/11/24 22:07:59 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/GIDs#5 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#15 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#12 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.wx.mk#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkmodules.pl#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkorigin.sh#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkversion.pl#2 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#4 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#5 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#17 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/GIDs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.16 2006/11/11 16:36:23 ahze Exp $ +$FreeBSD: ports/GIDs,v 1.18 2006/11/16 08:58:31 alexbl Exp $ # Please keep this file sorted by GID! bind:*:53: rdfdb:*:55: @@ -47,6 +47,7 @@ _symon:*:115: smokeping:*:117: ircproxyd:*:118: +fetchmail:*:124 postfix:*:125: maildrop:*:126: vchat:*:128: @@ -71,6 +72,7 @@ haclient:*:275: mrtg:*:279: dkfilter:*:325: +wildfire:*:340: ldap:*:389: tiarra:*:398: drweb:*:426: ==== //depot/projects/soc2006/gabor_ports/MOVED#15 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1183 2006/11/12 06:43:14 rafan Exp $ +# $FreeBSD: ports/MOVED,v 1.1188 2006/11/23 13:55:02 pav Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2539,3 +2539,11 @@ editors/openoffice.org-2.0|editors/openoffice.org-2|2006-11-12|Better version number handling editors/openoffice.org-2.0-devel|editors/openoffice.org-2-devel|2006-11-12|Better version number handling devel/ply|devel/py-ply|2006-11-12|Rename to consistency with other Python ports +devel/py-lucene|textproc/py-lucene|2006-11-15|Moved to be consistent with Lucene port +math/p5-AI-NeuralNet-Mesh||2006-11-21|Has expired: project no longer exists +net/p5-Archie||2006-11-21|Has expired: project no longer exists +www/mod_jk2||2006-11-21|Has expired: "JK2 is officially unsupported, no further development will take place." +www/mod_jk2-apache2||2006-11-21|Has expired: "JK2 is officially unsupported, no further development will take place." +devel/p5-IO-Stty||2006-11-21|Has expired: project no longer exists +print/pecl-panda||2006-11-22|Has expired: Project is dead and does not work +mail/dbmail-devel|mail/dbmail21|2006-11-23|Renamed ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.32 2006/10/31 05:27:21 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.36 2006/11/20 03:47:08 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -72,15 +72,30 @@ # USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:x11-toolkits/renaissance # depends on a shared lib in System directrory # +# USE_GNUSTEP_SYSTEM_BUNDLES+= EtoileMenus:x11-themes/etoile-etoilemenus +# depends on Bundles installed in System directrory at build and runtime +# +# USE_GNUSTEP_SYSTEM_THEMES+= Camaelon:x11-themes/etoile-camaelon +# depends on Themes installed in System directrory at build and runtime +# # USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime # depends on a shared lib in Local directrory # +# USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:audio/cddb-bundle +# depends on Bundles installed in Local directrory at build and runtime +# +# USE_GNUSTEP_LOCAL_THEMES+= WildMenus:x11-themes/etoile-wildmenus +# depends on Themes installed in Local directrory at build and runtime +# # USE_GNUSTEP_SYSTEM_APPS+= ProjectCenter:devel/projectcenter.app # depends on Application installed in System directrory at runtime # # USE_GNUSTEP_LOCAL_APPS+= Ink:misc/gnustep-examples # depends on Application installed in Local directrory at runtime # +# USE_GNUSTEP_LOCAL_TOOLS+= zillion:net/zillion +# depends on Tool installed in Local directrory at runtime +# # --------------------------------------------------------------------------- .if !defined(_POSTMKINCLUDED) @@ -126,10 +141,11 @@ .endif SYSTEMDIR= ${GNUSTEP_PREFIX}/System SYSMAKEDIR= ${SYSTEMDIR}/Library/Makefiles -BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles +SYSBUNDLEDIR= ${SYSTEMDIR}/Library/Bundles SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries LOCALLIBDIR= ${GNUSTEP_PREFIX}/Local/Library/Libraries +LOCALBUNDLEDIR= ${GNUSTEP_PREFIX}/Local/Library/Bundles .if defined(WITH_GNUSTEP_DEVEL) PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} PLIST_SUB+= GNUSTEP_DEVEL="" @@ -217,8 +233,8 @@ # Backend using xlib # .if defined(USE_GNUSTEP_XLIB) -BUILD_DEPENDS+= ${BUNDLEDIR}/${BACKXLIB}.bundle/${BACKXLIB}:${PORTSDIR}/${GNUSTEP_BACK_PORT} -RUN_DEPENDS+= ${BUNDLEDIR}/${BACKXLIB}.bundle/${BACKXLIB}:${PORTSDIR}/${GNUSTEP_BACK_PORT} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${BACKXLIB}.bundle/${BACKXLIB}:${PORTSDIR}/${GNUSTEP_BACK_PORT} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${BACKXLIB}.bundle/${BACKXLIB}:${PORTSDIR}/${GNUSTEP_BACK_PORT} BACKXLIB= libgnustep-back${BACKSUFFIX} MAKE_FLAGS+= GUI_BACKEND_LIB=back @@ -228,8 +244,8 @@ # Backend using xdps # .if defined(USE_GNUSTEP_XDPS) -BUILD_DEPENDS+= ${BUNDLEDIR}/${BACKXDPS}.bundle/${BACKXDPS}:${PORTSDIR}/${GNUSTEP_XDPS_PORT} -RUN_DEPENDS+= ${BUNDLEDIR}/${BACKXDPS}.bundle/${BACKXDPS}:${PORTSDIR}/${GNUSTEP_XDPS_PORT} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${BACKXDPS}.bundle/${BACKXDPS}:${PORTSDIR}/${GNUSTEP_XDPS_PORT} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${BACKXDPS}.bundle/${BACKXDPS}:${PORTSDIR}/${GNUSTEP_XDPS_PORT} BACKXDPS= libgnustep-xdps${BACKSUFFIX} MAKE_FLAGS+= GUI_BACKEND_LIB=xdps @@ -239,8 +255,8 @@ # Backend using libart # .if defined(USE_GNUSTEP_LIBART) -BUILD_DEPENDS+= ${BUNDLEDIR}/${BACKART}.bundle/${BACKART}:${PORTSDIR}/${GNUSTEP_ART_PORT} -RUN_DEPENDS+= ${BUNDLEDIR}/${BACKART}.bundle/${BACKART}:${PORTSDIR}/${GNUSTEP_ART_PORT} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${BACKART}.bundle/${BACKART}:${PORTSDIR}/${GNUSTEP_ART_PORT} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${BACKART}.bundle/${BACKART}:${PORTSDIR}/${GNUSTEP_ART_PORT} BACKART= libgnustep-art${BACKSUFFIX} MAKE_FLAGS+= GUI_BACKEND_LIB=art @@ -250,8 +266,8 @@ # Backend using cairo # .if defined(USE_GNUSTEP_CAIRO) -BUILD_DEPENDS+= ${BUNDLEDIR}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_CAIRO_PORT} -RUN_DEPENDS+= ${BUNDLEDIR}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_CAIRO_PORT} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_CAIRO_PORT} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_CAIRO_PORT} BACKCAIRO= libgnustep-cairo${BACKSUFFIX} MAKE_FLAGS+= GUI_BACKEND_LIB=cairo @@ -268,6 +284,26 @@ .endif # --------------------------------------------------------------------------- +# source system bundles +# +.if defined(USE_GNUSTEP_SYSTEM_BUNDLES) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_BUNDLES} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- +# source system themes +# +.if defined(USE_GNUSTEP_SYSTEM_THEMES) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_THEMES} +BUILD_DEPENDS+= ${SYSBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${SYSBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source local libs # .if defined(USE_GNUSTEP_LOCAL_LIBS) @@ -278,6 +314,26 @@ .endif # --------------------------------------------------------------------------- +# source local bundles +# +.if defined(USE_GNUSTEP_LOCAL_BUNDLES) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BUNDLES} +BUILD_DEPENDS+= ${LOCALBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${LOCALBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- +# source local themes +# +.if defined(USE_GNUSTEP_LOCAL_THEMES) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_THEMES} +BUILD_DEPENDS+= ${LOCALBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +RUN_DEPENDS+= ${LOCALBUNDLEDIR}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source system apps # .if defined(USE_GNUSTEP_SYSTEM_APPS) @@ -296,6 +352,15 @@ .endif # --------------------------------------------------------------------------- +# source local tools +# +.if defined(USE_GNUSTEP_LOCAL_TOOLS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_TOOLS} +RUN_DEPENDS+= ${GNUSTEP_PREFIX}/Local/Tools/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source GNUstep.sh # .if defined(USE_GNUSTEP_CONFIGURE) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#6 (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.34 2006/11/06 17:43:10 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.35 2006/11/22 06:59:37 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 @@ -231,7 +231,7 @@ exif fileinfo fribidi ftp gd gettext gmp \ hash iconv imap interbase ldap mbstring mcrypt \ mhash ming mssql mysql ncurses odbc \ - openssl panda pcntl pcre pdf pgsql posix \ + openssl pcntl pcre pdf pgsql posix \ pspell radius readline recode session shmop snmp \ sockets sybase_ct sysvmsg sysvsem sysvshm \ tokenizer wddx xml xmlrpc yaz zip zlib @@ -281,7 +281,6 @@ openssl_DEPENDS=security/php${PHP_VER}-openssl oracle_DEPENDS= databases/php${PHP_VER}-oracle overload_DEPENDS=lang/php${PHP_VER}-overload -panda_DEPENDS= print/pecl-panda pcntl_DEPENDS= devel/php${PHP_VER}-pcntl pcre_DEPENDS= devel/php${PHP_VER}-pcre pdf_DEPENDS= print/pecl-pdflib ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#12 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.401 2006/11/05 12:27:42 sat Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.402 2006/11/24 19:24:51 pav Exp $ # # Where to put distfiles that don't have any other master site @@ -1120,7 +1120,8 @@ ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \ ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/CTAN/&,} \ - ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ + ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ \ + ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_THEMES) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.wx.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.1 2006/07/05 02:13:12 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.2 2006/11/13 21:15:38 alepulver Exp $ # # bsd.wx.mk - Support for WxWidgets based ports. # @@ -14,7 +14,7 @@ # components (with run and/or build dependencies). It can be used after and/or # before bsd.port.pre.mk, but Python components will only work if Python # variables (e.g. USE_PYTHON) are defined before it (this is a bsd.python.mk -# limitation). +# limitation), at least it is manually included. # USE_WX - Set to the list of WxWidgets versions that can be used by # the port. The syntax allows the following elements: # - Single version (e.g. "2.4"). @@ -29,7 +29,7 @@ # WX_COMPS - Set to the list of WxWidgets components the port uses. # Several components can be specified separated by spaces. By # default it will have the value of "wx". Suffixes in the form -# "_xxx" may be added to the components to determine the +# ":xxx" may be added to the components to determine the # dependency type. # The available components are: # wx - The WxWidgets library. @@ -41,20 +41,23 @@ # build - Requires component for building. # lib - Requires component for building and running. # run - Requires component for running. -# If no suffix is present then "lib" will be used. +# If no suffix is present then "run" will be used for "python" +# and "lib" for others. # WX_CONF_ARGS - Set to "absolute" or "relative" if the port needs configure # arguments in addition to the WX_CONFIG environment variable. # It determines the type of parameters that have to be passed # to the configure script. In the first case it adds -# "--with-wx-config=${WX_CONFIG}" (absolute path of WX_CONFIG), -# and in second one "--with-wx=${X11BASE}" and +# "--with-wx-config=${WX_CONFIG}" (absolute path of +# WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus # "--with-wx-config=${WX_CONFIG:T} (prefix and name). -# WX_UNICODE - Set to "yes" (or anything) if the port needs the Unicode -# version of the WxWidgets library and/or contributed -# libraries. +# WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION +# after <bsd.port.pre.mk> (in case the port needs to manually run +# the script). +# WX_UNICODE - Define if the port needs the Unicode version of the +# WxWidgets library and/or contributed libraries. # NOTE: this should NOT be used for ports that can be compiled -# with Unicode or not, but for the ones that require it. The -# first case is handled by the user variable WITH_UNICODE. +# with Unicode or not, but for the ones that require it. +# WANT_UNICODE - Define if the port prefers Unicode, but doesn't require it. # WANT_WX - Set to "yes" or a valid single version (no ranges, etc). # In both cases it will detect the installed WxWidgets # components and add them to the variable HAVE_WX. If a @@ -70,23 +73,23 @@ # # The following variables are intended for the user and can be defined in # make.conf. -# WITH_UNICODE - If the variable is defined and both the running FreeBSD -# version and the selected WxWidgets version support Unicode, -# then the Unicode version of WxWidgets is used. -# WITH_WX_VER - If the variable is defined the version it contains will be -# used as the default for ports that support multiple -# WxWidgets versions. It can contain multiple versions, and -# the last possible one will be used. +# WITH_UNICODE - Define if you prefer the Unicode version when available. +# WITHOUT_UNICODE +# - Define if you prefer the non Unicode version (this +# variable disables WITH_UNICODE and WANT_UNICODE). +# WITH_WX_VER - Define to the list of prefered versions in reverse order. # # The following variables are defined by this file, to be read from the port. +# WX_CONFIG - The path to the wx-config program (with different name). +# WXRC_CMD - The path to the wxrc program (with different name). +# WX_VERSION - The WxWidgets version that is going to be used. # WX_UNICODE - If this variable is not defined by the port (which means it # requires the Unicode version of WxWidgets), it will be # defined in the case the Unicode version is used (enabled by -# the user through WITH_UNICODE). -# WX_VERSION - The WxWidgets version that is going to be used. +# WITH_UNICODE or WANT_UNICODE). # HAVE_WX - The list of WxWidgets components installed, if WANT_WX was # defined. The components will have version suffix if it was -# set to "yes"). +# set to "yes". # # Examples: # - A port that needs WxWidgets 2.6 and contributed libraries with Unicode. @@ -96,11 +99,11 @@ # - A port that needs WxPython 2.4 for running. # USE_PYTHON= yes # USE_WX= 2.4 -# WX_COMPS= python_run +# WX_COMPS= python:run # - A port that needs WxPython 2.4 or 2.6 for building. # USE_PYTHON= yes # USE_WX= 2.4 2.6 -# WX_COMPS= python_build +# WX_COMPS= python:build # - A port that needs WxWidgets version 2.4 or higher and contributed # libraries. # USE_WX= 2.4+ @@ -108,11 +111,6 @@ # - A port that needs WxWidgets of any version other than 2.4. # USE_WX_NOT= 2.4 # -# Notes: -# - The version is processed on each inclusion, so USE_WX, USE_WX_NOT and -# WX_UNICODE can be modified before and after including bsd.port.pre.mk. -# After determining the version and Unicode, WX_CONFIG will be defined. -# WX_Include_MAINTAINER= alepulver@FreeBSD.org @@ -129,20 +127,14 @@ # _WX_DEP_TYPES_ALL - List of valid dependency types. # _WX_VERS_ALL - List of supported versions. # _WX_VERS_UC_ALL - List of Unicode capable versions. -# _WX_CHANGE_VARS - List of variables allowed to change between pre and -# post inclusions (related to version). -# _WX_LISTS_ORDER - Reverse lists preference order. -# _WX_AUTO_VARS - Variables defined sometimes that may have to be -# redefined later. +# _WX_VERS_LISTS - Reverse lists preference order. # _WX_COMPS_ALL= wx contrib python mozilla svg _WX_DEP_TYPES_ALL= build lib run _WX_VERS_ALL= 2.4 2.6 _WX_VERS_UC_ALL= 2.6 -_WX_CHANGE_VARS= USE_WX USE_WX_NOT WX_UNICODE -_WX_LISTS_ORDER= _WX_VER_FINAL WANT_WX_VER WITH_WX_VER -_WX_AUTO_VARS= USE_WX WX_CONFIG +_WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER # # Variables used to determine what is needed: @@ -150,55 +142,74 @@ # _WX_LIB_comp_ver - Name of the shared library (optional). # _WX_SHVER_comp_ver - Shared library version (optional). # _WX_FILE_comp_ver - File installed by that component. +# _WX_DEPTYPE_comp_ver - Default dependency type (optional). # -_WX_PORT_wx_2.4= wxgtk24 +_WX_PORT_wx_2.4= x11-toolkits/wxgtk24 _WX_LIB_wx_2.4= wx_gtk2-2.4 -_WX_PORT_contrib_2.4= wxgtk24-contrib +_WX_PORT_contrib_2.4= x11-toolkits/wxgtk24-contrib _WX_LIB_contrib_2.4= wx_gtk2_canvas-2.4 -_WX_PORT_python_2.4= py-wxPython24 +_WX_PORT_python_2.4= x11-toolkits/py-wxPython24 _WX_FILE_python_2.4= ${PYTHON_SITELIBDIR}/wx/__init__.py -_WX_PORT_mozilla_2.4= wxmozilla +_WX_PORT_mozilla_2.4= x11-toolkits/wxmozilla _WX_LIB_mozilla_2.4= wxmozilla_gtk2-2.4 -_WX_PORT_wx_2.6= wxgtk26${_WX_UCL} +_WX_PORT_wx_2.6= x11-toolkits/wxgtk26${_WX_UCL} _WX_LIB_wx_2.6= wx_base${_WX_UC}-2.6 -_WX_PORT_contrib_2.6= wxgtk26${_WX_UCL}-contrib +_WX_PORT_contrib_2.6= x11-toolkits/wxgtk26${_WX_UCL}-contrib _WX_LIB_contrib_2.6= wx_gtk2${_WX_UC}_animate-2.6 -_WX_PORT_python_2.6= py-wxPython26${_WX_UCL} +_WX_PORT_python_2.6= x11-toolkits/py-wxPython26${_WX_UCL} _WX_FILE_python_2.6= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py -_WX_PORT_svg_2.6= wxsvg +_WX_PORT_svg_2.6= x11-toolkits/wxsvg _WX_LIB_svg_2.6= wxsvg # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately. +# Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib". .for comp in ${_WX_COMPS_ALL} +_WX_COMP= ${comp} . for ver in ${_WX_VERS_ALL} . if defined(_WX_LIB_${comp}_${ver}) _WX_SHVER_${comp}_${ver}= 0 _WX_FILE_${comp}_${ver}= ${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}} . endif +. if ${_WX_COMP} == "python" +_WX_DEPTYPE_${comp}_${ver}= run +. else +_WX_DEPTYPE_${comp}_${ver}= lib +. endif . endfor .endfor .endif # !_WX_Defined_Done # +# Check if the user/port wants Unicode. +# + +.if ${OSVERSION} >= 500000 && (!defined(WITHOUT_UNICODE) && \ + (defined(WITH_UNICODE) || defined(WANT_UNICODE))) +_WX_UC_AVAILABLE= yes +.else +.undef _WX_UC_AVAILABLE +.endif + +# # Check for present components. # -.if !defined(AFTERPORTMK) && defined(WANT_WX) +.if defined(WANT_WX) && defined(BEFOREPORTMK) # Check if Unicode will be used. . for __WANT_WX in ${WANT_WX} -. if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 && \ +. if defined(_WX_UC_AVAILABLE) && \ (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${WANT_WX:L} == "yes") _WX_WANT_UNICODE= yes . endif @@ -247,50 +258,17 @@ IGNORE?= selected an invalid value for WANT_WX: ${__WANT_WX} . endif . endfor -.endif # ! AFTERPORTMK && WANT_WX - -# -# Check if the version has changed between inclusions. -# - -.if defined(_WX_Version_Done) -. undef _WX_HAS_CHANGED - -. for var in ${_WX_CHANGE_VARS} -. if (defined(${var}) && !defined(_WX_OLD_${var})) || \ - (!defined(${var}) && defined(_WX_OLD_${var})) || \ - (defined(_WX_OLD_${var}) && ${_WX_OLD_${var}} != ${${var}}) -_WX_HAS_CHANGED= yes -. endif -. endfor -.endif # _WX_Version_Done +.endif # WANT_WX && BEFOREPORTMK # # Select WxWidgets version. # -.if (!defined(_WX_Version_Done) || defined(_WX_HAS_CHANGED)) && \ - (defined(USE_WX) || defined(USE_WX_NOT)) +.if !defined(_WX_Version_Done) && (defined(_POSTMKINCLUDED) || \ + (defined(WX_PREMK) && defined(BEFOREPORTMK) && \ + (defined(USE_WX) || defined(USE_WX_NOT)))) _WX_Version_Done= yes -# Handle automatic variables. - -.for var in ${_WX_AUTO_VARS} -. if defined(_WX_${var}_DEFINED) -. undef ${var} -. endif -. if !defined(${var}) -_WX_${var}_DEFINED= yes -. endif -.endfor - -# Reset old variable values. - -.if defined(_WX_HAS_CHANGED) -. undef _WX_VER -. undef _WX_IGNORE -.endif - # Set defaults (if one isn't present). USE_WX?= ${_WX_VERS_ALL} @@ -349,7 +327,7 @@ # Check for a null version. .if empty(_WX_VER_MERGED) -_WX_IGNORE?= selected a null or invalid WxWidgets version +IGNORE?= selected a null or invalid WxWidgets version .endif # @@ -365,9 +343,9 @@ . endif .endfor -# Requested by the user (optional). +# Requested by the user or port (optional). -.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 +.if defined(_WX_UC_AVAILABLE) . for ver in ${_WX_VER_UC} . if ${_WX_VERS_UC_ALL:M${ver}} != "" WX_UNICODE= yes @@ -379,9 +357,9 @@ .if defined(WX_UNICODE) . if ${OSVERSION} < 500000 -_WX_IGNORE?= requires FreeBSD versions >= 5.X (because of Unicode) +IGNORE?= requires FreeBSD versions >= 5.X (because of Unicode) . elif empty(_WX_VER_UC) -_WX_IGNORE?= selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED} +IGNORE?= selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED} . endif .endif @@ -410,7 +388,7 @@ # 3) _WX_VER_FINAL - Available versions. # -.for list in ${_WX_LISTS_ORDER} +.for list in _WX_VER_FINAL ${_WX_VERS_LISTS} . if defined(${list}) . for ver in ${${list}} . if ${_WX_VER_FINAL:M${ver}} != "" @@ -424,30 +402,19 @@ # Set variables. # -WX_VERSION= ${_WX_VER} WX_CONFIG?= ${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config +WXRC_CMD?= ${X11BASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} +WX_VERSION?= ${_WX_VER} -# Define old values for detecting changes. - -.for var in ${_WX_CHANGE_VARS} -. if defined(${var}) -_WX_OLD_${var}:= ${${var}} -. endif -.endfor - -.endif # ! _WX_Version_Done || _WX_HAS_CHANGED +.endif # !_WX_Version_Done && (_POSTMKINCLUDED || \ +# (WX_PREMK && BEFOREPORTMK && (USE_WX || USE_WX_NOT))) # # Process components list and add dependencies, variables, etc. # -.if !defined(BEFOREPORTMK) -# Error check. +.if defined(_POSTMKINCLUDED) -.if defined(_WX_IGNORE) -IGNORE?= ${_WX_IGNORE} -.endif - # # Component parsing. # @@ -466,10 +433,11 @@ _WX_COMPS_FINAL= # .for comp in ${WX_COMPS} -_WX_COMP= ${comp:C/_([[:alpha:]]+)$//} -_WX_DEP_TYPE= ${comp:C/.+_([[:alpha:]]+)$/\1/} +_WX_COMP= ${comp:C/:([[:alpha:]]+)$//} . if ${_WX_COMP} == ${comp} -_WX_DEP_TYPE= lib +_WX_DEP_TYPE= ${_WX_DEPTYPE_${comp}_${_WX_VER}} +. else +_WX_DEP_TYPE= ${comp:C/.+:([[:alpha:]]+)$/\1/} . endif _WX_COMP_NEW= ${_WX_COMP}_${_WX_DEP_TYPE} . for __WX_COMP in ${_WX_COMP} @@ -501,16 +469,19 @@ .for comp in ${_WX_COMPS_FINAL} _WX_COMP= ${comp:C/_([[:alpha:]]+)$//} _WX_DEP_TYPE= ${comp:C/.+_([[:alpha:]]+)$/\1/} -. if ${_WX_DEP_TYPE} == "lib" -. if defined(_WX_LIB_${_WX_COMP}_${_WX_VER}) -LIB_DEPENDS+= ${_WX_LIB_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}} +# XXX Need a .for loop here so the variable is expanded before the assignment. +. for comp_part in ${_WX_COMP} +. if ${_WX_DEP_TYPE} == "lib" +. if defined(_WX_LIB_${_WX_COMP}_${_WX_VER}) +LIB_DEPENDS+= ${_WX_LIB_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +. else +BUILD_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +RUN_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +. endif . else -BUILD_DEPENDS+= ${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}} -RUN_DEPENDS+= ${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}} +${_WX_DEP_TYPE:U}_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} . endif -. else -${_WX_DEP_TYPE:U}_DEPENDS+= ${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}} -. endif +. endfor .endfor # @@ -531,4 +502,4 @@ . endif .endif -.endif # ! BEFOREPORTMK +.endif # _POSTMKINCLUDED ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/chkmodules.pl#2 (text+ko) ==== @@ -28,9 +28,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: ports/Tools/scripts/chkmodules.pl,v 1.4 2005/01/09 10:21:17 krion Exp $ +# $FreeBSD: ports/Tools/scripts/chkmodules.pl,v 1.5 2006/11/23 12:16:59 erwin Exp $ # -# MAINTAINER= eik@FreeBSD.org +# MAINTAINER= erwin@FreeBSD.org # # CVSROOT-ports/modules auditing script, based on a shell script by # Clement Laforet. ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/chkorigin.sh#2 (text+ko) ==== @@ -28,9 +28,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: ports/Tools/scripts/chkorigin.sh,v 1.2 2004/03/28 19:13:34 eik Exp $ +# $FreeBSD: ports/Tools/scripts/chkorigin.sh,v 1.3 2006/11/23 12:16:59 erwin Exp $ # -# MAINTAINER= eik@FreeBSD.org +# MAINTAINER= erwin@FreeBSD.org # # PKGORIGIN connects packaged or installed ports to the directory they # originally came from. Although often overlooked, they are extremly ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/chkversion.pl#2 (text+ko) ==== @@ -28,9 +28,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: ports/Tools/scripts/chkversion.pl,v 1.13 2004/06/04 22:23:03 eik Exp $ +# $FreeBSD: ports/Tools/scripts/chkversion.pl,v 1.16 2006/11/23 14:04:52 erwin Exp $ # -# MAINTAINER= eik@FreeBSD.org +# MAINTAINER= erwin@FreeBSD.org # # PORTVERSION and PKGORIGIN auditing script # @@ -66,6 +66,7 @@ require 5.005; use strict; +use POSIX; use File::Find; use Cwd 'abs_path'; @@ -103,6 +104,8 @@ my $versionfile = "$versiondir/VERSIONS"; my $useindex = !-w $versiondir; +my $starttime = strftime("%a %b %e %G %k:%M:%S %Z",localtime); + sub readfrom { my $dir = shift; @@ -319,7 +322,7 @@ } sub template { - my ($from, $rcpt, $replyto, $ports) = @_; + my ($from, $rcpt, $replyto, $starttime, $ports) = @_; my $portlist = join ', ', sort keys %{$ports}; substr($portlist, 32) = '...' @@ -350,6 +353,7 @@ $_ =~ s/%%CC%%/$cc/og; $_ =~ s/%%REPLYTO%%/$replyto/og; $_ =~ s/%%SUBJECT%%/$portlist/og; + $_ =~ s/%%STARTTIME%%/$starttime/og; $header .= $_; } return $header; @@ -377,16 +381,16 @@ my $tmpl; -$tmpl = template $h_from, $rcpt_orig, $h_replyto, \%pkgorigin; +$tmpl = template $h_from, $rcpt_orig, $h_replyto, $starttime, \%pkgorigin; mail $tmpl, $rcpt_orig, \%pkgorigin; -$tmpl = template $h_from, $rcpt_vers, $h_replyto, \%backwards; +$tmpl = template $h_from, $rcpt_vers, $h_replyto, $starttime, \%backwards; mail $tmpl, $rcpt_vers, \%backwards; -$tmpl = template $h_from, $rcpt_watch, $h_replyto, \%watched; +$tmpl = template $h_from, $rcpt_watch, $h_replyto, $starttime, \%watched; mail $tmpl, $rcpt_watch, \%watched; -$tmpl = template $h_from, $rcpt_watch, $h_replyto, \%watchedm; +$tmpl = template $h_from, $rcpt_watch, $h_replyto, $starttime, \%watchedm; mail $tmpl, $rcpt_watchm, \%watchedm; exit((%pkgorigin || %backwards) ? 1 : 0); @@ -408,6 +412,8 @@ Please fix any errors as soon as possible. + The ports tree was updated at %%STARTTIME%%. + . From: %%FROM%% To: %%RCPT%% @@ -426,6 +432,8 @@ Please fix any errors as soon as possible. + The ports tree was updated at %%STARTTIME%%. + . From: %%FROM%% To: %%RCPT%% @@ -438,6 +446,8 @@ You have requested to be notified of version changes in the following ports: + The ports tree was updated at %%STARTTIME%%. + . From: %%FROM%% To: %%RCPT%% @@ -450,4 +460,6 @@ You have requested to be notified of maintainer changes in the following ports: + The ports tree was updated at %%STARTTIME%%. + . ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#4 (text+ko) ==== @@ -8,6 +8,9 @@ # When INDEX is broken, assemble the list of committers who touched files # on the most recent 'cvs update', and put those committers "on the hook". # These committers all stay on the hook until INDEX is buildable again. +# +# MAINTAINER= erwin@FreeBSD.org +# # -------------------------------------------------------- # Change these! ==== //depot/projects/soc2006/gabor_ports/UIDs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.20 2006/11/11 16:36:23 ahze Exp $ +$FreeBSD: ports/UIDs,v 1.22 2006/11/16 08:58:31 alexbl Exp $ # Please keep this file sorted by UID! bind:*:53:53:Bind Sandbox:/:/sbin/nologin majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent @@ -57,6 +57,7 @@ hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin smokeping:*:117:117:SmokePing Daemon:/nonexistent:/sbin/nologin ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/sbin/nologin +fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin vchat:*:128:128:VChat Conferencing System:/nonexistent:/sbin/nologin _bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin @@ -82,6 +83,7 @@ hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/sbin/nologin mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin +wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/sbin/nologin ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin ==== //depot/projects/soc2006/gabor_ports/UPDATING#17 (text+ko) ==== @@ -6,6 +6,13 @@ time you update your ports collection, before attempting any port upgrades. +20061121: + AFFECTS: users of www/hastymail + AUTHOR: miwi@FreeBSD.org + + The default install location has changed from + ${PREFIX}/www/data/hastymail to ${PREFIX}/www/hastymail. + 20061109 AFFECTS: users of milter-bogom, dk-milter, dkim-milter AUTHOR: ache@freebsd.org @@ -4400,4 +4407,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.424 2006/11/09 13:37:21 ache Exp $ +$FreeBSD: ports/UPDATING,v 1.425 2006/11/21 19:32:14 miwi Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611242208.kAOM8UuN059788>