Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Nov 2013 17:34:44 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332522 - in head/textproc/latex2html: . files
Message-ID:  <201311021734.rA2HYihD072850@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Sat Nov  2 17:34:44 2013
New Revision: 332522
URL: http://svnweb.freebsd.org/changeset/ports/332522

Log:
  Add STAGEDIR support.

Added:
  head/textproc/latex2html/files/patch-config-install.pl   (contents, props changed)
Modified:
  head/textproc/latex2html/Makefile
  head/textproc/latex2html/pkg-plist

Modified: head/textproc/latex2html/Makefile
==============================================================================
--- head/textproc/latex2html/Makefile	Sat Nov  2 17:26:11 2013	(r332521)
+++ head/textproc/latex2html/Makefile	Sat Nov  2 17:34:44 2013	(r332522)
@@ -11,41 +11,34 @@ MASTER_SITE_SUBDIR=	support/${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/dvips:${PORTSDIR}/print/dvipsk-tetex \
-		${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
+BUILD_DEPENDS=	${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	ja-latex2html-[0-9]*
 
-USES=			perl5
-USE_GHOSTSCRIPT=	yes
-USE_TEX=		latex dvipsk
-GNU_CONFIGURE=		yes
+USES=		perl5
+USE_GHOSTSCRIPT=yes
+USE_TEX=	latex dvipsk texhash
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL} \
 		--disable-gif \
 		--shlibdir=${DATADIR} \
-		--with-texpath=${PREFIX}/${TEXMFDIR}/tex/latex/html
+		--with-texpath=${PREFIX}/${TEXMFDIR}/tex/latex/html \
+		--without-mktexlsr
 SUB_FILES=	pkg-message
-PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR}
-
-MAN1=	latex2html.1
-
-TEXMFDIR=	share/texmf
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+PLIST_SUB=	TEXMFDIR=${TEXMFDIR}
+TEXHASHDIRS=	${TEXMFDIR}
 PORTDOCS=	FAQ INSTALL LICENSE README
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/latex2html.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_MAN} ${FILESDIR}/latex2html.1 ${STAGEDIR}${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
-	@${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/textproc/latex2html/files/patch-config-install.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/latex2html/files/patch-config-install.pl	Sat Nov  2 17:34:44 2013	(r332522)
@@ -0,0 +1,11 @@
+--- config/install.pl.orig	2002-11-29 20:49:01.000000000 +0900
++++ config/install.pl	2013-11-03 02:31:07.000000000 +0900
+@@ -372,7 +372,7 @@
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  unless(mkpath($ENV{DESTDIR}.$cfg{TEXPATH})) {
+   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {

Modified: head/textproc/latex2html/pkg-plist
==============================================================================
--- head/textproc/latex2html/pkg-plist	Sat Nov  2 17:26:11 2013	(r332521)
+++ head/textproc/latex2html/pkg-plist	Sat Nov  2 17:34:44 2013	(r332522)
@@ -4,6 +4,7 @@ bin/pstoimg
 bin/texexpand
 lib/latex2html/cfgcache.pm
 lib/latex2html/l2hconf.pm
+man/man1/latex2html.1.gz
 %%DATADIR%%/IndicTeX-HTML/README
 %%DATADIR%%/IndicTeX-HTML/bengali.perl
 %%DATADIR%%/IndicTeX-HTML/bengali.sty
@@ -315,8 +316,6 @@ lib/latex2html/l2hconf.pm
 %%TEXMFDIR%%/tex/latex/html/techexplHTML.tex
 %%TEXMFDIR%%/tex/latex/html/url.sty
 %%TEXMFDIR%%/tex/latex/html/verbatimfiles.sty
-@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
-@unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%
 @dirrm lib/latex2html
 @dirrm %%DATADIR%%/IndicTeX-HTML
 @dirrm %%DATADIR%%/L2hos



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311021734.rA2HYihD072850>