[csw-devel] SF.net SVN: gar:[19983] csw/mgar/pkg/texlive/trunk/Makefile

[pfelecan at users.sourceforge.net]

Revision: 19983
          http://gar.svn.sourceforge.net/gar/?rev=19983&view=rev
Author:   pfelecan
Date:     2012-12-31 12:48:57 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
texlive/trunk: fix regex and makefile conflict

Modified Paths:
--------------
    csw/mgar/pkg/texlive/trunk/Makefile

Modified: csw/mgar/pkg/texlive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texlive/trunk/Makefile	2012-12-31 01:04:31 UTC (rev 19982)
+++ csw/mgar/pkg/texlive/trunk/Makefile	2012-12-31 12:48:57 UTC (rev 19983)
@@ -5439,10 +5439,10 @@
 	cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {}
 	:    Bourne Shell
 	cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {}
-	: patch postinstallation files being too expansive to patch in the classic way
-	gsed --in-place 's;^cmbase=cmbase.mf$;/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh
-	gsed --in-place 's;^LATEXPATH="/usr/texbin/" # TeXLive$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh
-	gsed --in-place 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks
+	: patch postinstallation for those files being too expansive to patch in the classic way
+	gsed --in-place --expression 's;^cmbase=.*cmbase.mf$$;cmbase=/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh
+	gsed --in-place --expression 's;^LATEXPATH="/usr/texbin/" # TeXLive$$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh
+	gsed --in-place --expression 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks
 	$(MAKECOOKIE)
 
 REINPLACE_WHEN_USRLOCAL	=	postinstall

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.