From owner-svn-ports-all@FreeBSD.ORG Thu Jul 3 08:36:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7189CA77; Thu, 3 Jul 2014 08:36:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D1252B19; Thu, 3 Jul 2014 08:36:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s638aDMS020556; Thu, 3 Jul 2014 08:36:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s638aCJ5020554; Thu, 3 Jul 2014 08:36:12 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407030836.s638aCJ5020554@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 3 Jul 2014 08:36:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360344 - head/print/teTeX-base X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 08:36:13 -0000 Author: bapt Date: Thu Jul 3 08:36:12 2014 New Revision: 360344 URL: http://svnweb.freebsd.org/changeset/ports/360344 QAT: https://qat.redports.org/buildarchive/r360344/ Log: Revert staging teTeX doesn't seems to behave the same when make stage is run as root or run as a normal user With hat: portmgr Modified: head/print/teTeX-base/Makefile head/print/teTeX-base/pkg-plist Modified: head/print/teTeX-base/Makefile ============================================================================== --- head/print/teTeX-base/Makefile Thu Jul 3 08:29:15 2014 (r360343) +++ head/print/teTeX-base/Makefile Thu Jul 3 08:36:12 2014 (r360344) @@ -19,15 +19,15 @@ BUILD_DEPENDS= ${LOCALBASE}/${TEXMFDISTD RUN_DEPENDS= ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ texi2html:${PORTSDIR}/textproc/texi2html -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ - libwwwcore.so:${PORTSDIR}/www/libwww \ - libt1.so:${PORTSDIR}/devel/t1lib \ - libgd.so:${PORTSDIR}/${GD_PORT} +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ + wwwcore:${PORTSDIR}/www/libwww \ + t1:${PORTSDIR}/devel/t1lib \ + gd:${PORTSDIR}/${GD_PORT} GD_PORT?= graphics/gd WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION} GNU_CONFIGURE= yes -USES= gmake desthack +USES= gmake USE_GHOSTSCRIPT_RUN= yes CONFIGURE_ARGS= --disable-multiplatform \ --without-texinfo \ @@ -49,21 +49,74 @@ CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL INSTALL_PROGRAM="${INSTALL_PROGRAM}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 PKGMESSAGE= ${WRKDIR}/pkg-message -CONFLICTS_INSTALL= ja-ptex-base-[0-9]* 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]* +CONFLICTS= ja-ptex-base-[0-9]* 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]* + +MAN1= tie.1 kpseaccess.1 kpsereadlink.1 mpost.1 \ + dmp.1 dvicopy.1 dvilj.1 dvipdfm.1 \ + fmtutil.1 gftodvi.1 gftopk.1 gftype.1 \ + gsftopk.1 kpsewhich.1 makeindex.1 \ + mf.1 mft.1 mktexmf.1 mktexpk.1 \ + mktextfm.1 dvihp.1 patgen.1 \ + pfb2pfa.1 pdfxtex.1 pktype.1 pltotf.1 \ + pooltype.1 ps2pk.1 tex.1 vftovp.1 \ + vptovf.1 weave.1 pdfetex.1 fontinst.1 \ + cweb.1 ctie.1 etex.1 dvired.1 \ + mpto.1 newer.1 dvipdft.1 ebb.1 \ + dvipng.1 e2pall.1 makempx.1 \ + pk2bm.1 pktogf.1 tangle.1 amstex.1 \ + eplain.1 epstopdf.1 kpsetool.1 fdf2tex.1 \ + mkindex.1 pslatex.1 kpsewhere.1 \ + makempy.1 mkocp.1 mkofm.1 ofm2opl.1 \ + opl2ofm.1 otp2ocp.1 bibtex.1 outocp.1 \ + ovf2ovp.1 ovp2ovf.1 rumakeindex.1 texdoc.1 \ + tftopl.1 texexec.1 updmap.1 texshow.1 \ + texfind.1 texfont.1 texlinks.1 texutil.1 \ + thumbpdf.1 ttf2afm.1 dvitomp.1 latex.1 \ + pdftex.1 mag.1 kpsestat.1 texconfig.1 \ + allcm.1 allneeded.1 \ + dvitype.1 mktexlsr.1 omega.1 \ + ps2frag.1 dvi2fax.1 rubibtex.1 texdoctk.1 +MAN5= fmtutil.cnf.5 + +MLINKS= dvilj.1 dvilj2p.1 \ + dvilj.1 dvilj4.1 \ + dvilj.1 dvilj4l.1 \ + dvilj.1 dvilj6.1 \ + allcm.1 allec.1 \ + omega.1 lambda.1 \ + pdfetex.1 pdflatex.1 \ + kpsetool.1 kpsepath.1 \ + kpsetool.1 kpsexpand.1 \ + mf.1 mf-nowin.1 \ + cweb.1 ctangle.1 \ + cweb.1 cweave.1 \ + dvicopy.1 odvicopy.1 \ + fmtutil.1 mktexfmt.1 \ + fmtutil.1 fmtutil-sys.1 \ + texconfig.1 texconfig-sys.1 \ + updmap.1 updmap-sys.1 \ + dvitype.1 odvitype.1 \ + mktexlsr.1 texhash.1 INFO= kpathsea latex web2c -PLIST_SUB?= +NO_STAGE= yes +.include -OPTIONS_DEFINE= X11 -OPTIONS_SUB= X11 +PLIST_SUB?= -X11_USE= XORG=x11,xt -X11_COFNIGURE_WITH= x11 +.if !defined(WITHOUT_X11) +PLIST_SUB+= X11BITS="" +USE_XORG= x11 xt +.else +FLAVOR+= nox11 +CONFIGURE_ARGS+=--without-x11 +PLIST_SUB+= X11BITS="@comment " +.endif TETEX_SRC= tetex-src-${PORTVERSION} LIBGD_PREFIX?= ${LOCALBASE} @@ -81,7 +134,6 @@ MKTEXLSR= ${PREFIX}/bin/mktexlsr FMTUTIL_SYS= ${PREFIX}/bin/fmtutil-sys UPDMAP_SYS= ${PREFIX}/bin/updmap-sys UPDMAPDIR= ${TEXMFDIR}/updmap -SHAREMODE= 644 PLIST_SUB+= TEXMFDIR=${TEXMFDIR} \ TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \ @@ -97,29 +149,44 @@ SUB_LIST= TEXMFDIR=${TEXMFDIR} \ TEXMFDISTDIR=${TEXMFDISTDIR} \ UPDMAPDIR=${UPDMAPDIR} \ PREFIX=${PREFIX} +OLDCONFIG= web2c/texmf.cnf web2c/mktex.cnf web2c/fmtutil.cnf \ + web2c/updmap.cfg \ + xdvi/XDvi \ + dvipdfm/config/config \ + dvips/config/config.ps \ + etex/plain/config/language.def \ + tex/generic/config/language.dat \ + tex/context/config/cont-usr.tex \ + pdftex/config/pdftex.cfg # override several user-defined variables because the wrong # configurations may break the build. MAKE_ENV= TEXINPUTS= TEXMF= TEXMFCNF= -pre-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/ - ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/web2c/ +pre-su-install: +.for F in ${OLDCONFIG} + if [ -f ${PREFIX}/${TEXMFVARDIR}/${F} ]; then \ + ${RM} -f ${PREFIX}/${TEXMFVARDIR}/${F}; \ + ${ECHO_CMD} "NOTICE: old config file ${F} has been removed.";\ + fi +.endfor ${INSTALL_DATA} \ ${PREFIX}/${TEXMFDISTDIR}/web2c/updmap.cfg \ - ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/updmap.cfg + ${PREFIX}/${TEXMFCONFIGDIR}/web2c/updmap.cfg post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/texconfig - ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/texconfig/tcfmgr.map \ - ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/texconfig/tcfmgr.map - ${MV} -f ${STAGEDIR}${PREFIX}/bin/texdoctk ${STAGEDIR}${PREFIX}/bin/texdoctk.real - ${INSTALL_SCRIPT} ${WRKDIR}/texdoctk.wrapper ${STAGEDIR}${PREFIX}/bin/texdoctk - ${MKDIR} ${STAGEDIR}${PREFIX}/${UPDMAPDIR} - ${MV} -f ${STAGEDIR}${PREFIX}/bin/updmap-sys ${STAGEDIR}${PREFIX}/${UPDMAPDIR}/updmap-sys.dist - ${MV} -f ${STAGEDIR}${PREFIX}/bin/updmap ${STAGEDIR}${PREFIX}/${UPDMAPDIR}/updmap.dist - ${INSTALL_SCRIPT} ${WRKDIR}/updmap.wrapper ${STAGEDIR}${PREFIX}/bin/updmap-sys - ${INSTALL_SCRIPT} ${WRKDIR}/updmap.wrapper ${STAGEDIR}${PREFIX}/bin/updmap - ${RM} -f ${STAGEDIR}${PREFIX}/${TEXMFDIR}/ls-R + ${MKDIR} ${PREFIX}/${TEXMFCONFIGDIR}/texconfig + ${INSTALL_DATA} ${PREFIX}/${TEXMFDIR}/texconfig/tcfmgr.map \ + ${PREFIX}/${TEXMFCONFIGDIR}/texconfig/tcfmgr.map + ${MV} -f ${PREFIX}/bin/texdoctk ${PREFIX}/bin/texdoctk.real + ${INSTALL_SCRIPT} ${WRKDIR}/texdoctk.wrapper ${PREFIX}/bin/texdoctk + ${MKDIR} ${PREFIX}/${UPDMAPDIR} + ${MV} -f ${PREFIX}/bin/updmap-sys ${PREFIX}/${UPDMAPDIR}/updmap-sys.dist + ${MV} -f ${PREFIX}/bin/updmap ${PREFIX}/${UPDMAPDIR}/updmap.dist + ${INSTALL_SCRIPT} ${WRKDIR}/updmap.wrapper ${PREFIX}/bin/updmap-sys + ${INSTALL_SCRIPT} ${WRKDIR}/updmap.wrapper ${PREFIX}/bin/updmap + ${MKTEXLSR} + @${ECHO_MSG} + @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/print/teTeX-base/pkg-plist ============================================================================== --- head/print/teTeX-base/pkg-plist Thu Jul 3 08:29:15 2014 (r360343) +++ head/print/teTeX-base/pkg-plist Thu Jul 3 08:36:12 2014 (r360344) @@ -17,7 +17,7 @@ bin/pdfetex bin/pdfxtex bin/tex bin/mf -%%X11%%bin/mf-nowin +%%X11BITS%%bin/mf-nowin bin/mpost bin/newer bin/dmp @@ -171,119 +171,6 @@ include/kpathsea/variable.h include/kpathsea/xopendir.h include/kpathsea/xstat.h lib/libkpathsea.a -man/man1/allcm.1.gz -man/man1/allec.1.gz -man/man1/allneeded.1.gz -man/man1/amstex.1.gz -man/man1/bibtex.1.gz -man/man1/ctangle.1.gz -man/man1/ctie.1.gz -man/man1/cweave.1.gz -man/man1/cweb.1.gz -man/man1/dmp.1.gz -man/man1/dvi2fax.1.gz -man/man1/dvicopy.1.gz -man/man1/dvihp.1.gz -man/man1/dvilj.1.gz -man/man1/dvilj2p.1.gz -man/man1/dvilj4.1.gz -man/man1/dvilj4l.1.gz -man/man1/dvilj6.1.gz -man/man1/dvipdfm.1.gz -man/man1/dvipdft.1.gz -man/man1/dvipng.1.gz -man/man1/dvired.1.gz -man/man1/dvitomp.1.gz -man/man1/dvitype.1.gz -man/man1/e2pall.1.gz -man/man1/ebb.1.gz -man/man1/eplain.1.gz -man/man1/epstopdf.1.gz -man/man1/etex.1.gz -man/man1/fdf2tex.1.gz -man/man1/fmtutil-sys.1.gz -man/man1/fmtutil.1.gz -man/man1/fontinst.1.gz -man/man1/gftodvi.1.gz -man/man1/gftopk.1.gz -man/man1/gftype.1.gz -man/man1/gsftopk.1.gz -man/man1/kpseaccess.1.gz -man/man1/kpsepath.1.gz -man/man1/kpsereadlink.1.gz -man/man1/kpsestat.1.gz -man/man1/kpsetool.1.gz -man/man1/kpsewhere.1.gz -man/man1/kpsewhich.1.gz -man/man1/kpsexpand.1.gz -man/man1/lambda.1.gz -man/man1/latex.1.gz -man/man1/mag.1.gz -man/man1/makeindex.1.gz -man/man1/makempx.1.gz -man/man1/makempy.1.gz -man/man1/mf-nowin.1.gz -man/man1/mf.1.gz -man/man1/mft.1.gz -man/man1/mkindex.1.gz -man/man1/mkocp.1.gz -man/man1/mkofm.1.gz -man/man1/mktexfmt.1.gz -man/man1/mktexlsr.1.gz -man/man1/mktexmf.1.gz -man/man1/mktexpk.1.gz -man/man1/mktextfm.1.gz -man/man1/mpost.1.gz -man/man1/mpto.1.gz -man/man1/newer.1.gz -man/man1/odvicopy.1.gz -man/man1/odvitype.1.gz -man/man1/ofm2opl.1.gz -man/man1/omega.1.gz -man/man1/opl2ofm.1.gz -man/man1/otp2ocp.1.gz -man/man1/outocp.1.gz -man/man1/ovf2ovp.1.gz -man/man1/ovp2ovf.1.gz -man/man1/patgen.1.gz -man/man1/pdfetex.1.gz -man/man1/pdflatex.1.gz -man/man1/pdftex.1.gz -man/man1/pdfxtex.1.gz -man/man1/pfb2pfa.1.gz -man/man1/pk2bm.1.gz -man/man1/pktogf.1.gz -man/man1/pktype.1.gz -man/man1/pltotf.1.gz -man/man1/pooltype.1.gz -man/man1/ps2frag.1.gz -man/man1/ps2pk.1.gz -man/man1/pslatex.1.gz -man/man1/rubibtex.1.gz -man/man1/rumakeindex.1.gz -man/man1/tangle.1.gz -man/man1/tex.1.gz -man/man1/texconfig-sys.1.gz -man/man1/texconfig.1.gz -man/man1/texdoc.1.gz -man/man1/texdoctk.1.gz -man/man1/texexec.1.gz -man/man1/texfind.1.gz -man/man1/texfont.1.gz -man/man1/texhash.1.gz -man/man1/texlinks.1.gz -man/man1/texshow.1.gz -man/man1/texutil.1.gz -man/man1/tftopl.1.gz -man/man1/thumbpdf.1.gz -man/man1/tie.1.gz -man/man1/ttf2afm.1.gz -man/man1/updmap-sys.1.gz -man/man1/updmap.1.gz -man/man1/vftovp.1.gz -man/man1/vptovf.1.gz -man/man1/weave.1.gz -man/man5/fmtutil.cnf.5.gz %%TEXMFCONFIGDIR%%/web2c/updmap.cfg %%TEXMFDIR%%/web2c/mktex.opt %%TEXMFDIR%%/web2c/mktexdir