pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/fonts Mechanical changes to add DESTDIR support to pac...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/688e8b573e99
branches:  trunk
changeset: 539328:688e8b573e99
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 03 20:17:11 2008 +0000

description:
Mechanical changes to add DESTDIR support to packages that install
their files via a custom do-install target.

diffstat:

 fonts/acroread-font-share/Makefile.common  |   6 +-
 fonts/acroread5-font-share/Makefile.common |   6 +-
 fonts/acroread7-font-share/Makefile.common |   8 ++-
 fonts/adobe-cidfonts/Makefile              |   8 ++-
 fonts/adobe-cmaps/Makefile                 |  28 ++++++-----
 fonts/arphic-ttf/Makefile                  |  13 +++--
 fonts/artwiz-fonts/Makefile                |   8 ++-
 fonts/baekmuk-ttf/Makefile                 |  12 ++--
 fonts/bakoma-fonts/Makefile                |  11 ++-
 fonts/biznet-iso8859_2/Makefile            |  10 ++-
 fonts/chkfontpath/Makefile                 |   8 ++-
 fonts/cyberbit-ttf/Makefile.common         |  12 ++--
 fonts/cyr-rfx-share/Makefile.common        |   8 ++-
 fonts/dbz-ttf/Makefile                     |  12 ++--
 fonts/dejavu-ttf/Makefile                  |   9 ++-
 fonts/efont-unicode/Makefile               |   8 ++-
 fonts/freefont-ttf/Makefile                |  15 ++++--
 fonts/freefonts/Makefile                   |  11 ++-
 fonts/geoslab703-ttf/Makefile              |   8 ++-
 fonts/ja-elisat/Makefile                   |  12 ++--
 fonts/ja-elisau/Makefile                   |  12 ++--
 fonts/ja-kaname/Makefile                   |  14 +++--
 fonts/ja-kappa20/Makefile                  |  11 ++-
 fonts/ja-naga10/Makefile                   |   8 ++-
 fonts/ja-sazanami-ttf/Makefile             |  12 +++-
 fonts/jisx0212fonts/Makefile               |   8 ++-
 fonts/jisx0213fonts/Makefile               |   8 ++-
 fonts/kochi-ttf/Makefile                   |  10 ++-
 fonts/liberation-ttf/Makefile              |   9 ++-
 fonts/linux-libertine-ttf/Makefile         |  14 +++--
 fonts/mftrace/Makefile                     |  18 ++++---
 fonts/mkfontalias/Makefile                 |   7 ++-
 fonts/pcf2bdf/Makefile                     |   9 ++-
 fonts/profont/Makefile                     |   8 ++-
 fonts/tex-uhc-fonts-base/Makefile.common   |  10 ++-
 fonts/tex-unttf/Makefile                   |  75 +++++++++++++++--------------
 fonts/thaixfonts/Makefile                  |  10 ++--
 fonts/ttf2pk/Makefile                      |  22 ++++----
 fonts/type1inst/Makefile                   |  15 +++--
 fonts/un-core-ttf/Makefile                 |   8 ++-
 fonts/un-extra-ttf/Makefile                |   8 ++-
 fonts/vfontcap-kochi/Makefile              |   8 ++-
 fonts/watanabe_vfont/Makefile              |  13 +++--
 fonts/xmbdfed/Makefile                     |   9 ++-
 44 files changed, 325 insertions(+), 214 deletions(-)

diffs (truncated from 1485 to 300 lines):

diff -r 45d119f62449 -r 688e8b573e99 fonts/acroread-font-share/Makefile.common
--- a/fonts/acroread-font-share/Makefile.common Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/acroread-font-share/Makefile.common Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2006/10/22 16:06:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=       acroread-${DISTNAME}-4.0
@@ -14,6 +14,8 @@
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
@@ -21,6 +23,6 @@
 INSTALLATION_DIRS=     Acrobat4/Resource
 
 do-install:
-       ${GTAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource
+       ${GTAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat4/Resource
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/acroread5-font-share/Makefile.common
--- a/fonts/acroread5-font-share/Makefile.common        Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/acroread5-font-share/Makefile.common        Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/10/04 21:39:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=       acroread5-${DISTNAME}-5.0
@@ -17,6 +17,8 @@
 NO_SRC_ON_FTP= ${RESTRICTED}
 NO_BIN_ON_FTP= ${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
@@ -24,6 +26,6 @@
 INSTALLATION_DIRS=     Acrobat5/Resource/Font
 
 do-install:
-       @${GTAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat5/Resource/Font
+       @${GTAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat5/Resource/Font
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/acroread7-font-share/Makefile.common
--- a/fonts/acroread7-font-share/Makefile.common        Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/acroread7-font-share/Makefile.common        Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/10/04 21:39:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/03/03 20:17:11 jlam Exp $
 #
 
 PKGNAME=       acroread7-${DISTNAME}-7.0
@@ -17,12 +17,16 @@
 NO_SRC_ON_FTP= ${RESTRICTED}
 NO_BIN_ON_FTP= ${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
 USE_TOOLS+=    tar
 
+INSTALLATION_DIRS=     Acrobat7/Resource
+
 do-install:
-       @${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat7/Resource
+       @${TAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat7/Resource
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/adobe-cidfonts/Makefile
--- a/fonts/adobe-cidfonts/Makefile     Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/adobe-cidfonts/Makefile     Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/10/25 21:04:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=      adobe-cidfonts-20000901
 CATEGORIES=    fonts
@@ -26,6 +26,8 @@
 DISTFILES+=    WadaMin-Regular WadaMin-Regular.afm
 DISTFILES+=    WadaMin-RegularH WadaMin-RegularH.afm
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 EXTRACT_ONLY=  # empty
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
@@ -41,10 +43,10 @@
        ${ECHO} "@unexec ${RMDIR} -p %D/${RESOURCESUBDIR} 2>/dev/null || ${TRUE}";
 
 do-install:
-       ${INSTALL_DATA_DIR} ${RESOURCEDIR}/CIDFont
+       ${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CIDFont
        for file in ${DISTFILES}; do                                    \
                ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${file}      \
-                       ${RESOURCEDIR}/CIDFont;                         \
+                       ${DESTDIR}${RESOURCEDIR}/CIDFont;               \
        done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/adobe-cmaps/Makefile
--- a/fonts/adobe-cmaps/Makefile        Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/adobe-cmaps/Makefile        Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/15 22:04:15 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=      adobe-cmaps-20060615
 CATEGORIES=    fonts print
@@ -24,6 +24,8 @@
 HOMEPAGE=      http://partners.adobe.com/public/developer/opentype/
 COMMENT=       Adobe CMap files for CJK
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
@@ -32,39 +34,39 @@
 RESOURCEDIR=   ${PREFIX}/share/Adobe/Resource
 
 do-install:
-       ${INSTALL_DATA_DIR} ${RESOURCEDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}
        set -e; \
        for file in ${CMAP_DISTFILES}; do                               \
                extract_file="${_DISTDIR}/$${file}"; export extract_file; \
-               cd ${RESOURCEDIR}; ${EXTRACT_CMD};                      \
+               cd ${DESTDIR}${RESOURCEDIR}; ${EXTRACT_CMD};            \
        done
        set -e; \
        for file in ${PDFCORE}; do                                      \
-               ${MKDIR} ${RESOURCEDIR}/pdfcorefonts/$${file};          \
-               cd ${RESOURCEDIR}/pdfcorefonts/$${file};                \
+               ${MKDIR} ${DESTDIR}${RESOURCEDIR}/pdfcorefonts/$${file}; \
+               cd ${DESTDIR}${RESOURCEDIR}/pdfcorefonts/$${file};      \
                ${UNZIP_CMD} -aaoq ${_DISTDIR}/$${file}.zip;            \
        done
-       ${INSTALL_DATA_DIR} ${RESOURCEDIR}/CMap
+       ${INSTALL_DATA_DIR} ${DESTDIR}${RESOURCEDIR}/CMap
        set -e; \
-       cd ${RESOURCEDIR}; for dir in ${CMAP_FILES}; do                 \
+       cd ${DESTDIR}${RESOURCEDIR}; for dir in ${CMAP_FILES}; do       \
                for file in $${dir}/CMap/*; do                          \
-                       ${LN} -sf ../$${file} ${RESOURCEDIR}/CMap;      \
+                       ${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
                done;                                                   \
        done
        set -e; \
-       cd ${RESOURCEDIR}; for dir in ${RKSJ_FILES}; do                 \
+       cd ${DESTDIR}${RESOURCEDIR}; for dir in ${RKSJ_FILES}; do       \
                for file in $${dir}/*; do                               \
-                       ${LN} -sf ../$${file} ${RESOURCEDIR}/CMap;      \
+                       ${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
                done;                                                   \
        done
        set -e; \
-       cd ${RESOURCEDIR}; for dir in ${PDFCORE}; do                    \
+       cd ${DESTDIR}${RESOURCEDIR}; for dir in ${PDFCORE}; do          \
                for file in pdfcorefonts/$${dir}/*; do                  \
                        case $${file} in                                \
                        *.pdf)  ;;                                      \
                        *)                                              \
-                               ${RM} -f ${RESOURCEDIR}/CMap/`${BASENAME} $${file}`; \
-                               ${LN} -sf ../$${file} ${RESOURCEDIR}/CMap; \
+                               ${RM} -f ${DESTDIR}${RESOURCEDIR}/CMap/`${BASENAME} $${file}`; \
+                               ${LN} -sf ../$${file} ${DESTDIR}${RESOURCEDIR}/CMap; \
                                ;;                                      \
                        esac;                                           \
                done;                                                   \
diff -r 45d119f62449 -r 688e8b573e99 fonts/arphic-ttf/Makefile
--- a/fonts/arphic-ttf/Makefile Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/arphic-ttf/Makefile Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/10/09 11:40:30 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=      arphic-ttf-2.11
@@ -15,6 +15,8 @@
 FONT_FILES=    bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf
 MISC_FILES=    ARPHICPL.TXT logo.gif release.txt
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DIST_SUBDIR=   arphic-ttf
 WRKSRC=                ${WRKDIR}
 
@@ -26,9 +28,10 @@
 DOCDIR=                ${PREFIX}/share/doc/arphic-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-       cd ${WRKSRC} && ${INSTALL_DATA} ${FONT_FILES} ${FONTS_DIRS.ttf}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       cd ${WRKSRC} && ${INSTALL_DATA} ${MISC_FILES} ${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${FONT_FILES} \
+               ${DESTDIR}${FONTS_DIRS.ttf}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${MISC_FILES} ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/artwiz-fonts/Makefile
--- a/fonts/artwiz-fonts/Makefile       Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/artwiz-fonts/Makefile       Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=      artwiz-aleczapka-1.3
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.vastwaters.com/
 COMMENT=       Set of free fonts for X11 desktops
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/artwiz-aleczapka
 USE_X11BASE=   yes
 
@@ -22,6 +24,8 @@
 REQD_DIRS=     ${PREFIX}/lib/X11/fonts/artwiz
 
 do-install:
-       for i in ${WRKSRC}/*.pcf; do ${INSTALL_DATA} $$i ${FONTS_DIRS.x11}; done
+       for i in ${WRKSRC}/*.pcf; do \
+               ${INSTALL_DATA} $$i ${DESTDIR}${FONTS_DIRS.x11}; \
+       done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/baekmuk-ttf/Makefile
--- a/fonts/baekmuk-ttf/Makefile        Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/baekmuk-ttf/Makefile        Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/03 20:17:11 jlam Exp $
 
 DISTNAME=      baekmuk-ttf-2.2
 PKGREVISION=   2
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://kldp.net/projects/baekmuk/
 COMMENT=       Baekmuk family Korean TrueType fonts
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_X11BASE=   YES
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
@@ -17,9 +19,9 @@
 DOCDIR=                ${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTS_DIRS.ttf}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
+       ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT* ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 45d119f62449 -r 688e8b573e99 fonts/bakoma-fonts/Makefile
--- a/fonts/bakoma-fonts/Makefile       Mon Mar 03 19:43:22 2008 +0000
+++ b/fonts/bakoma-fonts/Makefile       Mon Mar 03 20:17:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
 #
 
 DISTNAME=      bakoma-20010719
@@ -15,6 +15,9 @@
 LICENSE+=              no-commercial-use
 NO_SRC_ON_CDROM=       #defined
 NO_BIN_ON_CDROM=       #defined
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BAKOMA_DIR=            ${PREFIX}/share/tex-contrib/BaKoMa
 WRKSRC=                        ${WRKDIR}/bakoma
 
@@ -25,11 +28,11 @@
 
 do-install:
 .for d in afm etc pfb pfm tfm ttf
-       ${INSTALL_DATA_DIR} ${BAKOMA_DIR}/${d}
-       ${INSTALL_DATA} ${WRKSRC}/${d}/* ${BAKOMA_DIR}/${d}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${BAKOMA_DIR}/${d}
+       ${INSTALL_DATA} ${WRKSRC}/${d}/* ${DESTDIR}${BAKOMA_DIR}/${d}



Home | Main Index | Thread Index | Old Index