pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/fonts/arphic-ttf Fixed installation by splitting the c...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/23e49b559a9b
branches:  trunk
changeset: 533952:23e49b559a9b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Oct 09 11:40:30 2007 +0000

description:
Fixed installation by splitting the code into the correct phases.

diffstat:

 fonts/arphic-ttf/Makefile |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (52 lines):

diff -r 7b52b6acea63 -r 23e49b559a9b fonts/arphic-ttf/Makefile
--- a/fonts/arphic-ttf/Makefile Tue Oct 09 11:31:46 2007 +0000
+++ b/fonts/arphic-ttf/Makefile Tue Oct 09 11:40:30 2007 +0000
@@ -1,41 +1,34 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/10/09 11:40:30 rillig Exp $
 #
 
 DISTNAME=      arphic-ttf-2.11
 PKGREVISION=   4
 CATEGORIES=    fonts
 MASTER_SITES=  ftp://freebsd.sinica.edu.tw/pub/keith/zh-arphicttf/
-DISTFILES=     ${FONT_FILES} ${MISC_FILES}
+DISTFILES=     ${FONT_FILES:=.gz} ${MISC_FILES}
 
 MAINTAINER=    rxg%NetBSD.org@localhost
 COMMENT=       Chinese TrueType fonts from Arphic Technology
 
-CONFLICTS=     arphicttf-*
+CONFLICTS=     arphicttf-[0-9]*
 
-FONT_FILES=    bkai00mp.ttf.gz bsmi00lp.ttf.gz gbsn00lp.ttf.gz gkai00mp.ttf.gz
+FONT_FILES=    bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf
 MISC_FILES=    ARPHICPL.TXT logo.gif release.txt
 
 DIST_SUBDIR=   arphic-ttf
-EXTRACT_ONLY=  # empty
+WRKSRC=                ${WRKDIR}
 
 USE_X11BASE=   YES
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-USE_TOOLS+=    gunzip
-
 FONTS_DIRS.ttf=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/arphic-ttf
 
 do-install:
        ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-       for f in ${FONT_FILES}; do \
-               ${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTS_DIRS.ttf}; \
-               ${GUNZIP_CMD} ${FONTS_DIRS.ttf}/$$f; \
-       done
+       cd ${WRKSRC} && ${INSTALL_DATA} ${FONT_FILES} ${FONTS_DIRS.ttf}
        ${INSTALL_DATA_DIR} ${DOCDIR}
-       for f in ${MISC_FILES}; do \
-               ${INSTALL_DATA} ${_DISTDIR}/$$f ${DOCDIR}; \
-       done
+       cd ${WRKSRC} && ${INSTALL_DATA} ${MISC_FILES} ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index