Date: Wed, 03 Dec 2003 11:49:52 -0500 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Trevor Johnson <trevor@jpj.net> Cc: portmgr@freebsd.org Subject: Re: patch for ports/x11/linux-XFree86-libs Message-ID: <1070470192.750.57.camel@gyros> In-Reply-To: <20031203114506.A5992@blues.jpj.net> References: <20031203114506.A5992@blues.jpj.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-1/JG0fwhiHYIED9wCGKH
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Wed, 2003-12-03 at 11:46, Trevor Johnson wrote:
> 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.
>=20
> While I'm here, be less verbose and slim the pre-install a little.
Approved.
Joe
>=20
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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=3D x11 linux
> MASTER_SITES=3D ${MASTER_SITE_REDHAT_LINUX}
> MASTER_SITE_SUBDIR=3D updates/9/en/os/i386
> +PKGNAMEPREFIX=3D linux-
> +DISTNAME=3D XFree86-libs-4.3.0-2.90.43.i386.rpm
> +EXTRACT_SUFX=3D
> +DIST_SUBDIR=3D rpm
> +EXTRACT_ONLY=3D
>=20
> MAINTAINER=3D trevor@FreeBSD.org
> COMMENT=3D XFree86 libraries, Linux/i386 binary
> -CONFLICTS=3D linux_base-6* linux_base-7* linux_base-deb* linux_base-gent=
oo*
>=20
> -BUILD_DEPENDS=3D rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
> +BUILD_DEPENDS=3D rpm:${PORTSDIR}/archivers/rpm
> RUN_DEPENDS=3D${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux=
_base-8
>=20
> BASEVERSION=3D 9
> +CONFLICTS=3D linux_base-6* linux_base-7* linux_base-deb* linux_base-gent=
oo*
> +MD5_FILE=3D ${MASTERDIR}/distinfo.${MACHINE_ARCH}
> +NO_BUILD=3D yes
> +NO_FILTER_SHLIBS=3D yes
> ONLY_FOR_ARCHS=3D i386
> PLIST=3D ${WRKDIR}/plist
> -RPM_SET=3D XFree86-libs-4.3.0-2.90.43.i386.rpm
> +PREFIX=3D ${LINUXBASE}
>=20
> 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
>=20
> 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}
>=20
> -.include "../../x11-toolkits/linux-gtk/Makefile"
> +.include <bsd.port.mk>
--=20
PGP Key : http://www.marcuscom.com/pgp.asc
--=-1/JG0fwhiHYIED9wCGKH
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQA/zhQwb2iPiv4Uz4cRAuDEAJ4i8UYBpatA9rgf1WmXJj4LYNyEWwCgnuP8
bj1thI/PSbrGCF5J/QrTr9k=
=ZtBG
-----END PGP SIGNATURE-----
--=-1/JG0fwhiHYIED9wCGKH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1070470192.750.57.camel>