Date: Fri, 29 Jun 2007 08:16:19 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 122523 for review Message-ID: <200706290816.l5T8GJuC072562@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122523 Change 122523 by gabor@gabor_server on 2007/06/29 08:15:29 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/GIDs#8 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#9 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#6 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#31 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#9 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#8 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/GIDs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.42 2007/06/10 13:33:05 dinoex Exp $ +$FreeBSD: ports/GIDs,v 1.43 2007/06/27 21:13:24 beech Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -74,6 +74,7 @@ sympa:*:200: dspam:*:202: bs:*:220: +postgrey:*:225: fcron:*:247: _tor:*:256: _dns-proxy-tor:*:257: ==== //depot/projects/soc2006/gabor_destdir/MOVED#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1397 2007/06/19 14:24:00 ahze Exp $ +# $FreeBSD: ports/MOVED,v 1.1399 2007/06/25 14:36:31 barner Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2390,7 +2390,6 @@ japanese/phpgroupware||2006-04-10|removed at mainter request (because broken and vulnerabilities) www/p5-Catalyst|www/p5-Catalyst-Runtime|2006-07-10|follow CPAN split of package textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-07-12|The textproc/p5-YAML-Syck port now includes JSON functionality -sysutils/ledit||2006-07-14|Has expired: Does not build x11/settitle||2006-07-14|Has expired: Download unavailable anymore net-im/simicq|net-im/sim-im|2006-07-15|renamed cad/gschem|cad/geda-gschem|2006-07-16|renamed @@ -3073,3 +3072,13 @@ net/cacti|net-mgmt/cacti|2007-06-18|Move to net-mgmt category net/zabbix-agent|net-mgmt/zabbix-agent|2007-06-18|Move to net-mgmt category graphics/gpdf|graphics/evince|2007-06-19|Obsolete port +deskutils/mnemo|deskutils/horde-mnemo|2007-06-21|Port renamed for consistency +deskutils/nag|deskutils/horde-nag|2007-06-21|Port renamed for consistency +deskutils/kronolith|deskutils/horde-kronolith|2007-06-21|Port renamed for consistency +devel/chora|devel/horde-chora|2007-06-21|Port renamed for consistency +ftp/gollem|ftp/horde-gollem|2007-06-21|Port renamed for consistency +mail/imp|mail/horde-imp|2007-06-21|Port renamed for consistency +mail/ingo|mail/horde-ingo|2007-06-21|Port renamed for consistency +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 ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.13 2006/11/07 09:11:53 clement Exp $ +# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.14 2007/06/28 15:50:53 pav Exp $ # # bsd.apache.mk - Apache related macros. # Author: Clement Laforet <clement@FreeBSD.org> @@ -393,7 +393,7 @@ .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@unexec ${SED} -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.140 2007/03/19 05:19:11 marcus Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.141 2007/06/28 16:02:48 pav Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ # @@ -689,9 +689,9 @@ # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly +.ifdef _USE_GNOME . for component in ${_USE_GNOME_ALL} -_COMP_TEST= ${_USE_GNOME:M${component}} -. if ${_COMP_TEST:S/${component}//}!=${_COMP_TEST:S/ / /g} +. if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS} EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS} @@ -726,6 +726,7 @@ . endif . endfor .endif +.endif .if defined(GNOME_PRE_PATCH) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.43 2007/06/04 11:20:29 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.44 2007/06/26 16:58:33 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -498,7 +498,7 @@ @(cd ${WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH) || defined(CLEAN_ROOT) +.if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT) rm -rf /root/GNUstep .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#31 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.569 2007/06/16 19:07:42 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.572 2007/06/28 16:06:02 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -2760,7 +2760,7 @@ benchmarks biology cad chinese comms converters databases \ deskutils devel dns editors elisp emulators finance french ftp \ games geography german gnome gnustep graphics hamradio haskell hebrew hungarian \ - ipv6 irc japanese java kde korean lang linux lisp \ + ipv6 irc japanese java kde kld korean lang linux lisp \ mail math mbone misc multimedia net net-im net-mgmt net-p2p news \ palm parallel pear perl5 plan9 polish portuguese ports-mgmt \ print python ruby rubygems russian \ @@ -3154,10 +3154,14 @@ .endif .if !defined(DEPENDS_TARGET) +.if defined(DEPENDS_PRECLEAN) +DEPENDS_TARGET= clean +DEPENDS_ARGS= NOCLEANDEPENDS=yes +.endif .if make(reinstall) -DEPENDS_TARGET= reinstall +DEPENDS_TARGET+= reinstall .else -DEPENDS_TARGET= install +DEPENDS_TARGET+= install .endif .if defined(DEPENDS_CLEAN) DEPENDS_TARGET+= clean @@ -4301,7 +4305,7 @@ .if !target(clean) clean: .if !defined(NOCLEANDEPENDS) - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} clean-depends + @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} limited-clean-depends .endif @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" .if target(pre-clean) @@ -4762,6 +4766,14 @@ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \ + if [ X${DEPENDS_PRECLEAN} != "X" ]; then \ + target="clean $$target"; \ + depends_args="$$depends_args NOCLEANDEPENDS=yes"; \ + fi; \ + if [ X${DEPENDS_CLEAN} != "X" ]; then \ + target="$$target clean"; \ + depends_args="$$depends_args NOCLEANDEPENDS=yes"; \ + fi; \ else \ target="${DEPENDS_TARGET}"; \ depends_args="${DEPENDS_ARGS}"; \ @@ -4926,9 +4938,95 @@ L=$$l; \ done +CLEAN-DEPENDS-FULL= \ + L="${_DEPEND_DIRS}"; \ + checked=""; \ + while [ -n "$$L" ]; do \ + l=""; \ + for d in $$L; do \ + case $$checked in \ + $$d\ *|*\ $$d\ *|*\ $$d) \ + continue;; \ + esac; \ + checked="$$checked $$d"; \ + if [ ! -d $$d ]; then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + if ! children=$$(cd $$d && ${MAKE} -V WRKDIR -V _DEPEND_DIRS); then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + state=0; \ + for child in $$children; do \ + case $$state in \ + 0) \ + if [ -d $child ]; then \ + ${ECHO_CMD} $$d; \ + fi; \ + state=1;; \ + 1) \ + case "$$checked $$l" in \ + $$child\ *|*\ $$child\ *|*\ $$child) \ + continue;; \ + esac; \ + l="$$l $$child";; \ + esac; \ + done; \ + done; \ + L=$$l; \ + done + +CLEAN-DEPENDS-LIMITED= \ + L="${_DEPEND_DIRS}"; \ + checked=""; \ + while [ -n "$$L" ]; do \ + l=""; \ + for d in $$L; do \ + case $$checked in \ + $$d\ *|*\ $$d\ *|*\ $$d) \ + continue;; \ + esac; \ + checked="$$checked $$d"; \ + if [ ! -d $$d ]; then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + if ! children=$$(cd $$d && ${MAKE} -V WRKDIR -V _DEPEND_DIRS); then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + state=0; \ + for child in $$children; do \ + case $$state in \ + 0) \ + if [ ! -d $child ]; then \ + break; \ + fi; \ + state=1; \ + ${ECHO_CMD} $$d;; \ + 1) \ + case "$$checked $$l" in \ + $$child\ *|*\ $$child\ *|*\ $$child) \ + continue;; \ + esac; \ + l="$$l $$child";; \ + esac; \ + done; \ + done; \ + L=$$l; \ + done + .if !target(clean-depends) clean-depends: - @for dir in $$(${ALL-DEPENDS-LIST}); do \ + @for dir in $$(${CLEAN-DEPENDS-FULL}); do \ + (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ + done +.endif + +.if !target(limited-clean-depends) +limited-clean-depends: + @for dir in $$(${CLEAN-DEPENDS-LIMITED}); do \ (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ done .endif @@ -5094,23 +5192,20 @@ ACTUAL-PACKAGE-DEPENDS?= \ if [ "${_LIB_RUN_DEPENDS}" != " " ]; then \ - for pkgname in ${PKG_DBDIR}/*; do \ + origins=$$(for pkgname in ${PKG_DBDIR}/*; do \ if [ -e $$pkgname/+CONTENTS ]; then \ - a=$${pkgname\#\#*/}; \ - b=`${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS`; \ - if [ ! -z $$b ]; then \ - origins="$$origins $$a $$b"; \ - fi; \ + ${ECHO_CMD} $${pkgname\#\#*/}; \ + ${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS; \ fi; \ - done; \ + done); \ for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ tmp=$${dir%/*}; \ dir=$${tmp\#\#*/}/$${dir\#\#*/}; \ set -- $$origins; \ - while [ $$\# != 0 ]; do \ - if [ $$dir = $$2 ]; then \ + while [ $$\# -gt 1 ]; do \ + if [ "$$dir" = "$$2" ]; then \ ${ECHO_CMD} $$1:$$dir; \ - if [ -e ${PKG_DBDIR}/$$1/+CONTENTS ]; then \ + if [ -e ${PKG_DBDIR}/$$1/+CONTENTS -a -z "${EXPLICIT_PACKAGE_DEPENDS}" ]; then \ packagelist="$$packagelist ${PKG_DBDIR}/$$1/+CONTENTS"; \ fi; \ break; \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#9 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.421 2007/06/19 10:28:40 sat Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.422 2007/06/26 11:39:12 edwin Exp $ # # Where to put distfiles that don't have any other master site @@ -1083,7 +1083,7 @@ MASTER_SITE_RUBYFORGE+= \ http://rubyforge.rubyuser.de/%SUBDIR%/ \ http://rubyforge.iasi.roedu.net/files/%SUBDIR%/ \ - http://rubyforge.halostatue.info/%SUBDIR%/ \ + http://files.rubyforge.mmmultiworks.com/%SUBDIR%/ \ http://files.rubyforge.vm.bytemark.co.uk/%SUBDIR%/ .endif ==== //depot/projects/soc2006/gabor_destdir/UIDs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.46 2007/06/10 13:33:05 dinoex Exp $ +$FreeBSD: ports/UIDs,v 1.48 2007/06/27 21:13:24 beech Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/sbin/nologin @@ -62,6 +62,7 @@ mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/sbin/nologin otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh +zabbix:*:122:122:Zabbix NMS:/nonexistent:/sbin/nologin _ntp:*:123:123:NTP Daemon:/var/empty:/sbin/nologin fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin @@ -84,6 +85,7 @@ 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 +postgrey:*:225:225:Postgrey Owner:/nonexistent:/sbin/nologin fcron:*:247:247:fcron pseudo-user:/nonexistent:/sbin/nologin _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh _dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706290816.l5T8GJuC072562>