head	1.17;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6
	OPENPKG_E1_MP_2_STABLE:1.4.2.3
	OPENPKG_E1_FP:1.4.2.3
	OPENPKG_2_STABLE_MP:1.5
	OPENPKG_2_STABLE_20061018:1.4.2.2
	OPENPKG_2_STABLE:1.4.0.2;
locks; strict;
comment	@# @;


1.17
date	2009.06.25.07.21.31;	author rse;	state Exp;
branches;
next	1.16;
commitid	wE99LCgEh1aRVcTt;

1.16
date	2009.06.19.19.09.35;	author rse;	state Exp;
branches;
next	1.15;
commitid	0W0NJryeDUAI2vSt;

1.15
date	2009.06.08.12.56.42;	author rse;	state Exp;
branches;
next	1.14;
commitid	ZVsYkR7znHtIk3Rt;

1.14
date	2009.02.19.22.55.04;	author rse;	state Exp;
branches;
next	1.13;
commitid	44eVYP1KhKSd96Dt;

1.13
date	2009.01.28.08.09.26;	author rse;	state Exp;
branches;
next	1.12;
commitid	xHNVTIat6jxeXbAt;

1.12
date	2009.01.12.12.00.15;	author rse;	state Exp;
branches;
next	1.11;
commitid	kD1DwyMnyCMiK9yt;

1.11
date	2008.10.18.18.30.41;	author rse;	state Exp;
branches;
next	1.10;
commitid	fordQ6hkZZyDF8nt;

1.10
date	2008.10.06.17.17.42;	author rse;	state Exp;
branches;
next	1.9;
commitid	q9sorrBwF0bwEAlt;

1.9
date	2007.10.12.06.46.34;	author rse;	state Exp;
branches;
next	1.8;
commitid	bLPvsyzPFXxrJgBs;

1.8
date	2007.07.31.07.43.47;	author rse;	state Exp;
branches;
next	1.7;
commitid	fe4dGJuWPEjyoTrs;

1.7
date	2007.05.20.07.32.51;	author rse;	state Exp;
branches;
next	1.6;
commitid	FQri1CQoy1DhEDis;

1.6
date	2006.12.13.11.25.16;	author rse;	state Exp;
branches;
next	1.5;
commitid	oqezkynzxCRT0mYr;

1.5
date	2006.10.22.17.56.37;	author rse;	state Exp;
branches;
next	1.4;
commitid	NyLpa8qHmGcNQHRr;

1.4
date	2006.09.06.14.38.04;	author cs;	state Exp;
branches
	1.4.2.1;
next	1.3;
commitid	5WQ1wWnOnHYleMLr;

1.3
date	2006.06.19.08.00.35;	author rse;	state Exp;
branches;
next	1.2;
commitid	92ayJ7z7jYcqzABr;

1.2
date	2006.04.25.18.13.18;	author rse;	state Exp;
branches;
next	1.1;
commitid	G7nl0v2lZMzeJzur;

1.1
date	2006.03.31.11.19.50;	author rse;	state Exp;
branches;
next	;
commitid	Ede4uyr7Lmmdfkrr;

1.4.2.1
date	2006.09.06.14.38.04;	author rse;	state dead;
branches;
next	1.4.2.2;
commitid	iZxwRSmmWscPXUQr;

1.4.2.2
date	2006.10.16.14.48.10;	author rse;	state Exp;
branches;
next	1.4.2.3;
commitid	iZxwRSmmWscPXUQr;

1.4.2.3
date	2006.10.22.17.58.27;	author rse;	state Exp;
branches;
next	;
commitid	CL8AWoAwFpoqRHRr;


desc
@@


1.17
log
@upgrading package: asymptote 1.77 -> 1.78
@
text
@Index: Makefile.in
--- Makefile.in.orig	2009-06-24 19:24:54 +0200
+++ Makefile.in	2009-06-25 09:12:56 +0200
@@@@ -41,8 +41,8 @@@@
 OPTS = $(DEFS) $(CFLAGS)
 INCL = -I . @@INCL@@
 
-CXX = @@CXX@@ -Wall -ansi
-CC = @@CC@@ -Wall -ansi
+CXX = @@CXX@@ @@CPPFLAGS@@ @@CXXFLAGS@@
+CC = @@CC@@ @@CPPFLAGS@@ @@CFLAGS@@
 MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND
 BISON = bison
 LEX = @@LEX@@
@@@@ -152,14 +152,14 @@@@
 
 install: asy-keywords.el install-texhash install-man
 
-install-all: asy-keywords.el install-texhash install-html
+install-all: asy-keywords.el
 
 install-texhash: install-asy
 	-if test -z "$(DESTDIR)"; then \
 	  texhash; \
 	fi
 
-install-asy: asy
+install-asy:
 	${INSTALL} -d $(bindir) $(asydir) $(GUIdir) $(exampledir) \
           $(animationsdir)
 	-${INSTALL} -d $(latexdir)
@@@@ -167,7 +167,7 @@@@
 	${INSTALL} -p -m 755 $(NAME) $(bindir)
 	${INSTALL} -p -m 644 asy-keywords.el base/*.asy $(addprefix base/,$(EXTRA)) $(asydir)
 	${INSTALL} -p -m 755 GUI/*.py $(GUIdir)
-	ln -sf @@datadir@@/asymptote/GUI/xasy.py $(bindir)/$(XNAME)
+	ln $(datadir)/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 \
Index: doc/Makefile.in
--- doc/Makefile.in.orig	2009-06-22 05:24:26 +0200
+++ doc/Makefile.in	2009-06-25 09:11:55 +0200
@@@@ -4,10 +4,10 @@@@
 ASY = ../asy -dir ../base -config "" -render=0
 DOCFILES = asymptote.pdf CAD.pdf
 
-docdir = $(DESTDIR)@@docdir@@
+docdir = $(DESTDIR)@@prefix@@/share/doc/asymptote
 infodir = $(DESTDIR)@@infodir@@
 datarootdir = @@datarootdir@@
-INSTALL = @@INSTALL@@
+INSTALL = @@prefix@@/bin/ginstall -c
 TEXI2DVI = @@TEXI2DVI@@
 
 export docdir infodir INSTALL
@


1.16
log
@upgrading package: asymptote 1.76 -> 1.77
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-06-08 05:53:40 +0200
+++ Makefile.in	2009-06-19 21:03:21 +0200
d15 1
a15 3
@@@@ -150,11 +150,11 @@@@
           grep -v three_\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list
 	./asy-list.pl asy.list @@VERSION@@
d17 1
a17 2
-install: asy-keywords.el install-asy install-man
+install: asy-keywords.el install-asy
d19 7
a25 1
 install-all: asy-keywords.el install-asy install-html
d32 1
a32 1
@@@@ -162,7 +162,7 @@@@
d42 2
a43 2
--- doc/Makefile.in.orig	2009-06-08 04:11:06 +0200
+++ doc/Makefile.in	2009-06-19 20:59:36 +0200
@


1.15
log
@upgrading package: asymptote 1.74 -> 1.76
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-06-02 01:18:19 +0200
+++ Makefile.in	2009-06-08 13:31:59 +0200
d15 1
a15 1
@@@@ -147,11 +147,11 @@@@
d22 1
a22 1
 install-all: asy-keywords.el install-asy install-doc
d29 1
a29 1
@@@@ -159,7 +159,7 @@@@
d39 2
a40 2
--- doc/Makefile.in.orig	2009-06-01 08:04:03 +0200
+++ doc/Makefile.in	2009-06-08 13:30:35 +0200
@


1.14
log
@upgrading package: asymptote 1.62 -> 1.65
@
text
@d2 3
a4 3
--- Makefile.in.orig	2009-02-19 17:34:38 +0100
+++ Makefile.in	2009-02-19 23:47:25 +0100
@@@@ -40,8 +40,8 @@@@
d15 3
a17 3
@@@@ -147,18 +147,18 @@@@
 asy-keywords.el: asy.list
 	ln -sf ../asy-keywords.el base/
d29 1
d31 1
a31 1
 	${INSTALL} -p -m 644 base/*.asy $(addprefix base/,$(EXTRA)) $(asydir)
d39 2
a40 2
--- doc/Makefile.in.orig	2009-02-19 17:34:16 +0100
+++ doc/Makefile.in	2009-02-19 23:44:34 +0100
@


1.13
log
@upgrading package: asymptote 1.59 -> 1.60
@
text
@d2 3
a4 3
--- Makefile.in.orig	2009-01-27 05:02:57 +0100
+++ Makefile.in	2009-01-28 08:49:46 +0100
@@@@ -39,8 +39,8 @@@@
d15 1
a15 1
@@@@ -146,18 +146,18 @@@@
d34 1
a34 1
 	${INSTALL} -p -m 644 examples/*.asy examples/piicon.eps \
d38 2
a39 2
--- doc/Makefile.in.orig	2009-01-27 05:02:08 +0100
+++ doc/Makefile.in	2009-01-27 22:20:51 +0100
@


1.12
log
@upgrading package: asymptote 1.52 -> 1.58
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-01-12 06:41:53 +0100
+++ Makefile.in	2009-01-12 12:51:41 +0100
d15 3
a17 1
@@@@ -148,16 +148,16 @@@@
d19 2
a20 1
 install: install-asy install-man
d22 1
a22 2
-install-all: install-asy install-doc
+install-all: install-asy
d24 2
a25 2
-install-asy: asy asy-keywords.el
+install-asy: asy-keywords.el
d38 2
a39 2
--- doc/Makefile.in.orig	2009-01-12 06:41:06 +0100
+++ doc/Makefile.in	2009-01-12 12:52:31 +0100
@


1.11
log
@upgrading package: asymptote 1.44 -> 1.45
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-10-18 09:10:01 +0200
+++ Makefile.in	2008-10-18 20:22:56 +0200
d15 1
a15 1
@@@@ -146,16 +146,16 @@@@
d34 4
a37 4
 	${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir)
Index: doc/Makefile
--- doc/Makefile.orig	2008-10-18 09:10:43 +0200
+++ doc/Makefile	2008-10-18 20:20:39 +0200
d42 7
a48 7
-docdir = $(DESTDIR)/usr/local/share/doc/asymptote
+docdir = $(DESTDIR)/openpkg-dev/share/doc/asymptote
 infodir = $(DESTDIR)${datarootdir}/info
 datarootdir = ${prefix}/share
-INSTALL = /usr/bin/ginstall -c
+INSTALL = /openpkg-dev/bin/ginstall -c
 TEXI2DVI = texi2dvi
@


1.10
log
@upgrading package: asymptote 1.43 -> 1.44
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-10-06 12:16:51 +0200
+++ Makefile.in	2008-10-06 18:59:12 +0200
@@@@ -38,8 +38,8 @@@@
d15 1
a15 1
@@@@ -145,16 +145,16 @@@@
d32 3
a34 3
 	${INSTALL} -p -m 644 examples/*.asy examples/piicon.eps doc/pixel.pdf \
 	  doc/*.asy doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex \
 	  $(exampledir)
d36 2
a37 2
--- doc/Makefile.orig	2008-10-06 12:23:49 +0200
+++ doc/Makefile	2008-10-06 18:58:06 +0200
@


1.9
log
@upgrading package: asymptote 1.33 -> 1.36
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-10-11 19:39:28 +0200
+++ Makefile.in	2007-10-12 08:42:01 +0200
@@@@ -34,8 +34,8 @@@@
d15 1
a15 1
@@@@ -117,16 +117,16 @@@@
d32 3
a34 3
 	${INSTALL} -p -m 644 examples/*.asy examples/piicon.eps doc/*.asy \
 	  doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir)
 	${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir)
d36 2
a37 2
--- doc/Makefile.orig	2007-10-11 19:40:04 +0200
+++ doc/Makefile	2007-10-12 08:36:21 +0200
d39 1
a39 1
 ASY = ../asy -dir ../base -config ""
@


1.8
log
@upgrading package: asymptote 1.32 -> 1.33
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-07-29 18:27:31 +0200
+++ Makefile.in	2007-07-31 09:36:34 +0200
d15 1
a15 1
@@@@ -116,9 +116,9 @@@@
d24 2
a25 1
 	${INSTALL} -d $(bindir) $(asydir) $(exampledir) $(animationsdir)
d27 8
a34 1
 	${INSTALL} -p -m 755 $(NAME) $(EXTRABIN) $(bindir)
d36 3
a38 5
--- doc/Makefile.orig	2007-07-29 18:28:22 +0200
+++ doc/Makefile	2007-07-31 09:39:20 +0200
@@@@ -2,7 +2,7 @@@@
 ASYFILES = $(wildcard *.asy) latexusage.asy
 SOURCE = asymptote.texi version.texi options
d40 1
a40 2
-DOCFILES = asymptote.pdf CAD.pdf
+DOCFILES = 
d42 2
a43 1
 docdir = $(DESTDIR)/usr/local/share/doc/asymptote
d45 4
a48 10
@@@@ -84,10 +84,9 @@@@
 	rm -f CAD.{aux,dvi,log,pdf,toc}
 	rm -rf asymptote
 
-install: man faq
+install: 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
d50 1
a50 1
 install-all: doc install
@


1.7
log
@upgrading package: asymptote 1.28 -> 1.29
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-05-19 19:25:56 +0200
+++ Makefile.in	2007-05-20 08:52:52 +0200
@@@@ -33,8 +33,8 @@@@
d15 1
a15 1
@@@@ -114,9 +114,9 @@@@
d28 2
a29 2
--- doc/Makefile.orig	2007-05-19 19:25:52 +0200
+++ doc/Makefile	2007-05-20 08:55:04 +0200
d33 1
a33 1
 ASY = ../asy -dir ../base
d35 1
a35 1
+DOCFILES =
d37 3
a39 3
 doc:	asymptote.dvi asymptote.info html man faq
 
@@@@ -80,10 +80,9 @@@@
@


1.6
log
@upgrading package: asymptote 1.18 -> 1.19
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-12-13 03:06:26 +0100
+++ Makefile.in	2006-12-13 12:21:17 +0100
@@@@ -30,8 +30,8 @@@@
d15 1
a15 1
@@@@ -105,9 +105,9 @@@@
d28 12
a39 12
--- doc/Makefile.orig	2006-12-13 03:06:11 +0100
+++ doc/Makefile	2006-12-13 12:22:33 +0100
@@@@ -6,7 +6,7 @@@@
 
 doc:	asymptote.dvi asymptote.info html man
 
-man:	asymptote.pdf CAD.pdf PDFAnim_temp_Guide.pdf asy.1
+man:
 
 faq:	
 	cd FAQ; $(MAKE) faq
@@@@ -71,10 +71,9 @@@@
@


1.5
log
@upgrading package: asymptote 1.13 -> 1.15
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-10-22 07:11:18 +0200
+++ Makefile.in	2006-10-22 19:46:27 +0200
@@@@ -29,8 +29,8 @@@@
d15 1
a15 1
@@@@ -104,9 +104,9 @@@@
d28 2
a29 2
--- doc/Makefile.orig	2006-10-22 07:11:09 +0200
+++ doc/Makefile	2006-10-22 19:53:06 +0200
d34 2
a35 2
-man:	asymptote.pdf CAD.pdf
+man:	
d39 2
a40 2
@@@@ -59,10 +59,9 @@@@
 	rm -f asymptote.{aux,cp,cps,dvi,fn,info,ky,log,pg,pdf,toc,tp,vr}
d47 1
a47 1
-	${INSTALL} -p -m 644 {$(DOCFILES)} $(docdir)
@


1.4
log
@upgrading package: asymptote 1.12 -> 1.13
@
text
@d2 2
a3 2
--- Makefile.in	2006-09-06 06:52:39 +0200
+++ Makefile.in	2006-09-06 16:20:27 +0200
d15 1
a15 1
@@@@ -105,9 +105,9 @@@@
d28 3
a30 3
--- doc/Makefile	2006-09-06 06:52:34 +0200
+++ doc/Makefile	2006-09-06 16:29:50 +0200
@@@@ -5,7 +5,7 @@@@
d34 2
a35 2
-man:	asymptote.pdf
+man:
d39 1
a39 1
@@@@ -55,10 +55,9 @@@@
d47 1
a47 1
-	${INSTALL} -p -m 644 asymptote.pdf $(docdir)
@


1.4.2.1
log
@file asymptote.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:10 +0000
@
text
@d1 50
@


1.4.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 50
Index: Makefile.in
--- Makefile.in	2006-09-06 06:52:39 +0200
+++ Makefile.in	2006-09-06 16:20:27 +0200
@@@@ -29,8 +29,8 @@@@
 OPTS = $(DEFS) $(CFLAGS)
 INCL = -I . @@INCL@@
 
-CXX = @@CXX@@ -Wall -ansi
-CC = @@CC@@ -Wall -ansi
+CXX = @@CXX@@ @@CPPFLAGS@@ @@CXXFLAGS@@
+CC = @@CC@@ @@CPPFLAGS@@ @@CFLAGS@@
 MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND
 BISON = bison
 LEX = @@LEX@@
@@@@ -105,9 +105,9 @@@@
 
 install: install-asy install-man
 
-install-all: install-asy install-doc
+install-all: install-asy
 
-install-asy: asy asy-keywords.el
+install-asy: asy-keywords.el
 	${INSTALL} -d $(bindir) $(asydir) $(exampledir) $(animationsdir)
 	-${INSTALL} -d $(latexdir)
 	${INSTALL} -p -m 755 $(NAME) $(EXTRABIN) $(bindir)
Index: doc/Makefile
--- doc/Makefile	2006-09-06 06:52:34 +0200
+++ doc/Makefile	2006-09-06 16:29:50 +0200
@@@@ -5,7 +5,7 @@@@
 
 doc:	asymptote.dvi asymptote.info html man
 
-man:	asymptote.pdf
+man:
 
 faq:	
 	cd FAQ; $(MAKE) faq
@@@@ -55,10 +55,9 @@@@
 	rm -f asymptote.{aux,cp,cps,dvi,fn,info,ky,log,pg,pdf,toc,tp,vr}
 	rm -rf asymptote
 
-install: man faq
+install: faq
 	cd FAQ; $(MAKE) install
 	${INSTALL} -d -m 755 $(docdir) $(mandir)/man1
-	${INSTALL} -p -m 644 asymptote.pdf $(docdir)
 	${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1
 
 install-all: doc install
@


1.4.2.3
log
@MFC: latest fixed version
@
text
@d2 2
a3 2
--- Makefile.in.orig	2006-10-22 07:11:18 +0200
+++ Makefile.in	2006-10-22 19:46:27 +0200
d15 1
a15 1
@@@@ -104,9 +104,9 @@@@
d28 3
a30 3
--- doc/Makefile.orig	2006-10-22 07:11:09 +0200
+++ doc/Makefile	2006-10-22 19:53:06 +0200
@@@@ -6,7 +6,7 @@@@
d34 2
a35 2
-man:	asymptote.pdf CAD.pdf
+man:	
d39 1
a39 1
@@@@ -59,10 +59,9 @@@@
d47 1
a47 1
-	${INSTALL} -p -m 644 {$(DOCFILES)} $(docdir)
@


1.3
log
@upgrade and band-aid Bash constructs in installation procedure by providing Bash
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-06-19 05:36:26 +0200
+++ Makefile.in	2006-06-19 09:48:47 +0200
@@@@ -28,8 +28,8 @@@@
d15 1
a15 1
@@@@ -92,9 +92,9 @@@@
d22 2
a23 2
-install-asy: asy
+install-asy:
d28 3
a30 3
--- doc/Makefile.orig	2006-06-19 05:36:12 +0200
+++ doc/Makefile	2006-06-19 09:49:21 +0200
@@@@ -4,7 +4,7 @@@@
d37 3
a39 3
 %.png:	%.asy
 	../asy -f png $<
@@@@ -51,9 +51,8 @@@@
d43 3
a45 2
-install-man: man
+install-man:
d50 1
a50 1
 install: doc install-man
@


1.2
log
@upgrading package: asymptote 1.03 -> 1.04
@
text
@d2 5
a6 5
--- Makefile.in.orig	2006-04-09 23:00:12 +0200
+++ Makefile.in	2006-04-25 19:15:56 +0200
@@@@ -20,8 +20,8 @@@@
 NAME = asy
 XNAME = x$(NAME)
d15 1
a15 1
@@@@ -88,9 +88,9 @@@@
d26 1
a26 1
 	${INSTALL} -p -m 755 -s $(NAME) $(bindir)
d28 2
a29 2
--- doc/Makefile.orig	2006-04-09 23:00:12 +0200
+++ doc/Makefile	2006-04-25 19:49:14 +0200
d45 1
a45 1
 	${INSTALL} -d $(docdir) $(mandir)/man1
@


1.1
log
@new package: asymptote 1.03 (Vector Graphics Programming Language)
@
text
@d2 2
a3 2
--- Makefile.in.orig	2006-03-10 20:19:57 +0100
+++ Makefile.in	2006-03-31 13:08:05 +0200
d26 1
a26 9
 	${INSTALL} -s $(NAME) $(bindir)
@@@@ -100,7 +100,6 @@@@
 		doc/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir)
 	${INSTALL} -m644 examples/animations/*.asy $(animationsdir)
 	-${INSTALL} -m644 doc/asymptote.sty $(latexdir)
-	-texhash
 
 install-doc: doc
 	cd doc; $(MAKE) install
d28 2
a29 2
--- doc/Makefile.orig	2005-11-16 09:36:10 +0100
+++ doc/Makefile	2006-03-31 13:08:45 +0200
d46 2
a47 2
-	${INSTALL} -m 644 asymptote.pdf $(docdir)
 	${INSTALL} -m 644 $(MANFILES) $(mandir)/man1
@