Index: head/emulators/linux_base-8/Makefile
===================================================================
--- head/emulators/linux_base-8/Makefile	(revision 126957)
+++ head/emulators/linux_base-8/Makefile	(revision 126958)
@@ -1,163 +1,168 @@
 # New ports collection makefile for:	linux_base-8
 # Date created:				2003-06-02
 # Whom:					trevor
 # based on ports/emulators/linux_base by Marcel Moolenaar and others
 #
 # $FreeBSD$
 #
 
 PORTNAME=		linux_base-8
 PORTVERSION=		8.0
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX} \
 			${MASTER_SITE_REDHAT_LINUX:S/$/:new/} \
 			ftp://mirror.switch.ch/mirror/ximian/mono/redhat-80-i386/:ft
 MASTER_SITE_SUBDIR=    \
 			${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS \
 			updates/${PORTVERSION}/${LANG}/os/${ARCH}/:new
 DISTFILES=		redhat-release-8.0-8.noarch.rpm \
 			glibc-common-2.3.2-4.80.8.${ARCH}.rpm:new \
 			glibc-2.3.2-4.80.8.${ARCH}.rpm:new \
 			setup-2.5.20-1.noarch.rpm \
 			filesystem-2.1.6-5.noarch.rpm \
 			basesystem-8.0-1.noarch.rpm \
 			libattr-2.0.8-3.${ARCH}.rpm \
 			libacl-2.0.11-2.${ARCH}.rpm \
 			libelf-0.8.2-2.${ARCH}.rpm \
 			bzip2-libs-1.0.2-5.${ARCH}.rpm \
 			termcap-11.0.1-13.noarch.rpm \
 			compat-db-3.3.11-2.${ARCH}.rpm \
 			db4-4.0.14-14.${ARCH}.rpm \
 			gdbm-1.8.0-18.${ARCH}.rpm \
 			glib-1.2.10-8.${ARCH}.rpm \
 			libtermcap-2.0.8-31.${ARCH}.rpm \
 			bash-2.05b-5.${ARCH}.rpm \
 			bzip2-1.0.2-5.${ARCH}.rpm \
 			compat-libstdc++-7.3-2.96.110.${ARCH}.rpm \
 			ncurses-5.2-28.${ARCH}.rpm \
 			info-4.2-5.${ARCH}.rpm \
 			grep-2.5.1-4.${ARCH}.rpm \
 			fileutils-4.1.9-11.${ARCH}.rpm \
 			popt-1.7-1.06.${ARCH}.rpm \
 			readline-4.3-3.${ARCH}.rpm \
 			setserial-2.17-9.${ARCH}.rpm \
 			libstdc++-3.2-7.${ARCH}.rpm \
 			slang-1.4.5-11.${ARCH}.rpm \
 			sh-utils-2.0.12-3.${ARCH}.rpm \
 			rpm-4.1-1.06.${ARCH}.rpm \
 			libgcc-3.2-7.${ARCH}.rpm \
 			freetype-2.1.5-0.ximian.5.1.${ARCH}.rpm:ft \
 			zlib-1.1.4-8.8x.${ARCH}.rpm:new
 EXTRACT_ONLY=
 
 MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 CONFLICTS=	linux_base-6* linux_base-7* linux_base-deb* linux_base-gentoo* \
 		linux_base-rh* linux_base-suse*
 ONLY_FOR_ARCHS=		i386 amd64
 DIST_SUBDIR=		rpm/${ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
 PLIST=			${WRKDIR}/pkg-plist
 MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 # Let's avoid hardcoding 'en' as the language.
 LANG=			en
 
 .ifdef USE_LINUX
 .error You have `USE_LINUX' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .include <bsd.port.pre.mk>
 
 DBPATH=			/var/lib/rpm
 RPM=			LC_ALL=C rpm
 RPMFLAGS=		--root ${WRKSRC} --dbpath ${DBPATH} --nodeps \
 			--replacepkgs --ignoreos --ignorearch
 RPMDIR=			${DISTDIR}/${DIST_SUBDIR}
 
 REMOVE_DIRS=		boot dev home initrd root tmp var/tmp usr/local usr/tmp
 REMOVE_FILES=		bin/df bin/su etc/exports etc/group etc/localtime \
 			etc/motd etc/passwd etc/printcap etc/services \
 			etc/protocols
 BRAND_FILES=		bin/rpm sbin/ldconfig sbin/sln
 
 .if (${ARCH} == "amd64")
 LATEST_LINK:=		${LATEST_LINK:C/linux/linux32/}
 ARCH=			i386
 FALLBACK_ELF_MIB=	kern.elf32.fallback_brand
 RPMFLAGS+=		--noscripts
 .else
 FALLBACK_ELF_MIB=	kern.fallback_elf_brand
 .endif
 LINUX_ELF=		3
 PREVIOUS_ELF!=		/sbin/sysctl -n ${FALLBACK_ELF_MIB}
 
 pre-install:
 #
 # Handle the loading of the linux loadable kernel module if required.
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 	@${MKDIR} ${WRKSRC}/${DBPATH} ${WRKSRC}/var/tmp ${WRKSRC}/lib
 	@cd ${WRKSRC}/lib && ${LN} -sf libtermcap.so.2.0.8 libtermcap.so.2
 	@${RPM} --initdb --root ${WRKSRC} --dbpath ${DBPATH}
 #
 # Make sure we have a /dev/null in the chrooted environment.
 	@${MKDIR} ${WRKSRC}/dev
 	@${RM} -f ${WRKSRC}/dev/null
 	@mknod ${WRKSRC}/dev/null c 2 2
 	@${CHMOD} 666 ${WRKSRC}/dev/null
 #
 # Install all packages. Ignore dependencies just like the Red Hat installer.
 # Also, set the ELF fallback brand to Linux, so that we don't have to do
 # anything special to run staticly linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
 	@for R in ${DISTFILES:S/:new//:S/:ft//}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 	@for F in ${BRAND_FILES}; do \
 		brandelf -t Linux ${WRKSRC}/$$F; \
 	done
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${PREVIOUS_ELF}
 #
 # Install yp.conf as a hint to NIS users and make sure there's a
 # mtab in etc, albeit an empty one. This is needed in a couple of
 # cases. Most notably staroffice6.
 #
 	${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf ${WRKSRC}/etc
 	${TOUCH} ${WRKSRC}/etc/mtab
 #
+# Create a good ld.so.conf
+#
+	${ECHO_CMD} -e '/lib\n/usr/lib\n/usr/X11R6/lib' > ${WRKSRC}/etc/ld.so.conf
+#
 # Finish
 #
 	@for D in ${REMOVE_DIRS}; do \
 		${RM} -rf ${WRKSRC}/$$D; \
 	done
 	@for F in ${REMOVE_FILES}; do \
 		${RM} -f ${WRKSRC}/$$F; \
 	done
 	@${LN} -sf /var/tmp ${WRKSRC}/usr/tmp
 #
 # Create PLIST
 #
 	${RM} -f ${PLIST}
 	cd ${WRKSRC} && ${FIND} -s . -type f -o -type l | \
 		${CUT} -c3-999 >> ${PLIST} \
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
 	cd ${WRKSRC} && ${FIND} * | ${CPIO} -dmp ${PREFIX}
 	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;
+	${PREFIX}/sbin/ldconfig
 
 post-install:
 	@${ECHO} ''
 	@fmt ${PKGMESSAGE}
 	@${ECHO} ''
 
 .include <bsd.port.post.mk>

Property changes on: head/emulators/linux_base-8/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.98
\ No newline at end of property
+1.99
\ No newline at end of property
Index: head/x11/linux-XFree86-libs/Makefile
===================================================================
--- head/x11/linux-XFree86-libs/Makefile	(revision 126957)
+++ head/x11/linux-XFree86-libs/Makefile	(revision 126958)
@@ -1,61 +1,61 @@
 # New ports collection makefile for:	linux-XFree86-libs
 # Date created:				2003-11-19
 # Whom:					trevor
 #
 # $FreeBSD$
 #
 
 PORTNAME=		XFree86-libs
 PORTVERSION=		4.3.99.902
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		x11 linux
 MASTER_SITES=	${MASTER_SITE_SUSE} \
 		ftp://ftp.in2p3.fr/pub/linux/suse/update/9.1/rpm/i586/ \
 		ftp://ftp.dit.upm.es/suseupdates/suse-9.1/updates/
 MASTER_SITE_SUBDIR=	i386/update/9.1/rpm/i586
 PKGNAMEPREFIX=	linux-
 DISTNAME=	XFree86-libs-4.3.99.902-43.35.3.i586.rpm
 EXTRACT_SUFX=
 DIST_SUBDIR=	rpm/i386/suse
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	XFree86 libraries, Linux binary
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
 
 CONFLICTS=	linux_base-6* linux_base-7* linux_base-deb*
 USE_LINUX=	yes
 USE_LINUX_PREFIX=yes
 MD5_FILE=	${MASTERDIR}/distinfo.i386
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST=		${WRKDIR}/plist
 PLIST_DIRS=	usr/X11R6/lib/X11
 
 pre-install:
 	@${RM} -f ${PLIST}
 .for ii in libXss.so.1 libxkbui.so.1 libxkbfile.so.1 libfontenc.so.1 libXxf86rush.so.1 libXvMC.so.1 libXinerama.so.1 libXfontcache.so.1 libXRes.so.1 libVncExt.so.2 libI810XvMC.so.1 libGLw.so.1 libFS.so.6
 	@${ECHO_CMD} usr/X11R6/lib/${ii} >> ${PLIST}
 .endfor
 	@${RM} -rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@cd ${WRKDIR}/tmp; \
 		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} | cpio -id; \
 		${FIND} * -type f -o -type l >> ${PLIST} ; \
 		${FIND} -d usr/X11R6/lib/X11/locale -type d  | \
 			${SED} -e 's:^:@dirrm :' >> ${PLIST}
 post-install:
 	@${SED} -e 's|%%LINUXBASE%%|${LINUXBASE}|g ; s|%%PREFIX%%|${PREFIX}|g' \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 do-install:
 	@rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \
 		 --nodeps --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
 		|| ${TRUE}
 
 .include <bsd.port.mk>

Property changes on: head/x11/linux-XFree86-libs/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/x11/linux-XFree86-libs/files/pkg-install.in
===================================================================
--- head/x11/linux-XFree86-libs/files/pkg-install.in	(revision 126957)
+++ head/x11/linux-XFree86-libs/files/pkg-install.in	(revision 126958)
@@ -1,12 +1,8 @@
 #!/bin/sh
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
 if [ "$2" = "POST-INSTALL" ]; then
-	rm -f %%LINUXBASE%%/etc/ld.so.cache
-	( find %%LINUXBASE%% -name lib -type d | sed -e 's:%%LINUXBASE%%::g'; \
-	  find %%PREFIX%% -name lib -type d | sed -e 's:%%PREFIX%%::g' ) \
-		| sort -u >%%LINUXBASE%%/etc/ld.so.conf
 	chroot %%LINUXBASE%% /sbin/ldconfig
 fi

Property changes on: head/x11/linux-XFree86-libs/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property