diff options
author | Andrey Grozin <grozin@gentoo.org> | 2008-10-09 06:25:51 +0000 |
---|---|---|
committer | Andrey Grozin <grozin@gentoo.org> | 2008-10-09 06:25:51 +0000 |
commit | 91edd75d36e51c2342ded1fd4fec35a2fcb6f81f (patch) | |
tree | ee62ce6e02b5e94cc9cec485d988bbbd7606454a /media-gfx/asymptote | |
parent | Version bump to 1.4.8_pre2 (forgot ChangeLog) (diff) | |
download | gentoo-2-91edd75d36e51c2342ded1fd4fec35a2fcb6f81f.tar.gz gentoo-2-91edd75d36e51c2342ded1fd4fec35a2fcb6f81f.tar.bz2 gentoo-2-91edd75d36e51c2342ded1fd4fec35a2fcb6f81f.zip |
Version bump, cleaning old files
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-tuxonice-r1 i686)
Diffstat (limited to 'media-gfx/asymptote')
-rw-r--r-- | media-gfx/asymptote/ChangeLog | 18 | ||||
-rw-r--r-- | media-gfx/asymptote/asymptote-1.41.ebuild | 136 | ||||
-rw-r--r-- | media-gfx/asymptote/asymptote-1.44.ebuild (renamed from media-gfx/asymptote/asymptote-1.43.ebuild) | 70 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch | 49 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.33-makefile.patch | 65 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch | 49 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.36-makefile.patch | 65 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.41-configure-ac.patch | 43 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.41-makefile.patch | 58 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.44-configure-ac.patch (renamed from media-gfx/asymptote/files/asymptote-1.43-configure-ac.patch) | 28 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.44-xdg-utils.patch (renamed from media-gfx/asymptote/files/asymptote-1.41-xdg-utils.patch) | 8 |
11 files changed, 67 insertions, 522 deletions
diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog index f7343b44e1e8..8db73925aeee 100644 --- a/media-gfx/asymptote/ChangeLog +++ b/media-gfx/asymptote/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for media-gfx/asymptote # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.21 2008/10/07 06:14:53 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.22 2008/10/09 06:25:51 grozin Exp $ + +*asymptote-1.44 (09 Oct 2008) + + 09 Oct 2008; Andrey Grozin <grozin@gentoo.org> + -files/asymptote-1.33-configure-ac.patch, + -files/asymptote-1.33-makefile.patch, + -files/asymptote-1.36-configure-ac.patch, + -files/asymptote-1.36-makefile.patch, + -files/asymptote-1.41-configure-ac.patch, + -files/asymptote-1.41-makefile.patch, + -files/asymptote-1.41-xdg-utils.patch, + -files/asymptote-1.43-configure-ac.patch, + +files/asymptote-1.44-configure-ac.patch, + +files/asymptote-1.44-xdg-utils.patch, -asymptote-1.41.ebuild, + -asymptote-1.43.ebuild, +asymptote-1.44.ebuild: + Version bump, cleaning old files *asymptote-1.43-r1 (07 Oct 2008) diff --git a/media-gfx/asymptote/asymptote-1.41.ebuild b/media-gfx/asymptote/asymptote-1.41.ebuild deleted file mode 100644 index b39d8c58c880..000000000000 --- a/media-gfx/asymptote/asymptote-1.41.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.41.ebuild,v 1.2 2008/09/04 07:52:46 opfer Exp $ - -inherit eutils elisp-common latex-package - -DESCRIPTION="A vector graphics language that provides a framework for technical drawing" -HOMEPAGE="http://asymptote.sourceforge.net/" -SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="boehm-gc doc fftw emacs gsl vim-syntax" - -RDEPEND=">=sys-libs/readline-4.3-r5 - >=sys-libs/ncurses-5.4-r5 - dev-libs/libsigsegv - x11-misc/xdg-utils - boehm-gc? ( >=dev-libs/boehm-gc-7.0 ) - virtual/latex-base - fftw? ( >=sci-libs/fftw-3.0.1 ) - emacs? ( virtual/emacs ) - gsl? ( sci-libs/gsl ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.5 - >=sys-devel/bison-1.875 - >=sys-devel/flex-2.5.4a-r5 - doc? ( >=media-gfx/imagemagick-6.1.3.2 - virtual/ghostscript - >=sys-apps/texinfo-4.7-r1 )" - -SITEFILE=64${PN}-gentoo.el - -pkg_setup() { - # checking if Boehm garbage collector was compiled with c++ support - if use boehm-gc ; then - if ! built_with_use dev-libs/boehm-gc nocxx ; then - einfo "dev-libs/boehm-gc has been compiled with nocxx use flag disabled" - else - echo - eerror "You have to rebuild dev-libs/boehm-gc enabling c++ support" - die - fi - fi - - if ! built_with_use dev-lang/python tk; then - eerror "Please reemerge dev-lang/python with 'tk' support or xasy will" - eerror "not work. In order to fix this, execute the following:" - eerror "echo \"dev-lang/python tk\" >> /etc/portage/package.use" - eerror "and reemerge dev-lang/python before emerging asymptote." - die "requires dev-lang/python with use-flag 'tk'!!" - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - - # Fixing fftw and gsl enabling - epatch "${FILESDIR}/${P}-configure-ac.patch" - einfo "Patching configure.ac" - sed -i \ - -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ - configure.ac || die "sed configure.ac failed" - - einfo "Building configure" - WANT_AUTOCONF=2.5 autoconf - - epatch "${FILESDIR}/${P}-makefile.patch" - - # Changing pdf, ps, image viewers to xdg-open - epatch "${FILESDIR}/${P}-xdg-utils.patch" -} - -src_compile() { - for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done - - # for the CPPFLAGS see http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - myconf="--with-latex=/usr/share/texmf/tex/latex --disable-gc-debug CPPFLAGS=-DHAVE_SYS_TYPES_H" - if use boehm-gc; then - myconf="${myconf} --enable-gc=system" - else - myconf="${myconf} --disable-gc" - fi - - econf ${myconf} $(use_with fftw) $(use_with gsl) || die "econf failed" - emake || die "emake failed" - - if use emacs ; then - elisp-compile base/*.el || die "elisp-compile failed" - fi -} - -src_install() { - for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done - - if use doc; then - target="install-all" - else - target="install" - fi - - emake DESTDIR="${D}" ${target} || die "emake install failed" - - dodoc BUGS ChangeLog README ReleaseNotes TODO - - if use emacs ; then - elisp-install ${PN} base/*.el base/*.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins base/asy.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/asy-ftd.vim" - fi -} - -pkg_postinst() { - latex-package_rehash - - elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' - elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' - - use emacs && elisp-site-regen -} - -pkg_postrm() { - latex-package_rehash - use emacs && elisp-site-regen -} diff --git a/media-gfx/asymptote/asymptote-1.43.ebuild b/media-gfx/asymptote/asymptote-1.44.ebuild index 391e95c5c6c4..c4dc70396522 100644 --- a/media-gfx/asymptote/asymptote-1.43.ebuild +++ b/media-gfx/asymptote/asymptote-1.44.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.43.ebuild,v 1.3 2008/07/08 10:35:25 grozin Exp $ - +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.44.ebuild,v 1.1 2008/10/09 06:25:51 grozin Exp $ +EAPI=2 inherit eutils autotools elisp-common latex-package multilib python DESCRIPTION="A vector graphics language that provides a framework for technical drawing" @@ -12,40 +12,24 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="boehm-gc doc emacs examples fftw gsl latex python vim-syntax X" +IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex python sigsegv vim-syntax X" RDEPEND=">=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 - dev-libs/libsigsegv - x11-misc/xdg-utils - boehm-gc? ( >=dev-libs/boehm-gc-7.0 ) + imagemagick? ( media-gfx/imagemagick[png] ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[-nocxx] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) - X? ( dev-lang/python dev-python/imaging ) + X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) python? ( dev-lang/python ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" DEPEND="${RDEPEND} - doc? ( dev-lang/perl virtual/texi2dvi )" + doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] )" pkg_setup() { - # checking if Boehm garbage collector was compiled with c++ support - if use boehm-gc; then - if ! built_with_use dev-libs/boehm-gc nocxx; then - einfo "dev-libs/boehm-gc has been compiled with nocxx use flag disabled" - else - echo - eerror "You have to rebuild dev-libs/boehm-gc enabling c++ support" - die - fi - fi - - if use X && ! built_with_use dev-python/imaging tk; then - eerror "Please re-emerge dev-python/imaging with the USE flag 'tk'" - die "Missing USE flag 'tk' for dev-python/imaging" - fi - if use latex; then # Calculating ASY_TEXMFDIR local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)" @@ -84,11 +68,8 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" - - # Fixing fftw and gsl enabling +src_prepare() { + # Fixing fftwl, gsl, sigsegv enabling epatch "${FILESDIR}/${P}-configure-ac.patch" einfo "Patching configure.ac" sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ @@ -101,35 +82,34 @@ src_unpack() { eautoreconf } -src_compile() { +src_configure() { # for the CPPFLAGS see # http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - local myconf="--disable-gc-debug CPPFLAGS=-DHAVE_SYS_TYPES_H" - - if use boehm-gc; then - myconf="${myconf} --enable-gc=system" - else - myconf="${myconf} --disable-gc" - fi - - econf ${myconf} \ + econf CPPFLAGS=-DHAVE_SYS_TYPES_H \ + --disable-gc-debug \ + $(use_enable boehm-gc gc system) \ $(use_with fftw) \ $(use_with gsl) \ - || die "econf failed" + $(use_with sigsegv) +} +src_compile() { emake || die "emake failed" cd doc emake asy.1 || die "emake asy.1 failed" - emake ${PN}.info || die "emake ${PN}.info failed" if use doc; then + # info + einfo "Making info" + emake ${PN}.info || die "emake ${PN}.info failed" + # html einfo "Making html docs" emake ${PN}/index.html einfo "Making FAQ" cd FAQ emake cd .. - # pdf files + # pdf einfo "Making pdf docs" export VARTEXFONTS="${T}"/fonts emake asymptote.pdf @@ -154,10 +134,7 @@ src_install() { # documentation dodoc BUGS ChangeLog README ReleaseNotes TODO - cd doc - doman asy.1 - doinfo ${PN}.info* - cd .. + doman doc/asy.1 # X GUI if use X; then @@ -216,6 +193,7 @@ src_install() { # extra documentation if use doc; then cd doc + doinfo ${PN}.info* dohtml ${PN}/* cd FAQ dodoc asy-faq.ascii diff --git a/media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch deleted file mode 100644 index cf4fc235481a..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- configure.ac 2007-07-30 02:28:12.000000000 +1000 -+++ ../configure.ac.new 2007-08-19 09:19:39.000000000 +1000 -@@ -76,10 +76,16 @@ - fi - fi - --AC_CHECK_HEADER(fftw3.h, -- AC_CHECK_LIB([fftw3], fftw_execute,, -+AC_ARG_WITH([fftw], -+ [ --with-fftw use fftw3], -+ [with_fftw=$withval], -+ [with_fftw="no"]) -+if test "$with_fftw" = "yes"; then -+AC_CHECK_HEADER([fftw3.h], -+ AC_CHECK_LIB([fftw3], [fftw_execute],, - AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])), - AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***])) -+fi - - GCVERSION=gc-7.0 - -@@ -108,7 +114,8 @@ - then INCL="-I$prefix/include/gc" - else INCL="-I$ac_cv_use_gc/include/gc" - fi -- AC_CHECK_HEADER(gc.h, -+ -+ AC_CHECK_HEADER([gc/gc.h], - AC_CHECK_LIB([gc],[GC_malloc],[ - LIBS=$LIBS"-lgc " - # LIBS=$LIBS"-lgccpp -lgc " -@@ -183,11 +190,17 @@ - [Define if you have a working <rpc/rpc.h> header file])], - AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) - -+AC_ARG_WITH(gsl, -+ [ --with-gsl use gsl libraries], -+ [with_gsl=$withval], -+ [with_gsl="no"]) -+if test "$with_gsl" = "yes"; then - AC_CHECK_HEADER(gsl/gsl_sf.h, - AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, - [Define to 1 if you have the 'gsl' library (-lgsl). ]) LIBS=$LIBS"-lgsl -lgslcblas "], - AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), - AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) -+fi - - # Checks for typedefs, structures, and compiler characteristics. - AC_TYPE_PID_T diff --git a/media-gfx/asymptote/files/asymptote-1.33-makefile.patch b/media-gfx/asymptote/files/asymptote-1.33-makefile.patch deleted file mode 100644 index d4d5b1a5cac4..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.33-makefile.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- ../media-gfx/asymptote-1.33/work/asymptote-1.33/Makefile.in 2007-07-30 02:27:31.000000000 +1000 -+++ Makefile.in 2007-08-12 08:15:32.000000000 +1000 -@@ -49,7 +49,7 @@ - datadir = $(DESTDIR)@datadir@ - asydir = $(datadir)/asymptote - docdir = $(DESTDIR)@docdir@ --exampledir = $(docdir)/examples -+exampledir = $(asydir)/examples - animationsdir = $(exampledir)/animations - latexdir = $(DESTDIR)@latexdir@ - INSTALL = @INSTALL@ -@@ -127,11 +127,9 @@ - doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir) - ${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir) - -${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir) -- -if test -z "$(DESTDIR)"; then \ -- texhash; \ -- fi - --install-doc: html -+ -+install-doc: - cd doc; $(MAKE) install-all - - install-man: man ---- ../media-gfx/asymptote-1.33/work/asymptote-1.33/doc/Makefile 2007-07-30 02:28:22.000000000 +1000 -+++ doc/Makefile 2007-08-12 08:21:29.000000000 +1000 -@@ -16,12 +16,12 @@ - - html: asymptote/index.html - --man: $(DOCFILES) asy.1 -+man: $(MANFILES) asy.1 - - faq: - cd FAQ; $(MAKE) faq - --doc: asymptote.dvi asymptote.info html man faq -+doc: $(DOCFILES) asymptote.info html man faq - - %.png: %.asy - $(ASY) -f png $< -@@ -84,15 +84,14 @@ - rm -f CAD.{aux,dvi,log,pdf,toc} - rm -rf asymptote - --install: man faq -- cd FAQ; $(MAKE) install -- ${INSTALL} -d -m 755 $(docdir) $(mandir)/man1 -- ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -- ${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1 -+install: man -+ ${INSTALL} -d -m 755 $(mandir)/man1 - --install-all: doc install -- cd FAQ; $(MAKE) install-info -- ${INSTALL} -d -m 755 $(infodir) -+install-all: doc faq install -+ cd FAQ; $(MAKE) install-all -+ ${INSTALL} -d -m 755 $(infodir) $(docdir)/html/asymptote -+ ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -+ ${INSTALL} -p -m 644 asymptote/* $(docdir)/html/asymptote - ${INSTALL} -p -m 644 asymptote.info $(infodir) - -${INSTALL} -p -m 644 asymptote.info-* $(infodir) - -if test -z "$(DESTDIR)"; then \ diff --git a/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch deleted file mode 100644 index cf4fc235481a..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- configure.ac 2007-07-30 02:28:12.000000000 +1000 -+++ ../configure.ac.new 2007-08-19 09:19:39.000000000 +1000 -@@ -76,10 +76,16 @@ - fi - fi - --AC_CHECK_HEADER(fftw3.h, -- AC_CHECK_LIB([fftw3], fftw_execute,, -+AC_ARG_WITH([fftw], -+ [ --with-fftw use fftw3], -+ [with_fftw=$withval], -+ [with_fftw="no"]) -+if test "$with_fftw" = "yes"; then -+AC_CHECK_HEADER([fftw3.h], -+ AC_CHECK_LIB([fftw3], [fftw_execute],, - AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])), - AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***])) -+fi - - GCVERSION=gc-7.0 - -@@ -108,7 +114,8 @@ - then INCL="-I$prefix/include/gc" - else INCL="-I$ac_cv_use_gc/include/gc" - fi -- AC_CHECK_HEADER(gc.h, -+ -+ AC_CHECK_HEADER([gc/gc.h], - AC_CHECK_LIB([gc],[GC_malloc],[ - LIBS=$LIBS"-lgc " - # LIBS=$LIBS"-lgccpp -lgc " -@@ -183,11 +190,17 @@ - [Define if you have a working <rpc/rpc.h> header file])], - AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) - -+AC_ARG_WITH(gsl, -+ [ --with-gsl use gsl libraries], -+ [with_gsl=$withval], -+ [with_gsl="no"]) -+if test "$with_gsl" = "yes"; then - AC_CHECK_HEADER(gsl/gsl_sf.h, - AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, - [Define to 1 if you have the 'gsl' library (-lgsl). ]) LIBS=$LIBS"-lgsl -lgslcblas "], - AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), - AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) -+fi - - # Checks for typedefs, structures, and compiler characteristics. - AC_TYPE_PID_T diff --git a/media-gfx/asymptote/files/asymptote-1.36-makefile.patch b/media-gfx/asymptote/files/asymptote-1.36-makefile.patch deleted file mode 100644 index d4d5b1a5cac4..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.36-makefile.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- ../media-gfx/asymptote-1.33/work/asymptote-1.33/Makefile.in 2007-07-30 02:27:31.000000000 +1000 -+++ Makefile.in 2007-08-12 08:15:32.000000000 +1000 -@@ -49,7 +49,7 @@ - datadir = $(DESTDIR)@datadir@ - asydir = $(datadir)/asymptote - docdir = $(DESTDIR)@docdir@ --exampledir = $(docdir)/examples -+exampledir = $(asydir)/examples - animationsdir = $(exampledir)/animations - latexdir = $(DESTDIR)@latexdir@ - INSTALL = @INSTALL@ -@@ -127,11 +127,9 @@ - doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir) - ${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir) - -${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir) -- -if test -z "$(DESTDIR)"; then \ -- texhash; \ -- fi - --install-doc: html -+ -+install-doc: - cd doc; $(MAKE) install-all - - install-man: man ---- ../media-gfx/asymptote-1.33/work/asymptote-1.33/doc/Makefile 2007-07-30 02:28:22.000000000 +1000 -+++ doc/Makefile 2007-08-12 08:21:29.000000000 +1000 -@@ -16,12 +16,12 @@ - - html: asymptote/index.html - --man: $(DOCFILES) asy.1 -+man: $(MANFILES) asy.1 - - faq: - cd FAQ; $(MAKE) faq - --doc: asymptote.dvi asymptote.info html man faq -+doc: $(DOCFILES) asymptote.info html man faq - - %.png: %.asy - $(ASY) -f png $< -@@ -84,15 +84,14 @@ - rm -f CAD.{aux,dvi,log,pdf,toc} - rm -rf asymptote - --install: man faq -- cd FAQ; $(MAKE) install -- ${INSTALL} -d -m 755 $(docdir) $(mandir)/man1 -- ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -- ${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1 -+install: man -+ ${INSTALL} -d -m 755 $(mandir)/man1 - --install-all: doc install -- cd FAQ; $(MAKE) install-info -- ${INSTALL} -d -m 755 $(infodir) -+install-all: doc faq install -+ cd FAQ; $(MAKE) install-all -+ ${INSTALL} -d -m 755 $(infodir) $(docdir)/html/asymptote -+ ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -+ ${INSTALL} -p -m 644 asymptote/* $(docdir)/html/asymptote - ${INSTALL} -p -m 644 asymptote.info $(infodir) - -${INSTALL} -p -m 644 asymptote.info-* $(infodir) - -if test -z "$(DESTDIR)"; then \ diff --git a/media-gfx/asymptote/files/asymptote-1.41-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.41-configure-ac.patch deleted file mode 100644 index 71a7bc06d243..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.41-configure-ac.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -U2 --recursive asymptote-1.41.orig/configure.ac asymptote-1.41/configure.ac ---- asymptote-1.41.orig/configure.ac 2008-02-02 07:13:56.000000000 +0600 -+++ asymptote-1.41/configure.ac 2008-02-04 06:21:51.000000000 +0600 -@@ -77,8 +77,14 @@ - fi - --AC_CHECK_HEADER(fftw3.h, -- AC_CHECK_LIB([fftw3], fftw_execute,, -+AC_ARG_WITH([fftw], -+ [ --with-fftw use fftw3], -+ [with_fftw=$withval], -+ [with_fftw="no"]) -+if test "$with_fftw" = "yes"; then -+AC_CHECK_HEADER([fftw3.h], -+ AC_CHECK_LIB([fftw3], [fftw_execute],, - AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])), - AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***])) -+fi - - GCVERSION=gc-7.0 -@@ -117,5 +123,5 @@ - CPPFLAGS_SAVE=$CPPFLAGS - CPPFLAGS=$CPPFLAGS" $INCL" -- AC_CHECK_HEADER(gc.h, -+ AC_CHECK_HEADER([gc/gc.h], - AC_CHECK_LIB([gc],[GC_malloc],[ - LIBS=$LIBS"-lgc " -@@ -197,4 +203,9 @@ - AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) - -+AC_ARG_WITH(gsl, -+ [ --with-gsl use gsl libraries], -+ [with_gsl=$withval], -+ [with_gsl="no"]) -+if test "$with_gsl" = "yes"; then - AC_CHECK_HEADER(gsl/gsl_sf.h, - AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, -@@ -202,4 +213,5 @@ - AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), - AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) -+fi - - # Checks for typedefs, structures, and compiler characteristics. diff --git a/media-gfx/asymptote/files/asymptote-1.41-makefile.patch b/media-gfx/asymptote/files/asymptote-1.41-makefile.patch deleted file mode 100644 index 3202ded70b2b..000000000000 --- a/media-gfx/asymptote/files/asymptote-1.41-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -U2 --recursive asymptote-1.41.orig/Makefile.in asymptote-1.41/Makefile.in ---- asymptote-1.41.orig/Makefile.in 2008-02-02 07:13:09.000000000 +0600 -+++ asymptote-1.41/Makefile.in 2008-02-04 06:23:35.000000000 +0600 -@@ -51,5 +51,5 @@ - GUIdir = $(asydir)/GUI - docdir = $(DESTDIR)@docdir@ --exampledir = $(docdir)/examples -+exampledir = $(asydir)/examples - animationsdir = $(exampledir)/animations - latexdir = $(DESTDIR)@latexdir@ -@@ -136,9 +136,6 @@ - ${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir) - -${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir) -- -if test -z "$(DESTDIR)"; then \ -- texhash; \ -- fi - --install-doc: html -+install-doc: - cd doc; $(MAKE) install-all - -diff -U2 --recursive asymptote-1.41.orig/doc/Makefile asymptote-1.41/doc/Makefile ---- asymptote-1.41.orig/doc/Makefile 2008-02-02 07:14:11.000000000 +0600 -+++ asymptote-1.41/doc/Makefile 2008-02-04 06:23:50.000000000 +0600 -@@ -17,10 +17,10 @@ - html: asymptote/index.html - --man: $(DOCFILES) asy.1 -+man: $(MANFILES) - - faq: - cd FAQ; $(MAKE) faq - --doc: asymptote.dvi asymptote.info html man faq -+doc: $(DOCFILES) asymptote.info html man faq - - %.png: %.asy -@@ -85,13 +85,12 @@ - rm -rf asymptote - --install: man faq -- cd FAQ; $(MAKE) install -- ${INSTALL} -d -m 755 $(docdir) $(mandir)/man1 -- ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -- ${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1 -+install: man -+ ${INSTALL} -d -m 755 $(mandir)/man1 - --install-all: doc install -- cd FAQ; $(MAKE) install-info -- ${INSTALL} -d -m 755 $(infodir) -+install-all: doc faq install -+ cd FAQ; $(MAKE) install-all -+ ${INSTALL} -d -m 755 $(infodir) $(docdir)/html/asymptote -+ ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) -+ ${INSTALL} -p -m 644 asymptote/* $(docdir)/html/asymptote - ${INSTALL} -p -m 644 asymptote.info $(infodir) - -${INSTALL} -p -m 644 asymptote.info-* $(infodir) diff --git a/media-gfx/asymptote/files/asymptote-1.43-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.44-configure-ac.patch index aa101a046317..94f5f28b3b14 100644 --- a/media-gfx/asymptote/files/asymptote-1.43-configure-ac.patch +++ b/media-gfx/asymptote/files/asymptote-1.44-configure-ac.patch @@ -1,6 +1,6 @@ -diff -U2 --recursive asymptote-1.43.orig/configure.ac asymptote-1.43/configure.ac ---- asymptote-1.43.orig/configure.ac 2008-06-12 14:42:50.000000000 +0700 -+++ asymptote-1.43/configure.ac 2008-06-22 17:30:54.000000000 +0700 +diff -U2 -r asymptote-1.44.orig/configure.ac asymptote-1.44/configure.ac +--- asymptote-1.44.orig/configure.ac 2008-10-06 17:23:34.000000000 +0700 ++++ asymptote-1.44/configure.ac 2008-10-09 20:48:59.000000000 +0700 @@ -77,8 +77,14 @@ fi @@ -25,7 +25,23 @@ diff -U2 --recursive asymptote-1.43.orig/configure.ac asymptote-1.43/configure.a + AC_CHECK_HEADER([gc/gc.h], AC_CHECK_LIB([gc],[GC_malloc],[ LIBS=$LIBS"-lgc " -@@ -198,4 +204,9 @@ +@@ -183,5 +189,14 @@ + AC_CHECK_LIB([m], [sqrt]) + AC_CHECK_LIB([z], [deflate]) +-AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]) ++ ++AC_ARG_WITH(sigsegv, ++ [ --with-sigsegv use libsigsegv], ++ [with_sigsegv=$withval], ++ [with_sigsegv="no"]) ++if test "$with_sigsegv" = "yes"; then ++AC_CHECK_HEADER(sigsegv.h, ++ AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]), ++ AC_MSG_NOTICE([*** Header file sigsegv.h not found ***])) ++fi + + AC_CHECK_LIB([readline], [rl_completion_matches],, +@@ -200,4 +215,9 @@ AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) +AC_ARG_WITH(gsl, @@ -35,9 +51,9 @@ diff -U2 --recursive asymptote-1.43.orig/configure.ac asymptote-1.43/configure.a +if test "$with_gsl" = "yes"; then AC_CHECK_HEADER(gsl/gsl_sf.h, AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, -@@ -203,4 +214,5 @@ +@@ -205,4 +225,5 @@ AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) +fi - TRIANGLE=Delaunay + case "$MACHTYPE" in diff --git a/media-gfx/asymptote/files/asymptote-1.41-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.44-xdg-utils.patch index bc2ac0a780ac..4ff8323edbbc 100644 --- a/media-gfx/asymptote/files/asymptote-1.41-xdg-utils.patch +++ b/media-gfx/asymptote/files/asymptote-1.44-xdg-utils.patch @@ -1,7 +1,7 @@ -diff -U2 --recursive asymptote-1.41.orig/settings.cc asymptote-1.41/settings.cc ---- asymptote-1.41.orig/settings.cc 2008-02-02 07:13:09.000000000 +0600 -+++ asymptote-1.41/settings.cc 2008-02-04 19:43:26.000000000 +0600 -@@ -74,12 +74,12 @@ +diff -U2 -r asymptote-1.44.orig/settings.cc asymptote-1.44/settings.cc +--- asymptote-1.44.orig/settings.cc 2008-10-06 17:16:51.000000000 +0700 ++++ asymptote-1.44/settings.cc 2008-10-09 20:53:22.000000000 +0700 +@@ -81,12 +81,12 @@ const char *HOME="HOME"; const char pathSeparator=':'; -string defaultPSViewer="gv"; |