From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 3 08:46:09 2003 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 668F316A4CE; Wed, 3 Dec 2003 08:46:09 -0800 (PST) Received: from blues.jpj.net (blues.jpj.net [208.210.80.156]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8E1B43FF2; Wed, 3 Dec 2003 08:46:07 -0800 (PST) (envelope-from trevor@jpj.net) Received: from blues.jpj.net (localhost.jpj.net [127.0.0.1]) by blues.jpj.net (8.12.10/8.12.3) with ESMTP id hB3Gk4q2022812; Wed, 3 Dec 2003 11:46:04 -0500 (EST) (envelope-from trevor@jpj.net) Received: from localhost (trevor@localhost)hB3Gk3IQ022803; Wed, 3 Dec 2003 11:46:04 -0500 (EST) X-Authentication-Warning: blues.jpj.net: trevor owned process doing -bs Date: Wed, 3 Dec 2003 11:46:03 -0500 (EST) From: Trevor Johnson To: portmgr@freebsd.org Message-ID: <20031203114506.A5992@blues.jpj.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: freebsd-ports-bugs@freebsd.org Subject: patch for ports/x11/linux-XFree86-libs X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2003 16:46:09 -0000 The linux-gtk port sets USE_LINUX_PREFIX which adds a dependency on linux_base 7.1, but that port has its own XFree86 libraries which conflict with the ones from this port. The rpm2cpio (used in pre-install) and rpm (used in do-install) ports conflict with each other. Fix the dependencies by bringing in parts of the linux-gtk Makefile so this port can stand on its own, and by using the rpm2cpio that accompanies rpm. While I'm here, be less verbose and slim the pre-install a little. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/linux-XFree86-libs/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 20 Nov 2003 06:12:37 -0000 1.3 +++ Makefile 3 Dec 2003 03:02:53 -0000 @@ -11,37 +11,45 @@ CATEGORIES= x11 linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} MASTER_SITE_SUBDIR= updates/9/en/os/i386 +PKGNAMEPREFIX= linux- +DISTNAME= XFree86-libs-4.3.0-2.90.43.i386.rpm +EXTRACT_SUFX= +DIST_SUBDIR= rpm +EXTRACT_ONLY= MAINTAINER= trevor@FreeBSD.org COMMENT= XFree86 libraries, Linux/i386 binary -CONFLICTS= linux_base-6* linux_base-7* linux_base-deb* linux_base-gentoo* -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 BASEVERSION= 9 +CONFLICTS= linux_base-6* linux_base-7* linux_base-deb* linux_base-gentoo* +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +NO_BUILD= yes +NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= i386 PLIST= ${WRKDIR}/plist -RPM_SET= XFree86-libs-4.3.0-2.90.43.i386.rpm +PREFIX= ${LINUXBASE} pre-install: - ${RM} -rf ${WRKSRC}/tmp - ${MKDIR} ${WRKSRC}/tmp - cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + @${RM} -rf ${WRKSRC}/tmp + @${MKDIR} ${WRKSRC}/tmp + @cd ${WRKSRC}/tmp; \ + rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} | cpio -id; \ ${FIND} * -type f -o -type l > ${PLIST} -.for ii in \ - usr/X11R6/lib/X11/locale/lib/common \ - usr/X11R6/lib/X11/locale/lib \ - usr/X11R6/lib/X11/locale \ - usr/X11R6/lib/X11 - ${ECHO_CMD} @dirrm ${ii} >> ${PLIST} +.for ii in X11/locale/lib/common X11/locale/lib X11/locale X11 + @${ECHO_CMD} @dirrm usr/X11R6/lib/${ii} >> ${PLIST} .endfor post-install: - ${RM} -f ${LINUXBASE}/etc/ld.so.cache - ${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ + @${RM} -f ${LINUXBASE}/etc/ld.so.cache + @${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \ > ${LINUXBASE}/etc/ld.so.conf - chroot ${LINUXBASE} sbin/ldconfig + @chroot ${LINUXBASE} sbin/ldconfig + +do-install: + @rpm -U --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm --nodeps \ + --replacepkgs ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} || ${TRUE} -.include "../../x11-toolkits/linux-gtk/Makefile" +.include -- Trevor Johnson