diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-24 15:47:50 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-24 15:47:50 +0000 |
| commit | 77760fcb6307bb10ac6bbf1653f33308bc4ffeb2 (patch) | |
| tree | 9a9bfdddc0d5bd83f4f805c6db760afc834ef9b7 /math/asymptote/files | |
| parent | Cisco::CopyConfig provides methods for manipulating the (diff) | |
Make print/ghostscript9-agpl-base the default Ghostscript port. Upstream
changed the license to the AGPL 3 in version 9.07 so print/ghostscript9-base
is stuck at 9.06 which is almost 4 years old now.
Fix the logic in Uses/ghostscript.mk so "agpl" is treated as a real version
on its own instead of as a variant of other versions.
Fix print/ghostscript9-agpl-base to install eps2write.
Update math/asymptote to 2.37 to support newer Ghostscript.
PR: 208159
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'math/asymptote/files')
| -rw-r--r-- | math/asymptote/files/patch-Makefile.in | 23 | ||||
| -rw-r--r-- | math/asymptote/files/patch-configure.ac | 16 | ||||
| -rw-r--r-- | math/asymptote/files/patch-settings.cc | 12 |
3 files changed, 9 insertions, 42 deletions
diff --git a/math/asymptote/files/patch-Makefile.in b/math/asymptote/files/patch-Makefile.in index 938782762d38..1da5ecf5299d 100644 --- a/math/asymptote/files/patch-Makefile.in +++ b/math/asymptote/files/patch-Makefile.in @@ -1,14 +1,6 @@ ---- ./Makefile.in.orig 2014-05-22 18:11:41.000000000 +0200 -+++ ./Makefile.in 2014-05-27 05:26:25.000000000 +0200 -@@ -53,7 +53,6 @@ - EXEXTRA = piicon.eps *.views *.dat *.bib - DOCEXTRA = *.asy *.csv *.dat latexusage.tex externalprc.tex pixel.pdf - KEYWORDS = base $(ASYMPTOTE_SITEDIR) --LATEXFILES = asymptote.sty asycolors.sty ocg.sty latexmkrc - CONTEXTFILES = colo-asy.tex - ASY = ./asy -dir base -config "" -render=0 - -@@ -84,7 +83,7 @@ +--- Makefile.in.orig 2016-03-14 05:33:18 UTC ++++ Makefile.in +@@ -88,7 +88,7 @@ datadir = $(DESTDIR)@datadir@ asydir = $(datadir)/asymptote GUIdir = $(asydir)/GUI docdir = $(DESTDIR)@docdir@ @@ -17,17 +9,12 @@ animationsdir = $(exampledir)/animations latexdir = $(DESTDIR)@latexdir@ contextdir = $(DESTDIR)@contextdir@ -@@ -234,13 +233,11 @@ +@@ -238,7 +238,7 @@ install-asy: asy sty ${INSTALL} -p -m 644 base/*.asy $(addprefix base/,$(EXTRA)) \ asy-keywords.el $(asydir) ${INSTALL} -p -m 755 GUI/*.py $(GUIdir) - ln -sf @datadir@/asymptote/GUI/xasy.py $(bindir)/$(XNAME) ++ ln -sf ../share/asymptote/GUI/xasy.py $(bindir)/$(XNAME) ${INSTALL} -p -m 644 examples/*.asy $(addprefix examples/,$(EXEXTRA)) \ doc/extra/*.asy $(addprefix doc/,$(DOCEXTRA)) $(exampledir) ${INSTALL} -p -m 644 examples/animations/*.asy \ - examples/animations/inlinemovie.tex \ - examples/animations/inlinemovie3.tex $(animationsdir) -- -${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir) - -${INSTALL} -p -m 644 $(addprefix doc/,$(CONTEXTFILES)) $(contextdir) - - install-html: html diff --git a/math/asymptote/files/patch-configure.ac b/math/asymptote/files/patch-configure.ac deleted file mode 100644 index 2e2f220721d1..000000000000 --- a/math/asymptote/files/patch-configure.ac +++ /dev/null @@ -1,16 +0,0 @@ ---- ./configure.ac.orig 2014-05-22 18:12:40.000000000 +0200 -+++ ./configure.ac 2014-05-27 05:26:25.000000000 +0200 -@@ -1,4 +1,3 @@ --# -*- Autoconf -*- - # Run autoheader and autoconf to produce a header and configure script from - # this file. - -@@ -160,7 +159,7 @@ - CPPFLAGS=$CPPFLAGS" $INCL" - AC_CHECK_HEADER(gc.h, - AC_CHECK_LIB([gc],[GC_malloc],[ -- LIBS=$LIBS"-lgc " -+ LIBS=$LIBS"-lgc-threaded " - AC_MSG_NOTICE([enabling system $GCNAME])],[ - GCDIR=$GCFILE - INCL="-I\$(GC)/include" diff --git a/math/asymptote/files/patch-settings.cc b/math/asymptote/files/patch-settings.cc index dcb5e22de367..0746f38efa69 100644 --- a/math/asymptote/files/patch-settings.cc +++ b/math/asymptote/files/patch-settings.cc @@ -1,6 +1,6 @@ ---- ./settings.cc.orig 2014-05-22 18:11:31.000000000 +0200 -+++ ./settings.cc 2014-05-27 05:26:36.000000000 +0200 -@@ -94,10 +94,10 @@ +--- settings.cc.orig 2016-03-14 05:33:18 UTC ++++ settings.cc +@@ -95,7 +95,7 @@ string defaultPSViewer="gv"; #ifdef __APPLE__ string defaultPDFViewer="open"; #else @@ -8,8 +8,4 @@ +string defaultPDFViewer="gv"; #endif string defaultGhostscript="gs"; --string defaultGhostscriptLibrary="/usr/lib/libgs.so"; -+string defaultGhostscriptLibrary="/usr/local/lib/libgs.so"; - string defaultDisplay="display"; - string defaultAnimate="animate"; - void queryRegistry() {} + string defaultGhostscriptLibrary="/usr/lib/libgs.so"; |
