From c1eba2d83eb1b997b5906a1458529c5c6a6a2fa4 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Mon, 1 May 2006 17:28:17 +0000 Subject: - convert to use bsd.linux-rpm.mk (get rid of include of linux-gtk/Makefile) [1] - use fixed plists [1] - category "linux" added to those ports without it [1] - update some ports to a recent FC3 one [1] - remove plists/... for Alpha (there's no support since linux_base-8 for Alpha anymore) - don't hardcode version numbers in some plists, use PLIST_SUB instead (any errors are mine, don't keep them, send them to me) Regarding linux-ungif I declare a maintainer timeout (one month, Boris tried to contact the maintainer) and also pull the "sweeping commit"-card (the port which it uses as some kind of master port can not be used for this anymore). Besides this, I don't think he will be upset when other people do the work instead of adding an entry to his TODO list. :-) This commit brings us just before the switch of the default linux base port to the fc3 one, modulo some bugs which may appear. So: Beta testers wanted! To test: sed -i.old -e 's:linux-XFree86-libs:linux-xorg-libs:' /usr/ports/Mk/bsd.port.mk echo OVERRIDE_LINUX_BASE_PORT=fc3 >> /etc/make.conf portupgrade -f -o emulators/linux_base-fc3 -f linux_base-8 portupgrade -o x11/linux-xorg-libs linux-XFree86-libs portupgrade linux-\* The first two steps are necessary to switch to fc3 as the new default linux base port, the last 3 steps to upgrade to fc3. And feel free to send a big "Thank you!" to Boris, he did a lot of the work! I just provided some hints and answered some questions (besides from committing all the necessary changes for FC3 and doing some minor changes+comments/improvements to/of his work), even when he tries to tell you something else. ;-) Submitted by: Boris Samorodov [1] --- x11-fonts/linux-f8-fontconfig/Makefile | 34 +++++++--------------- x11-fonts/linux-f8-fontconfig/distinfo.i386 | 9 ++++-- x11-fonts/linux-f8-fontconfig/files/pkg-install.in | 9 ------ x11-fonts/linux-f8-fontconfig/pkg-install | 6 ++++ 4 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 x11-fonts/linux-f8-fontconfig/files/pkg-install.in create mode 100644 x11-fonts/linux-f8-fontconfig/pkg-install (limited to 'x11-fonts/linux-f8-fontconfig') diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index b08e06f177c2..83e75aec9dda 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -7,43 +7,29 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux -MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS +DISTNAME= ${PORTNAME}-${PORTVERSION}-5 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig -EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat USE_REINPLACE= yes -BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 -RPM_SET= fontconfig-2.2.3-5.i386.rpm -PLIST= ${PKGDIR}/pkg-plist +USE_LINUX_RPM= yes +LINUX_DIST_VER= 3 +INSTALLS_SHLIB= yes -#PKGINSTALL= ${WRKDIR}/pkg-install - -do-extract: - @${RM} -rf ${WRKSRC}/tmp - @${MKDIR} ${WRKSRC}/tmp - @cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; +BRANDELF_DIRS= usr/bin post-patch: @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ - ${WRKSRC}/tmp/etc/fonts/fonts.conf + ${WRKSRC}/etc/fonts/fonts.conf post-install: - @${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/ - @${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list -# @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \ -# > ${PKGINSTALL} -#.if !defined(PACKAGE_BUILDING) -# @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -#.endif - -.include "../../x11-toolkits/linux-gtk/Makefile" + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + +.include diff --git a/x11-fonts/linux-f8-fontconfig/distinfo.i386 b/x11-fonts/linux-f8-fontconfig/distinfo.i386 index a4a930434541..d637d711c0c9 100644 --- a/x11-fonts/linux-f8-fontconfig/distinfo.i386 +++ b/x11-fonts/linux-f8-fontconfig/distinfo.i386 @@ -1,3 +1,6 @@ -MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458 -SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0 -SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946 +MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458 +SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0 +SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 118946 +MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 73facd3c7590de1377d76a933a1e60b1 +SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = fabdf9619833a6fa04dd5104c32eb19a00a443dc303432dcde33d1021bbf6032 +SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 767420 diff --git a/x11-fonts/linux-f8-fontconfig/files/pkg-install.in b/x11-fonts/linux-f8-fontconfig/files/pkg-install.in deleted file mode 100644 index 92023842a8c4..000000000000 --- a/x11-fonts/linux-f8-fontconfig/files/pkg-install.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin -export PATH - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - %%PREFIX%%/usr/bin/fc-cache -f -v -fi diff --git a/x11-fonts/linux-f8-fontconfig/pkg-install b/x11-fonts/linux-f8-fontconfig/pkg-install new file mode 100644 index 000000000000..ec594298d788 --- /dev/null +++ b/x11-fonts/linux-f8-fontconfig/pkg-install @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ "$2" = "POST-INSTALL" ]; then + echo "Running fc-cache to build fontconfig cache..." + ${PKG_PREFIX}/usr/bin/fc-cache -f -v +fi -- cgit v1.2.3