diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2005-02-06 13:55:24 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2005-02-06 13:55:24 +0000 |
commit | b929fb436e514ae10663e3abb6b4ae77a3838fef (patch) | |
tree | 14b0b5e4bbec6aa8d790b81cbb469acaa2f4ae04 /print | |
parent | Update to 2.99.13.20040204, a teTeX-3.0 release candidate. (diff) |
- teTeX-3.0 support
- fix predefined $TEXMF problem
- bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=128145
Diffstat (limited to 'print')
-rw-r--r-- | print/xdvik/Makefile | 29 | ||||
-rw-r--r-- | print/xdvik/files/patch-texk::xdvik::Makefile.in | 10 | ||||
-rw-r--r-- | print/xdvik/files/pkg-install.in | 25 | ||||
-rw-r--r-- | print/xdvik/pkg-plist | 11 |
4 files changed, 33 insertions, 42 deletions
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile index 2410038a1be4..e2e7b17072cf 100644 --- a/print/xdvik/Makefile +++ b/print/xdvik/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdvik PORTVERSION= 22.84.8 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xdvi @@ -17,10 +17,10 @@ MAINTAINER= hrs@FreeBSD.org COMMENT= DVI Previewer(kpathsearch) for X BUILD_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ - ${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ + ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ mktexlsr:${PORTSDIR}/print/teTeX-base RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ - ${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ + ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ mktexlsr:${PORTSDIR}/print/teTeX-base LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib @@ -38,15 +38,18 @@ CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik -PLIST_SUB= TEXMF=${TEXMF} -CONFLICTS= xdvi-* *-xdvi* +PLIST_SUB= TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config +CONFLICTS= xdvi-[0-9]* xdvi-*-[0-9]* \ + *-xdvi-[0-9]* xdvi-*-[0-9]* \ + *-xdvik-[0-9]* ja-ptex-tetex-[0-9]* MAN1= xdvi.1 xdvizilla.1 -TEXMF?= share/texmf -TEXMFLOCAL?= share/texmf-local -TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R -TEXCONFIG?= ${LOCALBASE}/bin/texconfig +TEXMFDIR= share/texmf +TEXMFDISTDIR= share/texmf-dist +TEXMFLOCALDIR= share/texmf-local +TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCALDIR}/ls-R +TEXCONFIGBIN= ${LOCALBASE}/bin/texconfig-sys MKTEXLSR?= ${LOCALBASE}/bin/mktexlsr LIBT1_PREFIX?= ${LOCALBASE} DOC_FILES= BUGS CHANGES INSTALL \ @@ -62,13 +65,13 @@ PAPERSIZE= a4 PKGINSTALL= ${WRKDIR}/pkg-install.sh PKGDEINSTALL= ${WRKDIR}/pkg-install.sh PKGINSTALL_SUB= MKTEXLSR=${MKTEXLSR} \ - XDVIDIR=${PREFIX}/${TEXMF}/xdvi \ - XDVIVARDIR=${PREFIX}/${TEXMF}-var/xdvi \ + XDVIDIR=${PREFIX}/${TEXMFDIR}/xdvi \ + XDVICONFDIR=${PREFIX}/${TEXMFDIR}-config/xdvi \ PAPERSIZE=${PAPERSIZE} \ - TEXCONFIG=${TEXCONFIG} \ + TEXCONFIGBIN=${TEXCONFIGBIN} \ LOCALBASE=${LOCALBASE} -pre-build: +pre-install: ${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} ${CHMOD} 0755 ${PKGINSTALL} diff --git a/print/xdvik/files/patch-texk::xdvik::Makefile.in b/print/xdvik/files/patch-texk::xdvik::Makefile.in deleted file mode 100644 index d79301d55dee..000000000000 --- a/print/xdvik/files/patch-texk::xdvik::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- texk/xdvik/Makefile.in.orig Tue Dec 21 22:23:47 2004 -+++ texk/xdvik/Makefile.in Tue Dec 21 22:24:05 2004 -@@ -138,6 +138,7 @@ - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps - $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext) - $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi -+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi.xdvik-tetex - $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps - if \ - grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \ diff --git a/print/xdvik/files/pkg-install.in b/print/xdvik/files/pkg-install.in index c1603750aac9..c76ea145bed8 100644 --- a/print/xdvik/files/pkg-install.in +++ b/print/xdvik/files/pkg-install.in @@ -3,34 +3,31 @@ PAPERSIZE=%%PAPERSIZE%% XDVIDIR=%%XDVIDIR%% -XDVIVARDIR=%%XDVIVARDIR%% +XDVICONFDIR=%%XDVICONFDIR%% MKTEXLSR=%%MKTEXLSR%% -TEXCONFIG=%%TEXCONFIG%% +TEXCONFIGBIN=%%TEXCONFIGBIN%% PATH=${PATH}:%%LOCALBASE%%/bin case $2 in POST-INSTALL) - cp -v ${XDVIDIR}/XDvi.xdvik-tetex ${XDVIDIR}/XDvi - if [ -f ${XDVIVARDIR}/XDvi ]; then - echo "======" - echo "NOTICE: you have to merge "\ - "${XDVIVARDIR}/XDvi from ${XDVIDIR}/XDvi." - echo "======" - fi + ${MKTEXLSR} case ${PAPERSIZE} in letter) - ${TEXCONFIG} xdvi us + ${TEXCONFIGBIN} xdvi paper us ;; *) - ${TEXCONFIG} xdvi a4 + ${TEXCONFIGBIN} xdvi paper a4 ;; esac ${MKTEXLSR} + echo "======" + echo "NOTICE: Before upgrading, you may want to make " \ + "a backup of the following file(s):" + echo " ${XDVICONFDIR}/XDvi" + echo "======" ;; DEINSTALL) - rm -f ${XDVIVARDIR}/XDvi - cp -v ${XDVIDIR}/XDvi.tetex ${XDVIDIR}/XDvi + # do nothing ${MKTEXLSR} ;; esac - diff --git a/print/xdvik/pkg-plist b/print/xdvik/pkg-plist index 0c494adfb266..ee430d461fbe 100644 --- a/print/xdvik/pkg-plist +++ b/print/xdvik/pkg-plist @@ -2,11 +2,12 @@ bin/xdvi bin/xdvi-motif.bin bin/xdvizilla -%%TEXMF%%/xdvi/XDvi.xdvik-tetex -%%TEXMF%%/xdvi/xdvi.cfg -%%TEXMF%%/xdvi/pixmaps/toolbar.xpm -%%TEXMF%%/xdvi/pixmaps/toolbar2.xpm -@dirrm %%TEXMF%%/xdvi/pixmaps +%%TEXMFDIR%%/xdvi/XDvi +%%TEXMFDIR%%/xdvi/xdvi.cfg +%%TEXMFDIR%%/xdvi/pixmaps/toolbar.xpm +%%TEXMFDIR%%/xdvi/pixmaps/toolbar2.xpm +@dirrm %%TEXMFDIR%%/xdvi/pixmaps +%%TEXMFCONFIGDIR%%/xdvi/XDvi %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/INSTALL |