Date: Sun, 12 Nov 2006 17:31:22 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 109806 for review Message-ID: <200611121731.kACHVMpX045424@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109806 Change 109806 by gabor@gabor_pluto on 2006/11/12 17:31:13 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/GIDs#4 integrate .. //depot/projects/soc2006/gabor_ports/LEGAL#7 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#14 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#8 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#3 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#4 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#11 integrate .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#5 integrate .. //depot/projects/soc2006/gabor_ports/UIDs#4 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#16 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/GIDs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.11 2006/08/28 20:15:56 pav Exp $ +$FreeBSD: ports/GIDs,v 1.16 2006/11/11 16:36:23 ahze Exp $ # Please keep this file sorted by GID! bind:*:53: rdfdb:*:55: @@ -59,6 +59,7 @@ moinmoin:*:192: sympa:*:200: dspam:*:202: +bs:*:220: _tor:*:256: _dns-proxy-tor:*:257: _trans-proxy-tor:*:258: @@ -67,6 +68,7 @@ smxc:*:262: smxm:*:263: smx:*:264: +haclient:*:275: mrtg:*:279: dkfilter:*:325: ldap:*:389: @@ -81,6 +83,9 @@ messagebus:*:556: realtime:*:557: avahi:*:558: +tacacs:*:559: +distcc:*:561: +_xsi:*:600: bnetd:*:700: bopm:*:717: openxpki:*:777: ==== //depot/projects/soc2006/gabor_ports/LEGAL#7 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.507 2006/10/10 06:01:49 ale Exp $ +# $FreeBSD: ports/LEGAL,v 1.509 2006/11/09 08:55:13 vd Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -378,8 +378,6 @@ libots-*.alpha.rpm lang/compaq-cc Distribution not allowed libSDLx11.so.tar.gz multimedia/mtv No redistribution LimeWireOther.zip net-p2p/limewire No redistribution allowed -linunace* archivers/linux-unace Distribution is permitted within the - original package only Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software @@ -410,7 +408,6 @@ mindfocus-* games/mindfocus Contains commercial character data mindterm-* security/mindterm-binary Do not sell for profit -mingw/Opengl95.exe devel/mingw-opengl-headers Not sure if we can redistribute it freely miracl* math/miracl Free for non-profit use but a commercial license is required for all other usages ==== //depot/projects/soc2006/gabor_ports/MOVED#14 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1168 2006/10/21 03:02:07 kris Exp $ +# $FreeBSD: ports/MOVED,v 1.1183 2006/11/12 06:43:14 rafan Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2490,3 +2490,52 @@ emulators/linux_base-suse-9.1||2006-10-20|Port expired and was removed emulators/linux_base-suse-9.2||2006-10-20|Port expired and was removed emulators/linux_base-suse-9.3||2006-10-20|Port expired and was removed +archivers/linux-unace||2006-10-31|Has expired: security issues +audio/gdesklets-cornerxmms||2006-10-31|Has expired: dead project and not fetchable any more +deskutils/gdesklets-sensor-displayconstraints||2006-10-31|Has expired: dead project and not fetchable any more +devel/sdl_ldbad||2006-10-31|Has expired: incorrect pkg-plist and doesn't required anymore +lang/pdss||2006-10-31|Has expired: fails to compile on recent FreeBSD versions +multimedia/slideshow||2006-10-31|Has expired: dead project and doesn't work with recent sdl +dns/queryperf|dns/dnsperf|2006-11-01|Project was improved and renamed +x11-toolkits/etox||2006-11-01|Has expired: doesn't work with recent e17 and obsoleted +x11-themes/e17-theme-blokkie||2006-11-01|Has expired: doesn't work with recent e17 +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 +devel/ac-archive|devel/autoconf-archive|2006-11-01|Replace broken ac-archive with working autoconf-archive +www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable +graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion +graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion +chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname +mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed +databases/php5-filepro||2006-11-06|Removed in 5.2 branch +databases/php5-pdo||2006-11-08|Removed +deskutils/offix-trash||2006-11-09|Has expired: development ceased in 1996 +devel/mingw||2006-11-09|Has expired: use mingw32-* ports instead +devel/mingw-binutils||2006-11-09|Has expired: use mingw32-* ports instead +devel/mingw-bin-msvcrt||2006-11-09|Has expired: use mingw32-* ports instead +devel/mingw-gcc||2006-11-09|Has expired: use mingw32-* ports instead +devel/mingw-opengl-headers||2006-11-09|Has expired: use mingw32-* ports instead +editors/offix-editor||2006-11-09|Has expired: developement ceased in 1996 +print/offix-printer||2006-11-09|Has expired: development ceased in 1996 +sysutils/wmmon||2006-11-09|Has expired: no longer available from mastersite +sysutils/xsysinfo||2006-11-09|Has expired: no longer available from mastersite +textproc/xmlada||2006-11-09|Has expired: no longer available from mastersite; 2.0 is available +www/p5-CGI-Application-ValidateRM||2006-11-09|Has expired: no longer available from mastersites +x11/offix-clipboard||2006-11-09|Has expired: development ceased in 1996 +x11/offix-execute||2006-11-09|Has expired: development ceased in 1996 +x11-fm/offix-files||2006-11-09|Has expired: development ceased in 1996 +x11-wm/icepref||2006-11-09|Has expired: is for IceWM version 1.04 (6 years old) +databases/p5-Catalyst-Model-CDBI-Plain|www/p5-Catalyst-Model-CDBI-Plain|2006-11-09|Moved to correct category +net-p2p/linux-overnet-core||2006-11-10|No longer downloadable +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 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.12 2006/06/20 04:58:12 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.13 2006/11/07 09:11:53 clement Exp $ # # bsd.apache.mk - Apache related macros. # Author: Clement Laforet <clement@FreeBSD.org> @@ -179,7 +179,7 @@ .endif . if defined(WITH_SUEXEC_UMASK) -CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${WITH_SUEXEC_UMASK} +CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK} . endif .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.135 2006/10/15 03:42:39 marcus Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.136 2006/10/31 09:11:23 jylefort Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # @@ -728,6 +728,12 @@ . endif .endif +.if defined(USE_GNOME_SUBR) +GNOME_SUBR= ${LOCALBASE}/etc/gnome.subr +RUN_DEPENDS+= ${GNOME_SUBR}:${PORTSDIR}/sysutils/gnome_subr +SUB_LIST+= GNOME_SUBR=${GNOME_SUBR} +.endif + .if ${MAINTAINER}=="gnome@FreeBSD.org" CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failed make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`). Put your attachment up on any website, copy-and-paste into http://freebsd-gnome.pastebin.com, or use send-pr(1) with the attachment. Try to avoid sending any attachments to the mailing list (${MAINTAINER}), because attachments sent to FreeBSD mailing lists are usually discarded by the mailing list software." .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.31 2006/10/05 17:27:31 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.32 2006/10/31 05:27:21 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -63,16 +63,24 @@ # USE_GNUSTEP_INSTALL=yes # call install target with GNUstep.sh sourced in the current shell # +# USE_GNUSTEP_MAKE_DIRS= App Tools +# call build and install target in each of the given dirs. +# # USE_GNUSTEP_MAKE=yes # require GNUstep.sh for build and install # -# USE_GNUSTEP_SYSTEM_LIBS= Renaissance:x11-toolkits/renaissance +# USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:x11-toolkits/renaissance # depends on a shared lib in System directrory # -# USE_GNUSTEP_LOCAL_LIBS= pantomime:mail/pantomime +# USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime # depends on a shared lib in Local directrory # - +# 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 +# # --------------------------------------------------------------------------- .if !defined(_POSTMKINCLUDED) @@ -250,7 +258,7 @@ .endif # --------------------------------------------------------------------------- -# source system liibs +# source system libs # .if defined(USE_GNUSTEP_SYSTEM_LIBS) .for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS} @@ -260,9 +268,8 @@ .endif # --------------------------------------------------------------------------- -# source local liibs +# source local libs # -:C/[.][0-9]*$//1 .if defined(USE_GNUSTEP_LOCAL_LIBS) .for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS} BUILD_DEPENDS+= ${LOCALLIBDIR}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} @@ -271,6 +278,24 @@ .endif # --------------------------------------------------------------------------- +# source system apps +# +.if defined(USE_GNUSTEP_SYSTEM_APPS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_APPS} +RUN_DEPENDS+= ${SYSTEMDIR}/Applications/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- +# source local apps +# +.if defined(USE_GNUSTEP_LOCAL_APPS) +.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_APPS} +RUN_DEPENDS+= ${GNUSTEP_PREFIX}/Local/Applications/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} +.endfor +.endif + +# --------------------------------------------------------------------------- # source GNUstep.sh # .if defined(USE_GNUSTEP_CONFIGURE) @@ -298,8 +323,15 @@ # .if defined(USE_GNUSTEP_BUILD) do-build: +.if defined(USE_GNUSTEP_MAKE_DIRS) +.for i in ${USE_GNUSTEP_MAKE_DIRS} + @(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +.endfor +.else @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) +.endif .endif @@ -308,8 +340,15 @@ # .if defined(USE_GNUSTEP_INSTALL) do-install: +.if defined(USE_GNUSTEP_MAKE_DIRS) +.for i in ${USE_GNUSTEP_MAKE_DIRS} + @(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +.endfor +.else @(cd ${WRKSRC}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) +.endif .if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH) || defined(CLEAN_ROOT) rm -rf /root/GNUstep .endif ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.lua.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.2 2006/10/05 18:17:25 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.4 2006/11/12 14:23:12 alepulver Exp $ # # bsd.lua.mk - Support for Lua based ports. # @@ -75,11 +75,14 @@ # LUA_SUBDIR - The directory under bin/share/lib where Lua is installed. # LUA_INCDIR - The directory where Lua and tolua header files are installed. # LUA_LIBDIR - The directory where Lua and tolua libraries are installed. -# LUA_MODLIBDIR - The directory where Lua modules (.lua) are installed. +# LUA_MODLIBDIR - The directory where Lua module libraries (.so) are installed. # LUA_MODSHAREDIR -# - The directory where Lua module libraries (.so) are installed. +# - The directory where Lua modules (.lua) are installed. # LUA_PKGNAMEPREFIX # - The package name prefix used by Lua modules. +# LUA_CMD - The path to the Lua interpreter. +# LUAC_CMD - The path to the Lua compiler. +# TOLUA_CMD - The path to the tolua program. # # Examples: # - A port that needs Lua 4.0 and tolua (also 4.0) libraries (lua for building @@ -313,7 +316,7 @@ # # Version. -LUA_VER= ${_LUA_VER} +LUA_VER?= ${_LUA_VER} LUA_VER_SH?= ${LUA_VER:C/[[:digit:]]\.([[:digit:]])/\1/} LUA_VER_STR?= ${LUA_VER:S/.//g} @@ -329,6 +332,11 @@ # Package name. LUA_PKGNAMEPREFIX?= lua${LUA_VER_STR}- +# Programs. +LUA_CMD?= ${LUA_PREFIX}/bin/lua-${LUA_VER} +LUAC_CMD?= ${LUA_PREFIX}/bin/luac-${LUA_VER} +TOLUA_CMD?= ${LUA_PREFIX}/bin/tolua-${LUA_VER} + .endif # !_LUA_Version_Done && (_POSTMKINCLUDED || \ # (LUA_PREMK && BEFOREPORTMK && (USE_LUA || USE_LUA_NOT))) ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#5 (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.33 2006/09/11 21:10:07 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.34 2006/11/06 17:43:10 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 @@ -43,7 +43,7 @@ .if ${PHP_VER} == 4 PHP_EXT_DIR= 20020429 .else -PHP_EXT_DIR= 20050922 +PHP_EXT_DIR= 20060613 .endif HTTPD?= ${LOCALBASE}/sbin/httpd @@ -228,7 +228,7 @@ .if ${USE_PHP:L} != "yes" # non-version specific components _USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \ - exif fileinfo filepro fribidi ftp gd gettext gmp \ + 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 \ @@ -236,7 +236,7 @@ sockets sybase_ct sysvmsg sysvsem sysvshm \ tokenizer wddx xml xmlrpc yaz zip zlib # version specific components -_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml mcal mcve \ +_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml filepro mcal mcve \ mnogosearch oracle overload pfpro xslt yp _USE_PHP_VER5= ${_USE_PHP_ALL} dom mysqli pdo simplexml soap sqlite \ tidy xmlreader xmlwriter xsl ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#4 (text+ko) ==== @@ -29,7 +29,7 @@ # # -# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.11 2006/09/20 11:20:32 stas Exp $ +# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.12 2006/10/31 21:37:05 edwin Exp $ # SDL_Include_MAINTAINER= edwin@FreeBSD.org @@ -37,7 +37,7 @@ # # These are the current supported SDL modules # -_USE_SDL_ALL= gfx gui image mixer mm net sdl sound ttf +_USE_SDL_ALL= gfx gui image mixer mm net pango sdl sound ttf # # Variables used to determine what is needed: @@ -74,6 +74,11 @@ _SUBDIR_net= net _REQUIRES_net= sdl +_VERSION_pango= 2 +_SUBDIR_pango= x11-toolkits +_LIB_pango= SDL_Pango +_REQUIRES_pango=sdl + _VERSION_sdl= 11 _SUBDIR_sdl= devel _LIB_sdl= SDL ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#11 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.400 2006/10/07 17:47:05 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.401 2006/11/05 12:27:42 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -964,7 +964,7 @@ .endif .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE) -.for mirror in heanet nchc kent easynews ufpr jaist umn +.for mirror in heanet nchc kent easynews ufpr umn MASTER_SITE_SOURCEFORGE+= \ http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/ .endfor @@ -973,7 +973,7 @@ # official sf.net mirrors that don't mirror all projects, check # http://prdownloads.sourceforge.net/%SUBDIR%/ .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_EXTENDED) -.for mirror in easynews switch puzzle ovh peterhost citkit keihanna +.for mirror in easynews switch puzzle belnet osdn ovh keihanna MASTER_SITE_SOURCEFORGE_EXTENDED+= \ http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/ .endfor ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#5 (text+ko) ==== @@ -30,7 +30,7 @@ # Originally written by Vasil Dimov <vd@FreeBSD.org> # Others: # -# $FreeBSD: ports/Tools/scripts/rmport,v 1.9 2006/10/05 10:40:29 vd Exp $ +# $FreeBSD: ports/Tools/scripts/rmport,v 1.11 2006/11/02 09:20:10 vd Exp $ # # MAINTAINER= vd@FreeBSD.org # @@ -92,7 +92,11 @@ find ${PORTSDIR} -mindepth 3 -maxdepth 3 -name "Makefile*" \ |xargs grep -H ${EXPVAR} \ |sed -E "s|${PORTSDIR}/?([^/]+/[^/]+)/Makefile:${EXPVAR}=[[:space:]]*([0-9-]{10})$|\2 \1|g" \ - |perl -ne "if ((substr(\$_, 0, 10) cmp '${TODAY}') <= 0) { print(\$_); }" + |perl -ne "if ((substr(\$_, 0, 10) cmp '${TODAY}') <= 0) { print(\$_); }" \ + |while read expdate catport ; do \ + echo -n "${expdate} ${catport}: " ; \ + make -C ${PORTSDIR}/${catport} -V DEPRECATED ; \ + done } # create temporary checkout directory @@ -100,6 +104,13 @@ { log "creating temporary directory" d=`mktemp -d -t rmport` + mkdir ${d}/CVS + cat > ${d}/CVS/Repository <<REPOSITORY +We need ./CVS directory in order to create a custom commit message template +(and put it in ./CVS/Template). Anyway cvs insists on CVS/Repository existence +although it (hopefully) does not care about its contents. +REPOSITORY + touch ${d}/CVS/Template log "created ${d}" echo "${d}" } @@ -145,7 +156,8 @@ # check if some Makefiles mention the port to be deleted portdir_grep="^[^#].*/`basename ${catport}`([[:space:]]|/|$)" - r="`find ${PORTSDIR} -mindepth 2 -maxdepth 3 \( -name "Makefile*" -or -path "*Mk/*.mk" \) \ + r="`find ${PORTSDIR} -mindepth 2 -maxdepth 3 \ + \( -name "Makefile*" -or -path "*Mk/*.mk" \) \ |xargs grep -EH "${portdir_grep}" \ |grep -vE "^(${rmcatports})" || :`" if [ -n "${r}" ] ; then @@ -162,7 +174,7 @@ break fi - read -p 'deal with the above issues and hit <enter> when ready' answer + read -p 'deal with the above issues and hit <enter> when ready' dummy done } @@ -186,7 +198,7 @@ msg="${catport}: checking if ${checkstr} is in ports/LEGAL" log "${msg}" while grep -i ${checkstr} ports/LEGAL ; do - read -p "${checkstr} is in ports/LEGAL, remove it and hit <enter> when ready" answer + read -p "${checkstr} is in ports/LEGAL, remove it and hit <enter> when ready" dummy log "${msg}" done done @@ -213,7 +225,11 @@ DEPRECATED="`make -C ${PORTSDIR}/${catport} -V DEPRECATED`" DEPRECATED=${DEPRECATED:+: ${DEPRECATED}} - REASON="Has expired${DEPRECATED}" + if [ -n "`make -C ${PORTSDIR}/${catport} -V EXPIRATION_DATE`" ] ; then + REASON="Has expired${DEPRECATED}" + else + REASON="Removed${DEPRECATED}" + fi log "${catport}: adding entry to ports/MOVED" @@ -244,6 +260,27 @@ ${PCVS} rm `find ports/${catport} -type f -not -path "*/CVS/*" -delete -print` } +append_Template() +{ + catport=${1} + + msg=${catport} + + EXPIRATION_DATE=`make -C ${PORTSDIR}/${catport} -V EXPIRATION_DATE` + if [ -n "${EXPIRATION_DATE}" ] ; then + msg="${EXPIRATION_DATE} ${msg}" + fi + + DEPRECATED="`make -C ${PORTSDIR}/${catport} -V DEPRECATED`" + if [ -n "${DEPRECATED}" ] ; then + msg="${msg}: ${DEPRECATED}" + fi + + log "${catport}: adding entry to commit message template" + + echo "${msg}" >> ./CVS/Template +} + # diff diff() { @@ -251,23 +288,34 @@ diffout=${codir}/diff - ${PCVS} diff -u CVSROOT/modules ports/MOVED ports/LEGAL \ - ports > ${diffout} 2>&1 || : + ${PCVS} diff -u CVSROOT/modules ports > ${diffout} 2>&1 || : - read -p "hit <enter> to view cvs diff output" answer + read -p "hit <enter> to view cvs diff output" dummy - # give this to the outside world so it can be removed when we are done + # give this to the outside world so it can be showed to the committer + # and removed when we are done echo ${diffout} } +ask() +{ + question=${1} + + answer=x + while [ "${answer}" != "y" -a "${answer}" != "n" ] ; do + read -p "${question} [yn] " answer + done + + echo ${answer} +} + # ask for confirmation and commit commit() { - read -p "do you want to commit? [yn] " answer + answer=`ask "do you want to commit?"` - if [ "${answer}" = "y" -o "${answer}" = "Y" ] ; then - ${PCVS} ci CVSROOT/modules ports/MOVED ports/LEGAL \ - ports + if [ "${answer}" = "y" ] ; then + ${PCVS} ci CVSROOT/modules ports fi } @@ -280,6 +328,9 @@ rm ${diffout} + rm CVS/Entries.Log CVS/Repository CVS/Template + rmdir CVS + # release cvs directories ${PCVS} rel -d CVSROOT ports @@ -290,12 +341,19 @@ usage() { echo "Usage:" >&2 + echo "" >&2 echo "find expired ports:" >&2 echo "${0} -F" >&2 + echo "" >&2 echo "remove port(s):" >&2 echo "${0} category1/port1 [ category2/port2 ... ]" >&2 + echo "" >&2 + echo "remove all expired ports (as returned by -F):" >&2 + echo "${0} -a" >&2 + echo "" >&2 echo "just check dependencies:" >&2 echo "${0} -d category/port" >&2 + exit 64 } @@ -322,6 +380,14 @@ exit fi +if [ ${1} = "-a" ] ; then + if [ ${#} -ne 1 ] ; then + usage + fi + ${0} `find_expired |cut -f 2 -d ' ' |cut -f 1 -d :` + exit +fi + codir=`mkcodir` cd ${codir} @@ -334,7 +400,7 @@ port=`basename ${catport}` # remove any trailing slashes catport="${cat}/${port}" - pkgname=`pkgname ${cat}/${port}` + pkgname=`pkgname ${catport}` check_dep ${catport} 1 "${*}" @@ -351,12 +417,22 @@ edit_Makefile ${cat} ${port} rm_port ${catport} + + append_Template ${catport} done -diffout=`diff` +# give a chance to the committer to edit files by hand and recreate/review +# the diff afterwards +answer=y +while [ "${answer}" = "y" ] ; do + diffout=`diff` + + # EDITOR instead of PAGER because vim has nice syntax highlighting ;-) + ${EDITOR} ${diffout} -# EDITOR instead of PAGER because vim has nice syntax highlighting ;-) -${EDITOR} ${diffout} + echo "you can now edit files under ${codir}/ by hand" + answer=`ask "do you want to recreate the diff?"` +done commit ==== //depot/projects/soc2006/gabor_ports/UIDs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.13 2006/09/04 11:59:22 ru Exp $ +$FreeBSD: ports/UIDs,v 1.20 2006/11/11 16:36:23 ahze 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 @@ -65,12 +65,12 @@ sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin -bogomilter:*:174:174:milter-bogom:/nonexistent:/sbin/nologin moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh +bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh _dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin _trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/sbin/nologin @@ -79,6 +79,7 @@ smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/sbin/nologin smxm:*:263:263:Sendmail X misc:/nonexistent:/sbin/nologin smx:*:264:264:Sendmail X other:/nonexistent:/sbin/nologin +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 ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin @@ -92,6 +93,9 @@ ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin +tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/sbin/nologin +distcc:*:561:561:Distcc user:/nonexistent:/sbin/nologin +_xsi:*:600:600:XMLSysInfo User:/nonexistent:/sbin/nologin bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin ==== //depot/projects/soc2006/gabor_ports/UPDATING#16 (text+ko) ==== @@ -6,6 +6,120 @@ time you update your ports collection, before attempting any port upgrades. +20061109 + AFFECTS: users of milter-bogom, dk-milter, dkim-milter + AUTHOR: ache@freebsd.org + + All 3 milters change their default user to "mailnull". + +20061108 + AFFECTS: Users of databases/postgresql*-server + AUTHOR: Palle Girgensohn <girgen@FreeBSD.org> + + With the latest patch release of the PostgreSQL ports, the rc script + is renamed `postgresql'. + +20061106 + AFFECTS: Users of net/freeradius + AUTHOR: David Wood <david@wood2.org.uk> + + FreeBSD used to patch FreeRADIUS's rlm_mschap.c to strip all domain names + when calculating the hash of an MS-CHAP challenge (a requirement specified + in RFC 2759 paragraph 4 and amplified in paragraph 8.2). FreeRADIUS now + offers its own solution to discard a domain name before hashing in the + MS-CHAP code, which can be enabled via a configuration option. As there is + no longer any need for the FreeBSD patch, it has been removed, leaving the + MS-CHAP code behaving as supplied by the FreeRADIUS team. + + If the previous behaviour of the MS-CHAP code is required, add: + + with_ntdomain_hack = yes + + to the mschap { } section of your FreeRADIUS configuration. There should be + a commented out line that can be modified around line 696 of + ${PREFIX}/etc/raddb/radiusd.conf if your configuration is based on the + sample FreeRADIUS configuration. + + This option is not set by default in the sample FreeRADIUS configuration. + Only those who have clients sending a domain name as part of the user name + when using MS-CHAP will be affected by this change; they will need to set + this option to allow FreeRADIUS to authenticate their clients successfully. + This may only affect those with older Windows clients, but I cannot be sure. + + Some sources suggest setting this configuration option anyway to prevent + FreeRADIUS from breaching RFC 2759 inadvertently, leading to authentication + failure. It is left to the user whether to set this configuration option + anyway, or only to set it in the event of authentication failures stemming + from MS-CHAP. + + Debug output from radiusd that reads "rlm_mschap: NT Domain delimeter found, + should we have enabled with_ntdomain_hack?" suggests that this configuration + option should be enabled. + + New maintainer alerted to this issue by private mail from Thomas Vogt + <thomas@bsdunix.ch>. + +20061106 + AFFECTS: users of syutils/munin-* + AUTHOR: miwi@FreeBSD.org + + - The default install location has changed from + ${PREFIX}/www/data/munin to ${PREFIX}/www/munin. + +20061106 + AFFECTS: users of chinese/tatter-tools + AUTHOR: chinsan.tw@gmail.com + + - The default install location has changed from + ${PREFIX}/www/data/tatter to ${PREFIX}/www/tatter. + +20061102 + AFFECTS: users of mail/fetchmail + AUTHOR: barner@FreeBSD.org + + - Along with the update to fetchmail 6.3.5, support for the POP2 + protocol has been removed from the port's default configuration. + If needed, POP2 can be enabled with the port's option interface. + + - New feature: GSSAPI support. + +20061101: + AFFECTS: Users of mail/dovecot + AUTHOR: shaun@FreeBSD.org + + Dovecot now requires the mail root to be set explicitly in the the + default_mail_env variable, where it could previously be omitted. + Using the old-style syntax may result in dovecot being unable to find + mailboxes. Installations using the example/default configuration + settings should not be affected. + + This is noted in the release announcement: + + http://dovecot.org/list/dovecot-news/2006-October/000016.html + +20061031: + AFFECTS: Users of math/rkward + AUTHOR: thierry@FreeBSD.org + + The way some information such as descriptive labels is stored in the + R workspace was changed in RKWard 0.4.0. + While the data itself can still be loaded, labels will not be + available from workspaces created with an earlier version of RKWard. + To convert the old labels to the new format, run + rk.convert.pre040 () + in the RKWard R console after loading the workspace in question. + +20061031: + AFFECTS: Users of news/inn-current or news/inn-stable + AUTHOR: shaun@FreeBSD.org + + The stable and current ports of inn have been updated. They suffered + from the same problem previously documented and fixed in news/inn. + When upgrading either of the two mentioned ports, users are advised + to move inn's database directory (/usr/local/news/db) out of the way + prior to _deinstallation_ in order to save its contents from being + erased. + 20061014: AFFECTS: All GTK+2 and GNOME users AUTHOR: gnome@FreeBSD.org @@ -4286,4 +4400,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.415 2006/10/20 02:18:17 mezz Exp $ +$FreeBSD: ports/UPDATING,v 1.424 2006/11/09 13:37:21 ache Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611121731.kACHVMpX045424>