svn commit: r313378 - in head: japanese/dvipsk japanese/ptex japanese/teTeX japanese/xdvik print/dvipsk-tetex print/teTeX print/teTeX-base print/teTeX-texmf print/xdvik
Hiroki Sato
hrs at FreeBSD.org
Sun Mar 3 20:49:37 UTC 2013
Author: hrs
Date: Sun Mar 3 20:49:34 2013
New Revision: 313378
URL: http://svnweb.freebsd.org/changeset/ports/313378
Log:
- Add CONFLICTS as a preparation of importing new TeX ports based on TeXLive.
No functional change.
- Style fixes.
Modified:
head/japanese/dvipsk/Makefile
head/japanese/ptex/Makefile
head/japanese/teTeX/Makefile
head/japanese/xdvik/Makefile
head/print/dvipsk-tetex/Makefile
head/print/teTeX-base/Makefile
head/print/teTeX-texmf/Makefile
head/print/teTeX/Makefile
head/print/xdvik/Makefile
Modified: head/japanese/dvipsk/Makefile
==============================================================================
--- head/japanese/dvipsk/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/japanese/dvipsk/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: dvipsk + jpatch
-# Date created: 25 Aug 1997
-# Whom: Makoto WATANABE <watanabe at zlab.phys.nagoya-u.ac.jp>
-#
+# Created by: Makoto WATANABE <watanabe at zlab.phys.nagoya-u.ac.jp>
# $FreeBSD$
-#
PORTNAME= dvipsk
PORTVERSION= 5.95b
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
${MASTER_SITE_LOCAL:S,%SUBDIR%,hrs/teTeX,:S,$,:udvipspatch,}
@@ -62,7 +58,10 @@ CONFIGURE_ARGS= --disable-multiplatform
--with-t1lib-include=${LIBT1_PREFIX}/include \
--without-xdvik --without-oxdvik
CONFLICTS= dvipsk-tetex-[0-9]* \
- dvips-[0-9]*
+ dvips-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
MAN1= dvips.1 afm2tfm.1
MLINKS= dvips.1 odvips.1
Modified: head/japanese/ptex/Makefile
==============================================================================
--- head/japanese/ptex/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/japanese/ptex/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -6,7 +6,7 @@
PORTNAME= ptex
PORTVERSION= 3.1.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -32,6 +32,11 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib
+CONFLICTS_INSTALL= \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${KANJICODE}
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
Modified: head/japanese/teTeX/Makefile
==============================================================================
--- head/japanese/teTeX/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/japanese/teTeX/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: teTeX
-# Date created: 3 June 2004
-# Whom: hrs
-#
# $FreeBSD$
PORTNAME= teTeX
PORTVERSION= 1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -26,6 +22,10 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDI
RUN_DEPENDS+= xdvi:${PORTSDIR}/japanese/xdvik
.endif
+CONFLICTS= texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
+
JTEXVF= ${LOCALBASE}/share/texmf-local/fonts/vf/n2a/dmjsy5.vf
TEXMFLOCAL_LSR= ${LOCALBASE}/share/texmf-local/ls-R
TEXMFDISTDIR= share/texmf-dist
Modified: head/japanese/xdvik/Makefile
==============================================================================
--- head/japanese/xdvik/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/japanese/xdvik/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: xdvik + jp-patch
-# Date created: 15 Jun 1998
-# Whom: Kentaro Inagaki <inagaki at tg.rim.or.jp>
-#
+# Created by: Kentaro Inagaki <inagaki at tg.rim.or.jp>
# $FreeBSD$
-#
PORTNAME= xdvik
PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= japanese print
MASTER_SITES= SF/xdvi/OldFiles
PKGNAMESUFFIX= -tetex
@@ -64,7 +60,10 @@ MAN1= xdvi.1 xdvizilla.1 t1mapper.1
INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik
PLIST_SUB= TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
XDVIETCDIR=${XDVIETCDIR}
-CONFLICTS= xdvi-[0-9]* xdvi-*-[0-9]* xdvik-[0-9]*
+CONFLICTS= texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]* \
+ xdvi-[0-9]* xdvi-*-[0-9]* xdvik-[0-9]*
VERSION_XDVIK= 22.40y1
VERSION_JPATCH= 1.21
Modified: head/print/dvipsk-tetex/Makefile
==============================================================================
--- head/print/dvipsk-tetex/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/print/dvipsk-tetex/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: dvipsk-tetex
-# Date created: 5 May 2004
-# Whom: hrs
-#
# $FreeBSD$
PORTNAME= dvipsk-tetex
PORTVERSION= 5.95a
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -53,7 +49,10 @@ CONFLICTS= *-teTeX-[0-9]* \
ja-ptex-*-[0-9]* \
dvips-[0-9]* \
*-dvips-[0-9]* \
- *-dvipsk-[0-9]*
+ *-dvipsk-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
MAN1= dvips.1 afm2tfm.1
MLINKS= dvips.1 odvips.1
Modified: head/print/teTeX-base/Makefile
==============================================================================
--- head/print/teTeX-base/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/print/teTeX-base/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: teTeX-base
-# Date created: 5 December 1996
-# Whom: Bernd Rosauer <br at netland.inka.de>
-#
+# Created by: Bernd Rosauer <br at netland.inka.de>
# $FreeBSD$
-#
PORTNAME= teTeX-base
PORTVERSION= 3.0
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -26,8 +22,9 @@ RUN_DEPENDS= ${LOCALBASE}/${TEXMFDISTDIR
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww \
t1.5:${PORTSDIR}/devel/t1lib \
- gd.4:${PORTSDIR}/graphics/gd
+ gd.4:${PORTSDIR}/${GD_PORT}
+GD_PORT?= graphics/gd
WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -53,7 +50,10 @@ CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
PKGMESSAGE= ${WRKDIR}/pkg-message
CONFLICTS= ja-ptex-base-[0-9]* latex2e-[0-9]* \
- tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
+ tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
MAN1= tie.1 kpseaccess.1 kpsereadlink.1 mpost.1 \
dmp.1 dvicopy.1 dvilj.1 dvipdfm.1 \
Modified: head/print/teTeX-texmf/Makefile
==============================================================================
--- head/print/teTeX-texmf/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/print/teTeX-texmf/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: teTeX-texmf
-# Date created: 5 June 2004
-# Whom: hrs
-#
# $FreeBSD$
PORTNAME= teTeX-texmf
PORTVERSION= 3.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -24,7 +20,10 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDI
${LOCALBASE}/share/fonts/amsfonts/doc/fonts/amsfonts/00README:${PORTSDIR}/print/font-amsfonts
CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \
- ja-ptext-base-[0-9]*
+ ja-ptext-base-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
.include <bsd.port.pre.mk>
Modified: head/print/teTeX/Makefile
==============================================================================
--- head/print/teTeX/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/print/teTeX/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: teTeX
-# Date created: 5 December 1996
-# Whom: Bernd Rosauer <br at netland.inka.de>
-#
+# Created by: Bernd Rosauer <br at netland.inka.de>
# $FreeBSD$
-#
PORTNAME= teTeX
PORTVERSION= 3.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -34,7 +30,10 @@ RUN_DEPENDS+= xdvi:${PORTSDIR}/print/xdv
# in print/teTeX-base.
DEPENDS_ARGS+= BATCH=yes
-CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
+CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
.if defined(WITH_LETTERSIZE)
FLAVOR+= letter
Modified: head/print/xdvik/Makefile
==============================================================================
--- head/print/xdvik/Makefile Sun Mar 3 20:43:52 2013 (r313377)
+++ head/print/xdvik/Makefile Sun Mar 3 20:49:34 2013 (r313378)
@@ -1,13 +1,9 @@
-# New ports collection makefile for: xdvik
-# Date created: 26 Feb 1998
-# Whom: Kentaro Inagaki <JBD01226 at niftyserve.ne.jp>
-#
+# Created by: Kentaro Inagaki <JBD01226 at niftyserve.ne.jp>
# $FreeBSD$
-#
PORTNAME= xdvik
PORTVERSION= 22.84.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -tetex
@@ -39,7 +35,10 @@ INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik
PLIST_SUB= TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config
CONFLICTS_INSTALL= xdvi-[0-9]* xdvi-*-[0-9]* *-xdvi-[0-9]* \
- *-xdvik-[0-9]* ja-xdvik-*-[0-9]*
+ *-xdvik-[0-9]* ja-xdvik-*-[0-9]* \
+ texlive-[0-9]* tex-web2c-[0-9]* \
+ tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
+ tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
MAN1= xdvi.1
MLINKS= xdvi.1 oxdvi.1
More information about the svn-ports-all
mailing list