pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/sgi-fonts PKG_DESTDIR_SUPPORT= user-destdir, plu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a93293ee567
branches:  trunk
changeset: 568733:7a93293ee567
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 17 17:21:18 2009 +0000

description:
PKG_DESTDIR_SUPPORT= user-destdir, plus add rpm2pkg to USE_TOOLS

diffstat:

 fonts/sgi-fonts/Makefile |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 65cedaa9392b -r 7a93293ee567 fonts/sgi-fonts/Makefile
--- a/fonts/sgi-fonts/Makefile  Thu Dec 17 16:42:45 2009 +0000
+++ b/fonts/sgi-fonts/Makefile  Thu Dec 17 17:21:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/22 17:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/17 17:21:18 abs Exp $
 #
 
 DISTNAME=      sgi-fonts-1.0-457.src
@@ -12,20 +12,19 @@
 HOMEPAGE=      http://oss.sgi.com/projects/sgi_propack/
 COMMENT=       Linux compatibility package for SGI fonts
 
-BUILD_DEPENDS+=        rpm2pkg>=1.3:../../pkgtools/rpm2pkg
-
 WRKSRC=                ${WRKDIR}/sgi-fonts
+PKG_DESTDIR_SUPPORT= user-destdir
 
 USE_IMAKE=     YES
-USE_TOOLS+=    bdftopcf bzcat gtar gzip
+USE_TOOLS+=    bdftopcf bzcat gtar gzip rpm2pkg
 FONTS_DIRS.x11+=       ${PREFIX}/lib/X11/fonts/misc/sgi
 REQD_DIRS+=            ${PREFIX}/lib/X11/fonts/misc/sgi
 
 do-extract:
-       ${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+       rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
        cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | ${GTAR} xf -
 
 post-install:
-       ${RM} ${PREFIX}/lib/X11/fonts/misc/sgi/fonts.scale
+       ${RM} ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi/fonts.scale
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index