Update to version 5.78a.

PR:		7199
Submitted by:	maintainer

6 files changed, 161 insertions, 137 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index bcf72e9f0710..46e276e322c2 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -1,23 +1,27 @@
 # New ports collection makefile for:    dvipsk + jpatch
-# Version required:     5.66a
+# Version required:     5.78a + p1.4
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/02 22:35:08 max Exp $
 #
 
-DISTNAME=	dvipsk-5.66a
-PKGNAME=	ja-dvipsk-5.66a
+DISTNAME=	dvipsk-5.78a
+PKGNAME=	ja-dvipsk-5.78a
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex215/ \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex215/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.3b.tar.gz
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/ \
+		ftp://ftp.center.osaka-u.ac.jp/CTAN/dviware/dvipsk/ \
+		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
+		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4.tar.gz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
 RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common \
 		${PREFIX}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
 
+MANUAL_PACKAGE_BUILD=	incompatible with other versions of dvipsk-*
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
@@ -27,38 +31,61 @@ TEXMF=		${PREFIX}/share/texmf
 DVIPSDIR=	${TEXMF}/dvips
 TEXDIR=		${TEXMF}/tex
 BINARIES=	dvips afm2tfm
-CONTRIB_FILES=	2a4.ps bb.ps bbfig config.fax config.lino config.lj2p \
-		config.post3x3 config.proto config.rokicki loop.ps \
-		mkdvipspapers oneline.tex papersize.level2 papersize.simple \
-		prepipe.ps ptmr.ed ptmro.ed rotsample.tex showpage.ps \
-		treen.sh treen2.sh
+BACKUP_FILES=	base/asex.enc base/psfonts.map config/config.ps
+BASE_FILES=	cmfonts.map cyrfonts.map eufonts.map lafonts.map \
+		reencode/asex.enc
+CONTRIB_DIRS=	afm-extra bbfig configs psfig volker
+CONTRIB_FILES=	MakeTeXPK.pl PSTricks colorsep.pro config.proto crop.lpr \
+		timesmat.sty whichinpath afm-extra/*.ed bbfig/bb* \
+		configs/*[^g] psfig/README psfig/lprep* volker/*
+PLAIN_MACROS=	psfig/psfig.tex psfntmac/ps_plain.tex
+LATEX209_MACROS=latex209/*.sty psfntmac/ps_lfonts.tex pspic/*
 DOCS=		../README.jpatch dvipsk/README \
-		dvipsk/dvips.texi dvipsk/dvips.help dvipsk/dvips.cps
+		dvipsk/dvips.texi dvipsk/dvips.help
 
 pre-patch:
-	@${PATCH} -s -d ${WRKSRC} < ${WRKDIR}/dvipsk.patch
-	@( cd ${WRKSRC}/dvipsk/contrib ; ${CP} config.rokicki config.ps )
+	@${PATCH} -p -s -d ${WRKSRC} < ${WRKDIR}/dvipsk.patch
+
+post-build:
+	@(\
+	  cd ${WRKSRC}/dvipsk/contrib ; \
+	  ../squeeze < colorsep.lpro > colorsep.pro \
+	)
 
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ] ; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir ; \
 	fi
+	@for i in ${BACKUP_FILES} ; do \
+	  if [ -f ${DVIPSDIR}/$$i ] ; then \
+	    ${MV} ${DVIPSDIR}/$$i ${DVIPSDIR}/$$i.bak ; \
+	  fi ; \
+	done
 
 post-install:
 	@for i in ${BINARIES} ; do \
 	    strip ${PREFIX}/bin/$$i ; \
 	done
-	@${MKDIR} ${DVIPSDIR}/contrib/volker
+	@${MKDIR} ${DVIPSDIR}/config
+	@for i in ${CONTRIB_DIRS} ; do \
+	  ${MKDIR} ${DVIPSDIR}/contrib/$$i ; \
+	done
 	@${MKDIR} ${TEXDIR}/latex209/dvips
 	@(\
+	  cd ${WRKSRC}/dvipsk ; \
+	  for i in ${BASE_FILES} ; do \
+	    ${INSTALL_DATA} $$i ${DVIPSDIR}/base ; \
+	  done ; \
+	  ${INSTALL_DATA} config.ps ${DVIPSDIR}/config ; \
 	  cd ${WRKSRC}/dvipsk/contrib ; \
-	  ${INSTALL_DATA} config.ps ${DVIPSDIR}/config.ps ; \
-	  for i in ${CONTRIB_FILES} volker/*; do \
+	  for i in ${CONTRIB_FILES} ; do \
 	    ${INSTALL_DATA} $$i ${DVIPSDIR}/contrib/$$i ; \
 	  done ; \
-	  cd ${WRKSRC}/dvipsk/contrib/latex209 ; \
-	  for i in *.sty ; do \
-	    ${INSTALL_DATA} $$i ${TEXDIR}/latex209/dvips/$$i ; \
+	  for i in ${PLAIN_MACROS} ; do \
+	    ${INSTALL_DATA} $$i ${TEXDIR}/plain/dvips ; \
+	  done ; \
+	  for i in ${LATEX209_MACROS} ; do \
+	    ${INSTALL_DATA} $$i ${TEXDIR}/latex209/dvips ; \
 	  done \
 	)
 .if !defined(NOPORTDOCS)
@@ -66,8 +93,14 @@ post-install:
 	@for i in ${DOCS} ; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/dvips ; \
 	done
-	@ln -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib
+	@${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib
+.endif
+.if defined(BATCH)
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL BATCH
+.else
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .endif
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index 3e19e44ba990..f221f037e5eb 100644
--- a/japanese/dvipsk/distinfo
+++ b/japanese/dvipsk/distinfo
@@ -1,2 +1,2 @@
-MD5 (dvipsk-5.66a.tar.gz) = 2c7006aa4de4840a6dce3cfebc68bdfd
-MD5 (dvipsk-jpatch-p1.3b.tar.gz) = 102f00fc5475334161e1728e553c3f3e
+MD5 (dvipsk-5.78a.tar.gz) = 7731c81a2614f62ff892b296d257c4d0
+MD5 (dvipsk-jpatch-p1.4.tar.gz) = 20b10a562e0f931768e258118ea773ba
diff --git a/japanese/dvipsk/files/patch-aa b/japanese/dvipsk/files/patch-aa
index 320382847d44..1b4ed0a9e126 100644
--- a/japanese/dvipsk/files/patch-aa
+++ b/japanese/dvipsk/files/patch-aa
@@ -1,22 +1,37 @@
---- dvipsk/output.c.orig	Sun May  3 06:42:35 1998
-+++ dvipsk/output.c	Sun May  3 06:42:46 1998
-@@ -90,6 +90,8 @@
- static Boolean popened = 0 ;
- int lastfont ; /* exported to dospecial to fix rotate.tex problem */
- static void chrcmd();                   /* just a forward declaration */
-+void cmdout();                          /* just a forward declaration */
-+void numout();                          /* just a forward declaration */
- static char strbuffer[LINELENGTH + 20], *strbp = strbuffer ;
- static struct papsiz *finpapsiz ;
- struct papsiz defpapsiz = {
---- Makefile.in.orig	Sat Feb  8 03:43:07 1997
-+++ Makefile.in	Sat Jun 27 17:41:51 1998
-@@ -31,7 +31,7 @@
- 	  (cd $$d && $(MAKE) $(makeargs) $@); else true; fi; done
+--- Makefile.in.orig	Thu Mar 12 06:37:45 1998
++++ Makefile.in	Sun Jun 28 11:41:59 1998
+@@ -34,7 +34,7 @@
+ 	  (cd $$d && $(MAKE) $(makeargs) $@) || break; else true; fi; done
  
  install install-data install-exec:
 -	for d in kpathsea $(programs); do if test -d $$d; then \
 +	for d in $(programs); do if test -d $$d; then \
- 	  (cd $$d && $(MAKE) $(installargs) $@); else true; fi; done
+ 	  (cd $$d && $(MAKE) $(installargs) $@) || break; else true; fi; done
  
  # Other standard targets for everything.
+--- dvipsk/Makefile.in.orig	Tue Mar  3 23:47:43 1998
++++ dvipsk/Makefile.in	Wed Jul  1 15:41:44 1998
+@@ -80,9 +80,9 @@
+ install-data: $(program).info
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(infodir) $(psheaderdir)/base $(dvips_plain_macrodir)
+ # PostScript prologues and encodings.
+-	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
+-	cd $(srcdir)/reencode && \
+-	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
++#	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
++#	cd $(srcdir)/reencode && \
++#	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
+ # config.ps. Any one config.ps will be wrong for most people, so don't
+ # install anything by default.
+ #	if test ! -r $(psheaderdir)/base/config.ps				\
+@@ -103,8 +103,8 @@
+ 	$(INSTALL_DATA) $(srcdir)/dvips.1 $(mandir)/dvips.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(mandir)/afm2tfm.$(manext)
+ # TeX macros.
+-	cd $(srcdir)/tex && for m in *.tex; do \
+-	  $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
++#	cd $(srcdir)/tex && for m in *.tex; do \
++#	  $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
+ 	$(POSTINSTALL)
+ 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+ 	  install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
diff --git a/japanese/dvipsk/files/patch-ab b/japanese/dvipsk/files/patch-ab
index 9c1248b7ebca..95ef6ba14047 100644
--- a/japanese/dvipsk/files/patch-ab
+++ b/japanese/dvipsk/files/patch-ab
@@ -1,33 +1,14 @@
---- dvipsk/contrib/config.ps.orig	Sun May  3 06:42:37 1998
-+++ dvipsk/contrib/config.ps	Sun May  3 06:59:56 1998
-@@ -4,13 +4,13 @@
+--- dvipsk/config.ps.orig	Sun Jun 28 11:43:25 1998
++++ dvipsk/config.ps	Sun Jun 28 11:46:02 1998
+@@ -4,9 +4,9 @@
  *
- m 1000000
+ m 470000
  *
 -*   And send output by default to the printer.
 +*   Run as a filter by default.
  *
--o !lpr
+-* o !lpr
 +f
  *
- *   Default resolution.
+ *  Additional .map files
  *
--D 400
-+D 300
- *
- *   Last resort sizes.
- *
-@@ -21,10 +21,10 @@
- *   If your default is a4 uncomment the following definition
- *   and comment out the letterSize definition.
- *
--*@ A4size 210mm 297mm
--*@+ %%PaperSize: A4
-+@ A4size 210mm 297mm
-+@+ %%PaperSize: A4
- 
--@ letterSize 8.5in 11in
-+*@ letterSize 8.5in 11in
- 
- @ letter 8.5in 11in
- @+ %%BeginPaperSize: Letter
diff --git a/japanese/dvipsk/pkg-descr b/japanese/dvipsk/pkg-descr
index 9060798b3b15..1bc7678ed809 100644
--- a/japanese/dvipsk/pkg-descr
+++ b/japanese/dvipsk/pkg-descr
@@ -10,9 +10,9 @@ You may have to set some variables in the path configuration file for
 kpathsea /usr/local/share/texmf/web2c/texmf.cnf so that the program
 can find PK fonts, Virtual fonts and TFM files. For example,
 
-PKFONTS = .:/usr/local/lib/fonts//:{$dbfonts,$VARTEXFONTS}//pk/$MAKETEX_MODE//
-VFFONTS = .:/usr/local/share/fonts/vf-a2bk:$dbfonts//vf//
-TFMFONTS = .:/usr/local/share/fonts/vf-a2bk:{$dbfonts,$VARTEXFONTS}//tfm//
+PKFONTS = .:/usr/local/lib/fonts//:{$TEXMF/fonts:$VARTEXFONTS}//pk//
+VFFONTS = .:/usr/local/share/fonts/vf-a2bk:$TEXMF/fonts//vf//
+TFMFONTS = .:/usr/local/share/fonts/vf-a2bk:{$TEXMF/fonts:$VARTEXFONTS}//tfm//
 
 - Makoto WATANABE
 watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index 476bfa2f7ce5..7be238459aff 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -6,77 +6,67 @@ info/dvips.info-1
 info/dvips.info-2
 info/dvips.info-3
 info/dvips.info-4
-info/dvips.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/dvips.info %D/info/dir
 man/man1/dvips.1.gz
 man/man1/afm2tfm.1.gz
-share/texmf/dvips/tex.pro
-share/texmf/dvips/texps.pro
-share/texmf/dvips/texc.pro
-share/texmf/dvips/special.pro
-share/texmf/dvips/finclude.pro
-share/texmf/dvips/color.pro
-share/texmf/dvips/crop.pro
-share/texmf/dvips/hps.pro
-share/texmf/dvips/8a.enc
-share/texmf/dvips/8r.enc
-share/texmf/dvips/ad.enc
-share/texmf/dvips/asex.enc
-share/texmf/dvips/asexp.enc
-share/texmf/dvips/cork.enc
-share/texmf/dvips/dc.enc
-share/texmf/dvips/dvips.enc
-share/texmf/dvips/funky.enc
-share/texmf/dvips/texmext.enc
-share/texmf/dvips/texmital.enc
-share/texmf/dvips/texmsym.enc
-share/texmf/dvips/xl2.enc
-share/texmf/dvips/xt2.enc
-share/texmf/dvips/config.ps
-share/texmf/dvips/psfonts.map
-share/texmf/dvips/contrib/2a4.ps
-share/texmf/dvips/contrib/bb.ps
-share/texmf/dvips/contrib/bbfig
-share/texmf/dvips/contrib/config.fax
-share/texmf/dvips/contrib/config.lino
-share/texmf/dvips/contrib/config.lj2p
-share/texmf/dvips/contrib/config.post3x3
+@exec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i ] ; then mv %D/share/texmf/dvips/$i %D/share/texmf/dvips/$i.bak ; fi ; done
+share/texmf/dvips/base/asex.enc
+share/texmf/dvips/base/cmfonts.map
+share/texmf/dvips/base/cyrfonts.map
+share/texmf/dvips/base/eufonts.map
+share/texmf/dvips/base/lafonts.map
+share/texmf/dvips/base/psfonts.map
+share/texmf/dvips/config/config.ps
+@unexec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i.bak ] ; then mv %D/share/texmf/dvips/$i.bak %D/share/texmf/dvips/$i ; fi ; done
+share/texmf/dvips/contrib/MakeTeXPK.pl
+share/texmf/dvips/contrib/PSTricks
+share/texmf/dvips/contrib/colorsep.pro
 share/texmf/dvips/contrib/config.proto
-share/texmf/dvips/contrib/config.rokicki
-share/texmf/dvips/contrib/loop.ps
-share/texmf/dvips/contrib/mkdvipspapers
-share/texmf/dvips/contrib/oneline.tex
-share/texmf/dvips/contrib/papersize.level2
-share/texmf/dvips/contrib/papersize.simple
-share/texmf/dvips/contrib/prepipe.ps
-share/texmf/dvips/contrib/ptmr.ed
-share/texmf/dvips/contrib/ptmro.ed
-share/texmf/dvips/contrib/rotsample.tex
-share/texmf/dvips/contrib/showpage.ps
-share/texmf/dvips/contrib/treen.sh
-share/texmf/dvips/contrib/treen2.sh
+share/texmf/dvips/contrib/crop.lpr
+share/texmf/dvips/contrib/timesmat.sty
+share/texmf/dvips/contrib/whichinpath
+share/texmf/dvips/contrib/afm-extra/ptmr.ed
+share/texmf/dvips/contrib/afm-extra/ptmro.ed
+share/texmf/dvips/contrib/bbfig/bb.ps
+share/texmf/dvips/contrib/bbfig/bbfig
+share/texmf/dvips/contrib/bbfig/bbfig.1
+share/texmf/dvips/contrib/configs/2a4.ps
+share/texmf/dvips/contrib/configs/config.fax
+share/texmf/dvips/contrib/configs/config.lino
+share/texmf/dvips/contrib/configs/config.lj2p
+share/texmf/dvips/contrib/configs/config.post3x3
+share/texmf/dvips/contrib/configs/config.rokicki
+share/texmf/dvips/contrib/configs/loop.ps
+share/texmf/dvips/contrib/configs/mkdvipspapers
+share/texmf/dvips/contrib/configs/papersize.level2
+share/texmf/dvips/contrib/configs/papersize.simple
+share/texmf/dvips/contrib/configs/prepipe.ps
+share/texmf/dvips/contrib/configs/showpage.ps
+share/texmf/dvips/contrib/psfig/README
+share/texmf/dvips/contrib/psfig/lprep68.pro
+share/texmf/dvips/contrib/psfig/lprep68.ps
+share/texmf/dvips/contrib/psfig/lprep70.pro
+share/texmf/dvips/contrib/psfig/lprep70.ps
 share/texmf/dvips/contrib/volker/README
-share/texmf/dvips/contrib/volker/config.a3
-share/texmf/dvips/contrib/volker/config.duplong
-share/texmf/dvips/contrib/volker/config.dupshort
-share/texmf/dvips/contrib/volker/config.inv
-share/texmf/dvips/contrib/volker/config.screen100
-share/texmf/dvips/contrib/volker/config.screen100-0
-share/texmf/dvips/contrib/volker/config.screen110
-share/texmf/dvips/contrib/volker/config.screen120
-share/texmf/dvips/contrib/volker/config.screen130
-share/texmf/dvips/contrib/volker/config.screen140
-share/texmf/dvips/contrib/volker/config.screen150
-share/texmf/dvips/contrib/volker/config.screen70
-share/texmf/dvips/contrib/volker/config.screen80
-share/texmf/dvips/contrib/volker/config.screen85
-share/texmf/dvips/contrib/volker/config.screen90
-share/texmf/dvips/contrib/volker/config.simplex
-share/texmf/tex/plain/dvips/blackdvi.tex
-share/texmf/tex/plain/dvips/colordvi.tex
-share/texmf/tex/plain/dvips/epsf.tex
-share/texmf/tex/plain/dvips/rotate.tex
+share/texmf/dvips/contrib/volker/a3.cfg
+share/texmf/dvips/contrib/volker/duplong.cfg
+share/texmf/dvips/contrib/volker/dupshort.cfg
+share/texmf/dvips/contrib/volker/inv.cfg
+share/texmf/dvips/contrib/volker/scr100.cfg
+share/texmf/dvips/contrib/volker/scr100-0.cfg
+share/texmf/dvips/contrib/volker/scr110.cfg
+share/texmf/dvips/contrib/volker/scr120.cfg
+share/texmf/dvips/contrib/volker/scr130.cfg
+share/texmf/dvips/contrib/volker/scr140.cfg
+share/texmf/dvips/contrib/volker/scr150.cfg
+share/texmf/dvips/contrib/volker/scr70.cfg
+share/texmf/dvips/contrib/volker/scr80.cfg
+share/texmf/dvips/contrib/volker/scr85.cfg
+share/texmf/dvips/contrib/volker/scr90.cfg
+share/texmf/dvips/contrib/volker/simplex.cfg
+share/texmf/tex/plain/dvips/psfig.tex
+share/texmf/tex/plain/dvips/ps_plain.tex
 share/texmf/tex/latex209/dvips/avantgarde.sty
 share/texmf/tex/latex209/dvips/blackdvi.sty
 share/texmf/tex/latex209/dvips/bookman.sty
@@ -90,16 +80,21 @@ share/texmf/tex/latex209/dvips/psfonts.sty
 share/texmf/tex/latex209/dvips/psgreek.sty
 share/texmf/tex/latex209/dvips/rotate.sty
 share/texmf/tex/latex209/dvips/times.sty
+share/texmf/tex/latex209/dvips/ps_lfonts.tex
+share/texmf/tex/latex209/dvips/pspic.readme
+share/texmf/tex/latex209/dvips/pspic.sty
 share/doc/dvips/README
 share/doc/dvips/README.jpatch
 share/doc/dvips/dvips.texi
 share/doc/dvips/dvips.help
-share/doc/dvips/dvips.cps
 @exec ln -fs %D/share/texmf/dvips/contrib %D/share/doc/dvips/contrib
 @unexec rm %D/share/doc/dvips/contrib
+@dirrm share/texmf/dvips/contrib/afm-extra
+@dirrm share/texmf/dvips/contrib/bbfig
+@dirrm share/texmf/dvips/contrib/configs
+@dirrm share/texmf/dvips/contrib/psfig
 @dirrm share/texmf/dvips/contrib/volker
 @dirrm share/texmf/dvips/contrib
-@dirrm share/texmf/dvips
-@dirrm share/texmf/tex/plain/dvips
 @dirrm share/texmf/tex/latex209/dvips
 @dirrm share/doc/dvips
+@unexec if [ -f %D/share/texmf/web2c/texmf.cnf.bak ] ; then rm -f %D/share/texmf/web2c/texmf.cnf ; mv %D/share/texmf/web2c/texmf.cnf.bak %D/share/texmf/web2c/texmf.cnf ; fi