pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/print convert to use tex.buildlink3.mk



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d9eb50b783e
branches:  trunk
changeset: 502794:8d9eb50b783e
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Tue Nov 08 23:03:10 2005 +0000

description:
convert to use tex.buildlink3.mk

diffstat:

 print/ja-dvipdfm/Makefile      |   6 +++---
 print/ja-ptex-bin/Makefile     |   7 ++++---
 print/ja-ptex-share/Makefile   |   5 +++--
 print/ja-vfxdvik/Makefile      |  10 ++++------
 print/texfamily-share/Makefile |   6 +++---
 print/texfamily/Makefile       |   8 +++++---
 6 files changed, 22 insertions(+), 20 deletions(-)

diffs (182 lines):

diff -r 8246a7ddad3c -r 8d9eb50b783e print/ja-dvipdfm/Makefile
--- a/print/ja-dvipdfm/Makefile Tue Nov 08 22:55:22 2005 +0000
+++ b/print/ja-dvipdfm/Makefile Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      dvipdfm-0.13.2c
 PKGNAME=       ja-${DISTNAME}
@@ -16,7 +16,7 @@
 
 CONFLICTS+=    dvipdfm-[0-9]*
 CONFLICTS+=    dvipdfmx-[0-9]*
-CONFLICTS+=    teTeX-bin>=2.0
+LATEX_ACCEPTED=        teTeX1
 
 WRKSRC=                ${WRKDIR}/dvipdfm
 GNU_CONFIGURE= yes
@@ -35,6 +35,6 @@
        ${PREFIX}/bin/mktexlsr
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../print/teTeX1-bin/kpathsea.buildlink3.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8246a7ddad3c -r 8d9eb50b783e print/ja-ptex-bin/Makefile
--- a/print/ja-ptex-bin/Makefile        Tue Nov 08 22:55:22 2005 +0000
+++ b/print/ja-ptex-bin/Makefile        Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      ptex-src-${PTEX_VERS}
 PKGNAME=       ja-ptex-bin-${PTEX_VERS}
@@ -27,6 +27,7 @@
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 
+LATEX_ACCEPTED=                teTeX2
 .include "../../print/teTeX-bin/Makefile.common"
 
 PTEX_VERS=             3.1.2
@@ -43,7 +44,7 @@
 WRKSRC_PTEX=           ${WRKSRC}/texk/web2c/${DISTNAME:S/-src//}
 EXTRACT_ONLY=          # none
 
-TEXMF=                 ${PREFIX}/share/texmf
+TEXMF=                 ${PKG_TEXMFPREFIX}
 TEXMFLOCAL=            ${PREFIX}/share/texmf.local
 FILES_SUBST+=          TEXMFLOCAL=${TEXMFLOCAL}
 FILES_SUBST+=          TEXMFSITE=${TEXMFSITE}
@@ -112,5 +113,5 @@
 pre-clean:
        cd ../../print/teTeX-bin && ${MAKE} clean
 
-.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8246a7ddad3c -r 8d9eb50b783e print/ja-ptex-share/Makefile
--- a/print/ja-ptex-share/Makefile      Tue Nov 08 22:55:22 2005 +0000
+++ b/print/ja-ptex-share/Makefile      Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      ptex-texmf-2.1
 PKGNAME=       ja-ptex-share-2.1
@@ -18,7 +18,7 @@
 HOMEPAGE=      http://www.ascii.co.jp/pb/ptex/
 COMMENT=       Library files for pTeX
 
-DEPENDS+=      teTeX>=2.0.1:../../print/teTeX
+LATEX_ACCEPTED=        teTeX2
 
 WRKSRC=                        ${WRKDIR}
 DIST_SUBDIR=           teTeX
@@ -41,4 +41,5 @@
                ${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f; \
        done
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8246a7ddad3c -r 8d9eb50b783e print/ja-vfxdvik/Makefile
--- a/print/ja-vfxdvik/Makefile Tue Nov 08 22:55:22 2005 +0000
+++ b/print/ja-vfxdvik/Makefile Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=       ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -19,8 +19,10 @@
 
 .if defined(USE_TEXFAMILY)
 DEPENDS+=      TeXfamily>=1.2.1:../../print/texfamily
+LATEX_ACCEPTED=        teTeX1
 .else
 DEPENDS+=      ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
+LATEX_ACCEPTED=        teTeX2
 .endif
 
 XDVI_DIR=      ${WRKDIR}/${DISTNAME}/texk/xdvik
@@ -70,11 +72,7 @@
 do-install:
        cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
 
-.if defined(USE_TEXFAMILY)
-.include "../../print/teTeX1-bin/kpathsea.buildlink3.mk"
-.else
-.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
-.endif
+.include "../../mk/tex.buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
 .include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r 8246a7ddad3c -r 8d9eb50b783e print/texfamily-share/Makefile
--- a/print/texfamily-share/Makefile    Tue Nov 08 22:55:22 2005 +0000
+++ b/print/texfamily-share/Makefile    Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      TeXfamily-share-1.2.1
 PKGREVISION=   5
@@ -19,8 +19,6 @@
 MAINTAINER=    kei%NetBSD.org@localhost
 COMMENT=       Machine-independent part of TeXfamily (pTeX, JTeX, MuLTeX)
 
-DEPENDS+=      teTeX>=1.0.7nb1:../../print/teTeX
-
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   TeXfamily
 EXTRACT_ONLY=  jis${EXTRACT_SUFX} nmin-ngoth${EXTRACT_SUFX} \
@@ -29,6 +27,7 @@
 NO_BUILD=      yes
 NO_MTREE=      yes
 PLIST_SRC=     ${WRKDIR}/PLIST_SRC
+LATEX_ACCEPTED=        teTeX1 teTeX2 teTeX3
 
 do-install:
        @${INSTALL_DATA_DIR} ${PREFIX}/share/texmf.local
@@ -67,4 +66,5 @@
                ${ECHO} "@dirrm $$DIR" >>${PLIST_SRC}; \
         done
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8246a7ddad3c -r 8d9eb50b783e print/texfamily/Makefile
--- a/print/texfamily/Makefile  Tue Nov 08 22:55:22 2005 +0000
+++ b/print/texfamily/Makefile  Tue Nov 08 23:03:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/08 23:03:10 tonio Exp $
 
 DISTNAME=      TeXfamily-1.2.1
 PKGREVISION=   5
@@ -27,6 +27,7 @@
 MAINTAINER=    kei%NetBSD.org@localhost
 COMMENT=       TeXfamily (pTeX, JTeX, MuLTeX) - executables
 
+LATEX_ACCEPTED=        teTeX1 teTeX2 teTeX3
 DEPENDS+=      TeXfamily-share>=1.2.1nb3:../../print/texfamily-share
 DEPENDS+=      ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 
@@ -115,8 +116,8 @@
                ${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
                ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}/ptex.tex
        ${RM} -f ${WRKSRC}/texmf ${WRKSRC}/texmf.local
-       ${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC}
-       ${LN} -s ${LOCALBASE}/share/texmf.local ${WRKSRC}
+       ${LN} -s ${PKG_TEXMFPREFIX}/ ${WRKSRC}/texmf
+       ${LN} -s ${LOCALBASE}/share/texmf.local ${WRKSRC}/texmf.local
 
 pre-patch:
        ${PATCH} -d ${WRKSRC}/texk/dvipsk --quiet -E -p1 < \
@@ -168,4 +169,5 @@
 pre-clean:
        cd ../../print/teTeX1-bin && ${MAKE} clean
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index