PERFORCE change 118097 for review

Gabor Kovesdan gabor at FreeBSD.org
Sat Apr 14 13:51:33 UTC 2007 

http://perforce.freebsd.org/chv.cgi?CH=118097

Change 118097 by gabor at gabor_server on 2007/04/14 13:51:25

	IFC (And note that it seems to work now, I was wrong when I said it
	does not work. That issues must have been a side-effect of the
	incomplete progress. Now it's time to add some easy and simple
	chrooted version of DESTDIR.)

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/GIDs#5 integrate
.. //depot/projects/soc2006/gabor_destdir/LEGAL#5 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.lua.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#6 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#2 integrate
.. //depot/projects/soc2006/gabor_destdir/UIDs#5 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#6 integrate

Differences ...

==== //depot/projects/soc2006/gabor_destdir/GIDs#5 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.34 2007/03/31 12:53:57 laszlof Exp $
+$FreeBSD: ports/GIDs,v 1.37 2007/04/11 13:27:34 miwi Exp $
 # Please keep this file sorted by GID!
 smmsp:*:25:
 bind:*:53:
@@ -52,6 +52,7 @@
 ircproxyd:*:118:
 mythtv:*:119:
 pdns:*:120
+_ntp:*:123:
 fetchmail:*:124
 postfix:*:125:
 maildrop:*:126:
@@ -65,6 +66,7 @@
 sfs:*:171:
 agk:*:172:
 polipo:*:173:
+flowtools:*:174:
 nagios:*:181:
 moinmoin:*:192:
 cups:*:193:
@@ -106,3 +108,4 @@
 openxpki:*:777:
 netdisco:*:840:
 bacula:*:910:
+otrs:*:121:

==== //depot/projects/soc2006/gabor_destdir/LEGAL#5 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.531 2007/03/31 03:41:14 alepulver Exp $
+# $FreeBSD: ports/LEGAL,v 1.534 2007/04/13 15:52:55 miwi Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -130,6 +130,7 @@
 						See http://www.opensource.apple.com/apsl/
 vbsd*e.tar.Z		security/vscan		Restricted to the license
 						terms set for VirusScan
+dbvis			java/dbvis		Redistribution is not permitted
 dc3play-*		graphics/dc3play	No redistribution due to
 						beta status
 dcl-*-C.tar.gz		science/cdcl		No commercial use
@@ -498,6 +499,7 @@
 savage/savage*		games/linux-savage	Savage is freeware, but i am
 						not sure of its license
 sdr-*			mbone/sdr		Crypto; export-controlled
+seatools_cli.tar	sysutils/seatools	Distfile should be loaded by hand
 serialmail-*		mail/serialmail		No license -- see
 						http://cr.yp.to/softwarelaw.html
 service-config-*	sysutils/service-config	Possibly restricted binary
@@ -593,8 +595,6 @@
 upsmon*			sysutils/upsmon		Redistribute only with
 						original source code
 ut_linux_mgr_*		sysutils/linux-megamgr	Redistribution prohibited
-urchin*.tar.gz		www/urchin5		Commercial software, also comes
-						bundled with Apache-SSL
 linux-ut/*		games/linux-ut		Redistribution limited
 ut2004-lnx-*		games/linux-ut2004-demo	Redistribution limited
 uzap.tar.gz             editors/uzap		Restrictive copyright

==== //depot/projects/soc2006/gabor_destdir/MOVED#6 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1339 2007/04/06 21:48:08 gerald Exp $
+# $FreeBSD: ports/MOVED,v 1.1348 2007/04/11 11:29:23 sem Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2898,3 +2898,41 @@
 editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
 editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
 lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42
+japanese/ptex-tetex|japanese/ptex|2007-04-08|Merged into japanese/ptex
+japanese/ptex-base|japanese/ptex|2007-04-08|Merged into japanese/ptex
+games/kgeography|misc/kdeedu3|2007-04-09|Merged into kdeedu
+games/bos|games/boswars|2007-04-09|Project name changed
+mail/p5-Mail-Box1|mail/p5-Mail-Box|2007-04-10|Has expired: obsolete, use mail/p5-Mail-Box instead
+x11-themes/kde-icons-wasp||2007-04-10|Has expired: Unfetchable
+x11-themes/kde-icons-sparkling||2007-04-10|Has expired: Unfetchable
+audio/x4x||2007-04-10|Has expired: Does not build
+audio/marlin||2007-04-10|Has expired: does not build with new nautilus-cd-burner
+chinese/tatter-tools||2007-04-10|Has expired: Incorrect pkg-plist
+chinese/vim-scdoc||2007-04-10|Has expired: Does not build
+databases/mergeant||2007-04-10|Has expired: does not build with new libgnomedb
+databases/pecl-paradox||2007-04-10|Has expired: Does not compile
+deskutils/yank||2007-04-10|Has expired: Incomplete pkg-plist
+emulators/kmamerun||2007-04-10|Has expired: Project was abandoned 4 years ago and expects an old version of XMAME, please use other frontends instead (like gxmame)
+graphics/hobbes-icons-xpm||2007-04-10|Has expired: Archaic port
+japanese/firefox-ja||2007-04-10|Has expired: Incomplete pkg-plist
+japanese/lookup-xemacs||2007-04-10|Has expired: Does not install
+lang/linux-hla||2007-04-10|Has expired: Does not compile
+mail/vmailmgr||2007-04-10|Has expired: Incomplete pkg-plist
+multimedia/qvamps||2007-04-10|Has expired: Touches filesystem prior to 'make install'
+net-mgmt/sting||2007-04-10|Has expired: Broken on all supported versions of FreeBSD
+net-mgmt/tas||2007-04-10|Has expired: Incomplete pkg-plist
+net-p2p/verlihub-plugins||2007-04-10|Has expired: Does not configure, it needs at least verlihub 1.0
+news/inn-stable||2007-04-10|Has expired: Fails to patch
+palm/malsync||2007-04-10|Has expired: Does not build with new pilot-link
+russian/elm.language||2007-04-10|Has expired: Leaves behind files on deinstall
+russian/pine.language||2007-04-10|Has expired: Leaves behind config file on deinstall
+science/py-scipy03||2007-04-10|Has expired: Replaced by py-scipy
+security/php4-cryptopp||2007-04-10|Has expired: Does not compile
+sysutils/tct||2007-04-10|Has expired: this port is obsolete, please use sysutils/sleuthkit instead
+textproc/ocaml-yaxi||2007-04-10|Has expired: Does not build
+ukrainian/pine.language||2007-04-10|Has expired: Leaves behind config file on deinstall
+www/mod_zap||2007-04-10|Has expired: Incomplete pkg-plist
+www/sahana2||2007-04-10|Has expired: Conflicting dependencies: php4 vs php5
+www/urchin5||2007-04-10|Has expired: Does not install
+databases/cyrus-smlacapd||2007-04-10|Has expired: this software is obsolete
+databases/mysql-administrator||2007-04-11|Removed

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.70 2007/03/25 04:07:55 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.71 2007/04/12 12:33:34 lofi Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -162,7 +162,7 @@
 
 _QT_COMPONENTS_ALL=	accessible assistant codecs-cn codecs-jp codecs-kr \
 			codecs-tw corelib designer doc gui iconengines \
-			imageformats inputformats assistantclient \
+			imageformats inputmethods assistantclient \
 			linguist moc network opengl pixeltool porting \
 			qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
 			uic uic3 xml
@@ -179,7 +179,7 @@
 gui_DEPENDS=		x11-toolkits/qt4-gui
 iconengines_DEPENDS=	graphics/qt4-iconengines
 imageformats_DEPENDS=	graphics/qt4-imageformats
-inputformats_DEPENDS=	x11/qt4-inputformats
+inputmethods_DEPENDS=	x11/qt4-inputmethods
 assistantclient_DEPENDS=devel/qt4-libqtassistantclient
 assistantclient_NAME=	libQtAssistantClient
 linguist_DEPENDS=	devel/qt4-linguist

==== //depot/projects/soc2006/gabor_destdir/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.10 2007/01/05 02:56:47 alepulver Exp $
+# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.13 2007/04/11 03:22:34 alepulver Exp $
 #
 # bsd.lua.mk - Support for Lua based ports.
 #
@@ -164,28 +164,30 @@
 _LUA_PORT_lua_5.1=		lang/lua
 _LUA_DEPTYPE_lua_5.1=	build
 
-_LUA_PORT_filename_5.1= devel/lua-filename
-_LUA_PORT_gettext_5.1=  devel/lua-gettext
-_LUA_PORT_posix_5.1=    devel/lua-posix
+_LUA_PORT_filename_5.1=	devel/lua-filename
+_LUA_PORT_gettext_5.1=	devel/lua-gettext
+_LUA_PORT_posix_5.1=	devel/lua-posix
 _LUA_PORT_pty_5.1=		devel/lua-pty
 
 .	for comp in ${_LUA_COMPS_ALL}
 _LUA_COMP=				${comp}
 .		for ver in ${_LUA_VERS_ALL}
+# XXX The hardcoded values here have to match LUA_* variables (later), and
+# are here only to allow autodetection of installed versions.
 .			if ${_LUA_COMP} == "lua"
-_LUA_LIB_${comp}_${ver}=	lua-${LUA_VER}.${LUA_VER_SH}
-_LUA_SHVER_${comp}_${ver}=	${LUA_VER_SH}
-_LUA_FILE_${comp}_${ver}=	${LUA_LIBDIR}/liblua.a
+_LUA_LIB_${comp}_${ver}=	lua-${ver}.${_LUA_SHVER_${comp}_${ver}}
+_LUA_SHVER_${comp}_${ver}=	${ver:C/[[:digit:]]\.([[:digit:]])/\1/}
+_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/liblua.a
 .			elif ${_LUA_COMP} == "tolua"
-_LUA_FILE_${comp}_${ver}=	${LUA_LIBDIR}/libtolua.a
+_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua.a
 _LUA_DEPTYPE_${comp}_${ver}=build
 .			elif ${_LUA_COMP} == "ruby"
-_LUA_FILE_${comp}_${ver}=	${RUBY_SITEARCHLIBDIR}/lua-${LUA_VER}.so
+_LUA_FILE_${comp}_${ver}=	${RUBY_SITEARCHLIBDIR}/lua-${ver}.so
 _LUA_DEPTYPE_${comp}_${ver}=lib
-.			else
-.				if !defined(_LUA_FILE_${comp}_${ver})
-_LUA_FILE_${comp}_${ver}=	${LUA_MODSHAREDIR}/${comp}.lua
-.				endif
+.			elif !defined(_LUA_FILE_${comp}_${ver})
+_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/share/lua/${ver}/${comp}.lua
+.			endif
+.			if !defined(_LUA_DEPTYPE_${comp}_${ver})
 _LUA_DEPTYPE_${comp}_${ver}=run
 .			endif
 .		endfor
@@ -257,7 +259,7 @@
 
 # Used for autodetection of installed versions.
 
-.if defined(_WX_Need_Version)
+.if defined(_LUA_Need_Version)
 _LUA_VER_INSTALLED:=	${_HAVE_LUA:Mlua-*:S/lua-//}
 .endif
 
@@ -390,7 +392,7 @@
 # 4) _LUA_VER_FINAL		- Available versions.
 #
 
-.for list in _LUA_VER_FINAL ${_LUA_LISTS_ORDER}
+.for list in _LUA_VER_FINAL ${_LUA_VERS_LISTS}
 .	if defined(${list})
 .		for ver in ${${list}}
 .			if ${_LUA_VER_FINAL:M${ver}} != ""

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#6 (text+ko) ====

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.416 2007/04/03 21:58:35 stas Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.417 2007/04/11 07:42:33 sat Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -116,6 +116,11 @@
 	http://bsd3.cenkes.org/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_CHEESESHOP)
+MASTER_SITE_CHEESESHOP+=	\
+	http://cheeseshop.python.org/packages/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_COMP_SOURCES)
 MASTER_SITE_COMP_SOURCES+=	\
 	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \
@@ -1340,6 +1345,7 @@
 			APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			BERLIOS:${PORTNAME:L} \
 			CENKES:myports \
+			CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
 			CSME:myports \
 			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
 			GCC:releases/${DISTNAME} \

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.1 2007/03/14 04:06:11 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.xfce.mk,v 1.2 2007/04/11 16:26:45 oliver Exp $
 #
 
 .if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include)
@@ -15,27 +15,33 @@
 _USE_XFCE_ALL=			configenv libexo libgui libutil libmcs mcsmanager panel \
 				thunar wm xfdev
 
-MASTER_SITE_SUBDIR?=		xfce-4.4.0
+MASTER_SITE_SUBDIR?=		xfce-4.4.1
 
 configenv_CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
-libexo_LIB_DEPENDS=		exo-0.3:${PORTSDIR}/x11/libexo
+libexo_BUILD_DEPENDS=		libexo>=0.3.2:${PORTSDIR}/x11/libexo
+libexo_RUN_DEPENDS=		libexo>=0.3.2:${PORTSDIR}/x11/libexo
 
-libgui_LIB_DEPENDS=		xfcegui4.6:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_BUILD_DEPENDS=		libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_RUN_DEPENDS=		libxfce4gui>=4.4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
-libutil_LIB_DEPENDS=		xfce4util.4:${PORTSDIR}/x11/libxfce4util
+libutil_BUILD_DEPENDS=		libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util
+libutil_RUN_DEPENDS=		libxfce4util>=4.4.1:${PORTSDIR}/x11/libxfce4util
 
-libmcs_LIB_DEPENDS=		xfce4mcs-manager.3:${PORTSDIR}/x11/libxfce4mcs
+libmcs_BUILD_DEPENDS=		libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs
+libmcs_RUN_DEPENDS=		libxfce4mcs>=4.4.1:${PORTSDIR}/x11/libxfce4mcs
 
-mcsmanager_BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-mcsmanager_RUN_DEPENDS=		xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_BUILD_DEPENDS=	xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_RUN_DEPENDS=		xfce4-mcs-manager>=4.4.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
-panel_LIB_DEPENDS=		xfce4panel.2:${PORTSDIR}/x11-wm/xfce4-panel
+panel_BUILD_DEPENDS=		xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS=		xfce4-panel>=4.4.1:${PORTSDIR}/x11-wm/xfce4-panel
 
-thunar_LIB_DEPENDS=		thunar-vfs-1.4:${PORTSDIR}/x11-fm/thunar
+thunar_BUILD_DEPENDS=		Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS=		Thunar>=0.8.0:${PORTSDIR}/x11-fm/thunar
 
-wm_BUILD_DEPENDS=		xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS=			xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+wm_BUILD_DEPENDS=		xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm
+wm_RUN_DEPENDS=			xfce4-wm>=4.4.1:${PORTSDIR}/x11-wm/xfce4-wm
 
 xfdev_RUN_DEPENDS=		xfce4-dev-tools:${PORTSDIR}/devel/xfce4-dev-tools
 

==== //depot/projects/soc2006/gabor_destdir/UIDs#5 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: ports/UIDs,v 1.37 2007/03/31 12:53:57 laszlof Exp $
+$FreeBSD: ports/UIDs,v 1.41 2007/04/11 13:27:34 miwi 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
@@ -61,6 +61,7 @@
 ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/sbin/nologin
 mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh
 pdns_recursor:*:120:120:pdns_recursor pseudo-user:/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
 navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/sbin/nologin
@@ -73,6 +74,7 @@
 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
+flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/sbin/nologin
 nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/sbin/nologin
 moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin
 cups:*:193:193:Cups Owner:/nonexistent:/sbin/nologin
@@ -115,3 +117,4 @@
 openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
 netdisco:*:840:840:netdisco daemon:/nonexistent:/usr/sbin/nologin
 bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin
+otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh
==== //depot/projects/soc2006/gabor_destdir/UPDATING#6 (text+ko) ====

@@ -6,6 +6,15 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070408:
+  AFFECTS: users of japanese/ptex{,-base,-tetex}
+  AUTHOR: hrs at FreeBSD.org
+
+  The japanese/ptex has been removed and japanese/ptex-tetex has been
+  renamed with japanese/ptex.  A pair of ptex and ptex-base and
+  ptex-tetex are basically the same with each other, so there should
+  be no functionality regression.
+
 20070407:
   AFFECTS: users of net-mgmt/nagios
   AUTHOR: jarrod at netleader.com.au
@@ -17,8 +26,8 @@
   Stopping nagios.
   # find / -user nagios -exec chown 181 {} \;
   # find / -group nagios -exec chgrp 181 {} \;
-  # pw usermod nagios -u 181
   # pw groupmod nagios -g 181
+  # pw usermod nagios -u 181 -g 181
   # /usr/local/etc/rc.d/nagios start
   Performing sanity check of nagios configuration: OK
   Starting nagios.
@@ -98,7 +107,7 @@
   1. Remove the current linux base port.
   2. Add to your /etc/make.conf "OVERRIDE_LINUX_BASE_PORT=fc6".
   3. Make sure no linux application is running.
-  4. Set apropriate sysctl (compat.linux.osrelease=2.6.16).
+  4. Set appropriate sysctl (compat.linux.osrelease=2.6.16).
   5. Install emulation/linux_base-fc6.
   5a. Those who use linux ports with automatic plist building should
       apply the following patch:
@@ -5079,4 +5088,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.496 2007/04/07 14:29:12 rafan Exp $
+$FreeBSD: ports/UPDATING,v 1.499 2007/04/13 11:31:19 blackend Exp $

More information about the p4-projects mailing list