Index: netpbm-10.28.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.28.ebuild,v retrieving revision 1.10 diff -u -r1.10 netpbm-10.28.ebuild --- netpbm-10.28.ebuild 5 Aug 2005 18:06:18 -0000 1.10 +++ netpbm-10.28.ebuild 14 Aug 2005 17:17:02 -0000 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.28.ebuild,v 1.10 2005/08/05 18:06:18 ka0ttic Exp $ -inherit flag-o-matic toolchain-funcs eutils +inherit flag-o-matic toolchain-funcs multilib DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" HOMEPAGE="http://netpbm.sourceforge.net/" @@ -10,7 +10,7 @@ LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86" IUSE="svga jpeg tiff png zlib" DEPEND="jpeg? ( >=media-libs/jpeg-6b ) @@ -26,23 +26,23 @@ if use svga ; then echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config - echo "LINUXSVGALIB = /usr/$(get_libdir)/libvga.so" >> Makefile.config + echo "LINUXSVGALIB = /usr/$(get_libdir)/libvga$(get_libname)" >> Makefile.config fi if use jpeg ; then - echo "JPEGLIB = libjpeg.so" >> Makefile.config + echo "JPEGLIB = libjpeg$(get_libname)" >> Makefile.config fi if use png ; then - echo "PNGLIB = libpng.so" >> Makefile.config + echo "PNGLIB = libpng$(get_libname)" >> Makefile.config fi if use tiff ; then - echo "TIFFLIB = libtiff.so" >> Makefile.config + echo "TIFFLIB = libtiff$(get_libname)" >> Makefile.config fi if use zlib ; then - echo "ZLIB = libz.so" >> Makefile.config + echo "ZLIB = libz$(get_libname)" >> Makefile.config fi # Sparc support ... @@ -53,9 +53,10 @@ -e 's:$(CFLAGS):$(CFLAGS) -fPIC:' \ -e 's:$(LDFLAGS):$(LDFLAGS) -fPIC:' \ lib/Makefile - sed -i -e 's:$(CCOPT):$(CCOPT) -fPIC:' \ + sed -i -e 's:$(CCOPT):$(CCOPT) -fPIC:' \ lib/util/Makefile + use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch epatch ${FILESDIR}/${PN}-dSAFER.patch } @@ -71,7 +72,8 @@ fi # Fix symlink not being created. - dosym `basename ${D}/usr/$(get_libdir)/libnetpbm.so.*` /usr/$(get_libdir)/libnetpbm.so + dosym `basename ${D}/usr/$(get_libdir)/libnetpbm$(get_libname ${PV})` \ + /usr/$(get_libdir)/libnetpbm$(get_libname) rm -rf ${D}/usr/bin/doc.url rm -rf ${D}/usr/man/web