From bddd6528ed7e5c207631fb8c39715a1a2fee359f Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 4 Nov 2005 01:19:40 +0000 Subject: - Unbreak on amd64: manually run build-locale-archive that is usually runned by rpm, but we use --noscripts here - Portlint --- emulators/linux_base-8/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 69a8946cedc3..245653254a50 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -13,8 +13,7 @@ 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 \ +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 \ @@ -71,10 +70,6 @@ LANG= en .include -.if ${ARCH} == amd64 -BROKEN= "Incorrect pkg-plist" -.endif - DBPATH= /var/lib/rpm RPM= LC_ALL=C rpm RPMFLAGS= --root ${PREFIX} --dbpath ${DBPATH} --nodeps \ @@ -130,6 +125,12 @@ do-install: # @${ECHO_CMD} -e '/lib\n/usr/lib\n/usr/X11R6/lib' > ${PREFIX}/etc/ld.so.conf # +# Build locale-archive manually, we passes --noscripts to rpm +# +.if ${MACHINE_ARCH} == "amd64" + @${PREFIX}/usr/sbin/build-locale-archive +.endif +# # Finish # @for D in ${REMOVE_DIRS}; do \ -- cgit v1.2.3