PERFORCE change 167349 for review

Alejandro Pulver alepulver at FreeBSD.org
Sat Aug 15 01:22:18 UTC 2009


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

Change 167349 by alepulver at alepulver_deimos on 2009/08/15 01:21:34

	- Integrate latest CVS changes.

Affected files ...

.. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.autotools.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.commands.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#5 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.octave.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#9 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#4 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#7 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.scons.mk#3 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sdl.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#6 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#6 integrate

Differences ...

==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: ports/GIDs,v 1.74 2009/06/19 17:16:01 mezz Exp $
+# $FreeBSD: ports/GIDs,v 1.77 2009/08/05 01:38:44 vanilla Exp $
 # Please keep this file sorted by GID!
 smmsp:*:25:
 bind:*:53:
@@ -84,6 +84,7 @@
 postgrey:*:225:
 aprsd:*:240:
 tnc:*:241:
+prosody:*:242:
 fcron:*:247:
 _tor:*:256:
 _dns-proxy-tor:*:257:
@@ -113,6 +114,7 @@
 nullmail:*:522:
 dkimproxy:*:525:
 pgbouncer:*:534:
+redis:*:535:
 ejabberd:*:543:
 qtss:*:554:
 ircdru:*:555:

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.autotools.mk#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.30 2007/07/28 06:33:42 ade Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.31 2009/08/02 19:32:04 mezz Exp $
 #
 # Please view me with 4 column tabs!
 #
@@ -175,10 +175,10 @@
 #---------------------------------------------------------------------------
 
 # Convenience function to save people having to depend directly on
-# devel/libltdl15
+# devel/libltdl22
 #
 .if defined(AUTOTOOL_libltdl)
-LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl15
+LIB_DEPENDS+=	ltdl.7:${PORTSDIR}/devel/libltdl22
 .endif
 
 .if defined(AUTOTOOL_libtool)
@@ -202,7 +202,7 @@
 LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
 LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
 LIBTOOL_M4=			${LOCALBASE}/share/aclocal/libtool.m4
-LTMAIN=				${LIBTOOL_SHAREDIR}/ltmain.sh
+LTMAIN=				${LIBTOOL_SHAREDIR}/config/ltmain.sh
 LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4}
 
 LIBTOOL_DEPENDS=	${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.commands.mk#2 (text+ko) ====

@@ -5,7 +5,7 @@
 #
 # Created by: Gabor Kovesdan <gabor at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.3 2008/04/14 16:46:41 pav Exp $
+# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.4 2009/08/03 15:36:58 miwi Exp $
 #
 # DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET
 # A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL
@@ -41,6 +41,7 @@
 FALSE?=		false				# Shell builtin
 FILE?=		/usr/bin/file
 FIND?=		/usr/bin/find
+FLEX?=		/usr/bin/flex
 FMT?=		/usr/bin/fmt
 GMAKE?=		gmake
 GREP?=		/usr/bin/grep
@@ -113,4 +114,18 @@
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=	${ECHO_CMD}
 
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_CMD?=	${LOCALBASE}/sbin/pkg_create
+PKG_ADD?=	${LOCALBASE}/sbin/pkg_add
+PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
+PKG_INFO?=	${LOCALBASE}/sbin/pkg_info
+PKG_VERSION?=	${LOCALBASE}/sbin/pkg_version
+.else
+PKG_CMD?=	/usr/sbin/pkg_create
+PKG_ADD?=	/usr/sbin/pkg_add
+PKG_DELETE?=	/usr/sbin/pkg_delete
+PKG_INFO?=	/usr/sbin/pkg_info
+PKG_VERSION?=	/usr/sbin/pkg_version
+.endif
+
 .endif

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#5 (text+ko) ====

@@ -1,7 +1,7 @@
 # -*- mode: Makefile; tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.database.mk,v 1.36 2009/07/08 06:54:19 girgen Exp $
+# $FreeBSD: ports/Mk/bsd.database.mk,v 1.37 2009/07/21 08:02:18 ale Exp $
 #
 
 .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)
@@ -111,6 +111,7 @@
 MYSQL41_LIBVER=		14
 MYSQL50_LIBVER=		15
 MYSQL51_LIBVER=		16
+MYSQL54_LIBVER=		16
 MYSQL60_LIBVER=		16
 
 # Setting/finding MySQL version we want.

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.9 2009/05/24 06:12:44 acm Exp $
+# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.10 2009/07/13 19:29:53 acm Exp $
 #
 # bsd.fpc.mk - Support for FreePascal based ports.
 #
@@ -47,6 +47,7 @@
 
 fpc-check-install:
 check-makevars::
+.if defined(UNITPREFIX) && defined(PKGNAMESUFFIX)
 	@${ECHO_CMD} "#################################################################"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} " The following freepascal unit will be installed in your system: "
@@ -54,6 +55,7 @@
 	@${ECHO_CMD} " * ${UNITPREFIX}${PKGNAMESUFFIX:S/-//}			       "
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "#################################################################"
+.endif
 
 _FPC_ALL_UNITS=	aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \
 		fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#6 (text+ko) ====

@@ -13,15 +13,15 @@
 # USE_FORTRAN knob.
 #
 # For example:
-#   USE_GCC=	4.2+	# port requires GCC 4.2 or later to build with.
-#   USE_GCC=	4.3		# port requires GCC 4.3 to build with.
+#   USE_GCC=	4.2+		# port requires GCC 4.2 or later.
+#   USE_GCC=	4.3			# port requires GCC 4.3.
 #
 # If your port needs a Fortran compiler, please specify that with the
 # USE_FORTRAN= knob.  Here is the list of options for that knob:
 #
-#   USE_FORTRAN=	yes	# use gfortran43 (/lang/gcc43)
-#   USE_FORTRAN=	g77	# use g77-34 (lang/gcc34; FreeBSD>=7)
-#						# or system f77 (/usr/bin/f77; FreeBSD<=6)
+#   USE_FORTRAN=	yes		# use gfortran43 (lang/gcc43)
+#   USE_FORTRAN=	g77		# use g77-34 (lang/gcc34; FreeBSD>=7)
+#							# or system f77 (/usr/bin/f77; FreeBSD<=6)
 #   USE_FORTRAN=	ifort	# use the Intel compiler (lang/ifc)
 #
 # Due to object file incompatiblity between Fortran compilers, we strongly
@@ -30,7 +30,7 @@
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.30 2009/06/19 17:48:47 gerald Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.31 2009/07/12 22:35:13 gerald Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald at FreeBSD.org

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#4 (text+ko) ====

@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.12 2009/05/04 19:23:41 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.14 2009/07/18 11:10:10 dinoex Exp $
 #   $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
@@ -320,7 +320,7 @@
 
 dbm_EXTRACT_AFTER_ARGS=		--exclude mozilla/dbm
 
-jpeg_LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+jpeg_LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 jpeg_EXTRACT_AFTER_ARGS=	--exclude mozilla/jpeg
 
@@ -532,10 +532,6 @@
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
 		s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
 
 # handles mozilla pis scripts.
 gecko-moz-pis-patch:

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.85 2009/06/03 11:01:50 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.kde4.mk,v 1.87 2009/08/10 11:47:29 makc Exp $
 #
 
 .if !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
@@ -34,9 +34,12 @@
 # kdelibs	- The base set of KDE4 libraries
 # kdeprefix	- If set, port will be installed into ${KDE4_PREFIX} instead of ${LOCALBASE}
 # pimlibs	- KDE4 PIM libraries
+# pimruntime	- KDE4 PIM runtime services
 # runtime	- More KDE applications
 # sharedmime	- share-mime-info wrapper for KDE4 ports
 # workspace	- More KDE applications (Plasma, kwin, etc.)
+# kdeexp	- experimental libraries (with non-stable ABI/API)
+# oxygen	- icon themes
 #
 # These read-only variables can be used in port Makefile:
 #
@@ -49,7 +52,7 @@
 #		but this could be changed in a future.
 #
 
-KDE4_VERSION=		4.2.4
+KDE4_VERSION=		4.3.0
 KDE4_BRANCH?=		stable
 
 #
@@ -72,7 +75,7 @@
 # KDE4 modules
 #
 _USE_KDE4_ALL=	akonadi automoc4 kdebase kdehier kdelibs kdeprefix \
-				pimlibs runtime sharedmime workspace
+		pimlibs pimruntime runtime sharedmime workspace kdeexp oxygen
 
 akonadi_LIB_DEPENDS=		akonadiprotocolinternals.1:${PORTSDIR}/databases/akonadi
 
@@ -88,6 +91,8 @@
 
 pimlibs_LIB_DEPENDS=		kpimutils.5:${PORTSDIR}/deskutils/kdepimlibs4
 
+pimruntime_LIB_DEPENDS=		kdepim-copy.5:${PORTSDIR}/deskutils/kdepim4-runtime
+
 runtime_BUILD_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kdebase4-runtime
 runtime_RUN_DEPENDS=		${KDE4_PREFIX}/bin/kdebugdialog:${PORTSDIR}/x11/kdebase4-runtime
 
@@ -96,6 +101,10 @@
 
 workspace_LIB_DEPENDS=		kscreensaver.5:${PORTSDIR}/x11/kdebase4-workspace
 
+kdeexp_LIB_DEPENDS=		knotificationitem-1.1:${PORTSDIR}/x11/kdelibs4-experimental
+
+oxygen_RUN_DEPENDS=		${KDE4_PREFIX}/share/icons/oxygen/index.theme:${PORTSDIR}/x11-themes/kde4-icons-oxygen
+
 #
 # Common build related stuff for kde4 ports. It's not intended for usage
 # in KDE4-dependent ports
@@ -122,14 +131,15 @@
 USE_LDCONFIG=	yes
 
 USE_CMAKE=	yes
-# TODO: bsd.cmake.mk should be fixed first
-# CMAKE_SOURCE_PATH=	${WRKSRC}
-# CONFIGURE_WRKSRC?=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
-# BUILD_WRKSRC?=	${CONFIGURE_WRKSRC}
-# INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
+CMAKE_SOURCE_PATH=	${WRKSRC}
+CONFIGURE_WRKSRC?=	${BUILD_WRKSRC}
+BUILD_WRKSRC?=		${WRKSRC}/build
+INSTALL_WRKSRC?=	${BUILD_WRKSRC}
+
+post-extract:	kde-create-builddir
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
-CMAKE_SOURCE_PATH=	..
+kde-create-builddir:
+	${MKDIR} ${BUILD_WRKSRC}
 
 .endif # KDE4_BUILDENV
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#3 (text+ko) ====

@@ -1,21 +1,19 @@
 # -*- mode: Makefile; tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.ldap.mk,v 1.4 2009/02/17 02:54:37 delphij Exp $
+# $FreeBSD: ports/Mk/bsd.ldap.mk,v 1.6 2009/07/20 08:13:11 delphij Exp $
 #
 
 .if defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include)
 
-Ldap_Post_Include=				bsd.ldap.mk
-Database_Include_MAINTAINER=	ports at FreeBSD.org
+Ldap_Post_Include=			bsd.ldap.mk
+Database_Include_MAINTAINER=		ports at FreeBSD.org
 
-# This file contains some routines to interact with different databases, such
-# as mysql, postgresql and berkley DB. For including this file define macro
-# USE_[LDAP], for example USE_OPENLDAP. Defining macro like USE_[LDAP]_VER or
-# WANT_[LDAP]_VER will include this file too.
+# For including this file define macro USE_OPENLDAP. Defining macro like
+# USE_OPENLDAP_VER or WANT_OPENLDAP_VER will include this file too.
 #
 ##
-# USE_OPENLDAP	- Add OpenLDAP client dependency.
+# USE_OPENLDAP			- Add OpenLDAP client dependency.
 #				  If no version is given (by the maintainer via the port or
 #				  by the user via defined variable), try to find the
 #				  currently installed version.  Fall back to default if
@@ -37,7 +35,7 @@
 DEFAULT_OPENLDAP_VER?=	24
 # OpenLDAP client versions currently supported
 OPENLDAP23_LIBVER=	2.3.2
-OPENLDAP24_LIBVER=	2.4.6
+OPENLDAP24_LIBVER=	2.4.7
 
 .if exists(${LOCALBASE}/bin/ldapwhoami)
 _OPENLDAP_VER!=	${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/'

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.24 2009/07/03 20:58:54 nox Exp $
+# $FreeBSD: ports/Mk/bsd.linux-apps.mk,v 1.29 2009/08/03 21:53:13 bsam Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -70,7 +70,7 @@
 _LINUX_APPS_ALL+=
 
 # 2.6.16 components
-_LINUX_26_APPS=		cyrus-sasl2 libidn libssh2 nspr nss openldap \
+_LINUX_26_APPS=		cyrus-sasl2 dbusglib dbuslibs libidn libssh2 nspr nss openldap \
 			sqlite3 tcl84 tk84
 
 _LINUX_APPS_ALL+=	${_LINUX_26_APPS}
@@ -146,6 +146,19 @@
 cyrus-sasl2_DETECT=	${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 cyrus-sasl2_PORT=	${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
 
+# no dbusglib_FILE
+# no dbusglib_f8_FILE
+dbusglib_f10_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
+dbusglib_DETECT=	${dbusglib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+dbusglib_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-glib
+dbusglib_DEPENDS=	dbuslibs expat
+
+# no dbuslibs_FILE
+# no dbuslibs_f8_FILE
+dbuslibs_f10_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
+dbuslibs_DETECT=	${dbuslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+dbuslibs_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-libs
+
 dri_FILE=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1
 dri_f8_FILE=		${LINUXBASE}/usr/lib/libGL.so.1
 dri_f10_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2
@@ -426,11 +439,15 @@
 sqlite3_PORT=		${PORTSDIR}/databases/linux${LINUX_DIST_SUFFIX}-sqlite3
 
 # no tcl84_FILE
-tcl84_f8_FILE=		${LINUXBASE}/usr/lib/tcl8.4
+tcl84_f8_FILE=		${LINUXBASE}/usr/lib/libtcl8.4.so
 # XXX: tcl85!!!
 tcl84_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
 tcl84_DETECT=		${tcl84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+.  if ${LINUX_DIST_SUFFIX} == "-f8"
 tcl84_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl84
+.  else
+tcl84_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
+.  endif
 
 tiff_FILE=			${LINUXBASE}/usr/lib/libtiff.so.3.7.1
 tiff_f8_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.8.2
@@ -444,7 +461,11 @@
 # XXX: tk85!!!
 tk84_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
 tk84_DETECT=		${tk84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+.  if ${LINUX_DIST_SUFFIX} == "-f8"
 tk84_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk84
+.  else
+tk84_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
+.  endif
 tk84_DEPENDS=		xorglibs
 
 xorglibs_FILE=		${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2.0
@@ -497,7 +518,7 @@
 .      if defined(${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE)
 IGNORE=	bsd.linux-apps.mk test failed: The component ${component} is empty for LINUX_DIST_SUFFIX=${LINUX_DIST_SUFFIX} (the corresponding variable ${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE is empty)
 .      else
-IGNORE=	bsd.linux-apps.mk test failed: The component ${component} is not defined for LINUX_DIST_SUFFIX=${LINUX_DIST_SUFFIX} (the corresponding variable ${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE is not defined)
+IGNORE=	bsd.linux-apps.mk test failed: The component ${component} is not defined for LINUX_DIST_SUFFIX=${LINUX_DIST_SUFFIX} (the corresponding variable ${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)
 .      endif
 .    endif
 .  endfor

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.octave.mk#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.octave.mk,v 1.3 2009/04/05 20:50:36 dhn Exp $
+# $FreeBSD: ports/Mk/bsd.octave.mk,v 1.4 2009/08/14 11:06:55 miwi Exp $
 #
 # bsd.octave.mk - Octave related macro
 # Common code to install octave-forge packages.
@@ -29,6 +29,8 @@
 
 MAKE_ENV+=	PACKAGE=${WRKDIR}/${DISTNAME}.tar.gz
 
+BROKEN=		does not compile
+
 do-install:
 	${MKDIR} ${TARBALLS_DIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}.tar.gz ${TARBALLS_DIR}/.

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#4 (text+ko) ====

@@ -2,7 +2,7 @@
 # Date created:		31 May 2002
 # Whom:			dinoex
 #
-# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.43 2009/05/07 08:19:02 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.44 2009/07/21 17:51:43 dinoex Exp $
 #
 # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
 #
@@ -114,11 +114,19 @@
 .else
 # PKG_DBDIR was not found, default
 OPENSSL_PORT?=		security/openssl
+.if ( ${OSVERSION} >= 800105 )
+OPENSSL_SHLIBVER?=	6
+.else
 OPENSSL_SHLIBVER?=	5
 .endif
 .endif
+.endif
 OPENSSL_PORT?=		security/openssl
+.if ( ${OSVERSION} >= 800105 )
+OPENSSL_SHLIBVER?=	6
+.else
 OPENSSL_SHLIBVER?=	5
+.endif
 
 OPENSSLDIR=		${OPENSSLBASE}/openssl
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#9 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.624 2009/06/26 17:03:48 bsam Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.625 2009/08/03 15:36:58 miwi Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -2377,20 +2377,6 @@
 PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
 
 
-.if exists(${LOCALBASE}/sbin/pkg_info)
-PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
-PKG_ADD?=		${LOCALBASE}/sbin/pkg_add
-PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
-PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
-PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
-.else
-PKG_CMD?=		/usr/sbin/pkg_create
-PKG_ADD?=		/usr/sbin/pkg_add
-PKG_DELETE?=	/usr/sbin/pkg_delete
-PKG_INFO?=		/usr/sbin/pkg_info
-PKG_VERSION?=		/usr/sbin/pkg_version
-.endif
-
 .if !defined(PKG_ARGS)
 PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u -t : -k 2`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
 .if !defined(NO_MTREE)

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#4 (text+ko) ====

@@ -21,11 +21,12 @@
 .if defined(QT_DIST)
 #CONFLICTS+=	Currently there are no conflicts \o/
 
-CONFIGURE_ARGS+=-fast ${CUPS} -platform ${QMAKESPEC} \
+CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \
 		-L${PREFIX}/${QT_LIBDIR_REL} \
 		-qt-gif -system-libjpeg -system-libpng \
 		-system-libmng -system-libtiff -system-zlib \
-		-confirm-license \
+		-opensource -confirm-license \
+		-no-pch \
 		-prefix ${PREFIX} \
 		-bindir ${PREFIX}/bin \
 		-libdir ${PREFIX}/${QT_LIBDIR_REL} \
@@ -42,9 +43,9 @@
 CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2
 .endif #defined(PACKAGE_BUILDING)
 
-.if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns"
-CONFIGURE_ARGS+=-no-exceptions
-.endif
+# .if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns"
+# CONFIGURE_ARGS+=-no-exceptions
+# .endif
 
 .if defined(WANT_QT_DEBUG)
 CONFIGURE_ARGS+=-debug
@@ -94,14 +95,14 @@
 # QT4 version
 # Don't forget to update ${PORTSDIR}/devel/qt4/files/configure !
 #
-QT4_VERSION?=		4.4.3
+QT4_VERSION?=		4.5.2
 
 _QT_COMPONENTS_ALL=	accessible assistant assistant-adp assistantclient \
 			clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
 			dbus designer doc help help-tools gui iconengines imageformats \
 			inputmethods linguist l10n makeqpf moc network opengl \
 			pixeltool porting  phonon phonon-gst qdbusviewer \
-			qmake qt3support qtconfig qtestlib qvfb rcc script \
+			qmake qt3support qtconfig qtestlib qvfb rcc script scripttools \
 			sql svg uic uic3 webkit xml xmlpatterns xmlpatterns-tool
 
 accessible_DEPENDS=	accessibility/qt4-accessible
@@ -142,6 +143,7 @@
 qvfb_DEPENDS=		devel/qt4-qvfb
 rcc_DEPENDS=		devel/qt4-rcc
 script_DEPENDS=		devel/qt4-script
+scripttools_DEPENDS=	devel/qt4-scripttools
 sql_DEPENDS=		databases/qt4-sql
 svg_DEPENDS=		graphics/qt4-svg
 uic_DEPENDS=		devel/qt4-uic
@@ -151,104 +153,12 @@
 xmlpatterns_DEPENDS=	textproc/qt4-xmlpatterns
 xmlpatterns-tool_DEPENDS=	textproc/qt4-xmlpatterns-tool
 
-accessible_build_DEPENDS=	${accessible_DEPENDS}
-assistant_build_DEPENDS=	${assistant_DEPENDS}
-assistant-adp_build_DEPENDS=	${assistant-adp_DEPENDS}
-assistantclient_build_DEPENDS=	${assistantclient_DEPENDS}
-assistantclient_build_NAME=	${assistantclient_NAME}
-clucene_build_DEPENDS=		${clucene_DEPENDS}
-codecs-cn_build_DEPENDS=	${codecs-cn_DEPENDS}
-codecs-jp_build_DEPENDS=	${codecs-jp_DEPENDS}
-codecs-kr_build_DEPENDS=	${codecs-kr_DEPENDS}
-codecs-tw_build_DEPENDS=	${codecs-tw_DEPENDS}
-corelib_build_DEPENDS=		${corelib_DEPENDS}
-dbus_build_DEPENDS=		${dbus_DEPENDS}
-designer_build_DEPENDS=		${designer_DEPENDS}
-doc_build_DEPENDS=		${doc_DEPENDS}
-gui_build_DEPENDS=		${gui_DEPENDS}
-help_build_DEPENDS=		${help_DEPENDS}
-help-tools_build_DEPENDS=	${help-tools_DEPENDS}
-iconengines_build_DEPENDS=	${iconengines_DEPENDS}
-imageformats_build_DEPENDS=	${imageformats_DEPENDS}
-inputmethods_build_DEPENDS=	${inputmethods_DEPENDS}
-linguist_build_DEPENDS=		${linguist_DEPENDS}
-l10n_build_DEPENDS=		${l10n_DEPENDS}
-makeqpf_build_DEPENDS=		${makeqpf_DEPENDS}
-moc_build_DEPENDS=		${moc_DEPENDS}
-network_build_DEPENDS=		${network_DEPENDS}
-opengl_build_DEPENDS=		${opengl_DEPENDS}
-pixeltool_build_DEPENDS=	${pixeltool_DEPENDS}
-phonon_build_DEPENDS=		${phonon_DEPENDS}
-phonon-gst_build_DEPENDS=	${phonon-gst_DEPENDS}
-porting_build_DEPENDS=		${porting_DEPENDS}
-qdbusviewer_build_DEPENDS=	${qdbusviewer_DEPENDS}
-qmake_build_DEPENDS=		${qmake_DEPENDS}
-qt3support_build_DEPENDS=	${qt3support_DEPENDS}
-qtconfig_build_DEPENDS=		${qtconfig_DEPENDS}
-qtestlib_build_DEPENDS=		${qtestlib_DEPENDS}
-qvfb_build_DEPENDS=		${qvfb_DEPENDS}
-rcc_build_DEPENDS=		${rcc_DEPENDS}
-script_build_DEPENDS=		${script_DEPENDS}
-sql_build_DEPENDS=		${sql_DEPENDS}
-svg_build_DEPENDS=		${svg_DEPENDS}
-uic_build_DEPENDS=		${uic_DEPENDS}
-uic3_build_DEPENDS=		${uic3_DEPENDS}
-webkit_build_DEPENDS=		${webkit_DEPENDS}
-xml_build_DEPENDS=		${xml_DEPENDS}
-xmlpatterns_build_DEPENDS=	${xmlpatterns_DEPENDS}
-xmlpatterns-tool_build_DEPENDS=	${xmlpatterns-tool_DEPENDS}
-
-accessible_run_DEPENDS=		${accessible_DEPENDS}
-assistant_run_DEPENDS=		${assistant_DEPENDS}
-assistant-adp_run_DEPENDS=	${assistant-adp_DEPENDS}
-assistantclient_run_DEPENDS=	${assistantclient_DEPENDS}
-assistantclient_run_NAME=	${assistantclient_NAME}
-clucene_run_DEPENDS=		${clucene_DEPENDS}
-codecs-cn_run_DEPENDS=		${codecs-cn_DEPENDS}
-codecs-jp_run_DEPENDS=		${codecs-jp_DEPENDS}
-codecs-kr_run_DEPENDS=		${codecs-kr_DEPENDS}
-codecs-tw_run_DEPENDS=		${codecs-tw_DEPENDS}
-corelib_run_DEPENDS=		${corelib_DEPENDS}
-dbus_run_DEPENDS=		${dbus_DEPENDS}
-designer_run_DEPENDS=		${designer_DEPENDS}
-doc_run_DEPENDS=		${doc_DEPENDS}
-gui_run_DEPENDS=		${gui_DEPENDS}
-help_run_DEPENDS=		${help_DEPENDS}
-help-tools_run_DEPENDS=		${help-tools_DEPENDS}
-iconengines_run_DEPENDS=	${iconengines_DEPENDS}
-imageformats_run_DEPENDS=	${imageformats_DEPENDS}
-inputmethods_run_DEPENDS=	${inputmethods_DEPENDS}
-linguist_run_DEPENDS=		${linguist_DEPENDS}
-l10n_run_DEPENDS=		${l10n_DEPENDS}
-makeqpf_run_DEPENDS=		${makeqpf_DEPENDS}
-moc_run_DEPENDS=		${moc_DEPENDS}
-network_run_DEPENDS=		${network_DEPENDS}
-opengl_run_DEPENDS=		${opengl_DEPENDS}
-pixeltool_run_DEPENDS=		${pixeltool_DEPENDS}
-phonon_run_DEPENDS=		${phonon_DEPENDS}
-phonon-gst_run_DEPENDS=		${phonon-gst_DEPENDS}
-porting_run_DEPENDS=		${porting_DEPENDS}
-qdbusviewer_run_DEPENDS=	${qdbusviewer_DEPENDS}
-qmake_run_DEPENDS=		${qmake_DEPENDS}
-qt3support_run_DEPENDS=		${qt3support_DEPENDS}
-qtconfig_run_DEPENDS=		${qtconfig_DEPENDS}
-qtestlib_run_DEPENDS=		${qtestlib_DEPENDS}
-qvfb_run_DEPENDS=		${qvfb_DEPENDS}
-rcc_run_DEPENDS=		${rcc_DEPENDS}
-script_run_DEPENDS=		${script_DEPENDS}
-sql_run_DEPENDS=		${sql_DEPENDS}
-svg_run_DEPENDS=		${svg_DEPENDS}
-uic_run_DEPENDS=		${uic_DEPENDS}
-uic3_run_DEPENDS=		${uic3_DEPENDS}
-webkit_run_DEPENDS=		${webkit_DEPENDS}
-xml_run_DEPENDS=		${xml_DEPENDS}
-xmlpatterns_run_DEPENDS=	${xmlpatterns_DEPENDS}
-xmlpatterns-tool_run_DEPENDS=	${xmlpatterns-tool_DEPENDS}
-
 .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
 Qt_Post_Include= bsd.qt.mk
 
 .for component in ${_QT_COMPONENTS_ALL}
+${component}_build_DEPENDS=	${${component}_DEPENDS}
+${component}_run_DEPENDS=	${${component}_DEPENDS}
 _QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run
 .endfor
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#7 (text+ko) ====

@@ -3,7 +3,7 @@
 #
 # Created by: Akinori MUSHA <knu at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.185 2009/06/19 12:42:44 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.186 2009/07/19 16:43:37 stas Exp $
 #
 
 .if !defined(Ruby_Include)
@@ -170,7 +170,7 @@
 # Ruby 1.8
 #
 RUBY_RELVERSION=	1.8.7
-RUBY_PORTREVISION=	3
+RUBY_PORTREVISION=	4
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	160
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.scons.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.11 2009/05/15 12:01:39 pav Exp $
+# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.13 2009/08/14 11:34:57 miwi Exp $
 #
 # bsd.scons.mk - Python-based SCons build system interface.
 # Author: Alexander Botero-Lowry <alexbl at FreeBSD.org>
@@ -9,7 +9,7 @@
 # Please view me with 4 column tabs!
 
 # Please make sure all changes to this file are passed through the maintainer.
-SCONS_MAINTAINER=	alexbl at FreeBSD.org
+SCONS_MAINTAINER=	python at FreeBSD.org
 
 #
 # SCONS_BIN is the location where the scons port installs the scons
@@ -45,11 +45,11 @@
 # same for any scons port to scons. Things like CCFLAGS, and LINKFLAGS
 # go here.
 #
-# SCONS_ARG is where you pass port specific scons flags to the scons
-# enviornment.
+# SCONS_ARGS is where you pass port specific scons flags to the scons
+# environment.
 #
 # SCONS_BUILDENV is where you pass variables you want to be in the
-# System Enviornment instead of the SCons Enviornment.
+# System Environment instead of the SCons Environment.
 #
 # SCONS_TARGET is the same as MAKE_TARGET it is passed as the last
 # argument to scons.

==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sdl.mk#2 (text+ko) ====

@@ -29,7 +29,7 @@
 #
 
 #
-# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.14 2008/04/28 23:20:54 edwin Exp $
+# $FreeBSD: ports/Mk/bsd.sdl.mk,v 1.15 2009/08/02 08:35:30 mva Exp $
 #
 
 SDL_Include_MAINTAINER=		edwin at FreeBSD.org
@@ -53,7 +53,7 @@
 _LIB_console=		SDL_console-2.1
 _REQUIRES_console=	sdl
 
-_VERSION_gfx=	0
+_VERSION_gfx=	18
 _SUBDIR_gfx=	graphics
 _REQUIRES_gfx=	sdl
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/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.476 2009/06/10 16:08:34 amdmi3 Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.479 2009/08/12 19:46:41 erwin Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -921,10 +921,17 @@
 .if !defined(IGNORE_MASTER_SITE_PACKETSTORM)
 MASTER_SITE_PACKETSTORM+= \
 	http://packetstormsecurity.nl/%SUBDIR%/ \
-	http://packetstorm.troop218.org/%SUBDIR%/ \
 	http://packetstorm.linuxsecurity.com/%SUBDIR%/ \
-	http://packetstorm.digital-network.net/%SUBDIR%/ \
-	http://packetstorm.icx.fr/%SUBDIR%/
+	http://packetstorm.setnine.com/%SUBDIR%/ \
+	http://packetstorm.austin2600.net/%SUBDIR%/ \
+	http://packetstorm.foofus.com/%SUBDIR%/ \
+	http://packetstorm.codar.com.br/%SUBDIR%/ \
+	http://packetstorm.rlz.cl/%SUBDIR%/ \
+	http://packetstorm.wowhacker.com/%SUBDIR%/ \
+	http://packetstorm.offensive-security.com/%SUBDIR%/ \
+	http://packetstorm.igor.onlinedirect.bg/%SUBDIR%/ \
+	http://packetstorm.unixteacher.org/%SUBDIR%/ \
+	http://packetstorm.orion-hosting.co.uk/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PERL_CPAN)
@@ -1165,12 +1172,19 @@
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE)
-.for mirror in superb-east nchc kent easynews ufpr mesh heanet # garr
+.for mirror in garr superb-east nchc kent easynews ufpr mesh heanet
 MASTER_SITE_SOURCEFORGE+= \
 	http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/
 .endfor
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_PROJECT)
+.for mirror in garr superb-east nchc kent easynews ufpr mesh heanet
+MASTER_SITE_SOURCEFORGE_PROJECT+= \
+	http://${mirror}.dl.sourceforge.net/project/%SUBDIR%/
+.endfor
+.endif
+
 # official sf.net mirrors that don't mirror all projects, check
 # http://prdownloads.sourceforge.net/%SUBDIR%/
 .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_EXTENDED)
@@ -1486,7 +1500,7 @@
 
 # Macro magic
 
-MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED \
+MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN SF:SOURCEFORGE SFP:SOURCEFORGE_PROJECT SFE:SOURCEFORGE_EXTENDED \
 			SFJP:SOURCEFORGE_JP RF:RUBYFORGE
 MASTER_SITES_SUBDIRS=	\
 			APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
@@ -1507,6 +1521,7 @@
 			RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
 			SAVANNAH:${PORTNAME:L} \
 			SOURCEFORGE:${PORTNAME:L} \
+			SOURCEFORGE_PROJECT:${PORTNAME:L} \
 			SOURCEFORGE_EXTENDED:${PORTNAME:L} \
 			RUBYFORGE:${PORTNAME:L}
 

==== //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: ports/UIDs,v 1.85 2009/06/19 17:16:01 mezz Exp $
+# $FreeBSD: ports/UIDs,v 1.89 2009/08/05 01:38:44 vanilla Exp $
 # Please keep this file sorted by UID!
 smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
@@ -33,7 +33,7 @@
 vpopmail:*:89:89::0:0:VPop Mail User:/usr/local/vpopmail:/nonexistent
 firebird:*:90:90::0:0:Firebird Database Administrator:/var/db/firebird:/bin/sh
 mailman:*:91:91::0:0:Mailman User:/usr/local/mailman:/usr/sbin/nologin
-gdm:*:92:92::0:0:GNOME Display Manager:/usr/local/etc/gdm/home:/sbin/nologin
+gdm:*:92:92::0:0:GNOME Display Manager:/usr/local/etc/gdm/home:/usr/sbin/nologin
 jabber:*:93:93::0:0:Jabber Daemon:/nonexistent:/nonexistent
 p4admin:*:94:94::0:0:Perforce admin:/usr/local/perforce:/usr/sbin/nologin
 interch:*:95:95::0:0:Interchange user:/usr/local/interchange:/usr/sbin/nologin
@@ -94,6 +94,7 @@
 postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin
 aprsd:*:240:240::0:0:aprsd:/nonexistent:/bin/sh
 tnc:*:241:241::0:0:aprsd:/nonexistent:/bin/sh
+prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin
 fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
 _tor:*:256:256::0:0:Tor anonymising router:/var/db/tor:/bin/sh
 _dns-proxy-tor:*:257:257::0:0:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin
@@ -110,7 +111,7 @@
 prelude:*:281:281::0:0:Prelude user:/nonexistent:/usr/sbin/nologin
 _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
 dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin
-_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/sbin/nologin
+_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin
 wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin
 stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
 openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin
@@ -123,7 +124,8 @@
 _bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh
 nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh
 dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin
-pgbouncer:*:534:534::0:0:Pgbouncer Daemon:/nonexistent:/sbin/nologin
+pgbouncer:*:534:534::0:0:Pgbouncer Daemon:/nonexistent:/usr/sbin/nologin
+redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin
 ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
 qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin
 ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh
@@ -138,7 +140,7 @@
 bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin
 bopm:*:717:717::0:0:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh
 openxpki:*:777:777::0:0:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
-puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/sbin/nologin
+puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin
 openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin
 dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin
 netdisco:*:840:840::0:0:netdisco daemon:/nonexistent:/usr/sbin/nologin
@@ -147,10 +149,10 @@
 iserv:*:911:911::0:0:Iserv Daemon:/nonexistent:/usr/sbin/nologin
 _sj3:*:912:912::0:0:SJ3 Daemon:/nonexistent:/usr/sbin/nologin
 _relayd:*:913:913::0:0:Relay Daemon:/var/empty:/usr/sbin/nologin
-bitlbee:*:914:914::0:0:Bitlbee pseudo-user:/nonexistent:/sbin/nologin
+bitlbee:*:914:914::0:0:Bitlbee pseudo-user:/nonexistent:/usr/sbin/nologin
 logcheck:*:915:915::0:0:Logcheck system account:/var/lib/logcheck:/usr/local/bin/bash
-_prayer:*:917:917:daemon:0:0:Prayer Account:/nonexistent:/sbin/nologin
-nefu:*:918:918::0:0:Nefu daemon:/var/db/nefu:/sbin/nologin
+_prayer:*:917:917:daemon:0:0:Prayer Account:/nonexistent:/usr/sbin/nologin
+nefu:*:918:918::0:0:Nefu daemon:/var/db/nefu:/usr/sbin/nologin
 couchdb:*:919:919:daemon:0:0:CouchDB Account:/var/empty:/usr/sbin/nologin
-vboxusers:*:920:920::0:0:Virtualbox user:/nonexistent:/sbin/nologin
+vboxusers:*:920:920::0:0:Virtualbox user:/nonexistent:/usr/sbin/nologin
 transmission:*:921:921::0:0:Transmission Daemon User:/usr/local/etc/transmission/home:/usr/sbin/nologin


More information about the p4-projects mailing list