pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/fonts/kochi-ttf Convert to fonts.mk. Bump PKGREVISION....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb8203dc19b6
branches:  trunk
changeset: 486308:fb8203dc19b6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Dec 26 17:30:51 2004 +0000

description:
Convert to fonts.mk. Bump PKGREVISION. Remove USE_X11BASE.

diffstat:

 fonts/kochi-ttf/Makefile        |  11 ++++-------
 fonts/kochi-ttf/files/deinstall |  20 --------------------
 fonts/kochi-ttf/files/install   |  20 --------------------
 3 files changed, 4 insertions(+), 47 deletions(-)

diffs (83 lines):

diff -r b3424dbf4f44 -r fb8203dc19b6 fonts/kochi-ttf/Makefile
--- a/fonts/kochi-ttf/Makefile  Sun Dec 26 15:58:40 2004 +0000
+++ b/fonts/kochi-ttf/Makefile  Sun Dec 26 17:30:51 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/06/15 02:35:11 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/26 17:30:51 wiz Exp $
 
 DISTNAME=      kochi-substitute-${KOCHI_VERSION}
 PKGNAME=       kochi-ttf-${KOCHI_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    fonts japanese
 MASTER_SITES=  http://osdn.dl.sourceforge.jp/efont/5411/
 EXTRACT_SUFX=  .tar.bz2
@@ -14,13 +14,9 @@
 KOCHI_VERSION= 20030809
 
 NO_BUILD=      yes
-USE_X11BASE=   yes
 USE_PKGINSTALL=        yes
 
-INSTALL_TMPL=  ${FILESDIR}/install
-DEINSTALL_TMPL=        ${FILESDIR}/deinstall
-FILES_SUBST+=  X11PREFIX=${X11PREFIX}
-FILES_SUBST+=  X11FONTSSUBDIR=TTF
+FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
@@ -29,4 +25,5 @@
        ${INSTALL_DATA} ${WRKSRC}/kochi-mincho-subst.ttf \
            ${PREFIX}/lib/X11/fonts/TTF/kochi-mincho.ttf
 
+.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b3424dbf4f44 -r fb8203dc19b6 fonts/kochi-ttf/files/deinstall
--- a/fonts/kochi-ttf/files/deinstall   Sun Dec 26 15:58:40 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: deinstall,v 1.1.1.1 2002/07/15 10:49:14 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11PREFIX=@X11PREFIX@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-DEINSTALL)
-       ;;
-POST-DEINSTALL)
-       ${X11PREFIX}/bin/mkfontscale ${X11FONTSDIR}
-       ;;
-*)
-       ${ECHO} "Unexpected argument: ${STAGE}"
-       exit 1
-       ;;
-esac
-exit 0
diff -r b3424dbf4f44 -r fb8203dc19b6 fonts/kochi-ttf/files/install
--- a/fonts/kochi-ttf/files/install     Sun Dec 26 15:58:40 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: install,v 1.1.1.1 2002/07/15 10:49:14 uebayasi Exp $
-
-PREFIX=@PREFIX@
-X11PREFIX=@X11PREFIX@
-X11FONTSPREFIX=${PREFIX}/lib/X11/fonts
-X11FONTSSUBDIR=@X11FONTSSUBDIR@
-X11FONTSDIR=${X11FONTSPREFIX}/${X11FONTSSUBDIR}
-
-case ${STAGE} in
-PRE-INSTALL)
-       ;;
-POST-INSTALL)
-       ${X11PREFIX}/bin/mkfontscale ${X11FONTSDIR}
-       ;;
-*)
-       ${ECHO} "Unexpected argument: ${STAGE}"
-       exit 1
-       ;;
-esac
-exit 0



Home | Main Index | Thread Index | Old Index